[Fix] Generate webpack-compatible output with static string arg

Closes #88.

Author: nicolo-ribaudo

src/utils.js

@@ -15,23 +15,37 @@ export function getImportSource(t, callNode) {
 }
 
 export function createDynamicImportTransform({ template, types: t }) {
-  const buildImport = template('Promise.resolve(SOURCE).then(s => INTEROP(require(s)))');
-  const buildImportNoInterop = template('Promise.resolve(SOURCE).then(s => require(s))');
+  const builders = {
+    static: {
+      interop: template('Promise.resolve().then(() => INTEROP(require(SOURCE)))'),
+      noInterop: template('Promise.resolve().then(() => require(SOURCE))'),
+    },
+    dynamic: {
+      interop: template('Promise.resolve(SOURCE).then(s => INTEROP(require(s)))'),
+      noInterop: template('Promise.resolve(SOURCE).then(s => require(s))'),
+    },
+  };
 
   const visited = typeof WeakSet === 'function' && new WeakSet();
 
+  const isString = (node) => t.isStringLiteral(node)
+    || (t.isTemplateLiteral(node) && node.expressions.length === 0);
+
   return (context, path) => {
     if (visited) {
       if (visited.has(path)) {
         return;
       }
       visited.add(path);
     }
+
     const SOURCE = getImportSource(t, path.parent);
 
+    const builder = isString(SOURCE) ? builders.static : builders.dynamic;
+
     const newImport = context.opts.noInterop
-      ? buildImportNoInterop({ SOURCE })
-      : buildImport({ SOURCE, INTEROP: context.addHelper('interopRequireWildcard') });
+      ? builder.noInterop({ SOURCE })
+      : builder.interop({ SOURCE, INTEROP: context.addHelper('interopRequireWildcard') });
 
     path.parentPath.replaceWith(newImport);
   };

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,15 +1,15 @@
-Promise.resolve('test-module').then(function (s) {
-  return babelHelpers.interopRequireWildcard(require(s));
+Promise.resolve().then(function () {
+  return babelHelpers.interopRequireWildcard(require('test-module'));
 }).then(function () {
-  return Promise.resolve('test-module-2').then(function (s) {
-    return babelHelpers.interopRequireWildcard(require(s));
+  return Promise.resolve().then(function () {
+    return babelHelpers.interopRequireWildcard(require('test-module-2'));
   });
 });
 
-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));
+Promise.all([Promise.resolve().then(function () {
+  return babelHelpers.interopRequireWildcard(require('test-1'));
+}), Promise.resolve().then(function () {
+  return babelHelpers.interopRequireWildcard(require('test-2'));
+}), Promise.resolve().then(function () {
+  return babelHelpers.interopRequireWildcard(require('test-3'));
 })]).then(function () {});

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

@@ -1,3 +1,3 @@
-Promise.resolve('test-module').then(s => require(s)).then(() => Promise.resolve('test-module-2').then(s => require(s)));
+Promise.resolve().then(() => require('test-module')).then(() => Promise.resolve().then(() => require('test-module-2')));
 
-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(() => {});
+Promise.all([Promise.resolve().then(() => require('test-1')), Promise.resolve().then(() => require('test-2')), Promise.resolve().then(() => require('test-3'))]).then(() => {});