webpack 5.99.9 → 5.100.0

package/lib/util/runtime.js

@@ -19,7 +19,7 @@ const SortableSet = require("./SortableSet");
  * @param {EntryOptions=} options optionally already received entry options
  * @returns {RuntimeSpec} runtime
  */
-module.exports.getEntryRuntime = (compilation, name, options) => {
+const getEntryRuntime = (compilation, name, options) => {
 	let dependOn;
 	let runtime;
 	if (options) {
@@ -68,7 +68,6 @@ const forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 		}
 	}
 };
-module.exports.forEachRuntime = forEachRuntime;
 
 /**
  * @template T
@@ -77,7 +76,7 @@ module.exports.forEachRuntime = forEachRuntime;
  */
 const getRuntimesKey = set => {
 	set.sort();
-	return Array.from(set).join("\n");
+	return [...set].join("\n");
 };
 
 /**
@@ -89,7 +88,6 @@ const getRuntimeKey = runtime => {
 	if (typeof runtime === "string") return runtime;
 	return runtime.getFromUnorderedCache(getRuntimesKey);
 };
-module.exports.getRuntimeKey = getRuntimeKey;
 
 /**
  * @param {string} key key of runtimes
@@ -101,7 +99,6 @@ const keyToRuntime = key => {
 	if (items.length === 1) return items[0];
 	return new SortableSet(items);
 };
-module.exports.keyToRuntime = keyToRuntime;
 
 /**
  * @template T
@@ -110,7 +107,7 @@ module.exports.keyToRuntime = keyToRuntime;
  */
 const getRuntimesString = set => {
 	set.sort();
-	return Array.from(set).join("+");
+	return [...set].join("+");
 };
 
 /**
@@ -122,13 +119,12 @@ const runtimeToString = runtime => {
 	if (typeof runtime === "string") return runtime;
 	return runtime.getFromUnorderedCache(getRuntimesString);
 };
-module.exports.runtimeToString = runtimeToString;
 
 /**
  * @param {RuntimeCondition} runtimeCondition runtime condition
  * @returns {string} readable version
  */
-module.exports.runtimeConditionToString = runtimeCondition => {
+const runtimeConditionToString = runtimeCondition => {
 	if (runtimeCondition === true) return "true";
 	if (runtimeCondition === false) return "false";
 	return runtimeToString(runtimeCondition);
@@ -163,14 +159,13 @@ const runtimeEqual = (a, b) => {
 		if (aV.value !== bV.value) return false;
 	}
 };
-module.exports.runtimeEqual = runtimeEqual;
 
 /**
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {-1|0|1} compare
  */
-module.exports.compareRuntime = (a, b) => {
+const compareRuntime = (a, b) => {
 	if (a === b) {
 		return 0;
 	} else if (a === undefined) {
@@ -221,7 +216,6 @@ const mergeRuntime = (a, b) => {
 	if (set.size === a.size) return a;
 	return set;
 };
-module.exports.mergeRuntime = mergeRuntime;
 
 /**
  * @param {RuntimeCondition} a first
@@ -229,7 +223,7 @@ module.exports.mergeRuntime = mergeRuntime;
  * @param {RuntimeSpec} runtime full runtime
  * @returns {RuntimeCondition} result
  */
-module.exports.mergeRuntimeCondition = (a, b, runtime) => {
+const mergeRuntimeCondition = (a, b, runtime) => {
 	if (a === false) return b;
 	if (b === false) return a;
 	if (a === true || b === true) return true;
@@ -250,7 +244,7 @@ module.exports.mergeRuntimeCondition = (a, b, runtime) => {
  * @param {RuntimeSpec} runtime full runtime
  * @returns {RuntimeSpec | true} result
  */
-module.exports.mergeRuntimeConditionNonFalse = (a, b, runtime) => {
+const mergeRuntimeConditionNonFalse = (a, b, runtime) => {
 	if (a === true || b === true) return true;
 	const merged = mergeRuntime(a, b);
 	if (merged === undefined) return;
@@ -296,14 +290,13 @@ const mergeRuntimeOwned = (a, b) => {
 	for (const item of b) a.add(item);
 	return a;
 };
-module.exports.mergeRuntimeOwned = mergeRuntimeOwned;
 
 /**
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {RuntimeSpec} merged
  */
-module.exports.intersectRuntime = (a, b) => {
+const intersectRuntime = (a, b) => {
 	if (a === undefined) {
 		return b;
 	} else if (b === undefined) {
@@ -376,7 +369,6 @@ const subtractRuntime = (a, b) => {
 	}
 	return set;
 };
-module.exports.subtractRuntime = subtractRuntime;
 
 /**
  * @param {RuntimeCondition} a first
@@ -384,7 +376,7 @@ module.exports.subtractRuntime = subtractRuntime;
  * @param {RuntimeSpec} runtime runtime
  * @returns {RuntimeCondition} result
  */
-module.exports.subtractRuntimeCondition = (a, b, runtime) => {
+const subtractRuntimeCondition = (a, b, runtime) => {
 	if (b === true) return false;
 	if (b === false) return a;
 	if (a === false) return false;
@@ -397,7 +389,7 @@ module.exports.subtractRuntimeCondition = (a, b, runtime) => {
  * @param {(runtime?: RuntimeSpec) => boolean} filter filter function
  * @returns {boolean | RuntimeSpec} true/false if filter is constant for all runtimes, otherwise runtimes that are active
  */
-module.exports.filterRuntime = (runtime, filter) => {
+const filterRuntime = (runtime, filter) => {
 	if (runtime === undefined) return filter();
 	if (typeof runtime === "string") return filter(runtime);
 	let some = false;
@@ -604,9 +596,10 @@ class RuntimeSpecMap {
 					/** @type {RuntimeSpecMapInnerMap<R>} */
 					(this._map).get(key);
 				const newValue = fn(oldValue);
-				if (newValue !== oldValue)
+				if (newValue !== oldValue) {
 					/** @type {RuntimeSpecMapInnerMap<R>} */
 					(this._map).set(key, newValue);
+				}
 			}
 		}
 	}
@@ -649,8 +642,6 @@ class RuntimeSpecMap {
 	}
 }
 
-module.exports.RuntimeSpecMap = RuntimeSpecMap;
-
 class RuntimeSpecSet {
 	/**
 	 * @param {Iterable<RuntimeSpec>=} iterable iterable
@@ -692,4 +683,21 @@ class RuntimeSpecSet {
 	}
 }
 
+module.exports.RuntimeSpecMap = RuntimeSpecMap;
 module.exports.RuntimeSpecSet = RuntimeSpecSet;
+module.exports.compareRuntime = compareRuntime;
+module.exports.filterRuntime = filterRuntime;
+module.exports.forEachRuntime = forEachRuntime;
+module.exports.getEntryRuntime = getEntryRuntime;
+module.exports.getRuntimeKey = getRuntimeKey;
+module.exports.intersectRuntime = intersectRuntime;
+module.exports.keyToRuntime = keyToRuntime;
+module.exports.mergeRuntime = mergeRuntime;
+module.exports.mergeRuntimeCondition = mergeRuntimeCondition;
+module.exports.mergeRuntimeConditionNonFalse = mergeRuntimeConditionNonFalse;
+module.exports.mergeRuntimeOwned = mergeRuntimeOwned;
+module.exports.runtimeConditionToString = runtimeConditionToString;
+module.exports.runtimeEqual = runtimeEqual;
+module.exports.runtimeToString = runtimeToString;
+module.exports.subtractRuntime = subtractRuntime;
+module.exports.subtractRuntimeCondition = subtractRuntimeCondition;

package/lib/util/semver.js

@@ -561,7 +561,7 @@ module.exports.stringifyHoley = json => {
 exports.parseVersionRuntimeCode = runtimeTemplate =>
 	`var parseVersion = ${runtimeTemplate.basicFunction("str", [
 		"// see webpack/lib/util/semver.js for original code",
-		`var p=${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return p.split(".").map((${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return+p==p?+p:p}))},n=/^([^-+]+)?(?:-([^+]+))?(?:\\+(.+))?$/.exec(str),r=n[1]?p(n[1]):[];return n[2]&&(r.length++,r.push.apply(r,p(n[2]))),n[3]&&(r.push([]),r.push.apply(r,p(n[3]))),r;`
+		`var p=${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return p.split(".").map(${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return+p==p?+p:p})},n=/^([^-+]+)?(?:-([^+]+))?(?:\\+(.+))?$/.exec(str),r=n[1]?p(n[1]):[];return n[2]&&(r.length++,r.push.apply(r,p(n[2]))),n[3]&&(r.push([]),r.push.apply(r,p(n[3]))),r;`
 	])}`;
 //#endregion
 

package/lib/util/serialization.js

@@ -41,6 +41,7 @@ const registerSerializers = memoize(() => {
 	// Load internal paths with a relative require
 	// This allows bundling all internal serializers
 	const internalSerializables = require("./internalSerializables");
+
 	getObjectMiddleware().registerLoader(/^webpack\/lib\//, req => {
 		const loader =
 			internalSerializables[
@@ -116,7 +117,9 @@ module.exports = {
 	createFileSerializer: (fs, hashFunction) => {
 		registerSerializers();
 		const Serializer = getSerializer();
+
 		const FileMiddleware = require("../serialization/FileMiddleware");
+
 		const fileMiddleware = new FileMiddleware(fs, hashFunction);
 		const binaryMiddleware = getBinaryMiddlewareInstance();
 		const SerializerMiddleware = getSerializerMiddleware();

package/lib/util/source.js

@@ -23,8 +23,8 @@ const _isSourceEqual = (a, b) => {
 	let bSource = typeof b.buffer === "function" ? b.buffer() : b.source();
 	if (aSource === bSource) return true;
 	if (typeof aSource === "string" && typeof bSource === "string") return false;
-	if (!Buffer.isBuffer(aSource)) aSource = Buffer.from(aSource, "utf-8");
-	if (!Buffer.isBuffer(bSource)) bSource = Buffer.from(bSource, "utf-8");
+	if (!Buffer.isBuffer(aSource)) aSource = Buffer.from(aSource, "utf8");
+	if (!Buffer.isBuffer(bSource)) bSource = Buffer.from(bSource, "utf8");
 	return aSource.equals(bSource);
 };
 
@@ -58,4 +58,5 @@ const isSourceEqual = (a, b) => {
 	}
 	return result;
 };
+
 module.exports.isSourceEqual = isSourceEqual;

package/lib/validateSchema.js

@@ -173,4 +173,5 @@ const validateSchema = (schema, options, validationConfiguration) => {
 		}
 	);
 };
+
 module.exports = validateSchema;

package/lib/wasm/EnableWasmLoadingPlugin.js

@@ -54,9 +54,7 @@ class EnableWasmLoadingPlugin {
 					"EnableWasmLoadingPlugin need to be used to enable this type of wasm loading. " +
 					'This usually happens through the "output.enabledWasmLoadingTypes" option. ' +
 					'If you are using a function as entry which sets "wasmLoading", you need to add all potential library types to "output.enabledWasmLoadingTypes". ' +
-					`These types are enabled: ${Array.from(
-						getEnabledTypes(compiler)
-					).join(", ")}`
+					`These types are enabled: ${[...getEnabledTypes(compiler)].join(", ")}`
 			);
 		}
 	}
@@ -80,6 +78,7 @@ class EnableWasmLoadingPlugin {
 					if (compiler.options.experiments.syncWebAssembly) {
 						// TODO webpack 6 remove FetchCompileWasmPlugin
 						const FetchCompileWasmPlugin = require("../web/FetchCompileWasmPlugin");
+
 						new FetchCompileWasmPlugin({
 							mangleImports: compiler.options.optimization.mangleWasmImports
 						}).apply(compiler);
@@ -87,6 +86,7 @@ class EnableWasmLoadingPlugin {
 
 					if (compiler.options.experiments.asyncWebAssembly) {
 						const FetchCompileAsyncWasmPlugin = require("../web/FetchCompileAsyncWasmPlugin");
+
 						new FetchCompileAsyncWasmPlugin().apply(compiler);
 					}
 
@@ -96,6 +96,7 @@ class EnableWasmLoadingPlugin {
 					if (compiler.options.experiments.syncWebAssembly) {
 						// TODO webpack 6 remove ReadFileCompileWasmPlugin
 						const ReadFileCompileWasmPlugin = require("../node/ReadFileCompileWasmPlugin");
+
 						new ReadFileCompileWasmPlugin({
 							mangleImports: compiler.options.optimization.mangleWasmImports,
 							import:
@@ -106,6 +107,7 @@ class EnableWasmLoadingPlugin {
 
 					if (compiler.options.experiments.asyncWebAssembly) {
 						const ReadFileCompileAsyncWasmPlugin = require("../node/ReadFileCompileAsyncWasmPlugin");
+
 						new ReadFileCompileAsyncWasmPlugin({
 							import:
 								compiler.options.output.module &&
@@ -117,6 +119,7 @@ class EnableWasmLoadingPlugin {
 				}
 				case "universal": {
 					const UniversalCompileAsyncWasmPlugin = require("../wasm-async/UniversalCompileAsyncWasmPlugin");
+
 					new UniversalCompileAsyncWasmPlugin().apply(compiler);
 					break;
 				}

package/lib/wasm-async/AsyncWebAssemblyJavascriptGenerator.js

@@ -105,6 +105,7 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 				return runtimeTemplate.importStatement({
 					update: false,
 					module: importedModule,
+					moduleGraph,
 					chunkGraph,
 					request,
 					originModule: module,
@@ -131,6 +132,7 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 					)}: ${runtimeTemplate.exportFromImport({
 						moduleGraph,
 						module: importedModule,
+						chunkGraph,
 						request,
 						exportName: dep.name,
 						originModule: module,
@@ -167,8 +169,9 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 			chunkGraph.getRenderedModuleHash(module, runtime)
 		)}${importsObj ? `, ${importsObj})` : ")"}`;
 
-		if (promises.length > 0)
+		if (promises.length > 0) {
 			runtimeRequirements.add(RuntimeGlobals.asyncModule);
+		}
 
 		const source = new RawSource(
 			promises.length > 0

package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -133,58 +133,55 @@ class AsyncWebAssemblyModulesPlugin {
 						});
 					});
 
-				compilation.hooks.renderManifest.tap(
-					"WebAssemblyModulesPlugin",
-					(result, options) => {
-						const { moduleGraph, chunkGraph, runtimeTemplate } = compilation;
-						const {
-							chunk,
-							outputOptions,
-							dependencyTemplates,
-							codeGenerationResults
-						} = options;
-
-						for (const module of chunkGraph.getOrderedChunkModulesIterable(
-							chunk,
-							compareModulesByIdOrIdentifier(chunkGraph)
-						)) {
-							if (module.type === WEBASSEMBLY_MODULE_TYPE_ASYNC) {
-								const filenameTemplate =
-									/** @type {NonNullable<OutputOptions["webassemblyModuleFilename"]>} */
-									(outputOptions.webassemblyModuleFilename);
-
-								result.push({
-									render: () =>
-										this.renderModule(
-											module,
-											{
-												chunk,
-												dependencyTemplates,
-												runtimeTemplate,
-												moduleGraph,
-												chunkGraph,
-												codeGenerationResults
-											},
-											hooks
-										),
-									filenameTemplate,
-									pathOptions: {
+				compilation.hooks.renderManifest.tap(PLUGIN_NAME, (result, options) => {
+					const { moduleGraph, chunkGraph, runtimeTemplate } = compilation;
+					const {
+						chunk,
+						outputOptions,
+						dependencyTemplates,
+						codeGenerationResults
+					} = options;
+
+					for (const module of chunkGraph.getOrderedChunkModulesIterable(
+						chunk,
+						compareModulesByIdOrIdentifier(chunkGraph)
+					)) {
+						if (module.type === WEBASSEMBLY_MODULE_TYPE_ASYNC) {
+							const filenameTemplate =
+								/** @type {NonNullable<OutputOptions["webassemblyModuleFilename"]>} */
+								(outputOptions.webassemblyModuleFilename);
+
+							result.push({
+								render: () =>
+									this.renderModule(
 										module,
-										runtime: chunk.runtime,
-										chunkGraph
-									},
-									auxiliary: true,
-									identifier: `webassemblyAsyncModule${chunkGraph.getModuleId(
-										module
-									)}`,
-									hash: chunkGraph.getModuleHash(module, chunk.runtime)
-								});
-							}
+										{
+											chunk,
+											dependencyTemplates,
+											runtimeTemplate,
+											moduleGraph,
+											chunkGraph,
+											codeGenerationResults
+										},
+										hooks
+									),
+								filenameTemplate,
+								pathOptions: {
+									module,
+									runtime: chunk.runtime,
+									chunkGraph
+								},
+								auxiliary: true,
+								identifier: `webassemblyAsyncModule${chunkGraph.getModuleId(
+									module
+								)}`,
+								hash: chunkGraph.getModuleHash(module, chunk.runtime)
+							});
 						}
-
-						return result;
 					}
-				);
+
+					return result;
+				});
 			}
 		);
 	}

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -172,9 +172,9 @@ const generateImportObject = (
 
 	const moduleIdStringified = JSON.stringify(chunkGraph.getModuleId(module));
 	if (waitForInstances.size === 1) {
-		const moduleId = Array.from(waitForInstances.values())[0];
+		const moduleId = [...waitForInstances.values()][0];
 		const promise = `installedWasmModules[${JSON.stringify(moduleId)}]`;
-		const variable = Array.from(waitForInstances.keys())[0];
+		const variable = [...waitForInstances.keys()][0];
 		return Template.asString([
 			`${moduleIdStringified}: function() {`,
 			Template.indent([

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -7,14 +7,13 @@
 
 const t = require("@webassemblyjs/ast");
 const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
-const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
+const { addWithAST, editWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const { RawSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const { WEBASSEMBLY_TYPES } = require("../ModuleSourceTypesConstants");
-const WebAssemblyUtils = require("./WebAssemblyUtils");
-
 const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
+const WebAssemblyUtils = require("./WebAssemblyUtils");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */

package/lib/wasm-sync/WebAssemblyInInitialChunkError.js

@@ -42,8 +42,9 @@ const getInitialModuleChains = (
 		for (const connection of moduleGraph.getIncomingConnections(head)) {
 			const newHead = connection.originModule;
 			if (newHead) {
-				if (!chunkGraph.getModuleChunks(newHead).some(c => c.canBeInitial()))
+				if (!chunkGraph.getModuleChunks(newHead).some(c => c.canBeInitial())) {
 					continue;
+				}
 				final = false;
 				if (alreadyReferencedModules.has(newHead)) continue;
 				alreadyReferencedModules.add(newHead);
@@ -76,7 +77,7 @@ const getInitialModuleChains = (
 	for (const result of incompleteResults) {
 		results.add(result);
 	}
-	return Array.from(results);
+	return [...results];
 };
 
 module.exports = class WebAssemblyInInitialChunkError extends WebpackError {

package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js

@@ -97,6 +97,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 								initParams.push(
 									runtimeTemplate.exportFromImport({
 										moduleGraph,
+										chunkGraph,
 										module: importedModule,
 										request: dep.request,
 										importVar: importData.importVar,
@@ -129,6 +130,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 							`${exportProp} = ${runtimeTemplate.exportFromImport({
 								moduleGraph,
 								module: /** @type {Module} */ (moduleGraph.getModule(dep)),
+								chunkGraph,
 								request: dep.request,
 								importVar: importData.importVar,
 								originModule: module,
@@ -158,6 +160,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 				([module, { importVar, request, reexports }]) => {
 					const importStatement = runtimeTemplate.importStatement({
 						module,
+						moduleGraph,
 						chunkGraph,
 						request,
 						importVar,

package/lib/wasm-sync/WebAssemblyUtils.js

@@ -62,5 +62,5 @@ const getUsedDependencies = (moduleGraph, module, mangle) => {
 	return array;
 };
 
-module.exports.getUsedDependencies = getUsedDependencies;
 module.exports.MANGLED_MODULE = MANGLED_MODULE;
+module.exports.getUsedDependencies = getUsedDependencies;

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -9,6 +9,9 @@ const Compilation = require("../Compilation");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
+const {
+	generateJavascriptHMR
+} = require("../hmr/JavascriptHotModuleReplacementHelper");
 const chunkHasJs = require("../javascript/JavascriptModulesPlugin").chunkHasJs;
 const { getInitialChunkIds } = require("../javascript/StartupHelpers");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
@@ -363,28 +366,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							]
 						)};`,
 						"",
-						Template.getFunctionContent(
-							require("../hmr/JavascriptHotModuleReplacement.runtime.js")
-						)
-							.replace(/\$key\$/g, "jsonp")
-							.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("jsonp")
 					])
 				: "// no HMR",
 			"",

package/lib/webpack.js

@@ -6,14 +6,14 @@
 "use strict";
 
 const util = require("util");
-const webpackOptionsSchemaCheck = require("../schemas/WebpackOptions.check.js");
+const webpackOptionsSchemaCheck = require("../schemas/WebpackOptions.check");
 const webpackOptionsSchema = require("../schemas/WebpackOptions.json");
 const Compiler = require("./Compiler");
 const MultiCompiler = require("./MultiCompiler");
 const WebpackOptionsApply = require("./WebpackOptionsApply");
 const {
-	applyWebpackOptionsDefaults,
-	applyWebpackOptionsBaseDefaults
+	applyWebpackOptionsBaseDefaults,
+	applyWebpackOptionsDefaults
 } = require("./config/defaults");
 const { getNormalizedWebpackOptions } = require("./config/normalization");
 const NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
@@ -115,8 +115,7 @@ const createCompiler = (rawOptions, compilerIndex) => {
  * @param {Array<T> | T} options options
  * @returns {Array<T>} array of options
  */
-const asArray = options =>
-	Array.isArray(options) ? Array.from(options) : [options];
+const asArray = options => (Array.isArray(options) ? [...options] : [options]);
 
 const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 	/**

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -104,4 +104,5 @@ class ImportScriptsChunkLoadingPlugin {
 		});
 	}
 }
+
 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");
@@ -199,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;