Merge pull request #12373 from webpack/deps/wasm

update `@webassemblyjs`

declarations.d.ts

@@ -234,6 +234,7 @@ declare module "@webassemblyjs/ast" {
 		args: string[];
 		result: string[];
 	}
+	export function moduleContextFromModuleAST(ast: any): any;
 
 	// Node matcher
 	export function isGlobalType(n: Node): boolean;

lib/wasm-sync/WebAssemblyGenerator.js

@@ -10,9 +10,7 @@ const Generator = require("../Generator");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
 const t = require("@webassemblyjs/ast");
-const {
-	moduleContextFromModuleAST
-} = require("@webassemblyjs/helper-module-context");
+const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 

lib/wasm-sync/WebAssemblyParser.js

@@ -6,9 +6,7 @@
 "use strict";
 
 const t = require("@webassemblyjs/ast");
-const {
-	moduleContextFromModuleAST
-} = require("@webassemblyjs/helper-module-context");
+const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const Parser = require("../Parser");
 const StaticExportsDependency = require("../dependencies/StaticExportsDependency");

package.json

@@ -7,10 +7,9 @@
   "dependencies": {
     "@types/eslint-scope": "^3.7.0",
     "@types/estree": "^0.0.45",
-    "@webassemblyjs/ast": "1.9.1",
-    "@webassemblyjs/helper-module-context": "1.9.1",
-    "@webassemblyjs/wasm-edit": "1.9.1",
-    "@webassemblyjs/wasm-parser": "1.9.1",
+    "@webassemblyjs/ast": "1.11.0",
+    "@webassemblyjs/wasm-edit": "1.11.0",
+    "@webassemblyjs/wasm-parser": "1.11.0",
     "acorn": "^8.0.4",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
@@ -96,7 +95,7 @@
     "ts-loader": "^8.0.2",
     "typescript": "^4.2.0-dev.20201130",
     "url-loader": "^4.1.0",
-    "wast-loader": "^1.9.0",
+    "wast-loader": "^1.11.0",
     "webassembly-feature": "1.3.0",
     "webpack-cli": "^4.3.0",
     "xxhashjs": "^0.2.2",

test/cases/side-effects/issue-11673/index.js

@@ -7,6 +7,6 @@ it("should compile", done => {
 	const worker = new Worker(new URL("worker.js", import.meta.url));
 	worker.once("message", value => {
 		expect(value).toBe(42);
-		done();
+		Promise.resolve(worker.terminate()).then(() => done(), done);
 	});
 });

test/configCases/worker/custom-worker/index.js

@@ -11,6 +11,7 @@ it("should allow to create a WebWorker", async () => {
 		};
 	});
 	expect(result).toBe("data: OK, thanks");
+	await worker.terminate();
 });
 
 it("should allow to share chunks", async () => {

test/configCases/worker/node-worker-named/index.js

@@ -11,7 +11,7 @@ it("should allow to create a WebWorker", async () => {
 		});
 	});
 	expect(result).toBe("data: OK, thanks");
-	worker.terminate();
+	await worker.terminate();
 });
 
 it("should allow to create another WebWorker", async () => {

test/configCases/worker/node-worker/index.js

@@ -9,7 +9,7 @@ it("should allow to create a WebWorker", async () => {
 		});
 	});
 	expect(result).toBe("data: OK, thanks");
-	worker.terminate();
+	await worker.terminate();
 });
 
 it("should allow to share chunks", async () => {

test/configCases/worker/web-worker/index.js

@@ -9,6 +9,7 @@ it("should allow to create a WebWorker", async () => {
 		};
 	});
 	expect(result).toBe("data: OK, thanks");
+	await worker.terminate();
 });
 
 it("should allow to share chunks", async () => {

test/configCases/worker/worker-contenthash/index.js

@@ -9,7 +9,7 @@ it("should allow to create a WebWorker", async () => {
 		});
 	});
 	expect(result).toBe("data: OK, thanks");
-	worker.terminate();
+	await worker.terminate();
 });
 
 it("should allow to share chunks", async () => {

test/helpers/createFakeWorker.js

@@ -70,4 +70,8 @@ require(${JSON.stringify(path.resolve(outputDirectory, file))});
 		postMessage(data) {
 			this.worker.postMessage(data);
 		}
+
+		terminate() {
+			return this.worker.terminate();
+		}
 	};

test/helpers/supportsWorker.js

@@ -1,7 +1,7 @@
-module.exports = function supportsWebAssembly() {
+module.exports = function supportsWorker() {
 	try {
 		// eslint-disable-next-line node/no-unsupported-features/node-builtins
-		return require("worker_threads") !== "undefined";
+		return require("worker_threads") !== undefined;
 	} catch (e) {
 		return false;
 	}

test/hotCases/worker/update-in-worker/index.js

@@ -13,4 +13,5 @@ it("should support hot module replacement in WebWorkers", done => {
 		}
 	};
 	worker.postMessage("test");
+	Promise.resolve(worker.terminate()).then(done, done);
 });