webpack 5.96.1 → 5.97.0

package/lib/wasm-async/UniversalCompileAsyncWasmPlugin.js

@@ -0,0 +1,103 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
+const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
+const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRuntimeModule");
+
+/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Compiler")} Compiler */
+
+const PLUGIN_NAME = "UniversalCompileAsyncWasmPlugin";
+
+class UniversalCompileAsyncWasmPlugin {
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+			const globalWasmLoading = compilation.outputOptions.wasmLoading;
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @returns {boolean} true, if wasm loading is enabled for the chunk
+			 */
+			const isEnabledForChunk = chunk => {
+				const options = chunk.getEntryOptions();
+				const wasmLoading =
+					options && options.wasmLoading !== undefined
+						? options.wasmLoading
+						: globalWasmLoading;
+				return wasmLoading === "universal";
+			};
+			const generateBeforeInstantiateStreaming = () =>
+				Template.asString([
+					"if (!useFetch) {",
+					Template.indent(["return fallback();"]),
+					"}"
+				]);
+			const generateBeforeLoadBinaryCode = path =>
+				Template.asString([
+					"var useFetch = typeof document !== 'undefined' || typeof self !== 'undefined';",
+					`var wasmUrl = ${path};`
+				]);
+			/**
+			 * @type {(path: string) => string}
+			 */
+			const generateLoadBinaryCode = () =>
+				Template.asString([
+					"(useFetch",
+					Template.indent([
+						`? fetch(new URL(wasmUrl, ${compilation.outputOptions.importMetaName}.url))`
+					]),
+					Template.indent([
+						": Promise.all([import('fs'), import('url')]).then(([{ readFile }, { URL }]) => new Promise((resolve, reject) => {",
+						Template.indent([
+							`readFile(new URL(wasmUrl, ${compilation.outputOptions.importMetaName}.url), (err, buffer) => {`,
+							Template.indent([
+								"if (err) return reject(err);",
+								"",
+								"// Fake fetch response",
+								"resolve({",
+								Template.indent(["arrayBuffer() { return buffer; }"]),
+								"});"
+							]),
+							"});"
+						]),
+						"})))"
+					])
+				]);
+
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.instantiateWasm)
+				.tap(PLUGIN_NAME, (chunk, set, { chunkGraph }) => {
+					if (!isEnabledForChunk(chunk)) return;
+					if (
+						!chunkGraph.hasModuleInGraph(
+							chunk,
+							m => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
+						)
+					) {
+						return;
+					}
+					compilation.addRuntimeModule(
+						chunk,
+						new AsyncWasmLoadingRuntimeModule({
+							generateBeforeLoadBinaryCode,
+							generateLoadBinaryCode,
+							generateBeforeInstantiateStreaming,
+							supportsStreaming: true
+						})
+					);
+				});
+		});
+	}
+}
+
+module.exports = UniversalCompileAsyncWasmPlugin;

package/lib/wasm-sync/WebAssemblyParser.js

@@ -19,7 +19,7 @@ const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDe
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 
-const JS_COMPAT_TYPES = new Set(["i32", "i64", "f32", "f64"]);
+const JS_COMPAT_TYPES = new Set(["i32", "i64", "f32", "f64", "externref"]);
 
 /**
  * @param {t.Signature} signature the func signature

package/lib/web/FetchCompileAsyncWasmPlugin.js

@@ -12,6 +12,8 @@ const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRun
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
+const PLUGIN_NAME = "FetchCompileAsyncWasmPlugin";
+
 class FetchCompileAsyncWasmPlugin {
 	/**
 	 * Apply the plugin
@@ -19,52 +21,49 @@ class FetchCompileAsyncWasmPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(
-			"FetchCompileAsyncWasmPlugin",
-			compilation => {
-				const globalWasmLoading = compilation.outputOptions.wasmLoading;
-				/**
-				 * @param {Chunk} chunk chunk
-				 * @returns {boolean} true, if wasm loading is enabled for the chunk
-				 */
-				const isEnabledForChunk = chunk => {
-					const options = chunk.getEntryOptions();
-					const wasmLoading =
-						options && options.wasmLoading !== undefined
-							? options.wasmLoading
-							: globalWasmLoading;
-					return wasmLoading === "fetch";
-				};
-				/**
-				 * @param {string} path path to the wasm file
-				 * @returns {string} code to load the wasm file
-				 */
-				const generateLoadBinaryCode = path =>
-					`fetch(${RuntimeGlobals.publicPath} + ${path})`;
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+			const globalWasmLoading = compilation.outputOptions.wasmLoading;
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @returns {boolean} true, if wasm loading is enabled for the chunk
+			 */
+			const isEnabledForChunk = chunk => {
+				const options = chunk.getEntryOptions();
+				const wasmLoading =
+					options && options.wasmLoading !== undefined
+						? options.wasmLoading
+						: globalWasmLoading;
+				return wasmLoading === "fetch";
+			};
+			/**
+			 * @param {string} path path to the wasm file
+			 * @returns {string} code to load the wasm file
+			 */
+			const generateLoadBinaryCode = path =>
+				`fetch(${RuntimeGlobals.publicPath} + ${path})`;
 
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.instantiateWasm)
-					.tap("FetchCompileAsyncWasmPlugin", (chunk, set, { chunkGraph }) => {
-						if (!isEnabledForChunk(chunk)) return;
-						if (
-							!chunkGraph.hasModuleInGraph(
-								chunk,
-								m => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
-							)
-						) {
-							return;
-						}
-						set.add(RuntimeGlobals.publicPath);
-						compilation.addRuntimeModule(
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.instantiateWasm)
+				.tap(PLUGIN_NAME, (chunk, set, { chunkGraph }) => {
+					if (!isEnabledForChunk(chunk)) return;
+					if (
+						!chunkGraph.hasModuleInGraph(
 							chunk,
-							new AsyncWasmLoadingRuntimeModule({
-								generateLoadBinaryCode,
-								supportsStreaming: true
-							})
-						);
-					});
-			}
-		);
+							m => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
+						)
+					) {
+						return;
+					}
+					set.add(RuntimeGlobals.publicPath);
+					compilation.addRuntimeModule(
+						chunk,
+						new AsyncWasmLoadingRuntimeModule({
+							generateLoadBinaryCode,
+							supportsStreaming: true
+						})
+					);
+				});
+		});
 	}
 }
 

package/lib/web/FetchCompileWasmPlugin.js

@@ -12,15 +12,15 @@ const WasmChunkLoadingRuntimeModule = require("../wasm-sync/WasmChunkLoadingRunt
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
-// TODO webpack 6 remove
-
-const PLUGIN_NAME = "FetchCompileWasmPlugin";
-
 /**
  * @typedef {object} FetchCompileWasmPluginOptions
  * @property {boolean} [mangleImports] mangle imports
  */
 
+// TODO webpack 6 remove
+
+const PLUGIN_NAME = "FetchCompileWasmPlugin";
+
 class FetchCompileWasmPlugin {
 	/**
 	 * @param {FetchCompileWasmPluginOptions} [options] options

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "webpack",
-  "version": "5.96.1",
+  "version": "5.97.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
     "@types/eslint-scope": "^3.7.7",
     "@types/estree": "^1.0.6",
-    "@webassemblyjs/ast": "^1.12.1",
-    "@webassemblyjs/wasm-edit": "^1.12.1",
-    "@webassemblyjs/wasm-parser": "^1.12.1",
+    "@webassemblyjs/ast": "^1.14.1",
+    "@webassemblyjs/wasm-edit": "^1.14.1",
+    "@webassemblyjs/wasm-parser": "^1.14.1",
     "acorn": "^8.14.0",
     "browserslist": "^4.24.0",
     "chrome-trace-event": "^1.0.2",