webpack 5.102.0 → 5.103.0

package/lib/SourceMapDevToolPlugin.js

@@ -20,6 +20,7 @@ const { makePathsAbsolute } = require("./util/identifier");
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
+/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").Rules} Rules */
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Compilation").Asset} Asset */
@@ -433,6 +434,25 @@ class SourceMapDevToolPlugin {
 										moduleToSourceNameMapping.get(m)
 									);
 									sourceMap.sources = /** @type {string[]} */ (moduleFilenames);
+									sourceMap.ignoreList = options.ignoreList
+										? sourceMap.sources.reduce(
+												/** @type {(acc: number[], sourceName: string, idx: number) => number[]} */ (
+													(acc, sourceName, idx) => {
+														const rule = /** @type {Rules} */ (
+															options.ignoreList
+														);
+														if (
+															ModuleFilenameHelpers.matchPart(sourceName, rule)
+														) {
+															acc.push(idx);
+														}
+														return acc;
+													}
+												),
+												[]
+											)
+										: [];
+
 									if (options.noSources) {
 										sourceMap.sourcesContent = undefined;
 									}
@@ -482,14 +502,12 @@ class SourceMapDevToolPlugin {
 									const sourceMapString = JSON.stringify(sourceMap);
 									if (sourceMapFilename) {
 										const filename = file;
-										const sourceMapContentHash =
-											/** @type {string} */
-											(
-												usesContentHash &&
-													createHash(compilation.outputOptions.hashFunction)
-														.update(sourceMapString)
-														.digest("hex")
-											);
+										const sourceMapContentHash = usesContentHash
+											? createHash(compilation.outputOptions.hashFunction)
+													.update(sourceMapString)
+													.digest("hex")
+											: undefined;
+
 										const pathParams = {
 											chunk,
 											filename: options.fileContext

package/lib/WebpackOptionsApply.js

@@ -18,6 +18,7 @@ const FlagDependencyExportsPlugin = require("./FlagDependencyExportsPlugin");
 
 const JavascriptMetaInfoPlugin = require("./JavascriptMetaInfoPlugin");
 
+const NodeStuffPlugin = require("./NodeStuffPlugin");
 const OptionsApply = require("./OptionsApply");
 
 const RecordIdsPlugin = require("./RecordIdsPlugin");
@@ -109,7 +110,15 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.externalsPresets.node) {
 			const NodeTargetPlugin = require("./node/NodeTargetPlugin");
 
-			new NodeTargetPlugin().apply(compiler);
+			// Some older versions of Node.js don't support all built-in modules via import, only via `require`,
+			// but шt seems like there shouldn't be a warning here since these versions are rarely used in real applications
+			new NodeTargetPlugin(
+				options.output.module &&
+				compiler.platform.node === null &&
+				compiler.platform.web === null
+					? "module-import"
+					: "node-commonjs"
+			).apply(compiler);
 
 			// Handle external CSS `@import` and `url()`
 			if (options.experiments.css) {
@@ -126,7 +135,9 @@ class WebpackOptionsApply extends OptionsApply {
 							if (dependencyType === "url") {
 								return callback(null, `asset ${request}`);
 							} else if (
-								dependencyType === "css-import" &&
+								(dependencyType === "css-import" ||
+									dependencyType === "css-import-local-module" ||
+									dependencyType === "css-import-global-module") &&
 								options.experiments.css
 							) {
 								return callback(null, `css-import ${request}`);
@@ -149,7 +160,9 @@ class WebpackOptionsApply extends OptionsApply {
 					if (dependencyType === "url") {
 						return callback(null, `asset ${request}`);
 					} else if (
-						dependencyType === "css-import" &&
+						(dependencyType === "css-import" ||
+							dependencyType === "css-import-local-module" ||
+							dependencyType === "css-import-global-module") &&
 						options.experiments.css
 					) {
 						return callback(null, `css-import ${request}`);
@@ -294,6 +307,14 @@ class WebpackOptionsApply extends OptionsApply {
 			).apply(compiler);
 		}
 
+		if (options.dotenv) {
+			const DotenvPlugin = require("./DotenvPlugin");
+
+			new DotenvPlugin(
+				typeof options.dotenv === "boolean" ? {} : options.dotenv
+			).apply(compiler);
+		}
+
 		if (options.devtool) {
 			if (options.devtool.includes("source-map")) {
 				const hidden = options.devtool.includes("hidden");
@@ -444,11 +465,11 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 		new CommonJsPlugin().apply(compiler);
 		new LoaderPlugin().apply(compiler);
-		if (options.node !== false) {
-			const NodeStuffPlugin = require("./NodeStuffPlugin");
-
-			new NodeStuffPlugin(options.node).apply(compiler);
-		}
+		new NodeStuffPlugin({
+			global: options.node ? options.node.global : false,
+			__dirname: options.node ? options.node.__dirname : false,
+			__filename: options.node ? options.node.__filename : false
+		}).apply(compiler);
 		new APIPlugin().apply(compiler);
 		new ExportsInfoApiPlugin().apply(compiler);
 		new WebpackIsIncludedPlugin().apply(compiler);
@@ -667,8 +688,11 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.optimization.nodeEnv) {
 			const DefinePlugin = require("./DefinePlugin");
 
+			const defValue = JSON.stringify(options.optimization.nodeEnv);
+
 			new DefinePlugin({
-				"process.env.NODE_ENV": JSON.stringify(options.optimization.nodeEnv)
+				"process.env.NODE_ENV": defValue,
+				"import.meta.env.NODE_ENV": defValue
 			}).apply(compiler);
 		}
 		if (options.optimization.minimize) {

package/lib/asset/AssetBytesGenerator.js

@@ -53,6 +53,7 @@ class AssetSourceGenerator extends Generator {
 
 				const encodedSource = originalSource.buffer().toString("base64");
 
+				runtimeRequirements.add(RuntimeGlobals.requireScope);
 				runtimeRequirements.add(RuntimeGlobals.toBinary);
 
 				let sourceContent;
@@ -65,7 +66,7 @@ class AssetSourceGenerator extends Generator {
 					} = ${RuntimeGlobals.toBinary}(${JSON.stringify(encodedSource)});`;
 				} else {
 					runtimeRequirements.add(RuntimeGlobals.module);
-					sourceContent = `${RuntimeGlobals.module}.exports = ${RuntimeGlobals.toBinary}(${JSON.stringify(
+					sourceContent = `${module.moduleArgument}.exports = ${RuntimeGlobals.toBinary}(${JSON.stringify(
 						encodedSource
 					)});`;
 				}

package/lib/asset/AssetGenerator.js

@@ -244,11 +244,10 @@ class AssetGenerator extends Generator {
 			hash.update(module.error.toString());
 		}
 
-		const fullContentHash = /** @type {string} */ (
-			hash.digest(runtimeTemplate.outputOptions.hashDigest)
+		const fullContentHash = hash.digest(
+			runtimeTemplate.outputOptions.hashDigest
 		);
 
-		/** @type {string} */
 		const contentHash = nonNumericOnlyHash(
 			fullContentHash,
 			runtimeTemplate.outputOptions.hashDigestLength
@@ -381,7 +380,6 @@ class AssetGenerator extends Generator {
 		}
 
 		return {
-			// eslint-disable-next-line object-shorthand
 			assetPath: /** @type {string} */ (assetPath),
 			assetInfo: { sourceFilename, ...assetInfo }
 		};
@@ -615,7 +613,7 @@ class AssetGenerator extends Generator {
 
 			runtimeRequirements.add(RuntimeGlobals.module);
 
-			return new RawSource(`${RuntimeGlobals.module}.exports = ${content};`);
+			return new RawSource(`${module.moduleArgument}.exports = ${content};`);
 		} else if (type === "css-url") {
 			return null;
 		}

package/lib/asset/AssetSourceGenerator.js

@@ -65,7 +65,7 @@ class AssetSourceGenerator extends Generator {
 					} = ${JSON.stringify(encodedSource)};`;
 				} else {
 					runtimeRequirements.add(RuntimeGlobals.module);
-					sourceContent = `${RuntimeGlobals.module}.exports = ${JSON.stringify(
+					sourceContent = `${module.moduleArgument}.exports = ${JSON.stringify(
 						encodedSource
 					)};`;
 				}

package/lib/cache/getLazyHashedEtag.js

@@ -34,7 +34,7 @@ class LazyHashedEtag {
 		if (this._hash === undefined) {
 			const hash = createHash(this._hashFunction);
 			this._obj.updateHash(hash);
-			this._hash = /** @type {string} */ (hash.digest("base64"));
+			this._hash = hash.digest("base64");
 		}
 		return this._hash;
 	}

package/lib/config/browserslistTargetHandler.js

@@ -15,59 +15,46 @@ const browserslist = require("browserslist");
 // [[C:]/path/to/config][:env]
 const inputRx = /^(?:((?:[A-Z]:)?[/\\].*?))?(?::(.+?))?$/i;
 
-/**
- * @typedef {object} BrowserslistHandlerConfig
- * @property {string=} configPath
- * @property {string=} env
- * @property {string=} query
- */
-
 /**
  * @param {string | null | undefined} input input string
  * @param {string} context the context directory
- * @returns {BrowserslistHandlerConfig} config
+ * @returns {string[] | undefined} selected browsers
  */
-const parse = (input, context) => {
-	if (!input) {
-		return {};
-	}
-
-	if (path.isAbsolute(input)) {
+const load = (input, context) => {
+	// browserslist:path-to-config
+	// browserslist:path-to-config:env
+	if (input && path.isAbsolute(input)) {
 		const [, configPath, env] = inputRx.exec(input) || [];
-		return { configPath, env };
-	}
 
-	const config = browserslist.findConfig(context);
+		const config = browserslist.loadConfig({
+			config: configPath,
+			env
+		});
 
-	if (config && Object.keys(config).includes(input)) {
-		return { env: input };
+		return browserslist(config, { env });
 	}
 
-	return { query: input };
-};
+	const env = input || undefined;
 
-/**
- * @param {string | null | undefined} input input string
- * @param {string} context the context directory
- * @returns {string[] | undefined} selected browsers
- */
-const load = (input, context) => {
-	const { configPath, env, query } = parse(input, context);
+	const config = browserslist.loadConfig({
+		path: context,
+		env
+	});
 
-	// if a query is specified, then use it, else
-	// if a path to a config is specified then load it, else
-	// find a nearest config
-	const config =
-		query ||
-		(configPath
-			? browserslist.loadConfig({
-					config: configPath,
-					env
-				})
-			: browserslist.loadConfig({ path: context, env }));
+	// browserslist
+	// browserslist:env
+	if (config) {
+		try {
+			return browserslist(config, { env, throwOnMissing: true });
+		} catch (_err) {
+			// Nothing, no `env` was found in browserslist, maybe input is `queries`
+		}
+	}
 
-	if (!config) return;
-	return browserslist(config);
+	// browserslist:query
+	if (env) {
+		return browserslist(env);
+	}
 };
 
 /**
@@ -104,28 +91,6 @@ const resolve = (browsers) => {
 	const anyBrowser = browsers.some((b) => /^(?!node)/.test(b));
 	const browserProperty = !anyBrowser ? false : anyNode ? null : true;
 	const nodeProperty = !anyNode ? false : anyBrowser ? null : true;
-	// Internet Explorer Mobile, Blackberry browser and Opera Mini are very old browsers, they do not support new features
-	const es6DynamicImport = rawChecker({
-		/* eslint-disable camelcase */
-		chrome: 63,
-		and_chr: 63,
-		edge: 79,
-		firefox: 67,
-		and_ff: 67,
-		// ie: Not supported
-		opera: 50,
-		op_mob: 46,
-		safari: [11, 1],
-		ios_saf: [11, 3],
-		samsung: [8, 2],
-		android: 63,
-		and_qq: [10, 4],
-		baidu: [13, 18],
-		and_uc: [15, 5],
-		kaios: [3, 0],
-		node: [12, 17]
-		/* eslint-enable camelcase */
-	});
 
 	return {
 		/* eslint-disable camelcase */
@@ -188,9 +153,9 @@ const resolve = (browsers) => {
 			ios_saf: 7,
 			samsung: [3, 0],
 			android: 38,
-			// and_qq: Unknown support
+			and_qq: [10, 4],
 			// baidu: Unknown support
-			// and_uc: Unknown support
+			and_uc: [12, 12],
 			kaios: [3, 0],
 			node: [0, 12]
 		}),
@@ -207,9 +172,9 @@ const resolve = (browsers) => {
 			ios_saf: 8,
 			samsung: [5, 0],
 			android: 49,
-			// and_qq: Unknown support
+			and_qq: [10, 4],
 			// baidu: Unknown support
-			// and_uc: Unknown support
+			and_uc: [12, 12],
 			kaios: [2, 5],
 			node: [6, 0]
 		}),
@@ -253,8 +218,44 @@ const resolve = (browsers) => {
 			kaios: [3, 0],
 			node: [12, 17]
 		}),
-		dynamicImport: es6DynamicImport,
-		dynamicImportInWorker: es6DynamicImport && !anyNode,
+		dynamicImport: rawChecker({
+			chrome: 63,
+			and_chr: 63,
+			edge: 79,
+			firefox: 67,
+			and_ff: 67,
+			// ie: Not supported
+			opera: 50,
+			op_mob: 46,
+			safari: [11, 1],
+			ios_saf: [11, 3],
+			samsung: [8, 2],
+			android: 63,
+			and_qq: [10, 4],
+			baidu: [13, 18],
+			and_uc: [15, 5],
+			kaios: [3, 0],
+			node: [12, 17]
+		}),
+		dynamicImportInWorker: rawChecker({
+			chrome: 80,
+			and_chr: 80,
+			edge: 80,
+			firefox: 114,
+			and_ff: 114,
+			// ie: Not supported
+			opera: 67,
+			op_mob: 57,
+			safari: [15, 0],
+			ios_saf: [15, 0],
+			samsung: [13, 0],
+			android: 80,
+			and_qq: [10, 4],
+			baidu: [13, 18],
+			and_uc: [15, 5],
+			kaios: [3, 0],
+			node: [12, 17]
+		}),
 		// browserslist does not have info about globalThis
 		// so this is based on mdn-browser-compat-data
 		globalThis: rawChecker({
@@ -270,9 +271,9 @@ const resolve = (browsers) => {
 			ios_saf: [12, 2],
 			samsung: [10, 1],
 			android: 71,
-			// and_qq: Unknown support
+			and_qq: [13, 1],
 			// baidu: Unknown support
-			// and_uc: Unknown support
+			and_uc: [15, 5],
 			kaios: [3, 0],
 			node: 12
 		}),
@@ -289,9 +290,9 @@ const resolve = (browsers) => {
 			ios_saf: [13, 4],
 			samsung: 13,
 			android: 80,
-			// and_qq: Not supported
+			and_qq: [13, 1],
 			// baidu: Not supported
-			// and_uc: Not supported
+			and_uc: [15, 5],
 			kaios: [3, 0],
 			node: 14
 		}),
@@ -327,9 +328,9 @@ const resolve = (browsers) => {
 			ios_saf: 11,
 			samsung: [6, 2],
 			android: 55,
-			and_qq: [13, 1],
+			and_qq: [10, 4],
 			baidu: [13, 18],
-			and_uc: [15, 5],
+			and_uc: [12, 12],
 			kaios: 3,
 			node: [7, 6]
 		}),
@@ -345,7 +346,7 @@ const resolve = (browsers) => {
 		fetchWasm: browserProperty,
 		global: nodeProperty,
 		importScripts: false,
-		importScriptsInWorker: true,
+		importScriptsInWorker: Boolean(browserProperty),
 		nodeBuiltins: nodeProperty,
 		nodePrefixForCoreModules:
 			nodeProperty &&
@@ -353,6 +354,11 @@ const resolve = (browsers) => {
 			rawChecker({
 				node: [14, 18]
 			}),
+		importMetaDirnameAndFilename:
+			nodeProperty &&
+			rawChecker({
+				node: [22, 16]
+			}),
 		require: nodeProperty
 	};
 };