Merge pull request #142 from entwicklerstube/dynamic-import-template-lit-141

Author: brigand

plugin/index.js

@@ -33,13 +33,34 @@ const replacePrefix = (path, opts = [], sourceFile) => {
   return path;
 };
 
+const replacePrefixStrOrQuasi = (node, opts, sourceFile) => {
+  // String literal
+  if (typeof node === 'string') {
+    return replacePrefix(node, opts, sourceFile);
+  }
+  // Template literal quasi
+  else if (node && typeof node.cooked === 'string') {
+    return {
+      ...node,
+      cooked: replacePrefix(node.cooked, opts, sourceFile),
+      raw: replacePrefix(node.raw, opts, sourceFile),
+    };
+  } else {
+    return node;
+  }
+};
+
 /**
  * Recursively traverses binary  expressions to find the first `StringLiteral` if any.
  * @param  {Object} t           Babel types
  * @param  {Node} arg           a Babel node
  * @return {StringLiteral?}
  */
 const traverseExpression = (t, arg) => {
+  if (t.isTemplateLiteral(arg)) {
+    return arg.quasis[0];
+  }
+
   if (t.isStringLiteral(arg)) {
     return arg;
   }
@@ -67,7 +88,7 @@ export default ({ types: t }) => {
       const firstArg = traverseExpression(t, args[0]);
 
       if (firstArg) {
-        firstArg.value = replacePrefix(
+        firstArg.value = replacePrefixStrOrQuasi(
           firstArg.value,
           state.opts,
           state.file.opts.filename,

test/plugin.spec.js

@@ -31,9 +31,9 @@ describe('Babel Root Import - Plugin', () => {
   });
 
   it('transforms for import() syntax', () => {
-    const targetRequire = slash(`/some/example.js`);
+    const targetRequire = slash(`"./some/example.js"`);
     const transformed = babelTransform(
-      "var SomeExample = import('~/some/example.js');",
+      'var SomeExample = import("~/some/example.js");',
       {
         plugins: [importSyntaxPlugin, BabelRootImportPlugin],
       },
@@ -42,6 +42,27 @@ describe('Babel Root Import - Plugin', () => {
     expect(transformed.code).to.contain(targetRequire);
   });
 
+  it('transforms for import() syntax with template literal', () => {
+    const targetRequire = slash('`./some/${foo}`');
+    const transformed = babelTransform('var SomeExample = import(`~/some/${foo}`);', {
+      plugins: [importSyntaxPlugin, BabelRootImportPlugin],
+    });
+
+    expect(transformed.code).to.contain(targetRequire);
+  });
+
+  it('transforms for require() with template literal', () => {
+    const targetRequire = slash('`./some/${foo}`');
+    const transformed = babelTransform(
+      'var SomeExample = require(`~/some/${foo}`);',
+      {
+        plugins: [BabelRootImportPlugin],
+      },
+    );
+
+    expect(transformed.code).to.contain(targetRequire);
+  });
+
   it('transforms for custom functions', () => {
     const targetRequire = slash(`/some/example.js`);
     const transformed = babelTransform(