webpack 5.97.1 → 5.104.1

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -11,6 +11,9 @@ const ImportScriptsChunkLoadingRuntimeModule = require("./ImportScriptsChunkLoad
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
+
+const PLUGIN_NAME = "ImportScriptsChunkLoadingPlugin";
 
 class ImportScriptsChunkLoadingPlugin {
 	/**
@@ -23,83 +26,84 @@ class ImportScriptsChunkLoadingPlugin {
 			chunkLoading: "import-scripts",
 			asyncChunkLoading: true
 		}).apply(compiler);
-		compiler.hooks.thisCompilation.tap(
-			"ImportScriptsChunkLoadingPlugin",
-			compilation => {
-				const globalChunkLoading = compilation.outputOptions.chunkLoading;
-				/**
-				 * @param {Chunk} chunk chunk
-				 * @returns {boolean} true, if wasm loading is enabled for the chunk
-				 */
-				const isEnabledForChunk = chunk => {
-					const options = chunk.getEntryOptions();
-					const chunkLoading =
-						options && options.chunkLoading !== undefined
-							? options.chunkLoading
-							: globalChunkLoading;
-					return chunkLoading === "import-scripts";
-				};
-				const onceForChunkSet = new WeakSet();
-				/**
-				 * @param {Chunk} chunk chunk
-				 * @param {Set<string>} set runtime requirements
-				 */
-				const handler = (chunk, set) => {
-					if (onceForChunkSet.has(chunk)) return;
-					onceForChunkSet.add(chunk);
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+			const globalChunkLoading = compilation.outputOptions.chunkLoading;
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @returns {boolean} true, if wasm loading is enabled for the chunk
+			 */
+			const isEnabledForChunk = (chunk) => {
+				const options = chunk.getEntryOptions();
+				const chunkLoading =
+					options && options.chunkLoading !== undefined
+						? options.chunkLoading
+						: globalChunkLoading;
+				return chunkLoading === "import-scripts";
+			};
+			const onceForChunkSet = new WeakSet();
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @param {RuntimeRequirements} set runtime requirements
+			 */
+			const handler = (chunk, set) => {
+				if (onceForChunkSet.has(chunk)) return;
+				onceForChunkSet.add(chunk);
+				if (!isEnabledForChunk(chunk)) return;
+				const withCreateScriptUrl = Boolean(
+					compilation.outputOptions.trustedTypes
+				);
+				set.add(RuntimeGlobals.moduleFactoriesAddOnly);
+				set.add(RuntimeGlobals.hasOwnProperty);
+				if (withCreateScriptUrl) {
+					set.add(RuntimeGlobals.createScriptUrl);
+				}
+				compilation.addRuntimeModule(
+					chunk,
+					new ImportScriptsChunkLoadingRuntimeModule(set, withCreateScriptUrl)
+				);
+			};
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.ensureChunkHandlers)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadManifest)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.baseURI)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.onChunksLoaded)
+				.tap(PLUGIN_NAME, handler);
+
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.ensureChunkHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.publicPath);
+					set.add(RuntimeGlobals.getChunkScriptFilename);
+				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
 					if (!isEnabledForChunk(chunk)) return;
-					const withCreateScriptUrl = Boolean(
-						compilation.outputOptions.trustedTypes
-					);
+					set.add(RuntimeGlobals.publicPath);
+					set.add(RuntimeGlobals.getChunkUpdateScriptFilename);
+					set.add(RuntimeGlobals.moduleCache);
+					set.add(RuntimeGlobals.hmrModuleData);
 					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
-					set.add(RuntimeGlobals.hasOwnProperty);
-					if (withCreateScriptUrl) {
-						set.add(RuntimeGlobals.createScriptUrl);
-					}
-					compilation.addRuntimeModule(
-						chunk,
-						new ImportScriptsChunkLoadingRuntimeModule(set, withCreateScriptUrl)
-					);
-				};
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.ensureChunkHandlers)
-					.tap("ImportScriptsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
-					.tap("ImportScriptsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadManifest)
-					.tap("ImportScriptsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.baseURI)
-					.tap("ImportScriptsChunkLoadingPlugin", handler);
-
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.ensureChunkHandlers)
-					.tap("ImportScriptsChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.publicPath);
-						set.add(RuntimeGlobals.getChunkScriptFilename);
-					});
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
-					.tap("ImportScriptsChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.publicPath);
-						set.add(RuntimeGlobals.getChunkUpdateScriptFilename);
-						set.add(RuntimeGlobals.moduleCache);
-						set.add(RuntimeGlobals.hmrModuleData);
-						set.add(RuntimeGlobals.moduleFactoriesAddOnly);
-					});
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadManifest)
-					.tap("ImportScriptsChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.publicPath);
-						set.add(RuntimeGlobals.getUpdateManifestFilename);
-					});
-			}
-		);
+				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadManifest)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.publicPath);
+					set.add(RuntimeGlobals.getUpdateManifestFilename);
+				});
+		});
 	}
 }
+
 module.exports = ImportScriptsChunkLoadingPlugin;

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -8,8 +8,11 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 const {
-	getChunkFilenameTemplate,
-	chunkHasJs
+	generateJavascriptHMR
+} = require("../hmr/JavascriptHotModuleReplacementHelper");
+const {
+	chunkHasJs,
+	getChunkFilenameTemplate
 } = require("../javascript/JavascriptModulesPlugin");
 const { getInitialChunkIds } = require("../javascript/StartupHelpers");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
@@ -51,7 +54,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			/** @type {string} */ (compilation.outputOptions.path),
+			compilation.outputOptions.path,
 			false
 		);
 		return `${RuntimeGlobals.baseURI} = self.location + ${JSON.stringify(
@@ -69,6 +72,9 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		const withLoading = this.runtimeRequirements.has(
 			RuntimeGlobals.ensureChunkHandlers
 		);
+		const withCallback = this.runtimeRequirements.has(
+			RuntimeGlobals.chunkCallback
+		);
 		const withHmr = this.runtimeRequirements.has(
 			RuntimeGlobals.hmrDownloadUpdateHandlers
 		);
@@ -101,13 +107,13 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
 			}{`,
 			Template.indent(
-				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 1`).join(
+				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 1`).join(
 					",\n"
 				)
 			),
 			"};",
 			"",
-			withLoading
+			withCallback || withLoading
 				? Template.asString([
 						"// importScripts chunk loading",
 						`var installChunk = ${runtimeTemplate.basicFunction("data", [
@@ -131,31 +137,33 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 						])};`
 					])
 				: "// no chunk install function needed",
-			withLoading
+			withCallback || withLoading
 				? Template.asString([
-						`${fn}.i = ${runtimeTemplate.basicFunction(
-							"chunkId, promises",
-							hasJsMatcher !== false
-								? [
-										'// "1" is the signal for "already loaded"',
-										"if(!installedChunks[chunkId]) {",
-										Template.indent([
-											hasJsMatcher === true
-												? "if(true) { // all chunks have JS"
-												: `if(${hasJsMatcher("chunkId")}) {`,
-											Template.indent(
-												`importScripts(${
-													withCreateScriptUrl
-														? `${RuntimeGlobals.createScriptUrl}(${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId))`
-														: `${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId)`
-												});`
-											),
-											"}"
-										]),
-										"}"
-									]
-								: "installedChunks[chunkId] = 1;"
-						)};`,
+						withLoading
+							? `${fn}.i = ${runtimeTemplate.basicFunction(
+									"chunkId, promises",
+									hasJsMatcher !== false
+										? [
+												'// "1" is the signal for "already loaded"',
+												"if(!installedChunks[chunkId]) {",
+												Template.indent([
+													hasJsMatcher === true
+														? "if(true) { // all chunks have JS"
+														: `if(${hasJsMatcher("chunkId")}) {`,
+													Template.indent(
+														`importScripts(${
+															withCreateScriptUrl
+																? `${RuntimeGlobals.createScriptUrl}(${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId))`
+																: `${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId)`
+														});`
+													),
+													"}"
+												]),
+												"}"
+											]
+										: "installedChunks[chunkId] = 1;"
+								)};`
+							: "",
 						"",
 						`var chunkLoadingGlobal = ${chunkLoadingGlobalExpr} = ${chunkLoadingGlobalExpr} || [];`,
 						"var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);",
@@ -194,28 +202,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						"",
-						Template.getFunctionContent(
-							require("../hmr/JavascriptHotModuleReplacement.runtime.js")
-						)
-							.replace(/\$key\$/g, "importScripts")
-							.replace(/\$installedChunks\$/g, "installedChunks")
-							.replace(/\$loadUpdateChunk\$/g, "loadUpdateChunk")
-							.replace(/\$moduleCache\$/g, RuntimeGlobals.moduleCache)
-							.replace(/\$moduleFactories\$/g, RuntimeGlobals.moduleFactories)
-							.replace(
-								/\$ensureChunkHandlers\$/g,
-								RuntimeGlobals.ensureChunkHandlers
-							)
-							.replace(/\$hasOwnProperty\$/g, RuntimeGlobals.hasOwnProperty)
-							.replace(/\$hmrModuleData\$/g, RuntimeGlobals.hmrModuleData)
-							.replace(
-								/\$hmrDownloadUpdateHandlers\$/g,
-								RuntimeGlobals.hmrDownloadUpdateHandlers
-							)
-							.replace(
-								/\$hmrInvalidateModuleHandlers\$/g,
-								RuntimeGlobals.hmrInvalidateModuleHandlers
-							)
+						generateJavascriptHMR("importScripts")
 					])
 				: "// no HMR",
 			"",

package/lib/webworker/WebWorkerTemplatePlugin.js

@@ -22,4 +22,5 @@ class WebWorkerTemplatePlugin {
 		new EnableChunkLoadingPlugin("import-scripts").apply(compiler);
 	}
 }
+
 module.exports = WebWorkerTemplatePlugin;

package/module.d.ts

@@ -161,10 +161,15 @@ declare namespace webpack {
 	}
 }
 
+interface ImportMetaEnv {
+	[key: string]: string | boolean | undefined;
+}
+
 interface ImportMeta {
 	url: string;
 	webpack: number;
 	webpackHot: webpack.Hot;
+	env: ImportMetaEnv;
 	webpackContext: (
 		request: string,
 		options?: {