Add babel helpers and support for named chunks.

package.json

@@ -43,6 +43,7 @@
     "babel-cli": "^6.22.2",
     "babel-core": "^6.22.1",
     "babel-eslint": "^7.1.1",
+    "babel-plugin-external-helpers": "^6.22.0",
     "babel-preset-airbnb": "^2.1.1",
     "babel-register": "^6.22.0",
     "chai": "^4.0.0",

src/index.js

@@ -3,22 +3,54 @@ import syntax from 'babel-plugin-syntax-dynamic-import';
 
 const TYPE_IMPORT = 'Import';
 
-const buildImport = template(`
+const buildImport = opts => template(`
   (new Promise((resolve) => {
     require.ensure([], (require) => {
-      resolve(require(SOURCE));
-    });
+      requireLogic
+    }${opts.webpackChunkName ? ', webpackChunkName' : ''});
   }))
-`);
+`)(opts);
 
-export default () => ({
+const chunkNamePattern = /webpackChunkName: "(.+)"/;
+
+export default ({ types }) => ({
   inherits: syntax,
 
   visitor: {
     CallExpression(path) {
       if (path.node.callee.type === TYPE_IMPORT) {
+        const importPath = path.node.arguments[0];
+
+        let webpackChunkName;
+        importPath.leadingComments = (importPath.leadingComments || []).filter((comment) => {
+          const matches = chunkNamePattern.exec(comment.value);
+          // Create a StringLiteral node for use in the babel-template.
+          webpackChunkName = matches ? types.StringLiteral(matches[1]) : undefined;
+          return !matches;
+        });
+
+        /**
+         * Create the resolve(require('path')) call.
+         * This utilizes babel-helpers to properly handle default and named exports.
+         */
+        const requireLogic = types.callExpression( // eslint-disable-line
+          types.identifier('resolve'), [
+            types.callExpression(
+              /**
+               * Wrap the require call with the require wildcard babel helper
+               * This helps to reduce boilerplate while sticking as closely
+               * as possible to the spec of import()
+               */
+              this.addHelper('interopRequireWildcard'), [
+                types.callExpression(types.identifier('require'), [importPath]),
+              ],
+            ),
+          ],
+        );
+
         const newImport = buildImport({
-          SOURCE: path.node.arguments,
+          requireLogic,
+          webpackChunkName,
         });
         path.replaceWith(newImport);
       }

test/fixtures/basic-import/expected.js → test/fixtures/basic-import/expected-external-helpers.js

@@ -1,5 +1,5 @@
 const testModule = new Promise(resolve => {
   require.ensure([], require => {
-    resolve(require('test-module'));
+    resolve(babelHelpers.interopRequireWildcard(require('test-module')));
   });
 });

test/fixtures/basic-import/expected-internal-helpers.js

@@ -0,0 +1,7 @@
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+const testModule = new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require('test-module')));
+  });
+});

test/fixtures/chained-import/expected.js → test/fixtures/chained-import/expected-external-helpers.js

@@ -1,23 +1,23 @@
 new Promise(resolve => {
   require.ensure([], require => {
-    resolve(require('test-module'));
+    resolve(babelHelpers.interopRequireWildcard(require('test-module')));
   });
 }).then(() => new Promise(resolve => {
   require.ensure([], require => {
-    resolve(require('test-module-2'));
+    resolve(babelHelpers.interopRequireWildcard(require('test-module-2')));
   });
 }));
 
 Promise.all([new Promise(resolve => {
   require.ensure([], require => {
-    resolve(require('test-1'));
+    resolve(babelHelpers.interopRequireWildcard(require('test-1')));
   });
 }), new Promise(resolve => {
   require.ensure([], require => {
-    resolve(require('test-2'));
+    resolve(babelHelpers.interopRequireWildcard(require('test-2')));
   });
 }), new Promise(resolve => {
   require.ensure([], require => {
-    resolve(require('test-3'));
+    resolve(babelHelpers.interopRequireWildcard(require('test-3')));
   });
 })]).then(() => {});

test/fixtures/chained-import/expected-internal-helpers.js

@@ -0,0 +1,25 @@
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require('test-module')));
+  });
+}).then(() => new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require('test-module-2')));
+  });
+}));
+
+Promise.all([new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require('test-1')));
+  });
+}), new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require('test-2')));
+  });
+}), new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require('test-3')));
+  });
+})]).then(() => {});

test/fixtures/dynamic-argument/expected.js → test/fixtures/dynamic-argument/expected-external-helpers.js

@@ -2,11 +2,11 @@ const MODULE = 'test-module';
 
 new Promise(resolve => {
   require.ensure([], require => {
-    resolve(require(MODULE));
+    resolve(babelHelpers.interopRequireWildcard(require(MODULE)));
   });
 });
 new Promise(resolve => {
   require.ensure([], require => {
-    resolve(require(`test-${MODULE}`));
+    resolve(babelHelpers.interopRequireWildcard(require(`test-${MODULE}`)));
   });
 });

test/fixtures/dynamic-argument/expected-internal-helpers.js

@@ -0,0 +1,14 @@
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+const MODULE = 'test-module';
+
+new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require(MODULE)));
+  });
+});
+new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require(`test-${MODULE}`)));
+  });
+});

test/fixtures/named-imports/actual.js

@@ -0,0 +1 @@
+const a = import(/* webpackChunkName: "some-path" */ './somePath');

test/fixtures/named-imports/expected-external-helpers.js

@@ -0,0 +1,5 @@
+const a = new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(babelHelpers.interopRequireWildcard(require('./somePath')));
+  }, 'some-path');
+});

test/fixtures/named-imports/expected-internal-helpers.js

@@ -0,0 +1,7 @@
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+const a = new Promise(resolve => {
+  require.ensure([], require => {
+    resolve(_interopRequireWildcard(require('./somePath')));
+  }, 'some-path');
+});

test/fixtures/nested-import/expected.js → test/fixtures/nested-import/expected-external-helpers.js

@@ -1,7 +1,7 @@
 function getModule(path) {
   return new Promise(resolve => {
     require.ensure([], require => {
-      resolve(require('test-module'));
+      resolve(babelHelpers.interopRequireWildcard(require('test-module')));
     });
   });
 }

test/fixtures/nested-import/expected-internal-helpers.js

@@ -0,0 +1,11 @@
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function getModule(path) {
+  return new Promise(resolve => {
+    require.ensure([], require => {
+      resolve(_interopRequireWildcard(require('test-module')));
+    });
+  });
+}
+
+getModule().then(() => {});

test/index.js

@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { join } from 'path';
 import { readdirSync, statSync, readFileSync } from 'fs';
 
-import testPlugin from './testPlugin';
+import { testPluginWithHelpers, testPluginWithoutHelpers } from './testPlugin';
 
 const FIXTURE_PATH = join(__dirname, 'fixtures');
 
@@ -13,10 +13,13 @@ const testFolders = readdirSync(FIXTURE_PATH).filter(file => (
 describe('babel-plugin-dynamic-import-webpack', () => {
   testFolders.forEach((folderName) => {
     const actual = readFileSync(join(FIXTURE_PATH, folderName, 'actual.js'), 'utf8');
-    const expected = readFileSync(join(FIXTURE_PATH, folderName, 'expected.js'), 'utf8');
+    const expectedInternalHelpers = readFileSync(join(FIXTURE_PATH, folderName, 'expected-internal-helpers.js'), 'utf8');
+    const expectedExternalHelpers = readFileSync(join(FIXTURE_PATH, folderName, 'expected-external-helpers.js'), 'utf8');
     it(`works with ${folderName}`, () => {
-      const result = testPlugin(actual);
-      expect(result.trim()).to.equal(expected.trim());
+      const resultInternalHelpers = testPluginWithHelpers(actual);
+      const resultExternalHelpers = testPluginWithoutHelpers(actual);
+      expect(resultInternalHelpers.trim()).to.equal(expectedInternalHelpers.trim());
+      expect(resultExternalHelpers.trim()).to.equal(expectedExternalHelpers.trim());
     });
   });
 });

test/testPlugin.js

@@ -1,6 +1,17 @@
 import { transform } from 'babel-core';
 
-export default function testPlugin(code) {
+export function testPluginWithoutHelpers(code) {
+  const result = transform(code, {
+    plugins: [
+      './src/index.js',
+      'external-helpers',
+    ],
+  });
+
+  return result.code;
+}
+
+export function testPluginWithHelpers(code) {
   const result = transform(code, {
     plugins: ['./src/index.js'],
   });