webpack 5.39.1 → 5.40.0

package/README.md

@@ -40,7 +40,7 @@
 	</a>
   <h1>webpack</h1>
   <p>
-    webpack is a module bundler. Its main purpose is to bundle JavaScript files for usage in a browser, yet it is also capable of transforming, bundling, or packaging just about any resource or asset.
+    Webpack is a module bundler. Its main purpose is to bundle JavaScript files for usage in a browser, yet it is also capable of transforming, bundling, or packaging just about any resource or asset.
   </p>
 </div>
 
@@ -77,7 +77,7 @@ yarn add webpack --dev
 
 <h2 align="center">Introduction</h2>
 
-webpack is a bundler for modules. The main purpose is to bundle JavaScript
+Webpack is a bundler for modules. The main purpose is to bundle JavaScript
 files for usage in a browser, yet it is also capable of transforming, bundling,
 or packaging just about any resource or asset.
 
@@ -95,14 +95,14 @@ Check out webpack's quick [**Get Started**](https://webpack.js.org/guides/gettin
 
 ### Browser Compatibility
 
-webpack supports all browsers that are [ES5-compliant](https://kangax.github.io/compat-table/es5/) (IE8 and below are not supported).
-webpack also needs `Promise` for `import()` and `require.ensure()`. If you want to support older browsers, you will need to [load a polyfill](https://webpack.js.org/guides/shimming/) before using these expressions.
+Webpack supports all browsers that are [ES5-compliant](https://kangax.github.io/compat-table/es5/) (IE8 and below are not supported).
+Webpack also needs `Promise` for `import()` and `require.ensure()`. If you want to support older browsers, you will need to [load a polyfill](https://webpack.js.org/guides/shimming/) before using these expressions.
 
 <h2 align="center">Concepts</h2>
 
 ### [Plugins](https://webpack.js.org/plugins/)
 
-webpack has a [rich plugin
+Webpack has a [rich plugin
 interface](https://webpack.js.org/plugins/). Most of the features
 within webpack itself use this plugin interface. This makes webpack very
 **flexible**.
@@ -129,7 +129,7 @@ within webpack itself use this plugin interface. This makes webpack very
 
 ### [Loaders](https://webpack.js.org/loaders/)
 
-webpack enables the use of loaders to preprocess files. This allows you to bundle
+Webpack enables the use of loaders to preprocess files. This allows you to bundle
 **any static resource** way beyond JavaScript. You can easily [write your own
 loaders](https://webpack.js.org/api/loaders/) using Node.js.
 
@@ -249,23 +249,23 @@ or are automatically applied via regex from your webpack configuration.
 
 ### Performance
 
-webpack uses async I/O and has multiple caching levels. This makes webpack fast
+Webpack uses async I/O and has multiple caching levels. This makes webpack fast
 and incredibly **fast** on incremental compilations.
 
 ### Module Formats
 
-webpack supports ES2015+, CommonJS and AMD modules **out of the box**. It performs clever static
+Webpack supports ES2015+, CommonJS and AMD modules **out of the box**. It performs clever static
 analysis on the AST of your code. It even has an evaluation engine to evaluate
 simple expressions. This allows you to **support most existing libraries** out of the box.
 
 ### [Code Splitting](https://webpack.js.org/guides/code-splitting/)
 
-webpack allows you to split your codebase into multiple chunks. Chunks are
+Webpack allows you to split your codebase into multiple chunks. Chunks are
 loaded asynchronously at runtime. This reduces the initial loading time.
 
 ### [Optimizations](https://webpack.js.org/guides/production-build/)
 
-webpack can do many optimizations to **reduce the output size of your
+Webpack can do many optimizations to **reduce the output size of your
 JavaScript** by deduplicating frequently used modules, minifying, and giving
 you full control of what is loaded initially and what is loaded at runtime
 through code splitting. It can also make your code chunks **cache

package/lib/cache/PackFileCacheStrategy.js

@@ -678,7 +678,7 @@ class PackContent {
 	 */
 	constructor(items, usedItems, dataOrFn, logger, lazyName) {
 		this.items = items;
-		/** @type {function(): PackContentItems | Promise<PackContentItems>} */
+		/** @type {function(): Promise<PackContentItems> | PackContentItems } */
 		this.lazy = typeof dataOrFn === "function" ? dataOrFn : undefined;
 		/** @type {Map<string, any>} */
 		this.content = typeof dataOrFn === "function" ? undefined : dataOrFn.map;

package/lib/cli.js

@@ -148,7 +148,7 @@ const getArguments = (schema = webpackSchema) => {
 				{
 					type: "reset",
 					multiple: false,
-					description: `Clear all items provided in configuration. ${description}`,
+					description: `Clear all items provided in '${schemaPath}' configuration. ${description}`,
 					path: schemaPath
 				}
 			],

package/lib/javascript/JavascriptParser.js

@@ -175,11 +175,18 @@ class JavascriptParser extends Parser {
 			/** @type {SyncBailHook<[IfStatementNode], boolean | void>} */
 			statementIf: new SyncBailHook(["statement"]),
 			/** @type {SyncBailHook<[ExpressionNode, ClassExpressionNode | ClassDeclarationNode], boolean | void>} */
-			classExtendsExpression: new SyncBailHook(["expression", "statement"]),
+			classExtendsExpression: new SyncBailHook([
+				"expression",
+				"classDefinition"
+			]),
 			/** @type {SyncBailHook<[MethodDefinitionNode | PropertyDefinitionNode, ClassExpressionNode | ClassDeclarationNode], boolean | void>} */
-			classBodyElement: new SyncBailHook(["element", "statement"]),
+			classBodyElement: new SyncBailHook(["element", "classDefinition"]),
 			/** @type {SyncBailHook<[ExpressionNode, MethodDefinitionNode | PropertyDefinitionNode, ClassExpressionNode | ClassDeclarationNode], boolean | void>} */
-			classBodyValue: new SyncBailHook(["expression", "element", "statement"]),
+			classBodyValue: new SyncBailHook([
+				"expression",
+				"element",
+				"classDefinition"
+			]),
 			/** @type {HookMap<SyncBailHook<[LabeledStatementNode], boolean | void>>} */
 			label: new HookMap(() => new SyncBailHook(["statement"])),
 			/** @type {SyncBailHook<[StatementNode, ImportSource], boolean | void>} */

package/lib/node/NodeTargetPlugin.js

@@ -55,6 +55,7 @@ const builtins = [
 	"wasi",
 	"worker_threads",
 	"zlib",
+	/^node:/,
 
 	// cspell:word pnpapi
 	// Yarn PnP adds pnpapi as "builtin"

package/lib/optimize/InnerGraphPlugin.js

@@ -238,12 +238,25 @@ class InnerGraphPlugin {
 						}
 					);
 
+					parser.hooks.classBodyElement.tap(
+						"InnerGraphPlugin",
+						(element, classDefinition) => {
+							if (!InnerGraph.isEnabled(parser.state)) return;
+							if (parser.scope.topLevelScope === true) {
+								const fn = classWithTopLevelSymbol.get(classDefinition);
+								if (fn) {
+									InnerGraph.setTopLevelSymbol(parser.state, undefined);
+								}
+							}
+						}
+					);
+
 					parser.hooks.classBodyValue.tap(
 						"InnerGraphPlugin",
-						(expression, element, statement) => {
+						(expression, element, classDefinition) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
-								const fn = classWithTopLevelSymbol.get(statement);
+								const fn = classWithTopLevelSymbol.get(classDefinition);
 								if (fn) {
 									if (
 										!element.static ||
@@ -253,6 +266,24 @@ class InnerGraphPlugin {
 										)
 									) {
 										InnerGraph.setTopLevelSymbol(parser.state, fn);
+										if (element.type !== "MethodDefinition" && element.static) {
+											InnerGraph.onUsage(parser.state, usedByExports => {
+												switch (usedByExports) {
+													case undefined:
+													case true:
+														return;
+													default: {
+														const dep = new PureExpressionDependency(
+															expression.range
+														);
+														dep.loc = expression.loc;
+														dep.usedByExports = usedByExports;
+														parser.state.module.addDependency(dep);
+														break;
+													}
+												}
+											});
+										}
 									} else {
 										InnerGraph.setTopLevelSymbol(parser.state, undefined);
 									}

package/lib/serialization/PlainObjectSerializer.js

@@ -7,19 +7,21 @@
 const cache = new WeakMap();
 
 class ObjectStructure {
-	constructor(keys) {
-		this.keys = keys;
-		this.children = new Map();
+	constructor() {
+		this.keys = undefined;
+		this.children = undefined;
 	}
 
-	getKeys() {
+	getKeys(keys) {
+		if (this.keys === undefined) this.keys = keys;
 		return this.keys;
 	}
 
 	key(key) {
+		if (this.children === undefined) this.children = new Map();
 		const child = this.children.get(key);
 		if (child !== undefined) return child;
-		const newChild = new ObjectStructure(this.keys.concat(key));
+		const newChild = new ObjectStructure();
 		this.children.set(key, newChild);
 		return newChild;
 	}
@@ -28,20 +30,27 @@ class ObjectStructure {
 const getCachedKeys = (keys, cacheAssoc) => {
 	let root = cache.get(cacheAssoc);
 	if (root === undefined) {
-		root = new ObjectStructure([]);
+		root = new ObjectStructure();
 		cache.set(cacheAssoc, root);
 	}
 	let current = root;
 	for (const key of keys) {
 		current = current.key(key);
 	}
-	return current.getKeys();
+	return current.getKeys(keys);
 };
 
 class PlainObjectSerializer {
 	serialize(obj, { write }) {
 		const keys = Object.keys(obj);
-		if (keys.length > 1) {
+		if (keys.length > 128) {
+			// Objects with so many keys are unlikely to share structure
+			// with other objects
+			write(keys);
+			for (const key of keys) {
+				write(obj[key]);
+			}
+		} else if (keys.length > 1) {
 			write(getCachedKeys(keys, write));
 			for (const key of keys) {
 				write(obj[key]);

package/lib/serialization/Serializer.js

@@ -15,7 +15,7 @@ class Serializer {
 		const ctx = { ...context, ...this.context };
 		let current = obj;
 		for (const middleware of this.serializeMiddlewares) {
-			if (current instanceof Promise) {
+			if (current && typeof current.then === "function") {
 				current = current.then(
 					data => data && middleware.serialize(data, context)
 				);
@@ -35,7 +35,7 @@ class Serializer {
 		/** @type {any} */
 		let current = value;
 		for (const middleware of this.deserializeMiddlewares) {
-			if (current instanceof Promise) {
+			if (current && typeof current.then === "function") {
 				current = current.then(data => middleware.deserialize(data, context));
 			} else {
 				current = middleware.deserialize(current, ctx);

package/lib/serialization/SerializerMiddleware.js

@@ -100,9 +100,10 @@ class SerializerMiddleware {
 	static serializeLazy(lazy, serialize) {
 		const fn = memoize(() => {
 			const r = lazy();
-			if (r instanceof Promise) return r.then(data => data && serialize(data));
-			if (r) return serialize(r);
-			return null;
+			if (r && typeof r.then === "function") {
+				return r.then(data => data && serialize(data));
+			}
+			return serialize(r);
 		});
 		fn[LAZY_TARGET] = lazy[LAZY_TARGET];
 		/** @type {any} */ (fn).options = /** @type {any} */ (lazy).options;
@@ -118,7 +119,9 @@ class SerializerMiddleware {
 	static deserializeLazy(lazy, deserialize) {
 		const fn = memoize(() => {
 			const r = lazy();
-			if (r instanceof Promise) return r.then(data => deserialize(data));
+			if (r && typeof r.then === "function") {
+				return r.then(data => deserialize(data));
+			}
 			return deserialize(r);
 		});
 		fn[LAZY_TARGET] = lazy[LAZY_TARGET];

package/lib/util/LazySet.js

@@ -24,21 +24,17 @@ const merge = (targetSet, toMerge) => {
 /**
  * @template T
  * @param {Set<Iterable<T>>} targetSet set where iterables should be added
- * @param {Array<Iterable<T> | LazySet<T>>} toDeepMerge iterables or lazy set to be flattened
+ * @param {Array<LazySet<T>>} toDeepMerge lazy sets to be flattened
  * @returns {void}
  */
 const flatten = (targetSet, toDeepMerge) => {
 	for (const set of toDeepMerge) {
-		if (set instanceof LazySet) {
-			if (set._set.size > 0) targetSet.add(set._set);
-			if (set._needMerge) {
-				for (const mergedSet of set._toMerge) {
-					targetSet.add(mergedSet);
-				}
-				flatten(targetSet, set._toDeepMerge);
+		if (set._set.size > 0) targetSet.add(set._set);
+		if (set._needMerge) {
+			for (const mergedSet of set._toMerge) {
+				targetSet.add(mergedSet);
 			}
-		} else {
-			targetSet.add(set);
+			flatten(targetSet, set._toDeepMerge);
 		}
 	}
 };
@@ -58,7 +54,7 @@ class LazySet {
 		this._set = new Set(iterable);
 		/** @type {Set<Iterable<T>>} */
 		this._toMerge = new Set();
-		/** @type {Array<Iterable<T> | LazySet<T>>} */
+		/** @type {Array<LazySet<T>>} */
 		this._toDeepMerge = [];
 		this._needMerge = false;
 		this._deopt = false;
@@ -76,6 +72,14 @@ class LazySet {
 		this._needMerge = false;
 	}
 
+	_isEmpty() {
+		return (
+			this._set.size === 0 &&
+			this._toMerge.size === 0 &&
+			this._toDeepMerge.length === 0
+		);
+	}
+
 	get size() {
 		if (this._needMerge) this._merge();
 		return this._set.size;
@@ -101,13 +105,18 @@ class LazySet {
 				_set.add(item);
 			}
 		} else {
-			this._toDeepMerge.push(iterable);
-			this._needMerge = true;
-			// Avoid being too memory hungry
-			if (this._toDeepMerge.length > 100000) {
-				this._flatten();
-				if (this._toMerge.size > 100000) this._merge();
+			if (iterable instanceof LazySet) {
+				if (iterable._isEmpty()) return this;
+				this._toDeepMerge.push(iterable);
+				this._needMerge = true;
+				if (this._toDeepMerge.length > 100000) {
+					this._flatten();
+				}
+			} else {
+				this._toMerge.add(iterable);
+				this._needMerge = true;
 			}
+			if (this._toMerge.size > 100000) this._merge();
 		}
 		return this;
 	}

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -291,7 +291,7 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 						"var promise;",
 						this.supportsStreaming
 							? Template.asString([
-									"if(importObject instanceof Promise && typeof WebAssembly.compileStreaming === 'function') {",
+									"if(importObject && typeof importObject.then === 'function' && typeof WebAssembly.compileStreaming === 'function') {",
 									Template.indent([
 										"promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) {",
 										Template.indent([
@@ -309,7 +309,7 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 									])
 							  ])
 							: Template.asString([
-									"if(importObject instanceof Promise) {",
+									"if(importObject && typeof importObject.then === 'function') {",
 									Template.indent([
 										"var bytesPromise = req.then(function(x) { return x.arrayBuffer(); });",
 										"promise = Promise.all([",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.39.1",
+  "version": "5.40.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",
@@ -14,7 +14,7 @@
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
     "enhanced-resolve": "^5.8.0",
-    "es-module-lexer": "^0.4.0",
+    "es-module-lexer": "^0.6.0",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
     "glob-to-regexp": "^0.4.1",
@@ -25,7 +25,7 @@
     "neo-async": "^2.6.2",
     "schema-utils": "^3.0.0",
     "tapable": "^2.1.1",
-    "terser-webpack-plugin": "^5.1.1",
+    "terser-webpack-plugin": "^5.1.3",
     "watchpack": "^2.2.0",
     "webpack-sources": "^2.3.0"
   },
@@ -91,7 +91,7 @@
     "simple-git": "^2.17.0",
     "strip-ansi": "^6.0.0",
     "style-loader": "^2.0.0",
-    "terser": "^5.5.0",
+    "terser": "^5.7.0",
     "toml": "^3.0.0",
     "tooling": "webpack/tooling#v1.19.0",
     "ts-loader": "^8.0.2",

package/types.d.ts

@@ -5795,11 +5795,13 @@ type LoaderContext<OptionsType> = NormalModuleLoaderContext<OptionsType> &
 	LoaderRunnerLoaderContext<OptionsType> &
 	LoaderPluginLoaderContext &
 	HotModuleReplacementPluginLoaderContext;
-type LoaderDefinition<OptionsType = {}, ContextAdditions = {}> =
-	LoaderDefinitionFunction<OptionsType, ContextAdditions> & {
-		raw?: false;
-		pitch?: PitchLoaderDefinitionFunction<OptionsType, ContextAdditions>;
-	};
+type LoaderDefinition<
+	OptionsType = {},
+	ContextAdditions = {}
+> = LoaderDefinitionFunction<OptionsType, ContextAdditions> & {
+	raw?: false;
+	pitch?: PitchLoaderDefinitionFunction<OptionsType, ContextAdditions>;
+};
 declare interface LoaderDefinitionFunction<
 	OptionsType = {},
 	ContextAdditions = {}
@@ -7204,7 +7206,7 @@ declare interface NormalModuleLoaderContext<OptionsType> {
 	};
 	emitFile(
 		name: string,
-		content: string,
+		content: string | Buffer,
 		sourceMap?: string,
 		assetInfo?: AssetInfo
 	): void;
@@ -8662,11 +8664,13 @@ declare interface RawChunkGroupOptions {
 	preloadOrder?: number;
 	prefetchOrder?: number;
 }
-type RawLoaderDefinition<OptionsType = {}, ContextAdditions = {}> =
-	RawLoaderDefinitionFunction<OptionsType, ContextAdditions> & {
-		raw: true;
-		pitch?: PitchLoaderDefinitionFunction<OptionsType, ContextAdditions>;
-	};
+type RawLoaderDefinition<
+	OptionsType = {},
+	ContextAdditions = {}
+> = RawLoaderDefinitionFunction<OptionsType, ContextAdditions> & {
+	raw: true;
+	pitch?: PitchLoaderDefinitionFunction<OptionsType, ContextAdditions>;
+};
 declare interface RawLoaderDefinitionFunction<
 	OptionsType = {},
 	ContextAdditions = {}