Fixed zip download with presets

cerebral · Mar 19, 2017 · 27aba9c · 27aba9c
1 parent 0828357
commit 27aba9c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/createLoaders.js b/src/createLoaders.js
@@ -1,5 +1,5 @@
 
-module.exports = function (currentLoaders) {
+module.exports = function (currentLoaders, resolve) {
 
   var loaders = [];
 
@@ -19,29 +19,29 @@ module.exports = function (currentLoaders) {
       }
     };
     if (currentLoaders.babel.es2015) {
-      loader.query.presets.push(require.resolve('babel-preset-es2015'));
+      loader.query.presets.push(resolve('babel-preset-es2015'));
     }
     if (currentLoaders.babel.react) {
-      loader.query.presets.push(require.resolve('babel-preset-react'));
+      loader.query.presets.push(resolve('babel-preset-react'));
     }
     if (currentLoaders.babel.stage0) {
-      loader.query.presets.push(require.resolve('babel-preset-stage-0'));
+      loader.query.presets.push(resolve('babel-preset-stage-0'));
     }
     if (currentLoaders.babel.jsx) {
       loader.query.plugins.push([
-        require.resolve('babel-plugin-transform-react-jsx'), {
+        resolve('babel-plugin-transform-react-jsx'), {
           pragma: currentLoaders.babel.jsx.pragma
         }
       ]);
     }
     if (currentLoaders.babel.decorators) {
-      loader.query.plugins.push(require.resolve('babel-plugin-transform-decorators-legacy'))
+      loader.query.plugins.push(resolve('babel-plugin-transform-decorators-legacy'))
     }
     if (currentLoaders.babel.classProperties) {
-      loader.query.plugins.push(require.resolve('babel-plugin-transform-class-properties'))
+      loader.query.plugins.push(resolve('babel-plugin-transform-class-properties'))
     }
     if (currentLoaders.babel.inferno) {
-      loader.query.plugins.push(require.resolve('babel-plugin-inferno'))
+      loader.query.plugins.push(resolve('babel-plugin-inferno'))
     }
 
     loaders.push(loader);

diff --git a/src/sessionBundler.js b/src/sessionBundler.js
@@ -36,7 +36,7 @@ module.exports = {
               modules: [path.resolve('node_modules'), path.join('/', 'node_modules')]
             },
             module: {
-              loaders: createLoaders(session.loaders)
+              loaders: createLoaders(session.loaders, require.resolve.bind(require))
             },
             plugins: manifest ? [
               new webpack.DllReferencePlugin({

diff --git a/src/zip.js b/src/zip.js
@@ -33,7 +33,8 @@ module.exports = function (req, res) {
     "license": "ISC"
   };
 
-  var loaders = createLoaders(req.session.loaders || {}).map(function (loader) {
+  var resolve = function (value) { return value; };
+  var loaders = createLoaders(req.session.loaders || {}, resolve).map(function (loader) {
     loader.test = '$$' + loader.test.toString() + '$$';
     if (loader.exclude) {
       loader.exclude = '$$' + loader.exclude.toString() + '$$';