[Fix] avoid using reserved param name in babel 7 templates

 - Test both Babel 6 and Babel 7
 - Add an OVERWRITE=true flag to automatically regenerate outputs
 - Use external-helpers instead of manually removing the helper with a regex

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## Unreleased
+- [Fix] avoid using reserved param name in babel 7 templates
 
 ## v2.3.1
 - [Fix] Evaluate `import()` argument synchronously (#85)

package.json

@@ -42,11 +42,16 @@
   },
   "homepage": "https://github.com/airbnb/babel-plugin-dynamic-import-node#readme",
   "devDependencies": {
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-external-helpers": "^7.8.3",
+    "@babel/plugin-transform-template-literals": "^7.8.3",
+    "@babel/preset-env": "^7.9.5",
     "airbnb-js-shims": "^2.2.0",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^9.0.0",
     "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-transform-es2015-template-literals": "^6.22.0",
     "babel-plugin-transform-replace-object-assign": "^1.0.0",
     "babel-preset-airbnb": "^2.6.0",

src/utils.js

@@ -15,8 +15,8 @@ export function getImportSource(t, callNode) {
 }
 
 export function createDynamicImportTransform({ template, types: t }) {
-  const buildImport = template('Promise.resolve(SOURCE).then(_ => INTEROP(require(_)))');
-  const buildImportNoInterop = template('Promise.resolve(SOURCE).then(_ => require(_))');
+  const buildImport = template('Promise.resolve(SOURCE).then(s => INTEROP(require(s)))');
+  const buildImportNoInterop = template('Promise.resolve(SOURCE).then(s => require(s))');
 
   return (context, path) => {
     const SOURCE = getImportSource(t, path.parent);

test/fixtures/basic-import/expected.6.es2015.js

@@ -0,0 +1,3 @@
+var testModule = Promise.resolve('test-module').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});

test/fixtures/basic-import/expected.6.js

@@ -0,0 +1 @@
+const testModule = Promise.resolve('test-module').then(s => babelHelpers.interopRequireWildcard(require(s)));

test/fixtures/basic-import/expected.6.noInterop.js

@@ -0,0 +1 @@
+const testModule = Promise.resolve('test-module').then(s => require(s));

test/fixtures/basic-import/expected.7.es2015.js

@@ -0,0 +1,3 @@
+var testModule = Promise.resolve('test-module').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});

test/fixtures/basic-import/expected.7.js

@@ -0,0 +1 @@
+const testModule = Promise.resolve('test-module').then(s => babelHelpers.interopRequireWildcard(require(s)));

test/fixtures/basic-import/expected.7.noInterop.js

@@ -0,0 +1 @@
+const testModule = Promise.resolve('test-module').then(s => require(s));

test/fixtures/chained-import/expected.6.es2015.js

@@ -0,0 +1,15 @@
+Promise.resolve('test-module').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+}).then(function () {
+  return Promise.resolve('test-module-2').then(function (s) {
+    return babelHelpers.interopRequireWildcard(require(s));
+  });
+});
+
+Promise.all([Promise.resolve('test-1').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+}), Promise.resolve('test-2').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+}), Promise.resolve('test-3').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+})]).then(function () {});

test/fixtures/chained-import/expected.6.noInterop.js

@@ -0,0 +1,3 @@
+Promise.resolve('test-module').then(s => require(s)).then(() => Promise.resolve('test-module-2').then(s => require(s)));
+
+Promise.all([Promise.resolve('test-1').then(s => require(s)), Promise.resolve('test-2').then(s => require(s)), Promise.resolve('test-3').then(s => require(s))]).then(() => {});

test/fixtures/chained-import/expected.7.es2015.js

@@ -0,0 +1,14 @@
+Promise.resolve('test-module').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+}).then(function () {
+  return Promise.resolve('test-module-2').then(function (s) {
+    return babelHelpers.interopRequireWildcard(require(s));
+  });
+});
+Promise.all([Promise.resolve('test-1').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+}), Promise.resolve('test-2').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+}), Promise.resolve('test-3').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+})]).then(function () {});

test/fixtures/chained-import/expected.7.noInterop.js

@@ -0,0 +1,2 @@
+Promise.resolve('test-module').then(s => require(s)).then(() => Promise.resolve('test-module-2').then(s => require(s)));
+Promise.all([Promise.resolve('test-1').then(s => require(s)), Promise.resolve('test-2').then(s => require(s)), Promise.resolve('test-3').then(s => require(s))]).then(() => {});

test/fixtures/dynamic-argument/expected.6.es2015.js

@@ -0,0 +1,8 @@
+var MODULE = Object('test-module');
+
+Promise.resolve('' + String(MODULE)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('test-' + String(MODULE)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});

test/fixtures/dynamic-argument/expected.6.js

@@ -0,0 +1,4 @@
+const MODULE = Object('test-module');
+
+Promise.resolve(`${MODULE}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`test-${MODULE}`).then(s => babelHelpers.interopRequireWildcard(require(s)));

test/fixtures/dynamic-argument/expected.6.noInterop.js

@@ -0,0 +1,4 @@
+const MODULE = Object('test-module');
+
+Promise.resolve(`${MODULE}`).then(s => require(s));
+Promise.resolve(`test-${MODULE}`).then(s => require(s));

test/fixtures/dynamic-argument/expected.7.es2015.js

@@ -0,0 +1,7 @@
+var MODULE = Object('test-module');
+Promise.resolve("".concat(MODULE)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve("test-".concat(MODULE)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});

test/fixtures/dynamic-argument/expected.7.js

@@ -0,0 +1,3 @@
+const MODULE = Object('test-module');
+Promise.resolve(`${MODULE}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`test-${MODULE}`).then(s => babelHelpers.interopRequireWildcard(require(s)));

test/fixtures/dynamic-argument/expected.7.noInterop.js

@@ -0,0 +1,3 @@
+const MODULE = Object('test-module');
+Promise.resolve(`${MODULE}`).then(s => require(s));
+Promise.resolve(`test-${MODULE}`).then(s => require(s));

test/fixtures/import-with-comment/expected.6.es2015.js

@@ -0,0 +1,6 @@
+Promise.resolve('my-module').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('my-module').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});

test/fixtures/import-with-comment/expected.6.js

@@ -0,0 +1,2 @@
+Promise.resolve('my-module').then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve('my-module').then(s => babelHelpers.interopRequireWildcard(require(s)));

test/fixtures/import-with-comment/expected.6.noInterop.js

@@ -0,0 +1,2 @@
+Promise.resolve('my-module').then(s => require(s));
+Promise.resolve('my-module').then(s => require(s));

test/fixtures/import-with-comment/expected.7.es2015.js

@@ -0,0 +1,6 @@
+Promise.resolve('my-module').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('my-module').then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});

test/fixtures/import-with-comment/expected.7.js

@@ -0,0 +1,2 @@
+Promise.resolve('my-module').then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve('my-module').then(s => babelHelpers.interopRequireWildcard(require(s)));

test/fixtures/import-with-comment/expected.7.noInterop.js

@@ -0,0 +1,2 @@
+Promise.resolve('my-module').then(s => require(s));
+Promise.resolve('my-module').then(s => require(s));

test/fixtures/nested-import/expected.6.es2015.js

@@ -0,0 +1,7 @@
+function getModule(path) {
+  return Promise.resolve('test-module').then(function (s) {
+    return babelHelpers.interopRequireWildcard(require(s));
+  });
+}
+
+getModule().then(function () {});

test/fixtures/nested-import/expected.6.js

@@ -0,0 +1,5 @@
+function getModule(path) {
+  return Promise.resolve('test-module').then(s => babelHelpers.interopRequireWildcard(require(s)));
+}
+
+getModule().then(() => {});

test/fixtures/nested-import/expected.6.noInterop.js

@@ -0,0 +1,5 @@
+function getModule(path) {
+  return Promise.resolve('test-module').then(s => require(s));
+}
+
+getModule().then(() => {});

test/fixtures/nested-import/expected.7.es2015.js

@@ -0,0 +1,7 @@
+function getModule(path) {
+  return Promise.resolve('test-module').then(function (s) {
+    return babelHelpers.interopRequireWildcard(require(s));
+  });
+}
+
+getModule().then(function () {});

test/fixtures/nested-import/expected.7.js

@@ -0,0 +1,5 @@
+function getModule(path) {
+  return Promise.resolve('test-module').then(s => babelHelpers.interopRequireWildcard(require(s)));
+}
+
+getModule().then(() => {});

test/fixtures/nested-import/expected.7.noInterop.js

@@ -0,0 +1,5 @@
+function getModule(path) {
+  return Promise.resolve('test-module').then(s => require(s));
+}
+
+getModule().then(() => {});

test/fixtures/non-string-argument/expected.6.es2015.js

@@ -0,0 +1,24 @@
+Promise.resolve('' + String({ 'answer': 42 })).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('' + String(['foo', 'bar'])).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('' + 42).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('' + String(void 0)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('' + String(undefined)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('' + String(null)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('' + String(true)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve('' + String(Symbol())).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});

test/fixtures/non-string-argument/expected.6.js

@@ -0,0 +1,8 @@
+Promise.resolve(`${{ 'answer': 42 }}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${['foo', 'bar']}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${42}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${void 0}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${undefined}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${null}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${true}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${Symbol()}`).then(s => babelHelpers.interopRequireWildcard(require(s)));

test/fixtures/non-string-argument/expected.6.noInterop.js

@@ -0,0 +1,8 @@
+Promise.resolve(`${{ 'answer': 42 }}`).then(s => require(s));
+Promise.resolve(`${['foo', 'bar']}`).then(s => require(s));
+Promise.resolve(`${42}`).then(s => require(s));
+Promise.resolve(`${void 0}`).then(s => require(s));
+Promise.resolve(`${undefined}`).then(s => require(s));
+Promise.resolve(`${null}`).then(s => require(s));
+Promise.resolve(`${true}`).then(s => require(s));
+Promise.resolve(`${Symbol()}`).then(s => require(s));

test/fixtures/non-string-argument/expected.7.es2015.js

@@ -0,0 +1,26 @@
+Promise.resolve("".concat({
+  'answer': 42
+})).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve("".concat(['foo', 'bar'])).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve("".concat(42)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve("".concat(void 0)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve("".concat(undefined)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve("".concat(null)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve("".concat(true)).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});
+Promise.resolve("".concat(Symbol())).then(function (s) {
+  return babelHelpers.interopRequireWildcard(require(s));
+});

test/fixtures/non-string-argument/expected.7.js

@@ -0,0 +1,10 @@
+Promise.resolve(`${{
+  'answer': 42
+}}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${['foo', 'bar']}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${42}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${void 0}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${undefined}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${null}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${true}`).then(s => babelHelpers.interopRequireWildcard(require(s)));
+Promise.resolve(`${Symbol()}`).then(s => babelHelpers.interopRequireWildcard(require(s)));