Switch to a local mime-type lookup table

- Fixes detection of CJSX
- Fixes detection of TSX
- Update require-hook to support multiple extensions per mimetype, fixes support for `.es6` JS files and `.litcoffee` files read via require.

Author: bengotow

package.json

@@ -31,7 +31,6 @@
     "node": ">= 5.0"
   },
   "dependencies": {
-    "@paulcbetts/mime-types": "^2.1.10",
     "btoa": "^1.1.2",
     "debug-electron": "0.0.1",
     "lru-cache": "^4.0.1",

src/compiler-host.js

@@ -1,18 +1,16 @@
-import mimeTypes from '@paulcbetts/mime-types';
 import fs from 'fs';
 import zlib from 'zlib';
 import path from 'path';
 import {pfs, pzlib} from './promise';
 
+import mimeTypes from './mime-types';
 import {forAllFiles, forAllFilesSync} from './for-all-files';
 import CompileCache from './compile-cache';
 import FileChangedCache from './file-change-cache';
 import ReadOnlyCompiler from './read-only-compiler';
 
 const d = require('debug-electron')('electron-compile:compiler-host');
 
-require('./rig-mime-types').init();
-
 // This isn't even my
 const finalForms = {
   'text/javascript': true,
@@ -267,7 +265,6 @@ export default class CompilerHost {
 
     if (hashInfo.isInNodeModules) {
       let code = hashInfo.sourceCode || await pfs.readFile(filePath, 'utf8');
-      code = await CompilerHost.fixNodeModulesSourceMapping(code, filePath, this.fileChangeCache.appRoot);
       return { code, mimeType: type };
     }
 
@@ -306,7 +303,9 @@ export default class CompilerHost {
       };
     }
 
-    let ctx = {};
+    let ctx = {
+      appRoot: this.appRoot,
+    };
     let code = hashInfo.sourceCode || await pfs.readFile(filePath, 'utf8');
 
     if (!(await compiler.shouldCompileFile(code, ctx))) {
@@ -491,7 +490,6 @@ export default class CompilerHost {
 
     if (hashInfo.isInNodeModules) {
       let code = hashInfo.sourceCode || fs.readFileSync(filePath, 'utf8');
-      code = CompilerHost.fixNodeModulesSourceMappingSync(code, filePath, this.fileChangeCache.appRoot);
       return { code, mimeType: type };
     }
 
@@ -602,58 +600,4 @@ export default class CompilerHost {
   static shouldPassthrough(hashInfo) {
     return hashInfo.isMinified || hashInfo.isInNodeModules || hashInfo.hasSourceMap || hashInfo.isFileBinary;
   }
-    
-  /**
-   * Look at the code of a node modules and see the sourceMapping path.
-   * If there is any, check the path and try to fix it with and
-   * root relative path.
-   * @private
-   */
-  static async fixNodeModulesSourceMapping(sourceCode, sourcePath, appRoot) {
-    let regexSourceMapping = /\/\/#.*sourceMappingURL=(?!data:)([^"'].*)/i;
-    let sourceMappingCheck = sourceCode.match(regexSourceMapping);
-
-    if (sourceMappingCheck && sourceMappingCheck[1] && sourceMappingCheck[1] !== ''){
-      let sourceMapPath = sourceMappingCheck[1];
-      
-      try {
-        await pfs.stat(sourceMapPath);
-      } catch (error) {
-        let normRoot = path.normalize(appRoot);
-        let absPathToModule = path.dirname(sourcePath.replace(normRoot, '').substring(1));
-        let newMapPath = path.join(absPathToModule, sourceMapPath);
-        
-        return sourceCode.replace(regexSourceMapping, `//# sourceMappingURL=${newMapPath}`);
-      }
-    }
-    
-    return sourceCode;
-  }
-
-  /**
-   * Look at the code of a node modules and see the sourceMapping path.
-   * If there is any, check the path and try to fix it with and
-   * root relative path.
-   * @private
-   */
-  static fixNodeModulesSourceMappingSync(sourceCode, sourcePath, appRoot) {
-    let regexSourceMapping = /\/\/#.*sourceMappingURL=(?!data:)([^"'].*)/i;
-    let sourceMappingCheck = sourceCode.match(regexSourceMapping);
-
-    if (sourceMappingCheck && sourceMappingCheck[1] && sourceMappingCheck[1] !== ''){
-      let sourceMapPath = sourceMappingCheck[1];
-      
-      try {
-        fs.statSync(sourceMapPath);
-      } catch (error) {
-        let normRoot = path.normalize(appRoot);
-        let absPathToModule = path.dirname(sourcePath.replace(normRoot, '').substring(1));
-        let newMapPath = path.join(absPathToModule, sourceMapPath);
-        
-        return sourceCode.replace(regexSourceMapping, `//# sourceMappingURL=${newMapPath}`);
-      }
-    }
-    
-    return sourceCode;
-  }
 }

src/mime-types.js

@@ -0,0 +1,41 @@
+import path from 'path';
+
+const MimeTypesToExtensions = {
+  'application/javascript': ['js', 'es6'],
+  'text/less': ['less'],
+  'text/stylus': ['stylus'],
+  'text/jsx': ['jsx'],
+  'text/cjsx': ['cjsx'],
+  'text/coffeescript': ['coffee', 'litcoffee'],
+  'text/typescript': ['ts'],
+  'text/tsx': ['tsx'],
+  'text/cson': ['cson'],
+  'text/html': ['html', 'htm'],
+  'text/jade': ['jade'],
+  'text/plain': ['txt'],
+  'image/svg+xml': ['svg'],
+};
+
+const ExtensionsToMimeTypes = {};
+for (const mimetype of Object.keys(MimeTypesToExtensions)) {
+  for (const ext of MimeTypesToExtensions[mimetype]) {
+    ExtensionsToMimeTypes[ext] = mimetype;
+  }
+}
+
+class MimeTypes {
+  lookup(filepath) {
+    const ext = path.extname(filepath);
+    return ExtensionsToMimeTypes[ext.slice(1)] || false;
+  }
+
+  extension(mimeType) {
+    return this.extensions(mimeType)[0];
+  }
+
+  extensions(mimeType) {
+    return MimeTypesToExtensions[mimeType] || [];
+  }
+
+}
+export default new MimeTypes();

src/protocol-hook.js

@@ -1,6 +1,6 @@
 import url from 'url';
 import fs from 'fs';
-import mime from '@paulcbetts/mime-types';
+import mime from './mime-types';
 
 const magicWords = "__magic__file__to__help__electron__compile.js";
 

src/require-hook.js

@@ -1,20 +1,20 @@
-import mimeTypes from '@paulcbetts/mime-types';
+import mimeTypes from './mime-types';
 
 /**
- * Initializes the node.js hook that allows us to intercept files loaded by 
- * node.js and rewrite them. This method along with {@link initializeProtocolHook} 
- * are the top-level methods that electron-compile actually uses to intercept 
+ * Initializes the node.js hook that allows us to intercept files loaded by
+ * node.js and rewrite them. This method along with {@link initializeProtocolHook}
+ * are the top-level methods that electron-compile actually uses to intercept
  * code that Electron loads.
- *  
+ *
  * @param  {CompilerHost} compilerHost  The compiler host to use for compilation.
- */ 
+ */
 export default function registerRequireExtension(compilerHost) {
   Object.keys(compilerHost.compilersByMimeType).forEach((mimeType) => {
-    let ext = mimeTypes.extension(mimeType);
-    
-    require.extensions[`.${ext}`] = (module, filename) => {
-      let {code} = compilerHost.compileSync(filename);
-      module._compile(code, filename);
-    };
+    mimeTypes.extensions(mimeType).forEach((ext) => {
+      require.extensions[`.${ext}`] = (module, filename) => {
+        let {code} = compilerHost.compileSync(filename);
+        module._compile(code, filename);
+      };
+    });
   });
 }

src/rig-mime-types.js

@@ -4,7 +4,7 @@ import path from 'path';
 import fs from 'fs';
 import rimraf from 'rimraf';
 import mkdirp from 'mkdirp';
-import mimeTypes from '@paulcbetts/mime-types';
+import mimeTypes from '../mime-types';
 import FileChangeCache from '../src/file-change-cache';
 import CompilerHost from '../src/compiler-host';
 

test/compiler-host.js

@@ -3,7 +3,7 @@ import './support';
 import pify from 'pify';
 import fs from 'fs';
 import path from 'path';
-import mimeTypes from '@paulcbetts/mime-types';
+import mimeTypes from '../mime-types';
 
 const pfs = pify(fs);
 

test/compiler-valid-invalid.js

@@ -13,8 +13,6 @@ global.AssertionError = chai.AssertionError;
 global.Assertion = chai.Assertion;
 global.assert = chai.assert;
 
-require('../src/rig-mime-types').init();
-
 global.compilersByMimeType = allCompilerClasses.reduce((acc,x) => {
   acc = acc || {};