webpack 5.42.1 → 5.43.0

package/lib/ExternalModule.js

@@ -16,6 +16,7 @@ const StaticExportsDependency = require("./dependencies/StaticExportsDependency"
 const extractUrlAndGlobal = require("./util/extractUrlAndGlobal");
 const makeSerializable = require("./util/makeSerializable");
 const propertyAccess = require("./util/propertyAccess");
+const { register } = require("./util/serialization");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
@@ -169,6 +170,8 @@ class ModuleExternalInitFragment extends InitFragment {
 			`external module import ${id}`
 		);
 		this._identifier = identifier;
+		this._id = id;
+		this._request = request;
 	}
 
 	getNamespaceIdentifier() {
@@ -176,6 +179,21 @@ class ModuleExternalInitFragment extends InitFragment {
 	}
 }
 
+register(
+	ModuleExternalInitFragment,
+	"webpack/lib/ExternalModule",
+	"ModuleExternalInitFragment",
+	{
+		serialize(obj, { write }) {
+			write(obj._id);
+			write(obj._request);
+		},
+		deserialize({ read }) {
+			return new ModuleExternalInitFragment(read(), read());
+		}
+	}
+);
+
 const generateModuleRemapping = (input, exportsInfo, runtime) => {
 	if (exportsInfo.otherExportsInfo.getUsed(runtime) === UsageState.Unused) {
 		const properties = [];

package/lib/FlagDependencyUsagePlugin.js

@@ -180,7 +180,11 @@ class FlagDependencyUsagePlugin {
 									b.groupOptions &&
 									b.groupOptions.entryOptions
 								) {
-									processModule(b, b.groupOptions.entryOptions.runtime, true);
+									processModule(
+										b,
+										b.groupOptions.entryOptions.runtime || undefined,
+										true
+									);
 								} else {
 									queue.enqueue(b);
 								}

package/lib/container/ContainerPlugin.js

@@ -39,6 +39,7 @@ class ContainerPlugin {
 				type: "var",
 				name: options.name
 			},
+			runtime: options.runtime,
 			filename: options.filename || undefined,
 			exposes: parseOptions(
 				options.exposes,
@@ -60,7 +61,8 @@ class ContainerPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const { name, exposes, shareScope, filename, library } = this._options;
+		const { name, exposes, shareScope, filename, library, runtime } =
+			this._options;
 
 		compiler.options.output.enabledLibraryTypes.push(library.type);
 
@@ -73,6 +75,7 @@ class ContainerPlugin {
 				{
 					name,
 					filename,
+					runtime,
 					library
 				},
 				error => {

package/lib/container/ModuleFederationPlugin.js

@@ -64,6 +64,7 @@ class ModuleFederationPlugin {
 					name: options.name,
 					library,
 					filename: options.filename,
+					runtime: options.runtime,
 					exposes: options.exposes
 				}).apply(compiler);
 			}

package/lib/dependencies/WorkerPlugin.js

@@ -270,7 +270,7 @@ class WorkerPlugin {
 							entryOptions.name = options.name;
 						}
 
-						if (!entryOptions.runtime) {
+						if (entryOptions.runtime === undefined) {
 							let i = workerIndexMap.get(parser.state) || 0;
 							workerIndexMap.set(parser.state, i + 1);
 							let name = `${cachedContextify(

package/lib/json/JsonData.js

@@ -0,0 +1,41 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const { register } = require("../util/serialization");
+
+class JsonData {
+	constructor(data) {
+		this._buffer = undefined;
+		this._data = undefined;
+		if (Buffer.isBuffer(data)) {
+			this._buffer = data;
+		} else {
+			this._data = data;
+		}
+	}
+
+	get() {
+		if (this._data === undefined && this._buffer !== undefined) {
+			this._data = JSON.parse(this._buffer.toString());
+		}
+		return this._data;
+	}
+}
+
+register(JsonData, "webpack/lib/json/JsonData", null, {
+	serialize(obj, { write }) {
+		if (obj._buffer === undefined && obj._data !== undefined) {
+			obj._buffer = Buffer.from(JSON.stringify(obj._data));
+		}
+		write(obj._buffer);
+	},
+	deserialize({ read }) {
+		return new JsonData(read());
+	}
+});
+
+module.exports = JsonData;

package/lib/json/JsonGenerator.js

@@ -116,7 +116,10 @@ class JsonGenerator extends Generator {
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {
-		let data = module.buildInfo && module.buildInfo.jsonData;
+		let data =
+			module.buildInfo &&
+			module.buildInfo.jsonData &&
+			module.buildInfo.jsonData.get();
 		if (!data) return 0;
 		return stringifySafe(data).length + 10;
 	}
@@ -145,7 +148,10 @@ class JsonGenerator extends Generator {
 			concatenationScope
 		}
 	) {
-		const data = module.buildInfo && module.buildInfo.jsonData;
+		const data =
+			module.buildInfo &&
+			module.buildInfo.jsonData &&
+			module.buildInfo.jsonData.get();
 		if (data === undefined) {
 			return new RawSource(
 				runtimeTemplate.missingModuleStatement({

package/lib/json/JsonParser.js

@@ -8,6 +8,7 @@
 const parseJson = require("json-parse-better-errors");
 const Parser = require("../Parser");
 const JsonExportsDependency = require("../dependencies/JsonExportsDependency");
+const JsonData = require("./JsonData");
 
 /** @typedef {import("../../declarations/plugins/JsonModulesPluginParser").JsonModulesPluginParserOptions} JsonModulesPluginParserOptions */
 /** @typedef {import("../Parser").ParserState} ParserState */
@@ -41,7 +42,7 @@ class JsonParser extends Parser {
 				? source
 				: parseFn(source[0] === "\ufeff" ? source.slice(1) : source);
 
-		state.module.buildInfo.jsonData = data;
+		state.module.buildInfo.jsonData = new JsonData(data);
 		state.module.buildInfo.strict = true;
 		state.module.buildMeta.exportsType = "default";
 		state.module.buildMeta.defaultObject =

package/lib/optimize/ConcatenatedModule.js

@@ -45,6 +45,7 @@ const {
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
+/** @template T @typedef {import("../InitFragment")<T>} InitFragment */
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
@@ -55,6 +56,7 @@ const {
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
@@ -104,6 +106,7 @@ if (!ReferencerClass.prototype.PropertyDefinition) {
  * @property {Object} ast
  * @property {Source} internalSource
  * @property {ReplaceSource} source
+ * @property {InitFragment<ChunkRenderContext>[]=} chunkInitFragments
  * @property {Iterable<string>} runtimeRequirements
  * @property {Scope} globalScope
  * @property {Scope} moduleScope
@@ -1508,6 +1511,8 @@ ${defineGetters}`
 			}
 		}
 
+		const chunkInitFragments = [];
+
 		// evaluate modules in order
 		for (const rawInfo of modulesWithInfo) {
 			let name;
@@ -1521,6 +1526,9 @@ ${defineGetters}`
 						)}\n`
 					);
 					result.add(info.source);
+					if (info.chunkInitFragments) {
+						for (const f of info.chunkInitFragments) chunkInitFragments.push(f);
+					}
 					if (info.runtimeRequirements) {
 						for (const r of info.runtimeRequirements) {
 							runtimeRequirements.add(r);
@@ -1583,9 +1591,14 @@ ${defineGetters}`
 			}
 		}
 
+		const data = new Map();
+		if (chunkInitFragments.length > 0)
+			data.set("chunkInitFragments", chunkInitFragments);
+
 		/** @type {CodeGenerationResult} */
 		const resultEntry = {
 			sources: new Map([["javascript", new CachedSource(result)]]),
+			data,
 			runtimeRequirements
 		};
 
@@ -1626,6 +1639,8 @@ ${defineGetters}`
 					concatenationScope
 				});
 				const source = codeGenResult.sources.get("javascript");
+				const data = codeGenResult.data;
+				const chunkInitFragments = data && data.get("chunkInitFragments");
 				const code = source.source().toString();
 				let ast;
 				try {
@@ -1662,6 +1677,7 @@ ${defineGetters}`
 				info.ast = ast;
 				info.internalSource = source;
 				info.source = resultSource;
+				info.chunkInitFragments = chunkInitFragments;
 				info.globalScope = globalScope;
 				info.moduleScope = moduleScope;
 			} catch (err) {

package/lib/optimize/RuntimeChunkPlugin.js

@@ -27,7 +27,7 @@ class RuntimeChunkPlugin {
 				(_, { name: entryName }) => {
 					if (entryName === undefined) return;
 					const data = compilation.entries.get(entryName);
-					if (!data.options.runtime && !data.options.dependOn) {
+					if (data.options.runtime === undefined && !data.options.dependOn) {
 						// Determine runtime chunk name
 						let name = this.options.name;
 						if (typeof name === "function") {

package/lib/rules/RuleSetCompiler.js

@@ -225,7 +225,7 @@ class RuleSetCompiler {
 		if (typeof condition === "string") {
 			return {
 				matchWhenEmpty: condition.length === 0,
-				fn: str => str.startsWith(condition)
+				fn: str => typeof str === "string" && str.startsWith(condition)
 			};
 		}
 		if (typeof condition === "function") {
@@ -245,7 +245,7 @@ class RuleSetCompiler {
 		if (condition instanceof RegExp) {
 			return {
 				matchWhenEmpty: condition.test(""),
-				fn: v => condition.test(v)
+				fn: v => typeof v === "string" && condition.test(v)
 			};
 		}
 		if (Array.isArray(condition)) {

package/lib/util/internalSerializables.js

@@ -156,6 +156,7 @@ module.exports = {
 		require("../dependencies/WebpackIsIncludedDependency"),
 	"dependencies/WorkerDependency": () =>
 		require("../dependencies/WorkerDependency"),
+	"json/JsonData": () => require("../json/JsonData"),
 	"optimize/ConcatenatedModule": () =>
 		require("../optimize/ConcatenatedModule"),
 	DelegatedModule: () => require("../DelegatedModule"),

package/lib/util/makeSerializable.js

@@ -9,7 +9,6 @@ const { register } = require("./serialization");
 class ClassSerializer {
 	constructor(Constructor) {
 		this.Constructor = Constructor;
-		this.hash = null;
 	}
 
 	serialize(obj, context) {

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "webpack",
-  "version": "5.42.1",
+  "version": "5.43.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
     "@types/eslint-scope": "^3.7.0",
-    "@types/estree": "^0.0.48",
-    "@webassemblyjs/ast": "1.11.0",
-    "@webassemblyjs/wasm-edit": "1.11.0",
-    "@webassemblyjs/wasm-parser": "1.11.0",
+    "@types/estree": "^0.0.49",
+    "@webassemblyjs/ast": "1.11.1",
+    "@webassemblyjs/wasm-edit": "1.11.1",
+    "@webassemblyjs/wasm-parser": "1.11.1",
     "acorn": "^8.4.1",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
     "enhanced-resolve": "^5.8.0",
-    "es-module-lexer": "^0.6.0",
+    "es-module-lexer": "^0.7.1",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
     "glob-to-regexp": "^0.4.1",