helper-module-transforms: dereference imported template tag (#10934)

* Dereference imported template tag * apply fix for OptionalCallExpression as well
babel · Dec 28, 2019 · b91720c · b91720c
1 parent e9dc74e
commit b91720c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/packages/babel-helper-module-transforms/src/rewrite-live-references.js b/packages/babel-helper-module-transforms/src/rewrite-live-references.js
@@ -182,7 +182,9 @@ const rewriteReferencesVisitor = {
       ref.loc = path.node.loc;
 
       if (
-        path.parentPath.isCallExpression({ callee: path.node }) &&
+        (path.parentPath.isCallExpression({ callee: path.node }) ||
+          path.parentPath.isOptionalCallExpression({ callee: path.node }) ||
+          path.parentPath.isTaggedTemplateExpression({ tag: path.node })) &&
         t.isMemberExpression(ref)
       ) {
         path.replaceWith(t.sequenceExpression([t.numericLiteral(0), ref]));

diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/import/input.mjs b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/import/input.mjs
@@ -7,3 +7,5 @@ foo;
 foo2;
 foo3;
 foo3();
+foo3``;
+foo3?.();
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/import/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/import/output.js
@@ -5,3 +5,5 @@ foo4.default;
 foo4.default;
 foo4.foo3;
 (0, foo4.foo3)();
+(0, foo4.foo3)``;
+(0, foo4.foo3)?.();
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/options.json
@@ -2,6 +2,7 @@
   "plugins": [
     "external-helpers",
     "syntax-object-rest-spread",
+    "syntax-optional-chaining",
     [
       "transform-modules-commonjs",
       { "strict": true, "mjsStrictNamespace": false }