webpack 5.99.5 → 5.99.7

package/lib/web/JsonpChunkLoadingPlugin.js

@@ -11,6 +11,8 @@ const JsonpChunkLoadingRuntimeModule = require("./JsonpChunkLoadingRuntimeModule
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
+const PLUGIN_NAME = "JsonpChunkLoadingPlugin";
+
 class JsonpChunkLoadingPlugin {
 	/**
 	 * Apply the plugin
@@ -18,82 +20,79 @@ class JsonpChunkLoadingPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(
-			"JsonpChunkLoadingPlugin",
-			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 === "jsonp";
-				};
-				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 === "jsonp";
+			};
+			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);
+				if (!isEnabledForChunk(chunk)) return;
+				set.add(RuntimeGlobals.moduleFactoriesAddOnly);
+				set.add(RuntimeGlobals.hasOwnProperty);
+				compilation.addRuntimeModule(
+					chunk,
+					new JsonpChunkLoadingRuntimeModule(set)
+				);
+			};
+			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.loadScript);
+					set.add(RuntimeGlobals.getChunkScriptFilename);
+				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
 					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.publicPath);
+					set.add(RuntimeGlobals.loadScript);
+					set.add(RuntimeGlobals.getChunkUpdateScriptFilename);
+					set.add(RuntimeGlobals.moduleCache);
+					set.add(RuntimeGlobals.hmrModuleData);
 					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
-					set.add(RuntimeGlobals.hasOwnProperty);
-					compilation.addRuntimeModule(
-						chunk,
-						new JsonpChunkLoadingRuntimeModule(set)
-					);
-				};
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.ensureChunkHandlers)
-					.tap("JsonpChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
-					.tap("JsonpChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadManifest)
-					.tap("JsonpChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.baseURI)
-					.tap("JsonpChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.onChunksLoaded)
-					.tap("JsonpChunkLoadingPlugin", handler);
-
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.ensureChunkHandlers)
-					.tap("JsonpChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.publicPath);
-						set.add(RuntimeGlobals.loadScript);
-						set.add(RuntimeGlobals.getChunkScriptFilename);
-					});
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
-					.tap("JsonpChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.publicPath);
-						set.add(RuntimeGlobals.loadScript);
-						set.add(RuntimeGlobals.getChunkUpdateScriptFilename);
-						set.add(RuntimeGlobals.moduleCache);
-						set.add(RuntimeGlobals.hmrModuleData);
-						set.add(RuntimeGlobals.moduleFactoriesAddOnly);
-					});
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadManifest)
-					.tap("JsonpChunkLoadingPlugin", (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);
+				});
+		});
 	}
 }
 

package/lib/webpack.js

@@ -59,7 +59,7 @@ const createMultiCompiler = (childOptions, options) => {
 
 /**
  * @param {WebpackOptions} rawOptions options object
- * @param {number} [compilerIndex] index of compiler
+ * @param {number=} compilerIndex index of compiler
  * @returns {Compiler} a compiler
  */
 const createCompiler = (rawOptions, compilerIndex) => {

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -12,6 +12,8 @@ const ImportScriptsChunkLoadingRuntimeModule = require("./ImportScriptsChunkLoad
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
+const PLUGIN_NAME = "ImportScriptsChunkLoadingPlugin";
+
 class ImportScriptsChunkLoadingPlugin {
 	/**
 	 * Apply the plugin
@@ -23,86 +25,83 @@ 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 {Set<string>} 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.onChunksLoaded)
-					.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/package.json

@@ -1,12 +1,13 @@
 {
   "name": "webpack",
-  "version": "5.99.5",
+  "version": "5.99.7",
   "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",
+    "@types/json-schema": "^7.0.15",
     "@webassemblyjs/ast": "^1.14.1",
     "@webassemblyjs/wasm-edit": "^1.14.1",
     "@webassemblyjs/wasm-parser": "^1.14.1",
@@ -23,7 +24,7 @@
     "loader-runner": "^4.2.0",
     "mime-types": "^2.1.27",
     "neo-async": "^2.6.2",
-    "schema-utils": "^4.3.0",
+    "schema-utils": "^4.3.2",
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.3.11",
     "watchpack": "^2.4.1",
@@ -167,7 +168,7 @@
     "pretty-lint": "yarn pretty-lint-base --check",
     "yarn-lint": "yarn-deduplicate --fail --list -s highest yarn.lock",
     "yarn-lint-fix": "yarn-deduplicate -s highest yarn.lock",
-    "benchmark": "node --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
+    "benchmark": "node --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.mjs\" --runInBand",
     "cover": "yarn cover:all && yarn cover:report",
     "cover:clean": "rimraf .nyc_output coverage",
     "cover:all": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --coverage",