webpack 5.66.0 → 5.67.0

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -9,6 +9,8 @@
 /** @typedef {import("./StatsPrinter")} StatsPrinter */
 /** @typedef {import("./StatsPrinter").StatsPrinterContext} StatsPrinterContext */
 
+const DATA_URI_CONTENT_LENGTH = 16;
+
 const plural = (n, singular, plural) => (n === 1 ? singular : plural);
 
 /**
@@ -26,6 +28,23 @@ const printSizes = (sizes, { formatSize = n => `${n}` }) => {
 	}
 };
 
+const getResourceName = resource => {
+	const dataUrl = /^data:[^,]+,/.exec(resource);
+	if (!dataUrl) return resource;
+
+	const len = dataUrl[0].length + DATA_URI_CONTENT_LENGTH;
+	if (resource.length < len) return resource;
+	return `${resource.slice(
+		0,
+		Math.min(resource.length - /* '..'.length */ 2, len)
+	)}..`;
+};
+
+const getModuleName = name => {
+	const [, prefix, resource] = /^(.*!)?([^!]*)$/.exec(name);
+	return [prefix, getResourceName(resource)];
+};
+
 const mapLines = (str, fn) => str.split("\n").map(fn).join("\n");
 
 /**
@@ -38,6 +57,10 @@ const isValidId = id => {
 	return typeof id === "number" || id;
 };
 
+const moreCount = (list, count) => {
+	return list && list.length > 0 ? `+ ${count}` : `${count}`;
+};
+
 /** @type {Record<string, (thing: any, context: StatsPrinterContext, printer: StatsPrinter) => string | void>} */
 const SIMPLE_PRINTERS = {
 	"compilation.summary!": (
@@ -163,13 +186,24 @@ const SIMPLE_PRINTERS = {
 	},
 	"compilation.assetsByChunkName": () => "",
 
-	"compilation.filteredModules": filteredModules =>
+	"compilation.filteredModules": (
+		filteredModules,
+		{ compilation: { modules } }
+	) =>
 		filteredModules > 0
-			? `${filteredModules} ${plural(filteredModules, "module", "modules")}`
+			? `${moreCount(modules, filteredModules)} ${plural(
+					filteredModules,
+					"module",
+					"modules"
+			  )}`
 			: undefined,
 	"compilation.filteredAssets": (filteredAssets, { compilation: { assets } }) =>
 		filteredAssets > 0
-			? `${filteredAssets} ${plural(filteredAssets, "asset", "assets")}`
+			? `${moreCount(assets, filteredAssets)} ${plural(
+					filteredAssets,
+					"asset",
+					"assets"
+			  )}`
 			: undefined,
 	"compilation.logging": (logging, context, printer) =>
 		Array.isArray(logging)
@@ -262,15 +296,19 @@ const SIMPLE_PRINTERS = {
 	"asset.separator!": () => "\n",
 	"asset.filteredRelated": (filteredRelated, { asset: { related } }) =>
 		filteredRelated > 0
-			? `${filteredRelated} related ${plural(
+			? `${moreCount(related, filteredRelated)} related ${plural(
 					filteredRelated,
 					"asset",
 					"assets"
 			  )}`
 			: undefined,
-	"asset.filteredChildren": filteredChildren =>
+	"asset.filteredChildren": (filteredChildren, { asset: { children } }) =>
 		filteredChildren > 0
-			? `${filteredChildren} ${plural(filteredChildren, "asset", "assets")}`
+			? `${moreCount(children, filteredChildren)} ${plural(
+					filteredChildren,
+					"asset",
+					"assets"
+			  )}`
 			: undefined,
 
 	assetChunk: (id, { formatChunkId }) => formatChunkId(id),
@@ -282,8 +320,8 @@ const SIMPLE_PRINTERS = {
 	"module.id": (id, { formatModuleId }) =>
 		isValidId(id) ? formatModuleId(id) : undefined,
 	"module.name": (name, { bold }) => {
-		const [, prefix, resource] = /^(.*!)?([^!]*)$/.exec(name);
-		return (prefix || "") + bold(resource);
+		const [prefix, resource] = getModuleName(name);
+		return `${prefix || ""}${bold(resource || "")}`;
 	},
 	"module.identifier": identifier => undefined,
 	"module.layer": (layer, { formatLayer }) =>
@@ -366,21 +404,29 @@ const SIMPLE_PRINTERS = {
 	"module.issuerPath": (issuerPath, { module }) =>
 		module.profile ? undefined : "",
 	"module.profile": profile => undefined,
-	"module.filteredModules": filteredModules =>
+	"module.filteredModules": (filteredModules, { module: { modules } }) =>
 		filteredModules > 0
-			? `${filteredModules} nested ${plural(
+			? `${moreCount(modules, filteredModules)} nested ${plural(
 					filteredModules,
 					"module",
 					"modules"
 			  )}`
 			: undefined,
-	"module.filteredReasons": filteredReasons =>
+	"module.filteredReasons": (filteredReasons, { module: { reasons } }) =>
 		filteredReasons > 0
-			? `${filteredReasons} ${plural(filteredReasons, "reason", "reasons")}`
+			? `${moreCount(reasons, filteredReasons)} ${plural(
+					filteredReasons,
+					"reason",
+					"reasons"
+			  )}`
 			: undefined,
-	"module.filteredChildren": filteredChildren =>
+	"module.filteredChildren": (filteredChildren, { module: { children } }) =>
 		filteredChildren > 0
-			? `${filteredChildren} ${plural(filteredChildren, "module", "modules")}`
+			? `${moreCount(children, filteredChildren)} ${plural(
+					filteredChildren,
+					"module",
+					"modules"
+			  )}`
 			: undefined,
 	"module.separator!": () => "\n",
 
@@ -388,7 +434,8 @@ const SIMPLE_PRINTERS = {
 	"moduleIssuer.profile.total": (value, { formatTime }) => formatTime(value),
 
 	"moduleReason.type": type => type,
-	"moduleReason.userRequest": (userRequest, { cyan }) => cyan(userRequest),
+	"moduleReason.userRequest": (userRequest, { cyan }) =>
+		cyan(getResourceName(userRequest)),
 	"moduleReason.moduleId": (moduleId, { formatModuleId }) =>
 		isValidId(moduleId) ? formatModuleId(moduleId) : undefined,
 	"moduleReason.module": (module, { magenta }) => magenta(module),
@@ -397,9 +444,16 @@ const SIMPLE_PRINTERS = {
 	"moduleReason.active": (active, { formatFlag }) =>
 		active ? undefined : formatFlag("inactive"),
 	"moduleReason.resolvedModule": (module, { magenta }) => magenta(module),
-	"moduleReason.filteredChildren": filteredChildren =>
+	"moduleReason.filteredChildren": (
+		filteredChildren,
+		{ moduleReason: { children } }
+	) =>
 		filteredChildren > 0
-			? `${filteredChildren} ${plural(filteredChildren, "reason", "reasons")}`
+			? `${moreCount(children, filteredChildren)} ${plural(
+					filteredChildren,
+					"reason",
+					"reasons"
+			  )}`
 			: undefined,
 
 	"module.profile.total": (value, { formatTime }) => formatTime(value),
@@ -427,10 +481,21 @@ const SIMPLE_PRINTERS = {
 		size ? formatSize(size) : undefined,
 	"chunkGroup.auxiliaryAssetsSize": (size, { formatSize }) =>
 		size ? `(${formatSize(size)})` : undefined,
-	"chunkGroup.filteredAssets": n =>
-		n > 0 ? `${n} ${plural(n, "asset", "assets")}` : undefined,
-	"chunkGroup.filteredAuxiliaryAssets": n =>
-		n > 0 ? `${n} auxiliary ${plural(n, "asset", "assets")}` : undefined,
+	"chunkGroup.filteredAssets": (n, { chunkGroup: { assets } }) =>
+		n > 0
+			? `${moreCount(assets, n)} ${plural(n, "asset", "assets")}`
+			: undefined,
+	"chunkGroup.filteredAuxiliaryAssets": (
+		n,
+		{ chunkGroup: { auxiliaryAssets } }
+	) =>
+		n > 0
+			? `${moreCount(auxiliaryAssets, n)} auxiliary ${plural(
+					n,
+					"asset",
+					"assets"
+			  )}`
+			: undefined,
 	"chunkGroup.is!": () => "=",
 	"chunkGroupAsset.name": (asset, { green }) => green(asset),
 	"chunkGroupAsset.size": (size, { formatSize, chunkGroup }) =>
@@ -490,9 +555,9 @@ const SIMPLE_PRINTERS = {
 	"chunk.recorded": (recorded, { formatFlag, green }) =>
 		recorded ? green(formatFlag("recorded")) : undefined,
 	"chunk.reason": (reason, { yellow }) => (reason ? yellow(reason) : undefined),
-	"chunk.filteredModules": filteredModules =>
+	"chunk.filteredModules": (filteredModules, { chunk: { modules } }) =>
 		filteredModules > 0
-			? `${filteredModules} chunk ${plural(
+			? `${moreCount(modules, filteredModules)} chunk ${plural(
 					filteredModules,
 					"module",
 					"modules"

package/lib/util/AsyncQueue.js

@@ -19,7 +19,7 @@ let inHandleResult = 0;
 /**
  * @template T
  * @callback Callback
- * @param {WebpackError=} err
+ * @param {(WebpackError | null)=} err
  * @param {T=} result
  */
 

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -6,7 +6,6 @@
 "use strict";
 
 const RuntimeGlobals = require("../RuntimeGlobals");
-const CreateScriptUrlRuntimeModule = require("../runtime/CreateScriptUrlRuntimeModule");
 const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenciesPlugin");
 const ImportScriptsChunkLoadingRuntimeModule = require("./ImportScriptsChunkLoadingRuntimeModule");
 
@@ -43,7 +42,9 @@ class ImportScriptsChunkLoadingPlugin {
 					const withCreateScriptUrl = !!compilation.outputOptions.trustedTypes;
 					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
 					set.add(RuntimeGlobals.hasOwnProperty);
-					if (withCreateScriptUrl) set.add(RuntimeGlobals.createScriptUrl);
+					if (withCreateScriptUrl) {
+						set.add(RuntimeGlobals.createScriptUrl);
+					}
 					compilation.addRuntimeModule(
 						chunk,
 						new ImportScriptsChunkLoadingRuntimeModule(set, withCreateScriptUrl)
@@ -61,15 +62,6 @@ class ImportScriptsChunkLoadingPlugin {
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.baseURI)
 					.tap("ImportScriptsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.createScriptUrl)
-					.tap("RuntimePlugin", (chunk, set) => {
-						compilation.addRuntimeModule(
-							chunk,
-							new CreateScriptUrlRuntimeModule()
-						);
-						return true;
-					});
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.ensureChunkHandlers)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.66.0",
+  "version": "5.67.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",
@@ -28,7 +28,7 @@
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.1.3",
     "watchpack": "^2.3.1",
-    "webpack-sources": "^3.2.2"
+    "webpack-sources": "^3.2.3"
   },
   "peerDependenciesMeta": {
     "webpack-cli": {
@@ -143,13 +143,6 @@
     "test:integration": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.{basictest,longtest,test}.js\"",
     "test:basic": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.basictest.js\"",
     "test:unit": "node --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\"",
-    "travis:integration": "yarn cover:integration --ci $JEST",
-    "travis:basic": "yarn cover:basic --ci $JEST",
-    "travis:lintunit": "yarn lint && yarn cover:unit --ci $JEST",
-    "travis:benchmark": "yarn benchmark --ci",
-    "appveyor:integration": "yarn cover:integration --ci %JEST%",
-    "appveyor:unit": "yarn cover:unit --ci %JEST%",
-    "appveyor:benchmark": "yarn benchmark --ci",
     "build:examples": "cd examples && node buildAll.js",
     "type-report": "rimraf coverage && yarn cover:types && yarn cover:report && open-cli coverage/lcov-report/index.html",
     "pretest": "yarn lint",
@@ -159,7 +152,7 @@
     "type-lint": "tsc",
     "typings-test": "tsc -p tsconfig.types.test.json",
     "module-typings-test": "tsc -p tsconfig.module.test.json",
-    "spellcheck": "cspell \"{.github,benchmark,bin,examples,hot,lib,schemas,setup,tooling}/**/*.{md,yml,yaml,js,json}\" \"*.md\"",
+    "spellcheck": "cspell \"**/*\"",
     "special-lint": "node node_modules/tooling/lockfile-lint && node node_modules/tooling/schemas-lint && node node_modules/tooling/inherit-types && node node_modules/tooling/format-schemas && node tooling/generate-runtime-code.js && node tooling/generate-wasm-code.js && node node_modules/tooling/format-file-header && node node_modules/tooling/compile-to-definitions && node node_modules/tooling/precompile-schemas && node node_modules/tooling/generate-types --no-template-literals",
     "special-lint-fix": "node node_modules/tooling/inherit-types --write && node node_modules/tooling/format-schemas --write && node tooling/generate-runtime-code.js --write && node tooling/generate-wasm-code.js --write && node node_modules/tooling/format-file-header --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/precompile-schemas --write && node node_modules/tooling/generate-types --no-template-literals --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix && yarn pretty-lint-fix",