Merge pull request #14861 from webpack/fix-runtime-template

sokra · web-flow · commit c9ffb8332737 · 2021-12-02T09:05:33.000+01:00
fix RuntimeTemplate
diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js
@@ -200,7 +200,7 @@ class RuntimeTemplate {
 
 		// when the first two args are expression, we need to prepend "" + to force string
 		// concatenation instead of number addition.
-		return typeof args[0] !== "string" && args[1] !== "string"
+		return typeof args[0] !== "string" && typeof args[1] !== "string"
 			? `"" + ${str}`
 			: str;
 	}
diff --git a/test/RuntimeTemplate.unittest.js b/test/RuntimeTemplate.unittest.js
@@ -0,0 +1,78 @@
+"use strict";
+
+const RuntimeTemplate = require("../lib/RuntimeTemplate");
+const RequestShortener = require("../lib/RequestShortener");
+
+describe("RuntimeTemplate.concatenation", () => {
+	it("no args", () => {
+		const runtimeTemplate = new RuntimeTemplate(
+			undefined,
+			{ environment: { templateLiteral: false } },
+			new RequestShortener(__dirname)
+		);
+		expect(runtimeTemplate.concatenation()).toBe('""');
+	});
+
+	it("1 arg", () => {
+		const runtimeTemplate = new RuntimeTemplate(
+			undefined,
+			{ environment: { templateLiteral: false } },
+			new RequestShortener(__dirname)
+		);
+		expect(runtimeTemplate.concatenation({ expr: 1 })).toBe('"" + 1');
+		expect(runtimeTemplate.concatenation("str")).toBe('"str"');
+	});
+
+	it("es5", () => {
+		const runtimeTemplate = new RuntimeTemplate(
+			undefined,
+			{ environment: { templateLiteral: false } },
+			new RequestShortener(__dirname)
+		);
+
+		expect(
+			runtimeTemplate.concatenation({ expr: "__webpack__.p" }, "str/a")
+		).toBe('__webpack__.p + "str/a"');
+		expect(
+			runtimeTemplate.concatenation(
+				{ expr: "__webpack__.p" },
+				{ expr: "str.a" },
+				"str"
+			)
+		).toBe('"" + __webpack__.p + str.a + "str"');
+		expect(runtimeTemplate.concatenation("a", "b", { expr: 1 })).toBe(
+			'"a" + "b" + 1'
+		);
+		expect(runtimeTemplate.concatenation("a", { expr: 1 }, "b")).toBe(
+			'"a" + 1 + "b"'
+		);
+	});
+
+	describe("es6", () => {
+		const runtimeTemplate = new RuntimeTemplate(
+			undefined,
+			{ environment: { templateLiteral: true } },
+			new RequestShortener(__dirname)
+		);
+
+		it("should prefer shorten variant #1", () => {
+			expect(runtimeTemplate.concatenation({ expr: 1 }, "a", { expr: 2 })).toBe(
+				'1 + "a" + 2'
+			);
+		});
+
+		it("should prefer shorten variant #2", () => {
+			expect(
+				runtimeTemplate.concatenation({ expr: 1 }, "a", { expr: 2 }, "b")
+			).toBe('1 + "a" + 2 + "b"');
+		});
+
+		it("should prefer shorten variant #3", () => {
+			/* eslint-disable no-template-curly-in-string */
+			expect(runtimeTemplate.concatenation("a", { expr: 1 }, "b")).toBe(
+				"`a${1}b`"
+			);
+			/* eslint-enable */
+		});
+	});
+});

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ class RuntimeTemplate {`
`200`	`200`
`201`	`201`	`// when the first two args are expression, we need to prepend "" + to force string`
`202`	`202`	`// concatenation instead of number addition.`
`203`		`- return typeof args[0] !== "string" && args[1] !== "string"`
	`203`	`+ return typeof args[0] !== "string" && typeof args[1] !== "string"`
`204`	`204`	? `"" + ${str}`
`205`	`205`	`: str;`
`206`	`206`	`}`