webpack 5.64.0 → 5.64.4

package/README.md

@@ -9,8 +9,6 @@
 
 [![node][node]][node-url]
 [![deps][deps]][deps-url]
-[![tests][tests]][tests-url]
-[![builds][builds]][builds-url]
 [![builds2][builds2]][builds2-url]
 [![coverage][cover]][cover-url]
 [![licenses][licenses]][licenses-url]
@@ -703,12 +701,8 @@ src="https://static.monei.net/monei-logo.svg" height="30" alt="MONEI"></a>
 [node-url]: https://nodejs.org
 [deps]: https://img.shields.io/david/webpack/webpack.svg
 [deps-url]: https://david-dm.org/webpack/webpack
-[tests]: https://img.shields.io/travis/webpack/webpack/main.svg
-[tests-url]: https://travis-ci.org/webpack/webpack
 [prs]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg
 [prs-url]: https://webpack.js.org/contribute/
-[builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/main
-[builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true
 [builds2]: https://dev.azure.com/webpack/webpack/_apis/build/status/webpack.webpack
 [builds2-url]: https://dev.azure.com/webpack/webpack/_build/latest?definitionId=3
 [licenses-url]: https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack?ref=badge_shield

package/lib/CleanPlugin.js

@@ -16,6 +16,7 @@ const processAsyncTree = require("./util/processAsyncTree");
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./logging/Logger").Logger} Logger */
 /** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
+/** @typedef {import("./util/fs").StatsCallback} StatsCallback */
 
 /** @typedef {(function(string):boolean)|RegExp} IgnoreItem */
 /** @typedef {function(IgnoreItem): void} AddToIgnoreCallback */
@@ -102,6 +103,20 @@ const getDiffToOldAssets = (currentAssets, oldAssets) => {
 	return diff;
 };
 
+/**
+ * @param {OutputFileSystem} fs filesystem
+ * @param {string} filename path to file
+ * @param {StatsCallback} callback callback for provided filename
+ * @returns {void}
+ */
+const doStat = (fs, filename, callback) => {
+	if ("lstat" in fs) {
+		fs.lstat(filename, callback);
+	} else {
+		fs.stat(filename, callback);
+	}
+};
+
 /**
  * @param {OutputFileSystem} fs filesystem
  * @param {string} outputPath output path
@@ -150,7 +165,7 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 						log(`${filename} will be kept`);
 						return process.nextTick(callback);
 					}
-					fs.stat(path, (err, stats) => {
+					doStat(fs, path, (err, stats) => {
 						if (err) return handleError(err);
 						if (!stats.isDirectory()) {
 							push({

package/lib/FileSystemInfo.js

@@ -2016,8 +2016,7 @@ class FileSystemInfo {
 			}
 			return capturedItems;
 		};
-		if (files) {
-			const capturedFiles = captureNonManaged(files, managedFiles);
+		const processCapturedFiles = capturedFiles => {
 			switch (mode) {
 				case 3:
 					this._fileTshsOptimization.optimize(snapshot, capturedFiles);
@@ -2094,12 +2093,11 @@ class FileSystemInfo {
 					}
 					break;
 			}
+		};
+		if (files) {
+			processCapturedFiles(captureNonManaged(files, managedFiles));
 		}
-		if (directories) {
-			const capturedDirectories = captureNonManaged(
-				directories,
-				managedContexts
-			);
+		const processCapturedDirectories = capturedDirectories => {
 			switch (mode) {
 				case 3:
 					this._contextTshsOptimization.optimize(snapshot, capturedDirectories);
@@ -2219,9 +2217,13 @@ class FileSystemInfo {
 					}
 					break;
 			}
+		};
+		if (directories) {
+			processCapturedDirectories(
+				captureNonManaged(directories, managedContexts)
+			);
 		}
-		if (missing) {
-			const capturedMissing = captureNonManaged(missing, managedMissing);
+		const processCapturedMissing = capturedMissing => {
 			this._missingExistenceOptimization.optimize(snapshot, capturedMissing);
 			for (const path of capturedMissing) {
 				const cache = this._fileTimestamps.get(path);
@@ -2246,11 +2248,17 @@ class FileSystemInfo {
 					});
 				}
 			}
+		};
+		if (missing) {
+			processCapturedMissing(captureNonManaged(missing, managedMissing));
 		}
 		this._managedItemInfoOptimization.optimize(snapshot, managedItems);
 		for (const path of managedItems) {
 			const cache = this._managedItems.get(path);
 			if (cache !== undefined) {
+				if (cache !== "missing") {
+					managedFiles.add(join(this.fs, path, "package.json"));
+				}
 				managedItemInfo.set(path, cache);
 			} else {
 				jobs++;
@@ -2262,9 +2270,26 @@ class FileSystemInfo {
 							);
 						}
 						jobError();
-					} else {
+					} else if (entry) {
+						if (entry !== "missing") {
+							managedFiles.add(join(this.fs, path, "package.json"));
+						}
 						managedItemInfo.set(path, entry);
 						jobDone();
+					} else {
+						// Fallback to normal snapshotting
+						const process = (set, fn) => {
+							if (set.size === 0) return;
+							const captured = new Set();
+							for (const file of set) {
+								if (file.startsWith(path)) captured.add(file);
+							}
+							if (captured.size > 0) fn(captured);
+						};
+						process(managedFiles, processCapturedFiles);
+						process(managedContexts, processCapturedDirectories);
+						process(managedMissing, processCapturedMissing);
+						jobDone();
 					}
 				});
 			}
@@ -3477,9 +3502,10 @@ class FileSystemInfo {
 								this._managedItems.set(path, "nested");
 								return callback(null, "nested");
 							}
-							const problem = `Managed item ${path} isn't a directory or doesn't contain a package.json`;
-							this.logger.warn(problem);
-							return callback(new Error(problem));
+							this.logger.warn(
+								`Managed item ${path} isn't a directory or doesn't contain a package.json (see snapshot.managedPaths option)`
+							);
+							return callback();
 						});
 						return;
 					}
@@ -3491,6 +3517,12 @@ class FileSystemInfo {
 				} catch (e) {
 					return callback(e);
 				}
+				if (!data.name) {
+					this.logger.warn(
+						`${packageJsonPath} doesn't contain a "name" property (see snapshot.managedPaths option)`
+					);
+					return callback();
+				}
 				const info = `${data.name || ""}@${data.version || ""}`;
 				this._managedItems.set(path, info);
 				callback(null, info);

package/lib/WatchIgnorePlugin.js

@@ -87,7 +87,20 @@ class IgnoringWatchFileSystem {
 					fileTimestamps.set(path, IGNORE_TIME_ENTRY);
 				}
 				return fileTimestamps;
-			}
+			},
+			getInfo:
+				watcher.getInfo &&
+				(() => {
+					const info = watcher.getInfo();
+					const { fileTimeInfoEntries, contextTimeInfoEntries } = info;
+					for (const path of ignoredFiles) {
+						fileTimeInfoEntries.set(path, IGNORE_TIME_ENTRY);
+					}
+					for (const path of ignoredDirs) {
+						contextTimeInfoEntries.set(path, IGNORE_TIME_ENTRY);
+					}
+					return info;
+				})
 		};
 	}
 }

package/lib/Watching.js

@@ -109,30 +109,44 @@ class Watching {
 			this.lastWatcherStartTime = Date.now();
 		}
 		this.compiler.fsStartTime = Date.now();
-		this._mergeWithCollected(
-			changedFiles ||
-				(this.pausedWatcher &&
+		if (
+			changedFiles &&
+			removedFiles &&
+			fileTimeInfoEntries &&
+			contextTimeInfoEntries
+		) {
+			this._mergeWithCollected(changedFiles, removedFiles);
+			this.compiler.fileTimestamps = fileTimeInfoEntries;
+			this.compiler.contextTimestamps = contextTimeInfoEntries;
+		} else if (this.pausedWatcher) {
+			if (this.pausedWatcher.getInfo) {
+				const {
+					changes,
+					removals,
+					fileTimeInfoEntries,
+					contextTimeInfoEntries
+				} = this.pausedWatcher.getInfo();
+				this._mergeWithCollected(changes, removals);
+				this.compiler.fileTimestamps = fileTimeInfoEntries;
+				this.compiler.contextTimestamps = contextTimeInfoEntries;
+			} else {
+				this._mergeWithCollected(
 					this.pausedWatcher.getAggregatedChanges &&
-					this.pausedWatcher.getAggregatedChanges()),
-			(this.compiler.removedFiles =
-				removedFiles ||
-				(this.pausedWatcher &&
+						this.pausedWatcher.getAggregatedChanges(),
 					this.pausedWatcher.getAggregatedRemovals &&
-					this.pausedWatcher.getAggregatedRemovals()))
-		);
-
+						this.pausedWatcher.getAggregatedRemovals()
+				);
+				this.compiler.fileTimestamps =
+					this.pausedWatcher.getFileTimeInfoEntries();
+				this.compiler.contextTimestamps =
+					this.pausedWatcher.getContextTimeInfoEntries();
+			}
+		}
 		this.compiler.modifiedFiles = this._collectedChangedFiles;
 		this._collectedChangedFiles = undefined;
 		this.compiler.removedFiles = this._collectedRemovedFiles;
 		this._collectedRemovedFiles = undefined;
 
-		this.compiler.fileTimestamps =
-			fileTimeInfoEntries ||
-			(this.pausedWatcher && this.pausedWatcher.getFileTimeInfoEntries());
-		this.compiler.contextTimestamps =
-			contextTimeInfoEntries ||
-			(this.pausedWatcher && this.pausedWatcher.getContextTimeInfoEntries());
-
 		const run = () => {
 			if (this.compiler.idle) {
 				return this.compiler.cache.endIdle(err => {

package/lib/config/defaults.js

@@ -383,7 +383,7 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
 					return [path.resolve(match[1], "unplugged")];
 				}
 			} else {
-				const match = /^(.+?[\\/]node_modules)[\\/]/.exec(
+				const match = /^(.+?[\\/]node_modules[\\/])/.exec(
 					// eslint-disable-next-line node/no-extraneous-require
 					require.resolve("watchpack")
 				);

package/lib/container/ContainerEntryModule.js

@@ -10,6 +10,7 @@ const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Module = require("../Module");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
 const makeSerializable = require("../util/makeSerializable");
 const ContainerExposedDependency = require("./ContainerExposedDependency");
 
@@ -104,6 +105,7 @@ class ContainerEntryModule extends Module {
 			strict: true,
 			topLevelDeclarations: new Set(["moduleMap", "get", "init"])
 		};
+		this.buildMeta.exportsType = "namespace";
 
 		this.clearDependenciesAndBlocks();
 
@@ -127,6 +129,7 @@ class ContainerEntryModule extends Module {
 			}
 			this.addBlock(block);
 		}
+		this.addDependency(new StaticExportsDependency(["get", "init"], false));
 
 		callback();
 	}

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -282,7 +282,7 @@ class CommonJsImportsParserPlugin {
 				dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
 				dep.optional = !!parser.scope.inTry;
 				dep.loc = expr.loc;
-				parser.state.module.addDependency(dep);
+				parser.state.current.addDependency(dep);
 				return true;
 			}
 		};
@@ -299,7 +299,7 @@ class CommonJsImportsParserPlugin {
 				dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
 				dep.optional = !!parser.scope.inTry;
 				dep.loc = expr.callee.loc;
-				parser.state.module.addDependency(dep);
+				parser.state.current.addDependency(dep);
 				parser.walkExpressions(expr.arguments);
 				return true;
 			}

package/lib/dependencies/URLPlugin.js

@@ -82,7 +82,7 @@ class URLPlugin {
 							relative
 						);
 						dep.loc = expr.loc;
-						parser.state.module.addDependency(dep);
+						parser.state.current.addDependency(dep);
 						InnerGraph.onUsage(parser.state, e => (dep.usedByExports = e));
 						return true;
 					});

package/lib/esm/ModuleChunkFormatPlugin.js

@@ -5,18 +5,16 @@
 
 "use strict";
 
-const { ConcatSource, RawSource } = require("webpack-sources");
+const { ConcatSource } = require("webpack-sources");
 const { RuntimeGlobals } = require("..");
 const HotUpdateChunk = require("../HotUpdateChunk");
 const Template = require("../Template");
+const { getAllChunks } = require("../javascript/ChunkHelpers");
 const {
 	getCompilationHooks,
 	getChunkFilenameTemplate
 } = require("../javascript/JavascriptModulesPlugin");
-const {
-	generateEntryStartup,
-	updateHashForEntryStartup
-} = require("../javascript/StartupHelpers");
+const { updateHashForEntryStartup } = require("../javascript/StartupHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
 
@@ -84,63 +82,90 @@ class ModuleChunkFormatPlugin {
 										}
 									)
 									.split("/");
-								const runtimeOutputName = compilation
-									.getPath(
-										getChunkFilenameTemplate(
-											runtimeChunk,
-											compilation.outputOptions
-										),
-										{
-											chunk: runtimeChunk,
-											contentHashType: "javascript"
-										}
-									)
-									.split("/");
 
 								// remove filename, we only need the directory
-								const outputFilename = currentOutputName.pop();
+								currentOutputName.pop();
 
-								// remove common parts
-								while (
-									currentOutputName.length > 0 &&
-									runtimeOutputName.length > 0 &&
-									currentOutputName[0] === runtimeOutputName[0]
-								) {
-									currentOutputName.shift();
-									runtimeOutputName.shift();
-								}
+								const getRelativePath = chunk => {
+									const baseOutputName = currentOutputName.slice();
+									const chunkOutputName = compilation
+										.getPath(
+											getChunkFilenameTemplate(
+												chunk,
+												compilation.outputOptions
+											),
+											{
+												chunk: chunk,
+												contentHashType: "javascript"
+											}
+										)
+										.split("/");
 
-								// create final path
-								const runtimePath =
-									(currentOutputName.length > 0
-										? "../".repeat(currentOutputName.length)
-										: "./") + runtimeOutputName.join("/");
+									// remove common parts
+									while (
+										baseOutputName.length > 0 &&
+										chunkOutputName.length > 0 &&
+										baseOutputName[0] === chunkOutputName[0]
+									) {
+										baseOutputName.shift();
+										chunkOutputName.shift();
+									}
+									// create final path
+									return (
+										(baseOutputName.length > 0
+											? "../".repeat(baseOutputName.length)
+											: "./") + chunkOutputName.join("/")
+									);
+								};
 
 								const entrySource = new ConcatSource();
 								entrySource.add(source);
 								entrySource.add(";\n\n// load runtime\n");
 								entrySource.add(
 									`import __webpack_require__ from ${JSON.stringify(
-										runtimePath
-									)};\n`
-								);
-								entrySource.add(
-									`import * as __webpack_self_exports__ from ${JSON.stringify(
-										"./" + outputFilename
+										getRelativePath(runtimeChunk)
 									)};\n`
 								);
-								entrySource.add(
-									`${RuntimeGlobals.externalInstallChunk}(__webpack_self_exports__);\n`
-								);
-								const startupSource = new RawSource(
-									generateEntryStartup(
-										chunkGraph,
-										runtimeTemplate,
-										entries,
-										chunk,
-										false
-									)
+
+								const startupSource = new ConcatSource();
+								startupSource.add(
+									`var __webpack_exec__ = ${runtimeTemplate.returningFunction(
+										`__webpack_require__(${RuntimeGlobals.entryModuleId} = moduleId)`,
+										"moduleId"
+									)}\n`
 								);
+
+								const loadedChunks = new Set();
+								let index = 0;
+								for (let i = 0; i < entries.length; i++) {
+									const [module, entrypoint] = entries[i];
+									const final = i + 1 === entries.length;
+									const moduleId = chunkGraph.getModuleId(module);
+									const chunks = getAllChunks(
+										entrypoint,
+										runtimeChunk,
+										undefined
+									);
+									for (const chunk of chunks) {
+										if (loadedChunks.has(chunk)) continue;
+										loadedChunks.add(chunk);
+										startupSource.add(
+											`import * as __webpack_chunk_${index}__ from ${JSON.stringify(
+												getRelativePath(chunk)
+											)};\n`
+										);
+										startupSource.add(
+											`${RuntimeGlobals.externalInstallChunk}(__webpack_chunk_${index}__);\n`
+										);
+										index++;
+									}
+									startupSource.add(
+										`${
+											final ? "var __webpack_exports__ = " : ""
+										}__webpack_exec__(${JSON.stringify(moduleId)});\n`
+									);
+								}
+
 								entrySource.add(
 									hooks.renderStartup.call(
 										startupSource,

package/lib/javascript/ChunkHelpers.js

@@ -0,0 +1,33 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const Entrypoint = require("../Entrypoint");
+
+/** @typedef {import("../Chunk")} Chunk */
+
+/**
+ * @param {Entrypoint} entrypoint a chunk group
+ * @param {Chunk} excludedChunk1 current chunk which is excluded
+ * @param {Chunk} excludedChunk2 runtime chunk which is excluded
+ * @returns {Set<Chunk>} chunks
+ */
+const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
+	const queue = new Set([entrypoint]);
+	const chunks = new Set();
+	for (const entrypoint of queue) {
+		for (const chunk of entrypoint.chunks) {
+			if (chunk === excludedChunk1) continue;
+			if (chunk === excludedChunk2) continue;
+			chunks.add(chunk);
+		}
+		for (const parent of entrypoint.parentsIterable) {
+			if (parent instanceof Entrypoint) queue.add(parent);
+		}
+	}
+	return chunks;
+};
+exports.getAllChunks = getAllChunks;

package/lib/javascript/JavascriptParser.js

@@ -1189,14 +1189,15 @@ class JavascriptParser extends Parser {
 				const node = /** @type {TaggedTemplateExpressionNode} */ (_node);
 				const tag = this.evaluateExpression(node.tag);
 
-				if (tag.isIdentifier() && tag.identifier !== "String.raw") return;
-				const { quasis, parts } = getSimplifiedTemplateResult(
-					"raw",
-					node.quasi
-				);
-				return new BasicEvaluatedExpression()
-					.setTemplateString(quasis, parts, "raw")
-					.setRange(node.range);
+				if (tag.isIdentifier() && tag.identifier === "String.raw") {
+					const { quasis, parts } = getSimplifiedTemplateResult(
+						"raw",
+						node.quasi
+					);
+					return new BasicEvaluatedExpression()
+						.setTemplateString(quasis, parts, "raw")
+						.setRange(node.range);
+				}
 			});
 
 		this.hooks.evaluateCallExpressionMember

package/lib/javascript/StartupHelpers.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const Entrypoint = require("../Entrypoint");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const { isSubset } = require("../util/SetHelpers");
+const { getAllChunks } = require("./ChunkHelpers");
 const { chunkHasJs } = require("./JavascriptModulesPlugin");
 
 /** @typedef {import("../util/Hash")} Hash */
@@ -19,30 +19,6 @@ const { chunkHasJs } = require("./JavascriptModulesPlugin");
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {(string|number)[]} EntryItem */
 
-// TODO move to this file to ../javascript/ChunkHelpers.js
-
-/**
- * @param {Entrypoint} entrypoint a chunk group
- * @param {Chunk} excludedChunk1 current chunk which is excluded
- * @param {Chunk} excludedChunk2 runtime chunk which is excluded
- * @returns {Set<Chunk>} chunks
- */
-const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
-	const queue = new Set([entrypoint]);
-	const chunks = new Set();
-	for (const entrypoint of queue) {
-		for (const chunk of entrypoint.chunks) {
-			if (chunk === excludedChunk1) continue;
-			if (chunk === excludedChunk2) continue;
-			chunks.add(chunk);
-		}
-		for (const parent of entrypoint.parentsIterable) {
-			if (parent instanceof Entrypoint) queue.add(parent);
-		}
-	}
-	return chunks;
-};
-
 const EXPORT_PREFIX = "var __webpack_exports__ = ";
 
 /**