Merge pull request #14820 from webpack/fix-evaluate-tagged-template

fix evaluating tagged template
webpack · Nov 25, 2021 · c930a76 · c930a76
2 parents fc4ff6d + 58edd1a
commit c930a76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/lib/javascript/JavascriptParser.js b/lib/javascript/JavascriptParser.js
@@ -1189,14 +1189,15 @@ class JavascriptParser extends Parser {
 				const node = /** @type {TaggedTemplateExpressionNode} */ (_node);
 				const tag = this.evaluateExpression(node.tag);
 
-				if (tag.isIdentifier() && tag.identifier !== "String.raw") return;
-				const { quasis, parts } = getSimplifiedTemplateResult(
-					"raw",
-					node.quasi
-				);
-				return new BasicEvaluatedExpression()
-					.setTemplateString(quasis, parts, "raw")
-					.setRange(node.range);
+				if (tag.isIdentifier() && tag.identifier === "String.raw") {
+					const { quasis, parts } = getSimplifiedTemplateResult(
+						"raw",
+						node.quasi
+					);
+					return new BasicEvaluatedExpression()
+						.setTemplateString(quasis, parts, "raw")
+						.setRange(node.range);
+				}
 			});
 
 		this.hooks.evaluateCallExpressionMember

diff --git a/test/cases/parsing/evaluate-nullish/index.js b/test/cases/parsing/evaluate-nullish/index.js
@@ -1,5 +1,9 @@
+function a() {}
+
 it("should evaluate nullish coalescing", function () {
 	expect("" ?? require("fail")).toBe("");
+	expect(String.raw`aaaa` ?? require("fail")).toBe("aaaa");
+	expect(a`aaaa` ?? "expected").toBe("expected");
 	expect(null ?? "expected").toBe("expected");
 	expect(("" ?? require("fail")) && true).toBe("");
 	let x = 0;