webpack 5.26.1 → 5.27.1

package/lib/MultiCompiler.js

@@ -318,7 +318,18 @@ module.exports = class MultiCompiler {
 	 * @returns {SetupResult[]} result of setup
 	 */
 	_runGraph(setup, run, callback) {
-		/** @typedef {{ compiler: Compiler, result: Stats, state: "blocked" | "queued" | "running" | "done", children: Node[], parents: Node[] }} Node */
+		/** @typedef {{ compiler: Compiler, result: Stats, state: "pending" | "blocked" | "queued" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
+
+		// State transitions for nodes:
+		// -> blocked (initial)
+		// blocked -> queued [add to queue] (when all parents done)
+		// queued -> running [running++] (when processing the queue)
+		// running -> done [running--] (when compilation is done)
+		// done -> pending (when invalidated from file change)
+		// pending -> blocked (when invalidated from aggregated changes)
+		// done -> blocked (when invalidated, from parent invalidation)
+		// running -> running-outdated (when invalidated, either from change or parent invalidation)
+		// running-outdated -> blocked [running--] (when compilation is done)
 
 		/** @type {Node[]} */
 		const nodes = this.compilers.map(compiler => ({
@@ -376,13 +387,12 @@ module.exports = class MultiCompiler {
 			running--;
 			if (node.state === "running") {
 				node.state = "done";
-			}
-			for (const child of node.children) {
-				if (child.state !== "blocked") continue;
-				if (child.parents.every(p => p.state === "done")) {
-					child.state = "queued";
-					queue.enqueue(child);
+				for (const child of node.children) {
+					checkUnblocked(child);
 				}
+			} else if (node.state === "running-outdated") {
+				node.state = "blocked";
+				checkUnblocked(node);
 			}
 			process.nextTick(processQueue);
 		};
@@ -390,12 +400,28 @@ module.exports = class MultiCompiler {
 		 * @param {Node} node node
 		 * @returns {void}
 		 */
-		const nodeInvalid = node => {
-			if (node.state === "done" || node.state === "running") {
+		const nodeInvalidFromParent = node => {
+			if (node.state === "done") {
 				node.state = "blocked";
+			} else if (node.state === "running") {
+				node.state = "running-outdated";
 			}
 			for (const child of node.children) {
-				nodeInvalid(child);
+				nodeInvalidFromParent(child);
+			}
+		};
+		/**
+		 * @param {Node} node node
+		 * @returns {void}
+		 */
+		const nodeInvalid = node => {
+			if (node.state === "done") {
+				node.state = "pending";
+			} else if (node.state === "running") {
+				node.state = "running-outdated";
+			}
+			for (const child of node.children) {
+				nodeInvalidFromParent(child);
 			}
 		};
 		/**
@@ -404,15 +430,26 @@ module.exports = class MultiCompiler {
 		 */
 		const nodeChange = node => {
 			nodeInvalid(node);
+			if (node.state === "pending") {
+				node.state = "blocked";
+			}
+			checkUnblocked(node);
+			processQueue();
+		};
+		/**
+		 * @param {Node} node node
+		 * @returns {void}
+		 */
+		const checkUnblocked = node => {
 			if (
 				node.state === "blocked" &&
 				node.parents.every(p => p.state === "done")
 			) {
 				node.state = "queued";
 				queue.enqueue(node);
-				processQueue();
 			}
 		};
+
 		const setupResults = [];
 		nodes.forEach((node, i) => {
 			setupResults.push(
@@ -420,7 +457,7 @@ module.exports = class MultiCompiler {
 					node.compiler,
 					i,
 					nodeDone.bind(null, node),
-					() => node.state === "blocked" || node.state === "queued",
+					() => node.state !== "done" && node.state !== "running",
 					() => nodeChange(node),
 					() => nodeInvalid(node)
 				)
@@ -434,7 +471,11 @@ module.exports = class MultiCompiler {
 				node.state = "running";
 				run(node.compiler, nodeDone.bind(null, node));
 			}
-			if (!errored && running === 0) {
+			if (
+				!errored &&
+				running === 0 &&
+				nodes.every(node => node.state === "done")
+			) {
 				const stats = [];
 				for (const node of nodes) {
 					const result = node.result;

package/lib/NormalModule.js

@@ -37,7 +37,7 @@ const {
 } = require("./util/comparators");
 const createHash = require("./util/createHash");
 const { join } = require("./util/fs");
-const { contextify } = require("./util/identifier");
+const { contextify, absolutify } = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
 
@@ -441,6 +441,30 @@ class NormalModule extends Module {
 				}
 			};
 		};
+		const getAbsolutify = memoize(() =>
+			absolutify.bindCache(compilation.compiler.root)
+		);
+		const getAbsolutifyInContext = memoize(() =>
+			absolutify.bindContextCache(this.context, compilation.compiler.root)
+		);
+		const getContextify = memoize(() =>
+			contextify.bindCache(compilation.compiler.root)
+		);
+		const getContextifyInContext = memoize(() =>
+			contextify.bindContextCache(this.context, compilation.compiler.root)
+		);
+		const utils = {
+			absolutify: (context, request) => {
+				return context === this.context
+					? getAbsolutifyInContext()(request)
+					: getAbsolutify()(context, request);
+			},
+			contextify: (context, request) => {
+				return context === this.context
+					? getContextifyInContext()(request)
+					: getContextify()(context, request);
+			}
+		};
 		const loaderContext = {
 			version: 2,
 			getOptions: schema => {
@@ -553,6 +577,7 @@ class NormalModule extends Module {
 				}
 				this.buildInfo.buildDependencies.add(dep);
 			},
+			utils,
 			rootContext: options.context,
 			webpack: true,
 			sourceMap: !!this.useSourceMap,

package/lib/NormalModuleFactory.js

@@ -597,7 +597,7 @@ class NormalModuleFactory extends ModuleFactory {
 				}
 
 				// resource without scheme and without path
-				else if (/^($|\?|#)/.test(unresolvedResource)) {
+				else if (/^($|\?)/.test(unresolvedResource)) {
 					resourceData = {
 						resource: unresolvedResource,
 						data: {},

package/lib/RecordIdsPlugin.js

@@ -213,6 +213,7 @@ class RecordIdsPlugin {
 					}
 					if (records.chunks.bySource) {
 						for (const chunk of chunks) {
+							if (chunk.id !== null) continue;
 							const sources = getChunkSources(chunk);
 							for (const source of sources) {
 								const id = records.chunks.bySource[source];

package/lib/Template.js

@@ -349,7 +349,7 @@ class Template {
 
 	/**
 	 * @param {RuntimeModule[]} runtimeModules array of runtime modules in order
-	 * @param {RenderContext & { codeGenerationResults?: CodeGenerationResults }} renderContext render context
+	 * @param {RenderContext & { codeGenerationResults?: CodeGenerationResults, useStrict?: boolean }} renderContext render context
 	 * @returns {Source} rendered runtime modules in a Source object
 	 */
 	static renderRuntimeModules(runtimeModules, renderContext) {
@@ -380,10 +380,12 @@ class Template {
 					source.add(runtimeSource);
 				} else if (renderContext.runtimeTemplate.supportsArrowFunction()) {
 					source.add("(() => {\n");
+					if (renderContext.useStrict) source.add('\t"use strict";\n');
 					source.add(new PrefixSource("\t", runtimeSource));
 					source.add("\n})();\n\n");
 				} else {
 					source.add("!function() {\n");
+					if (renderContext.useStrict) source.add('\t"use strict";\n');
 					source.add(new PrefixSource("\t", runtimeSource));
 					source.add("\n}();\n\n");
 				}

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -10,7 +10,10 @@ const { RuntimeGlobals } = require("..");
 const HotUpdateChunk = require("../HotUpdateChunk");
 const Template = require("../Template");
 const { getCompilationHooks } = require("./JavascriptModulesPlugin");
-const { generateEntryStartup } = require("./StartupHelpers");
+const {
+	generateEntryStartup,
+	updateHashForEntryStartup
+} = require("./StartupHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
 
@@ -80,16 +83,25 @@ class ArrayPushCallbackChunkFormatPlugin {
 								chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
 							);
 							if (runtimeModules.length > 0 || entries.length > 0) {
+								const strictBailout = hooks.strictRuntimeBailout.call(
+									renderContext
+								);
 								const runtime = new ConcatSource(
 									(runtimeTemplate.supportsArrowFunction()
 										? "__webpack_require__ =>"
 										: "function(__webpack_require__)") +
 										" { // webpackRuntimeModules\n",
-									'"use strict";\n\n'
+									strictBailout
+										? `// runtime can't be in strict mode because ${strictBailout}.\n\n`
+										: '"use strict";\n\n'
 								);
 								if (runtimeModules.length > 0) {
 									runtime.add(
-										Template.renderRuntimeModules(runtimeModules, renderContext)
+										Template.renderRuntimeModules(runtimeModules, {
+											...renderContext,
+											codeGenerationResults: compilation.codeGenerationResults,
+											useStrict: !!strictBailout
+										})
 									);
 								}
 								if (entries.length > 0) {
@@ -131,6 +143,10 @@ class ArrayPushCallbackChunkFormatPlugin {
 						hash.update(`${runtimeTemplate.outputOptions.chunkLoadingGlobal}`);
 						hash.update(`${runtimeTemplate.outputOptions.hotUpdateGlobal}`);
 						hash.update(`${runtimeTemplate.outputOptions.globalObject}`);
+						const entries = Array.from(
+							chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+						);
+						updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
 					}
 				);
 			}

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -12,7 +12,10 @@ const {
 	getChunkFilenameTemplate,
 	getCompilationHooks
 } = require("./JavascriptModulesPlugin");
-const { generateEntryStartup } = require("./StartupHelpers");
+const {
+	generateEntryStartup,
+	updateHashForEntryStartup
+} = require("./StartupHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
 
@@ -156,6 +159,10 @@ class CommonJsChunkFormatPlugin {
 						if (chunk.hasRuntime()) return;
 						hash.update("CommonJsChunkFormatPlugin");
 						hash.update("1");
+						const entries = Array.from(
+							chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+						);
+						updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
 					}
 				);
 			}

package/lib/javascript/JavascriptModulesPlugin.js

@@ -583,7 +583,7 @@ class JavascriptModulesPlugin {
 			if (strictBailout) {
 				source.add(
 					prefix +
-						`// runtime can't be in strict mode because ${strictBailout}.`
+						`// runtime can't be in strict mode because ${strictBailout}.\n`
 				);
 			} else {
 				allStrict = true;

package/lib/javascript/StartupHelpers.js

@@ -11,6 +11,7 @@ const Template = require("../Template");
 const { isSubset } = require("../util/SetHelpers");
 const { chunkHasJs } = require("./JavascriptModulesPlugin");
 
+/** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
@@ -71,21 +72,24 @@ exports.generateEntryStartup = (
 		return `__webpack_exec__(${JSON.stringify(id)})`;
 	};
 	const outputCombination = (chunks, moduleIds, final) => {
-		const old = final ? "undefined" : "0";
-		const prefix = final ? EXPORT_PREFIX : "";
 		if (chunks.size === 0) {
-			runtime.push(`${prefix}(${moduleIds.map(runModule).join(", ")});`);
+			runtime.push(
+				`${final ? EXPORT_PREFIX : ""}(${moduleIds.map(runModule).join(", ")});`
+			);
 		} else {
 			const fn = runtimeTemplate.returningFunction(
 				moduleIds.map(runModule).join(", ")
 			);
 			runtime.push(
-				`${prefix}${
+				`${final && !passive ? EXPORT_PREFIX : ""}${
 					passive
 						? RuntimeGlobals.onChunksLoaded
 						: RuntimeGlobals.startupEntrypoint
-				}(${old}, ${JSON.stringify(Array.from(chunks, c => c.id))}, ${fn});`
+				}(0, ${JSON.stringify(Array.from(chunks, c => c.id))}, ${fn});`
 			);
+			if (final && passive) {
+				runtime.push(`${EXPORT_PREFIX}${RuntimeGlobals.onChunksLoaded}();`);
+			}
 		}
 	};
 
@@ -119,6 +123,23 @@ exports.generateEntryStartup = (
 	return Template.asString(runtime);
 };
 
+/**
+ * @param {Hash} hash the hash to update
+ * @param {ChunkGraph} chunkGraph chunkGraph
+ * @param {import("../ChunkGraph").EntryModuleWithChunkGroup[]} entries entries
+ * @param {Chunk} chunk chunk
+ * @returns {void}
+ */
+exports.updateHashForEntryStartup = (hash, chunkGraph, entries, chunk) => {
+	for (const [module, entrypoint] of entries) {
+		const runtimeChunk = entrypoint.getRuntimeChunk();
+		const moduleId = chunkGraph.getModuleId(module);
+		hash.update(`${moduleId}`);
+		for (const c of getAllChunks(entrypoint, chunk, runtimeChunk))
+			hash.update(`${c.id}`);
+	}
+};
+
 /**
  * @param {Chunk} chunk the chunk
  * @param {ChunkGraph} chunkGraph the chunk graph

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.26.1",
+  "version": "5.27.1",
   "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",

package/types.d.ts

@@ -10620,6 +10620,7 @@ declare class Template {
 		runtimeModules: RuntimeModule[],
 		renderContext: RenderContextModuleTemplate & {
 			codeGenerationResults?: CodeGenerationResults;
+			useStrict?: boolean;
 		}
 	): Source;
 	static renderChunkRuntimeModules(