webpack 5.31.2 → 5.33.2

package/lib/javascript/JavascriptModulesPlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const { SyncWaterfallHook, SyncHook, SyncBailHook } = require("tapable");
+const vm = require("vm");
 const {
 	ConcatSource,
 	OriginalSource,
@@ -51,6 +52,17 @@ const chunkHasJs = (chunk, chunkGraph) => {
 		: false;
 };
 
+const printGeneratedCodeForStack = (module, code) => {
+	const lines = code.split("\n");
+	const n = `${lines.length}`.length;
+	return `\n\nGenerated code for ${module.identifier()}\n${lines
+		.map((line, i, lines) => {
+			const iStr = `${i + 1}`;
+			return `${" ".repeat(n - iStr.length)}${iStr} | ${line}`;
+		})
+		.join("\n")}`;
+};
+
 /**
  * @typedef {Object} RenderContext
  * @property {Chunk} chunk the chunk
@@ -369,16 +381,69 @@ class JavascriptModulesPlugin {
 				});
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
 					"JavascriptModulesPlugin",
-					(chunk, set) => {
+					(chunk, set, { chunkGraph }) => {
 						if (
 							!set.has(RuntimeGlobals.startupNoDefault) &&
-							compilation.chunkGraph.hasChunkEntryDependentChunks(chunk)
+							chunkGraph.hasChunkEntryDependentChunks(chunk)
 						) {
 							set.add(RuntimeGlobals.onChunksLoaded);
 							set.add(RuntimeGlobals.require);
 						}
 					}
 				);
+				compilation.hooks.executeModule.tap(
+					"JavascriptModulesPlugin",
+					(options, context) => {
+						const source = options.codeGenerationResult.sources.get(
+							"javascript"
+						);
+						if (source === undefined) return;
+						const { module, moduleObject } = options;
+						const code = source.source();
+
+						const fn = vm.runInThisContext(
+							`(function(${module.moduleArgument}, ${module.exportsArgument}, __webpack_require__) {\n${code}\n/**/})`,
+							{
+								filename: module.identifier(),
+								lineOffset: -1
+							}
+						);
+						try {
+							fn.call(
+								moduleObject.exports,
+								moduleObject,
+								moduleObject.exports,
+								context.__webpack_require__
+							);
+						} catch (e) {
+							e.stack += printGeneratedCodeForStack(options.module, code);
+							throw e;
+						}
+					}
+				);
+				compilation.hooks.executeModule.tap(
+					"JavascriptModulesPlugin",
+					(options, context) => {
+						const source = options.codeGenerationResult.sources.get("runtime");
+						if (source === undefined) return;
+						let code = source.source();
+						if (typeof code !== "string") code = code.toString();
+
+						const fn = vm.runInThisContext(
+							`(function(__webpack_require__) {\n${code}\n/**/})`,
+							{
+								filename: options.module.identifier(),
+								lineOffset: -1
+							}
+						);
+						try {
+							fn.call(null, context.__webpack_require__);
+						} catch (e) {
+							e.stack += printGeneratedCodeForStack(options.module, code);
+							throw e;
+						}
+					}
+				);
 			}
 		);
 	}

package/lib/library/AbstractLibraryPlugin.js

@@ -12,6 +12,7 @@ const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin")
 /** @typedef {import("../../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../../declarations/WebpackOptions").LibraryType} LibraryType */
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
 /** @typedef {import("../Compiler")} Compiler */
@@ -27,6 +28,7 @@ const COMMON_LIBRARY_NAME_MESSAGE =
  * @template T
  * @typedef {Object} LibraryContext
  * @property {Compilation} compilation
+ * @property {ChunkGraph} chunkGraph
  * @property {T} options
  */
 
@@ -75,7 +77,8 @@ class AbstractLibraryPlugin {
 								if (module) {
 									this.finishEntryModule(module, name, {
 										options,
-										compilation
+										compilation,
+										chunkGraph: compilation.chunkGraph
 									});
 								}
 							}
@@ -101,10 +104,14 @@ class AbstractLibraryPlugin {
 			) {
 				compilation.hooks.additionalChunkRuntimeRequirements.tap(
 					_pluginName,
-					(chunk, set) => {
+					(chunk, set, { chunkGraph }) => {
 						const options = getOptionsForChunk(chunk);
 						if (options !== false) {
-							this.runtimeRequirements(chunk, set, { options, compilation });
+							this.runtimeRequirements(chunk, set, {
+								options,
+								compilation,
+								chunkGraph
+							});
 						}
 					}
 				);
@@ -116,7 +123,11 @@ class AbstractLibraryPlugin {
 				hooks.render.tap(_pluginName, (source, renderContext) => {
 					const options = getOptionsForChunk(renderContext.chunk);
 					if (options === false) return source;
-					return this.render(source, renderContext, { options, compilation });
+					return this.render(source, renderContext, {
+						options,
+						compilation,
+						chunkGraph: compilation.chunkGraph
+					});
 				});
 			}
 
@@ -131,7 +142,8 @@ class AbstractLibraryPlugin {
 						if (options === false) return;
 						return this.embedInRuntimeBailout(module, renderContext, {
 							options,
-							compilation
+							compilation,
+							chunkGraph: compilation.chunkGraph
 						});
 					}
 				);
@@ -146,7 +158,8 @@ class AbstractLibraryPlugin {
 					if (options === false) return;
 					return this.strictRuntimeBailout(renderContext, {
 						options,
-						compilation
+						compilation,
+						chunkGraph: compilation.chunkGraph
 					});
 				});
 			}
@@ -161,7 +174,8 @@ class AbstractLibraryPlugin {
 						if (options === false) return source;
 						return this.renderStartup(source, module, renderContext, {
 							options,
-							compilation
+							compilation,
+							chunkGraph: compilation.chunkGraph
 						});
 					}
 				);
@@ -170,7 +184,11 @@ class AbstractLibraryPlugin {
 			hooks.chunkHash.tap(_pluginName, (chunk, hash, context) => {
 				const options = getOptionsForChunk(chunk);
 				if (options === false) return;
-				this.chunkHash(chunk, hash, context, { options, compilation });
+				this.chunkHash(chunk, hash, context, {
+					options,
+					compilation,
+					chunkGraph: compilation.chunkGraph
+				});
 			});
 		});
 	}

package/lib/node/CommonJsChunkLoadingPlugin.js

@@ -39,7 +39,9 @@ class CommonJsChunkLoadingPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === chunkLoadingValue;
 				};
 				const onceForChunkSet = new WeakSet();

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -25,8 +25,8 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { chunk } = this;
-		const { chunkGraph, runtimeTemplate } = this.compilation;
+		const { chunkGraph, chunk } = this;
+		const { runtimeTemplate } = this.compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this.runtimeRequirements.has(RuntimeGlobals.baseURI);
 		const withExternalInstallChunk = this.runtimeRequirements.has(

package/lib/node/ReadFileCompileAsyncWasmPlugin.js

@@ -25,7 +25,9 @@ class ReadFileCompileAsyncWasmPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
-						(options && options.wasmLoading) || globalWasmLoading;
+						options && options.wasmLoading !== undefined
+							? options.wasmLoading
+							: globalWasmLoading;
 					return wasmLoading === "async-node";
 				};
 				const generateLoadBinaryCode = path =>

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -31,7 +31,9 @@ class ReadFileCompileWasmPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
-						(options && options.wasmLoading) || globalWasmLoading;
+						options && options.wasmLoading !== undefined
+							? options.wasmLoading
+							: globalWasmLoading;
 					return wasmLoading === "async-node";
 				};
 				const generateLoadBinaryCode = path =>

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -25,8 +25,8 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { chunk } = this;
-		const { chunkGraph, runtimeTemplate } = this.compilation;
+		const { chunkGraph, chunk } = this;
+		const { runtimeTemplate } = this.compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this.runtimeRequirements.has(RuntimeGlobals.baseURI);
 		const withExternalInstallChunk = this.runtimeRequirements.has(

package/lib/prefetch/ChunkPrefetchPreloadPlugin.js

@@ -24,8 +24,7 @@ class ChunkPrefetchPreloadPlugin {
 			compilation => {
 				compilation.hooks.additionalChunkRuntimeRequirements.tap(
 					"ChunkPrefetchPreloadPlugin",
-					(chunk, set) => {
-						const { chunkGraph } = compilation;
+					(chunk, set, { chunkGraph }) => {
 						if (chunkGraph.getNumberOfEntryModules(chunk) === 0) return;
 						const startupChildChunks = chunk.getChildrenOfTypeInOrder(
 							chunkGraph,
@@ -43,8 +42,7 @@ class ChunkPrefetchPreloadPlugin {
 				);
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
 					"ChunkPrefetchPreloadPlugin",
-					(chunk, set) => {
-						const { chunkGraph } = compilation;
+					(chunk, set, { chunkGraph }) => {
 						const chunkMap = chunk.getChildIdsByOrdersMap(chunkGraph, false);
 
 						if (chunkMap.prefetch) {

package/lib/runtime/CompatRuntimeModule.js

@@ -19,9 +19,8 @@ class CompatRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { chunk, compilation } = this;
+		const { chunkGraph, chunk, compilation } = this;
 		const {
-			chunkGraph,
 			runtimeTemplate,
 			mainTemplate,
 			moduleTemplates,

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -39,6 +39,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 		const {
 			global,
 			chunk,
+			chunkGraph,
 			contentType,
 			getFilenameForChunk,
 			allChunks,
@@ -90,12 +91,12 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 			for (const c of chunk.getAllAsyncChunks()) {
 				addChunk(c);
 			}
-			const includeEntries = compilation.chunkGraph
+			const includeEntries = chunkGraph
 				.getTreeRuntimeRequirements(chunk)
 				.has(RuntimeGlobals.ensureChunkIncludeEntries);
 			if (includeEntries) {
 				includedChunksMessages.push("sibling chunks for the entrypoint");
-				for (const c of compilation.chunkGraph.getChunkEntryDependentChunksIterable(
+				for (const c of chunkGraph.getChunkEntryDependentChunksIterable(
 					chunk
 				)) {
 					addChunk(c);

package/lib/runtime/PublicPathRuntimeModule.js

@@ -8,20 +8,20 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 
 class PublicPathRuntimeModule extends RuntimeModule {
-	constructor() {
+	constructor(publicPath) {
 		super("publicPath", RuntimeModule.STAGE_BASIC);
+		this.publicPath = publicPath;
 	}
 
 	/**
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { compilation } = this;
-		const { publicPath } = compilation.outputOptions;
+		const { compilation, publicPath } = this;
 
 		return `${RuntimeGlobals.publicPath} = ${JSON.stringify(
-			this.compilation.getPath(publicPath || "", {
-				hash: this.compilation.hash || "XXXX"
+			compilation.getPath(publicPath || "", {
+				hash: compilation.hash || "XXXX"
 			})
 		)};`;
 	}

package/lib/runtime/RuntimeIdRuntimeModule.js

@@ -16,8 +16,7 @@ class RuntimeIdRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { chunk, compilation } = this;
-		const { chunkGraph } = compilation;
+		const { chunkGraph, chunk } = this;
 		const runtime = chunk.runtime;
 		if (typeof runtime !== "string")
 			throw new Error("RuntimeIdRuntimeModule must be in a single runtime");

package/lib/runtime/StartupChunkDependenciesPlugin.js

@@ -32,14 +32,16 @@ class StartupChunkDependenciesPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === this.chunkLoading;
 				};
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
 					"StartupChunkDependenciesPlugin",
-					(chunk, set) => {
+					(chunk, set, { chunkGraph }) => {
 						if (!isEnabledForChunk(chunk)) return;
-						if (compilation.chunkGraph.hasChunkEntryDependentChunks(chunk)) {
+						if (chunkGraph.hasChunkEntryDependentChunks(chunk)) {
 							set.add(RuntimeGlobals.startup);
 							set.add(RuntimeGlobals.ensureChunk);
 							set.add(RuntimeGlobals.ensureChunkIncludeEntries);

package/lib/runtime/StartupChunkDependenciesRuntimeModule.js

@@ -19,8 +19,8 @@ class StartupChunkDependenciesRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { chunk, compilation } = this;
-		const { chunkGraph, runtimeTemplate } = compilation;
+		const { chunkGraph, chunk, compilation } = this;
+		const { runtimeTemplate } = compilation;
 		const chunkIds = Array.from(
 			chunkGraph.getChunkEntryDependentChunksIterable(chunk)
 		).map(chunk => {

package/lib/serialization/ObjectMiddleware.js

@@ -386,6 +386,9 @@ class ObjectMiddleware extends SerializerMiddleware {
 					throw e;
 				}
 			},
+			setCircularReference(ref) {
+				addReferenceable(ref);
+			},
 			snapshot() {
 				return {
 					length: result.length,
@@ -442,7 +445,9 @@ class ObjectMiddleware extends SerializerMiddleware {
 				}
 
 				if (cycleStack.has(item)) {
-					throw new Error(`Circular references can't be serialized`);
+					throw new Error(
+						`This is a circular references. To serialize circular references use 'setCircularReference' somewhere in the circle during serialize and deserialize.`
+					);
 				}
 
 				const { request, name, serializer } = ObjectMiddleware.getSerializerFor(
@@ -568,6 +573,9 @@ class ObjectMiddleware extends SerializerMiddleware {
 			read() {
 				return decodeValue();
 			},
+			setCircularReference(ref) {
+				addReferenceable(ref);
+			},
 			...context
 		};
 		this.extendContext(ctx);
@@ -585,14 +593,15 @@ class ObjectMiddleware extends SerializerMiddleware {
 					throw new Error(
 						`Unexpected end of object at position ${currentDataPos - 1}`
 					);
-				} else if (typeof nextItem === "number" && nextItem < 0) {
-					// relative reference
-					return referenceable[currentPos + nextItem];
 				} else {
 					const request = nextItem;
 					let serializer;
 
 					if (typeof request === "number") {
+						if (request < 0) {
+							// relative reference
+							return referenceable[currentPos + request];
+						}
 						serializer = objectTypeLookup[currentPosTypeLookup - request];
 					} else {
 						if (typeof request !== "string") {

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -30,11 +30,8 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const {
-			runtimeTemplate,
-			chunkGraph,
-			codeGenerationResults
-		} = this.compilation;
+		const { compilation, chunkGraph } = this;
+		const { runtimeTemplate, codeGenerationResults } = compilation;
 		const chunkToModuleMapping = {};
 		/** @type {Map<string | number, Source>} */
 		const moduleIdToSourceMapping = new Map();

package/lib/sharing/ShareRuntimeModule.js

@@ -22,12 +22,12 @@ class ShareRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
+		const { compilation, chunkGraph } = this;
 		const {
 			runtimeTemplate,
-			chunkGraph,
 			codeGenerationResults,
 			outputOptions: { uniqueName }
-		} = this.compilation;
+		} = compilation;
 		/** @type {Map<string, Map<number, Set<string>>>} */
 		const initCodePerScope = new Map();
 		for (const chunk of this.chunk.getAllReferencedChunks()) {

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -148,6 +148,7 @@ const { makePathsRelative, parseResource } = require("../util/identifier");
  * @property {boolean=} cacheable
  * @property {boolean=} built
  * @property {boolean=} codeGenerated
+ * @property {boolean=} buildTimeExecuted
  * @property {boolean=} cached
  * @property {boolean=} optional
  * @property {boolean=} orphan
@@ -1077,6 +1078,9 @@ const SIMPLE_EXTRACTORS = {
 			const { compilation, type } = context;
 			const built = compilation.builtModules.has(module);
 			const codeGenerated = compilation.codeGeneratedModules.has(module);
+			const buildTimeExecuted = compilation.buildTimeExecutedModules.has(
+				module
+			);
 			/** @type {{[x: string]: number}} */
 			const sizes = {};
 			for (const sourceType of module.getSourceTypes()) {
@@ -1091,6 +1095,7 @@ const SIMPLE_EXTRACTORS = {
 				sizes,
 				built,
 				codeGenerated,
+				buildTimeExecuted,
 				cached: !built && !codeGenerated
 			};
 			Object.assign(object, statsModule);

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -306,6 +306,8 @@ const SIMPLE_PRINTERS = {
 		built ? yellow(formatFlag("built")) : undefined,
 	"module.codeGenerated": (codeGenerated, { formatFlag, yellow }) =>
 		codeGenerated ? yellow(formatFlag("code generated")) : undefined,
+	"module.buildTimeExecuted": (buildTimeExecuted, { formatFlag, green }) =>
+		buildTimeExecuted ? green(formatFlag("build time executed")) : undefined,
 	"module.cached": (cached, { formatFlag, green }) =>
 		cached ? green(formatFlag("cached")) : undefined,
 	"module.assets": (assets, { formatFlag, magenta }) =>

package/lib/util/AsyncQueue.js

@@ -6,6 +6,8 @@
 "use strict";
 
 const { SyncHook, AsyncSeriesHook } = require("tapable");
+const { makeWebpackError } = require("../HookWebpackError");
+const WebpackError = require("../WebpackError");
 const ArrayQueue = require("./ArrayQueue");
 
 const QUEUED_STATE = 0;
@@ -17,7 +19,7 @@ let inHandleResult = 0;
 /**
  * @template T
  * @callback Callback
- * @param {Error=} err
+ * @param {WebpackError=} err
  * @param {T=} result
  */
 
@@ -39,6 +41,7 @@ class AsyncQueueEntry {
 		/** @type {Callback<R>[] | undefined} */
 		this.callbacks = undefined;
 		this.result = undefined;
+		/** @type {WebpackError | undefined} */
 		this.error = undefined;
 	}
 }
@@ -99,15 +102,17 @@ class AsyncQueue {
 	}
 
 	/**
-	 * @param {T} item a item
+	 * @param {T} item an item
 	 * @param {Callback<R>} callback callback function
 	 * @returns {void}
 	 */
 	add(item, callback) {
-		if (this._stopped) return callback(new Error("Queue was stopped"));
+		if (this._stopped) return callback(new WebpackError("Queue was stopped"));
 		this.hooks.beforeAdd.callAsync(item, err => {
 			if (err) {
-				callback(err);
+				callback(
+					makeWebpackError(err, `AsyncQueue(${this._name}).hooks.beforeAdd`)
+				);
 				return;
 			}
 			const key = this._getKey(item);
@@ -127,7 +132,7 @@ class AsyncQueue {
 				this.hooks.added.call(item);
 				this._root._activeTasks++;
 				process.nextTick(() =>
-					this._handleResult(newEntry, new Error("Queue was stopped"))
+					this._handleResult(newEntry, new WebpackError("Queue was stopped"))
 				);
 			} else {
 				this._entries.set(key, newEntry);
@@ -144,7 +149,7 @@ class AsyncQueue {
 	}
 
 	/**
-	 * @param {T} item a item
+	 * @param {T} item an item
 	 * @returns {void}
 	 */
 	invalidate(item) {
@@ -156,6 +161,31 @@ class AsyncQueue {
 		}
 	}
 
+	/**
+	 * Waits for an already started item
+	 * @param {T} item an item
+	 * @param {Callback<R>} callback callback function
+	 * @returns {void}
+	 */
+	waitFor(item, callback) {
+		const key = this._getKey(item);
+		const entry = this._entries.get(key);
+		if (entry === undefined) {
+			return callback(
+				new WebpackError(
+					"waitFor can only be called for an already started item"
+				)
+			);
+		}
+		if (entry.state === DONE_STATE) {
+			process.nextTick(() => callback(entry.error, entry.result));
+		} else if (entry.callbacks === undefined) {
+			entry.callbacks = [callback];
+		} else {
+			entry.callbacks.push(callback);
+		}
+	}
+
 	/**
 	 * @returns {void}
 	 */
@@ -167,7 +197,7 @@ class AsyncQueue {
 		for (const entry of queue) {
 			this._entries.delete(this._getKey(entry.item));
 			root._activeTasks++;
-			this._handleResult(entry, new Error("Queue was stopped"));
+			this._handleResult(entry, new WebpackError("Queue was stopped"));
 		}
 	}
 
@@ -257,7 +287,10 @@ class AsyncQueue {
 	_startProcessing(entry) {
 		this.hooks.beforeStart.callAsync(entry.item, err => {
 			if (err) {
-				this._handleResult(entry, err);
+				this._handleResult(
+					entry,
+					makeWebpackError(err, `AsyncQueue(${this._name}).hooks.beforeStart`)
+				);
 				return;
 			}
 			let inCallback = false;
@@ -276,13 +309,15 @@ class AsyncQueue {
 
 	/**
 	 * @param {AsyncQueueEntry<T, K, R>} entry the entry
-	 * @param {Error=} err error, if any
+	 * @param {WebpackError=} err error, if any
 	 * @param {R=} result result, if any
 	 * @returns {void}
 	 */
 	_handleResult(entry, err, result) {
 		this.hooks.result.callAsync(entry.item, err, result, hookError => {
-			const error = hookError || err;
+			const error = hookError
+				? makeWebpackError(hookError, `AsyncQueue(${this._name}).hooks.result`)
+				: err;
 
 			const callback = entry.callback;
 			const callbacks = entry.callbacks;