webpack 5.64.1 → 5.65.0

package/lib/javascript/JavascriptParser.js

@@ -935,6 +935,13 @@ class JavascriptParser extends Parser {
 				.setString("undefined")
 				.setRange(expr.range);
 		});
+		this.hooks.evaluate.for("Identifier").tap("JavascriptParser", expr => {
+			if (/** @type {IdentifierNode} */ (expr).name === "undefined") {
+				return new BasicEvaluatedExpression()
+					.setUndefined()
+					.setRange(expr.range);
+			}
+		});
 		/**
 		 * @param {string} exprType expression type name
 		 * @param {function(ExpressionNode): GetInfoResult | undefined} getInfo get info
@@ -1189,14 +1196,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__ = ";
 
 /**

package/lib/library/AssignLibraryPlugin.js

@@ -174,7 +174,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 
 	_getPrefix(compilation) {
 		return this.prefix === "global"
-			? [compilation.outputOptions.globalObject]
+			? [compilation.runtimeTemplate.globalObject]
 			: this.prefix;
 	}
 
@@ -325,15 +325,10 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	 */
 	chunkHash(chunk, hash, chunkHashContext, { options, compilation }) {
 		hash.update("AssignLibraryPlugin");
-		const prefix =
-			this.prefix === "global"
-				? [compilation.outputOptions.globalObject]
-				: this.prefix;
-		const fullName = options.name ? prefix.concat(options.name) : prefix;
-		const fullNameResolved = fullName.map(n =>
-			compilation.getPath(n, {
-				chunk
-			})
+		const fullNameResolved = this._getResolvedFullName(
+			options,
+			chunk,
+			compilation
 		);
 		if (options.name ? this.named === "copy" : this.unnamed === "copy") {
 			hash.update("copy");

package/lib/node/NodeWatchFileSystem.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const util = require("util");
 const Watchpack = require("watchpack");
 
 /** @typedef {import("../../declarations/WebpackOptions").WatchOptions} WatchOptions */
@@ -68,7 +69,22 @@ class NodeWatchFileSystem {
 		if (callbackUndelayed) {
 			this.watcher.once("change", callbackUndelayed);
 		}
+
+		const fetchTimeInfo = () => {
+			const fileTimeInfoEntries = new Map();
+			const contextTimeInfoEntries = new Map();
+			if (this.watcher) {
+				this.watcher.collectTimeInfoEntries(
+					fileTimeInfoEntries,
+					contextTimeInfoEntries
+				);
+			}
+			return { fileTimeInfoEntries, contextTimeInfoEntries };
+		};
 		this.watcher.once("aggregated", (changes, removals) => {
+			// pause emitting events (avoids clearing aggregated changes and removals on timeout)
+			this.watcher.pause();
+
 			if (this.inputFileSystem && this.inputFileSystem.purge) {
 				const fs = this.inputFileSystem;
 				for (const item of changes) {
@@ -78,8 +94,14 @@ class NodeWatchFileSystem {
 					fs.purge(item);
 				}
 			}
-			const times = this.watcher.getTimeInfoEntries();
-			callback(null, times, times, changes, removals);
+			const { fileTimeInfoEntries, contextTimeInfoEntries } = fetchTimeInfo();
+			callback(
+				null,
+				fileTimeInfoEntries,
+				contextTimeInfoEntries,
+				changes,
+				removals
+			);
 		});
 
 		this.watcher.watch({ files, directories, missing, startTime });
@@ -99,39 +121,71 @@ class NodeWatchFileSystem {
 					this.watcher.pause();
 				}
 			},
-			getAggregatedRemovals: () => {
-				const items = this.watcher && this.watcher.aggregatedRemovals;
-				if (items && this.inputFileSystem && this.inputFileSystem.purge) {
-					const fs = this.inputFileSystem;
-					for (const item of items) {
-						fs.purge(item);
+			getAggregatedRemovals: util.deprecate(
+				() => {
+					const items = this.watcher && this.watcher.aggregatedRemovals;
+					if (items && this.inputFileSystem && this.inputFileSystem.purge) {
+						const fs = this.inputFileSystem;
+						for (const item of items) {
+							fs.purge(item);
+						}
 					}
-				}
-				return items;
-			},
-			getAggregatedChanges: () => {
-				const items = this.watcher && this.watcher.aggregatedChanges;
-				if (items && this.inputFileSystem && this.inputFileSystem.purge) {
+					return items;
+				},
+				"Watcher.getAggregatedRemovals is deprecated in favor of Watcher.getInfo since that's more performant.",
+				"DEP_WEBPACK_WATCHER_GET_AGGREGATED_REMOVALS"
+			),
+			getAggregatedChanges: util.deprecate(
+				() => {
+					const items = this.watcher && this.watcher.aggregatedChanges;
+					if (items && this.inputFileSystem && this.inputFileSystem.purge) {
+						const fs = this.inputFileSystem;
+						for (const item of items) {
+							fs.purge(item);
+						}
+					}
+					return items;
+				},
+				"Watcher.getAggregatedChanges is deprecated in favor of Watcher.getInfo since that's more performant.",
+				"DEP_WEBPACK_WATCHER_GET_AGGREGATED_CHANGES"
+			),
+			getFileTimeInfoEntries: util.deprecate(
+				() => {
+					return fetchTimeInfo().fileTimeInfoEntries;
+				},
+				"Watcher.getFileTimeInfoEntries is deprecated in favor of Watcher.getInfo since that's more performant.",
+				"DEP_WEBPACK_WATCHER_FILE_TIME_INFO_ENTRIES"
+			),
+			getContextTimeInfoEntries: util.deprecate(
+				() => {
+					return fetchTimeInfo().contextTimeInfoEntries;
+				},
+				"Watcher.getContextTimeInfoEntries is deprecated in favor of Watcher.getInfo since that's more performant.",
+				"DEP_WEBPACK_WATCHER_CONTEXT_TIME_INFO_ENTRIES"
+			),
+			getInfo: () => {
+				const removals = this.watcher && this.watcher.aggregatedRemovals;
+				const changes = this.watcher && this.watcher.aggregatedChanges;
+				if (this.inputFileSystem && this.inputFileSystem.purge) {
 					const fs = this.inputFileSystem;
-					for (const item of items) {
-						fs.purge(item);
+					if (removals) {
+						for (const item of removals) {
+							fs.purge(item);
+						}
+					}
+					if (changes) {
+						for (const item of changes) {
+							fs.purge(item);
+						}
 					}
 				}
-				return items;
-			},
-			getFileTimeInfoEntries: () => {
-				if (this.watcher) {
-					return this.watcher.getTimeInfoEntries();
-				} else {
-					return new Map();
-				}
-			},
-			getContextTimeInfoEntries: () => {
-				if (this.watcher) {
-					return this.watcher.getTimeInfoEntries();
-				} else {
-					return new Map();
-				}
+				const { fileTimeInfoEntries, contextTimeInfoEntries } = fetchTimeInfo();
+				return {
+					changes,
+					removals,
+					fileTimeInfoEntries,
+					contextTimeInfoEntries
+				};
 			}
 		};
 	}

package/lib/sharing/ConsumeSharedModule.js

@@ -210,6 +210,10 @@ class ConsumeSharedModule extends Module {
 			}
 			args.push(stringifyHoley(requiredVersion));
 			fn += "VersionCheck";
+		} else {
+			if (singleton) {
+				fn += "Singleton";
+			}
 		}
 		if (fallbackCode) {
 			fn += "Fallback";

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -103,9 +103,16 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 				]
 			)};`,
 			`var getInvalidSingletonVersionMessage = ${runtimeTemplate.basicFunction(
-				"key, version, requiredVersion",
+				"scope, key, version, requiredVersion",
 				[
-					`return "Unsatisfied version " + version + " of shared singleton module " + key + " (required " + rangeToString(requiredVersion) + ")"`
+					`return "Unsatisfied version " + version + " from " + (version && scope[key][version].from) + " of shared singleton module " + key + " (required " + rangeToString(requiredVersion) + ")"`
+				]
+			)};`,
+			`var getSingleton = ${runtimeTemplate.basicFunction(
+				"scope, scopeName, key, requiredVersion",
+				[
+					"var version = findSingletonVersionKey(scope, key);",
+					"return get(scope[key][version]);"
 				]
 			)};`,
 			`var getSingletonVersion = ${runtimeTemplate.basicFunction(
@@ -113,7 +120,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 				[
 					"var version = findSingletonVersionKey(scope, key);",
 					"if (!satisfy(requiredVersion, version)) " +
-						'typeof console !== "undefined" && console.warn && console.warn(getInvalidSingletonVersionMessage(key, version, requiredVersion));',
+						'typeof console !== "undefined" && console.warn && console.warn(getInvalidSingletonVersionMessage(scope, key, version, requiredVersion));',
 					"return get(scope[key][version]);"
 				]
 			)};`,
@@ -122,7 +129,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 				[
 					"var version = findSingletonVersionKey(scope, key);",
 					"if (!satisfy(requiredVersion, version)) " +
-						"throw new Error(getInvalidSingletonVersionMessage(key, version, requiredVersion));",
+						"throw new Error(getInvalidSingletonVersionMessage(scope, key, version, requiredVersion));",
 					"return get(scope[key][version]);"
 				]
 			)};`,
@@ -202,6 +209,13 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 					"return get(findValidVersion(scope, key, version) || warnInvalidVersion(scope, scopeName, key, version) || findVersion(scope, key));"
 				]
 			)});`,
+			`var loadSingleton = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
+				"scopeName, scope, key",
+				[
+					"ensureExistence(scopeName, key);",
+					"return getSingleton(scope, scopeName, key);"
+				]
+			)});`,
 			`var loadSingletonVersionCheck = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
 				"scopeName, scope, key, version",
 				[
@@ -230,6 +244,13 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 					"return get(findValidVersion(scope, key, version) || warnInvalidVersion(scope, scopeName, key, version) || findVersion(scope, key));"
 				]
 			)});`,
+			`var loadSingletonFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
+				"scopeName, scope, key, fallback",
+				[
+					`if(!scope || !${RuntimeGlobals.hasOwnProperty}(scope, key)) return fallback();`,
+					"return getSingleton(scope, scopeName, key);"
+				]
+			)});`,
 			`var loadSingletonVersionCheckFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
 				"scopeName, scope, key, version, fallback",
 				[

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -1160,7 +1160,7 @@ const AVAILABLE_FORMATS = {
 			},
 			{ regExp: /(\(module has no exports\))/g, format: red },
 			{ regExp: /\(possible exports: (.+)\)/g, format: green },
-			{ regExp: /\s*([^\s].* doesn't exist)/g, format: red },
+			{ regExp: /(?:^|\n)(.* doesn't exist)/g, format: red },
 			{ regExp: /('\w+' option has not been set)/g, format: red },
 			{
 				regExp: /(Emitted value instead of an instance of Error)/g,

package/lib/util/create-schema-validation.js

@@ -9,11 +9,18 @@ const memoize = require("./memoize");
 
 const getValidate = memoize(() => require("schema-utils").validate);
 
-const createSchemaValidation = (check = v => false, getSchema, options) => {
+const createSchemaValidation = (check, getSchema, options) => {
 	getSchema = memoize(getSchema);
 	return value => {
-		if (!check(value)) {
+		if (check && !check(value)) {
 			getValidate()(getSchema(), value, options);
+			if (check) {
+				require("util").deprecate(
+					() => {},
+					"webpack bug: Pre-compiled schema reports error while real schema is happy. This has performance drawbacks.",
+					"DEP_WEBPACK_PRE_COMPILED_SCHEMA_INVALID"
+				)();
+			}
 		}
 	};
 };

package/lib/util/extractUrlAndGlobal.js

@@ -11,5 +11,8 @@
  */
 module.exports = function extractUrlAndGlobal(urlAndGlobal) {
 	const index = urlAndGlobal.indexOf("@");
+	if (index <= 0 || index === urlAndGlobal.length - 1) {
+		throw new Error(`Invalid request "${urlAndGlobal}"`);
+	}
 	return [urlAndGlobal.substring(index + 1), urlAndGlobal.substring(0, index)];
 };

package/lib/util/fs.js

@@ -61,6 +61,15 @@ const path = require("path");
 /** @typedef {function((NodeJS.ErrnoException | Error | null)=, any=): void} ReadJsonCallback */
 /** @typedef {function((NodeJS.ErrnoException | Error | null)=, IStats|string=): void} LstatReadlinkAbsoluteCallback */
 
+/**
+ * @typedef {Object} WatcherInfo
+ * @property {Set<string>} changes get current aggregated changes that have not yet send to callback
+ * @property {Set<string>} removals get current aggregated removals that have not yet send to callback
+ * @property {Map<string, FileSystemInfoEntry | "ignore">} fileTimeInfoEntries get info about files
+ * @property {Map<string, FileSystemInfoEntry | "ignore">} contextTimeInfoEntries get info about directories
+ */
+
+// TODO webpack 6 deprecate missing getInfo
 /**
  * @typedef {Object} Watcher
  * @property {function(): void} close closes the watcher and all underlying file watchers
@@ -69,6 +78,7 @@ const path = require("path");
  * @property {function(): Set<string>=} getAggregatedRemovals get current aggregated removals that have not yet send to callback
  * @property {function(): Map<string, FileSystemInfoEntry | "ignore">} getFileTimeInfoEntries get info about files
  * @property {function(): Map<string, FileSystemInfoEntry | "ignore">} getContextTimeInfoEntries get info about directories
+ * @property {function(): WatcherInfo=} getInfo get info about timestamps and changes
  */
 
 /**

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -59,13 +59,13 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		const {
 			runtimeTemplate,
 			outputOptions: {
-				globalObject,
 				chunkLoadingGlobal,
 				hotUpdateGlobal,
 				crossOriginLoading,
 				scriptType
 			}
 		} = compilation;
+		const globalObject = runtimeTemplate.globalObject;
 		const { linkPreload, linkPrefetch } =
 			JsonpChunkLoadingRuntimeModule.getCompilationHooks(compilation);
 		const fn = RuntimeGlobals.ensureChunkHandlers;

package/lib/webpack.js

@@ -96,6 +96,9 @@ const createCompiler = rawOptions => {
  * @returns {MultiCompiler} the multi compiler object
  */
 
+const asArray = options =>
+	Array.isArray(options) ? Array.from(options) : [options];
+
 const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 	/**
 	 * @param {WebpackOptions | (ReadonlyArray<WebpackOptions> & MultiCompilerOptions)} options options
@@ -104,8 +107,13 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 	 */
 	(options, callback) => {
 		const create = () => {
-			if (!webpackOptionsSchemaCheck(options)) {
+			if (!asArray(options).every(webpackOptionsSchemaCheck)) {
 				getValidateSchema()(webpackOptionsSchema, options);
+				util.deprecate(
+					() => {},
+					"webpack bug: Pre-compiled schema reports error while real schema is happy. This has performance drawbacks.",
+					"DEP_WEBPACK_PRE_COMPILED_SCHEMA_INVALID"
+				)();
 			}
 			/** @type {MultiCompiler|Compiler} */
 			let compiler;

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -31,10 +31,11 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 			chunkGraph,
 			compilation: {
 				runtimeTemplate,
-				outputOptions: { globalObject, chunkLoadingGlobal, hotUpdateGlobal }
+				outputOptions: { chunkLoadingGlobal, hotUpdateGlobal }
 			},
 			_withCreateScriptUrl: withCreateScriptUrl
 		} = this;
+		const globalObject = runtimeTemplate.globalObject;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this.runtimeRequirements.has(RuntimeGlobals.baseURI);
 		const withLoading = this.runtimeRequirements.has(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.64.1",
+  "version": "5.65.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",
@@ -27,7 +27,7 @@
     "schema-utils": "^3.1.0",
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.1.3",
-    "watchpack": "^2.2.0",
+    "watchpack": "^2.3.1",
     "webpack-sources": "^3.2.2"
   },
   "peerDependenciesMeta": {
@@ -98,7 +98,7 @@
     "style-loader": "^2.0.0",
     "terser": "^5.7.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.20.0",
+    "tooling": "webpack/tooling#v1.20.1",
     "ts-loader": "^8.0.2",
     "typescript": "^4.2.0-beta",
     "url-loader": "^4.1.0",