fix issue where minified files without js extns do get detected (firefox-devtools#4091)

Author: bomsy

src/components/Editor/Footer.js

@@ -139,11 +139,6 @@ class SourceFooter extends PureComponent {
   }
 
   renderCommands() {
-    const { selectedSource } = this.props;
-    if (!shouldShowPrettyPrint(selectedSource)) {
-      return null;
-    }
-
     return (
       <div className="commands">
         {this.prettyPrintButton()}

src/utils/pretty-print/index.js

@@ -18,13 +18,9 @@ type PrettyPrintOpts = {
 };
 
 export async function prettyPrint({ source, url }: PrettyPrintOpts) {
-  const contentType = source.contentType;
   const indent = 2;
 
-  assert(
-    isJavaScript(source.url, contentType),
-    "Can't prettify non-javascript files."
-  );
+  assert(isJavaScript(source), "Can't prettify non-javascript files.");
 
   return await _prettyPrint({
     url,

src/utils/source.js

@@ -38,7 +38,7 @@ function shouldPrettyPrint(source: any) {
   }
 
   const _isPretty = isPretty(source);
-  const _isJavaScript = isJavaScript(source.url);
+  const _isJavaScript = isJavaScript(source);
   const isOriginal = isOriginalId(source.id);
   const hasSourceMap = source.sourceMapURL;
 
@@ -59,10 +59,10 @@ function shouldPrettyPrint(source: any) {
  * @memberof utils/source
  * @static
  */
-function isJavaScript(url: ?string, contentType: string = ""): boolean {
+function isJavaScript(source: Source): boolean {
   return (
-    (url && /\.(jsm|js)?$/.test(trimUrlQuery(url))) ||
-    contentType.includes("javascript")
+    (source.url && /\.(jsm|js)?$/.test(trimUrlQuery(source.url))) ||
+    !!(source.contentType && source.contentType.includes("javascript"))
   );
 }
 

src/utils/tests/source.spec.js

@@ -2,7 +2,8 @@ import {
   getFilename,
   getMode,
   getSourceLineCount,
-  isThirdParty
+  isThirdParty,
+  isJavaScript
 } from "../source.js";
 
 describe("sources", () => {
@@ -22,6 +23,22 @@ describe("sources", () => {
     });
   });
 
+  describe("isJavaScript", () => {
+    it("is not JavaScript", () => {
+      expect(isJavaScript({ url: "foo.html" })).toBe(false);
+      expect(isJavaScript({ contentType: "text/html" })).toBe(false);
+    });
+
+    it("is JavaScript", () => {
+      expect(isJavaScript({ url: "foo.js" })).toBe(true);
+      expect(isJavaScript({ url: "bar.jsm" })).toBe(true);
+      expect(isJavaScript({ contentType: "text/javascript" })).toBe(true);
+      expect(isJavaScript({ contentType: "application/javascript" })).toBe(
+        true
+      );
+    });
+  });
+
   describe("isThirdParty", () => {
     it("node_modules", () => {
       expect(isThirdParty({ url: "/node_modules/foo.js" })).toBe(true);