Merge pull request #16065 from webpack/fix/issue-16054

sokra · web-flow · commit 555915b4123e · 2022-07-25T09:16:16.000+02:00
support es2022
diff --git a/lib/javascript/JavascriptParser.js b/lib/javascript/JavascriptParser.js
@@ -1447,6 +1447,11 @@ class JavascriptParser extends Parser {
 							this.walkExpression(classElement.value);
 							this.scope.topLevelScope = wasTopLevel;
 						}
+					} else if (classElement.type === "StaticBlock") {
+						const wasTopLevel = this.scope.topLevelScope;
+						this.scope.topLevelScope = false;
+						this.walkBlockStatement(classElement);
+						this.scope.topLevelScope = wasTopLevel;
 					}
 				}
 			}
@@ -1903,7 +1908,7 @@ class JavascriptParser extends Parser {
 						!this.hooks.importSpecifier.call(
 							statement,
 							source,
-							specifier.imported.name,
+							specifier.imported.name || specifier.imported.value,
 							name
 						)
 					) {
@@ -1973,7 +1978,7 @@ class JavascriptParser extends Parser {
 				const specifier = statement.specifiers[specifierIndex];
 				switch (specifier.type) {
 					case "ExportSpecifier": {
-						const name = specifier.exported.name;
+						const name = specifier.exported.name || specifier.exported.value;
 						if (source) {
 							this.hooks.exportImportSpecifier.call(
 								statement,
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "@webassemblyjs/ast": "1.11.1",
     "@webassemblyjs/wasm-edit": "1.11.1",
     "@webassemblyjs/wasm-parser": "1.11.1",
-    "acorn": "^8.4.1",
+    "acorn": "^8.7.1",
     "acorn-import-assertions": "^1.7.6",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
diff --git a/test/cases/parsing/es2022/counter.js b/test/cases/parsing/es2022/counter.js
@@ -0,0 +1,4 @@
+let value = 0;
+const add = () => value++;
+
+export { value, add }
diff --git a/test/cases/parsing/es2022/es2022.js b/test/cases/parsing/es2022/es2022.js
@@ -0,0 +1,20 @@
+import { "\0 add" as add } from './reexport';
+
+export default class Foo {
+	static {
+		new Foo(add);
+	}
+
+	constructor(fn) {
+		this.#foo = fn;
+		this.#add();
+	}
+
+	#foo = undefined;
+
+	#add() {
+		if (#foo in this && this.#foo) {
+			this.#foo();
+		}
+	}
+}
diff --git a/test/cases/parsing/es2022/index.js b/test/cases/parsing/es2022/index.js
@@ -0,0 +1,7 @@
+import { value, add } from "./counter";
+import Foo from "./es2022";
+
+it("should compile and run", () => {
+	new Foo(add);
+	expect(value).toBe(2);
+});
diff --git a/test/cases/parsing/es2022/reexport.js b/test/cases/parsing/es2022/reexport.js
@@ -0,0 +1 @@
+export { add as "\0 add" } from "./counter";
diff --git a/test/cases/parsing/es2022/test.filter.js b/test/cases/parsing/es2022/test.filter.js
@@ -0,0 +1,11 @@
+module.exports = function(config) {
+	// terser doesn't support static {}
+	if (config.mode === "production") return false;
+
+	try {
+		eval("class A { static {} }");
+		return true;
+	} catch {
+		return false;
+	}
+};
diff --git a/yarn.lock b/yarn.lock
@@ -1230,10 +1230,10 @@ acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.4.1:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+acorn@^8.2.4, acorn@^8.7.1:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
 agent-base@6:
   version "6.0.2"

Original file line number	Diff line number	Diff line change
`@@ -1447,6 +1447,11 @@ class JavascriptParser extends Parser {`
`1447`	`1447`	`this.walkExpression(classElement.value);`
`1448`	`1448`	`this.scope.topLevelScope = wasTopLevel;`
`1449`	`1449`	`}`
	`1450`	`+ } else if (classElement.type === "StaticBlock") {`
	`1451`	`+ const wasTopLevel = this.scope.topLevelScope;`
	`1452`	`+ this.scope.topLevelScope = false;`
	`1453`	`+ this.walkBlockStatement(classElement);`
	`1454`	`+ this.scope.topLevelScope = wasTopLevel;`
`1450`	`1455`	`}`
`1451`	`1456`	`}`
`1452`	`1457`	`}`
`@@ -1903,7 +1908,7 @@ class JavascriptParser extends Parser {`
`1903`	`1908`	`!this.hooks.importSpecifier.call(`
`1904`	`1909`	`statement,`
`1905`	`1910`	`source,`
`1906`		`- specifier.imported.name,`
	`1911`	`+ specifier.imported.name \|\| specifier.imported.value,`
`1907`	`1912`	`name`
`1908`	`1913`	`)`
`1909`	`1914`	`) {`
`@@ -1973,7 +1978,7 @@ class JavascriptParser extends Parser {`
`1973`	`1978`	`const specifier = statement.specifiers[specifierIndex];`
`1974`	`1979`	`switch (specifier.type) {`
`1975`	`1980`	`case "ExportSpecifier": {`
`1976`		`- const name = specifier.exported.name;`
	`1981`	`+ const name = specifier.exported.name \|\| specifier.exported.value;`
`1977`	`1982`	`if (source) {`
`1978`	`1983`	`this.hooks.exportImportSpecifier.call(`
`1979`	`1984`	`statement,`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { add as "\0 add" } from "./counter";`