webpack 5.47.0 → 5.50.0

package/lib/NormalModuleFactory.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { getContext } = require("loader-runner");
 const asyncLib = require("neo-async");
 const {
 	AsyncSeriesBailHook,
@@ -20,7 +21,7 @@ const ModuleGraph = require("./ModuleGraph");
 const NormalModule = require("./NormalModule");
 const BasicEffectRulePlugin = require("./rules/BasicEffectRulePlugin");
 const BasicMatcherRulePlugin = require("./rules/BasicMatcherRulePlugin");
-const DescriptionDataMatcherRulePlugin = require("./rules/DescriptionDataMatcherRulePlugin");
+const ObjectMatcherRulePlugin = require("./rules/ObjectMatcherRulePlugin");
 const RuleSetCompiler = require("./rules/RuleSetCompiler");
 const UseEffectRulePlugin = require("./rules/UseEffectRulePlugin");
 const LazySet = require("./util/LazySet");
@@ -44,7 +45,9 @@ const { parseResource } = require("./util/identifier");
  * @property {ModuleFactoryCreateData["resolveOptions"]} resolveOptions
  * @property {string} context
  * @property {string} request
+ * @property {Record<string, any> | undefined} assertions
  * @property {ModuleDependency[]} dependencies
+ * @property {string} dependencyType
  * @property {Object} createData
  * @property {LazySet<string>} fileDependencies
  * @property {LazySet<string>} missingDependencies
@@ -58,6 +61,7 @@ const { parseResource } = require("./util/identifier");
  * @property {string} path
  * @property {string} query
  * @property {string} fragment
+ * @property {string=} context
  */
 
 /** @typedef {ResourceData & { data: Record<string, any> }} ResourceDataWithData */
@@ -65,6 +69,7 @@ const { parseResource } = require("./util/identifier");
 const EMPTY_RESOLVE_OPTIONS = {};
 const EMPTY_PARSER_OPTIONS = {};
 const EMPTY_GENERATOR_OPTIONS = {};
+const EMPTY_ELEMENTS = [];
 
 const MATCH_RESOURCE_REGEX = /^([^!]+)!=!/;
 
@@ -182,7 +187,8 @@ const ruleSetCompiler = new RuleSetCompiler([
 	new BasicMatcherRulePlugin("issuer"),
 	new BasicMatcherRulePlugin("compiler"),
 	new BasicMatcherRulePlugin("issuerLayer"),
-	new DescriptionDataMatcherRulePlugin(),
+	new ObjectMatcherRulePlugin("assert", "assertions"),
+	new ObjectMatcherRulePlugin("descriptionData"),
 	new BasicEffectRulePlugin("type"),
 	new BasicEffectRulePlugin("sideEffects"),
 	new BasicEffectRulePlugin("parser"),
@@ -218,6 +224,10 @@ class NormalModuleFactory extends ModuleFactory {
 			resolveForScheme: new HookMap(
 				() => new AsyncSeriesBailHook(["resourceData", "resolveData"])
 			),
+			/** @type {HookMap<AsyncSeriesBailHook<[ResourceDataWithData, ResolveData], true | void>>} */
+			resolveInScheme: new HookMap(
+				() => new AsyncSeriesBailHook(["resourceData", "resolveData"])
+			),
 			/** @type {AsyncSeriesBailHook<[ResolveData], TODO>} */
 			factorize: new AsyncSeriesBailHook(["resolveData"]),
 			/** @type {AsyncSeriesBailHook<[ResolveData], TODO>} */
@@ -338,55 +348,84 @@ class NormalModuleFactory extends ModuleFactory {
 					contextInfo,
 					context,
 					dependencies,
+					dependencyType,
 					request,
+					assertions,
 					resolveOptions,
 					fileDependencies,
 					missingDependencies,
 					contextDependencies
 				} = data;
-				const dependencyType =
-					(dependencies.length > 0 && dependencies[0].category) || "";
 				const loaderResolver = this.getResolver("loader");
 
 				/** @type {ResourceData | undefined} */
 				let matchResourceData = undefined;
 				/** @type {string} */
-				let requestWithoutMatchResource = request;
-				const matchResourceMatch = MATCH_RESOURCE_REGEX.exec(request);
-				if (matchResourceMatch) {
-					let matchResource = matchResourceMatch[1];
-					if (matchResource.charCodeAt(0) === 46) {
-						// 46 === ".", 47 === "/"
-						const secondChar = matchResource.charCodeAt(1);
-						if (
-							secondChar === 47 ||
-							(secondChar === 46 && matchResource.charCodeAt(2) === 47)
-						) {
-							// if matchResources startsWith ../ or ./
-							matchResource = join(this.fs, context, matchResource);
+				let unresolvedResource;
+				/** @type {{loader: string, options: string|undefined}[]} */
+				let elements;
+				let noPreAutoLoaders = false;
+				let noAutoLoaders = false;
+				let noPrePostAutoLoaders = false;
+
+				const contextScheme = getScheme(context);
+				/** @type {string | undefined} */
+				let scheme = getScheme(request);
+
+				if (!scheme) {
+					/** @type {string} */
+					let requestWithoutMatchResource = request;
+					const matchResourceMatch = MATCH_RESOURCE_REGEX.exec(request);
+					if (matchResourceMatch) {
+						let matchResource = matchResourceMatch[1];
+						if (matchResource.charCodeAt(0) === 46) {
+							// 46 === ".", 47 === "/"
+							const secondChar = matchResource.charCodeAt(1);
+							if (
+								secondChar === 47 ||
+								(secondChar === 46 && matchResource.charCodeAt(2) === 47)
+							) {
+								// if matchResources startsWith ../ or ./
+								matchResource = join(this.fs, context, matchResource);
+							}
 						}
+						matchResourceData = {
+							resource: matchResource,
+							...cacheParseResource(matchResource)
+						};
+						requestWithoutMatchResource = request.substr(
+							matchResourceMatch[0].length
+						);
 					}
-					matchResourceData = {
-						resource: matchResource,
-						...cacheParseResource(matchResource)
-					};
-					requestWithoutMatchResource = request.substr(
-						matchResourceMatch[0].length
-					);
-				}
 
-				const firstChar = requestWithoutMatchResource.charCodeAt(0);
-				const secondChar = requestWithoutMatchResource.charCodeAt(1);
-				const noPreAutoLoaders = firstChar === 45 && secondChar === 33; // startsWith "-!"
-				const noAutoLoaders = noPreAutoLoaders || firstChar === 33; // startsWith "!"
-				const noPrePostAutoLoaders = firstChar === 33 && secondChar === 33; // startsWith "!!";
-				const rawElements = requestWithoutMatchResource
-					.slice(
-						noPreAutoLoaders || noPrePostAutoLoaders ? 2 : noAutoLoaders ? 1 : 0
-					)
-					.split(/!+/);
-				const unresolvedResource = rawElements.pop();
-				const elements = rawElements.map(identToLoaderRequest);
+					scheme = getScheme(requestWithoutMatchResource);
+
+					if (!scheme && !contextScheme) {
+						const firstChar = requestWithoutMatchResource.charCodeAt(0);
+						const secondChar = requestWithoutMatchResource.charCodeAt(1);
+						noPreAutoLoaders = firstChar === 45 && secondChar === 33; // startsWith "-!"
+						noAutoLoaders = noPreAutoLoaders || firstChar === 33; // startsWith "!"
+						noPrePostAutoLoaders = firstChar === 33 && secondChar === 33; // startsWith "!!";
+						const rawElements = requestWithoutMatchResource
+							.slice(
+								noPreAutoLoaders || noPrePostAutoLoaders
+									? 2
+									: noAutoLoaders
+									? 1
+									: 0
+							)
+							.split(/!+/);
+						unresolvedResource = rawElements.pop();
+						elements = rawElements.map(identToLoaderRequest);
+						scheme = getScheme(unresolvedResource);
+					} else {
+						unresolvedResource = requestWithoutMatchResource;
+						elements = EMPTY_ELEMENTS;
+					}
+				} else {
+					unresolvedResource = request;
+					elements = EMPTY_ELEMENTS;
+				}
 
 				const resolveContext = {
 					fileDependencies,
@@ -396,8 +435,6 @@ class NormalModuleFactory extends ModuleFactory {
 
 				/** @type {ResourceDataWithData} */
 				let resourceData;
-				/** @type {string | undefined} */
-				const scheme = getScheme(unresolvedResource);
 
 				let loaders;
 
@@ -447,6 +484,7 @@ class NormalModuleFactory extends ModuleFactory {
 						resourceQuery: resourceDataForRules.query,
 						resourceFragment: resourceDataForRules.fragment,
 						scheme,
+						assertions,
 						mimetype: matchResourceData ? "" : resourceData.data.mimetype || "",
 						dependency: dependencyType,
 						descriptionData: matchResourceData
@@ -536,6 +574,8 @@ class NormalModuleFactory extends ModuleFactory {
 								rawRequest: request,
 								loaders: allLoaders,
 								resource: resourceData.resource,
+								context:
+									resourceData.context || getContext(resourceData.resource),
 								matchResource: matchResourceData
 									? matchResourceData.resource
 									: undefined,
@@ -590,7 +630,7 @@ class NormalModuleFactory extends ModuleFactory {
 
 				this.resolveRequestArray(
 					contextInfo,
-					context,
+					contextScheme ? this.context : context,
 					elements,
 					loaderResolver,
 					resolveContext,
@@ -601,6 +641,49 @@ class NormalModuleFactory extends ModuleFactory {
 					}
 				);
 
+				const defaultResolve = context => {
+					if (/^($|\?)/.test(unresolvedResource)) {
+						resourceData = {
+							resource: unresolvedResource,
+							data: {},
+							...cacheParseResource(unresolvedResource)
+						};
+						continueCallback();
+					}
+
+					// resource without scheme and with path
+					else {
+						const normalResolver = this.getResolver(
+							"normal",
+							dependencyType
+								? cachedSetProperty(
+										resolveOptions || EMPTY_RESOLVE_OPTIONS,
+										"dependencyType",
+										dependencyType
+								  )
+								: resolveOptions
+						);
+						this.resolveResource(
+							contextInfo,
+							context,
+							unresolvedResource,
+							normalResolver,
+							resolveContext,
+							(err, resolvedResource, resolvedResourceResolveData) => {
+								if (err) return continueCallback(err);
+								if (resolvedResource !== false) {
+									resourceData = {
+										resource: resolvedResource,
+										data: resolvedResourceResolveData,
+										...cacheParseResource(resolvedResource)
+									};
+								}
+								continueCallback();
+							}
+						);
+					}
+				};
+
 				// resource with scheme
 				if (scheme) {
 					resourceData = {
@@ -608,7 +691,8 @@ class NormalModuleFactory extends ModuleFactory {
 						data: {},
 						path: undefined,
 						query: undefined,
-						fragment: undefined
+						fragment: undefined,
+						context: undefined
 					};
 					this.hooks.resolveForScheme
 						.for(scheme)
@@ -618,47 +702,27 @@ class NormalModuleFactory extends ModuleFactory {
 						});
 				}
 
-				// resource without scheme and without path
-				else if (/^($|\?)/.test(unresolvedResource)) {
+				// resource within scheme
+				else if (contextScheme) {
 					resourceData = {
 						resource: unresolvedResource,
 						data: {},
-						...cacheParseResource(unresolvedResource)
+						path: undefined,
+						query: undefined,
+						fragment: undefined,
+						context: undefined
 					};
-					continueCallback();
-				}
-
-				// resource without scheme and with path
-				else {
-					const normalResolver = this.getResolver(
-						"normal",
-						dependencyType
-							? cachedSetProperty(
-									resolveOptions || EMPTY_RESOLVE_OPTIONS,
-									"dependencyType",
-									dependencyType
-							  )
-							: resolveOptions
-					);
-					this.resolveResource(
-						contextInfo,
-						context,
-						unresolvedResource,
-						normalResolver,
-						resolveContext,
-						(err, resolvedResource, resolvedResourceResolveData) => {
+					this.hooks.resolveInScheme
+						.for(contextScheme)
+						.callAsync(resourceData, data, (err, handled) => {
 							if (err) return continueCallback(err);
-							if (resolvedResource !== false) {
-								resourceData = {
-									resource: resolvedResource,
-									data: resolvedResourceResolveData,
-									...cacheParseResource(resolvedResource)
-								};
-							}
+							if (!handled) return defaultResolve(this.context);
 							continueCallback();
-						}
-					);
+						});
 				}
+
+				// resource without scheme and without path
+				else defaultResolve(context);
 			}
 		);
 	}
@@ -694,17 +758,22 @@ class NormalModuleFactory extends ModuleFactory {
 		const resolveOptions = data.resolveOptions || EMPTY_RESOLVE_OPTIONS;
 		const dependency = dependencies[0];
 		const request = dependency.request;
+		const assertions = dependency.assertions;
 		const contextInfo = data.contextInfo;
 		const fileDependencies = new LazySet();
 		const missingDependencies = new LazySet();
 		const contextDependencies = new LazySet();
+		const dependencyType =
+			(dependencies.length > 0 && dependencies[0].category) || "";
 		/** @type {ResolveData} */
 		const resolveData = {
 			contextInfo,
 			resolveOptions,
 			context,
 			request,
+			assertions,
 			dependencies,
+			dependencyType,
 			fileDependencies,
 			missingDependencies,
 			contextDependencies,
@@ -851,7 +920,7 @@ ${hints.join("\n\n")}`;
 										null,
 										`Did you mean '${resource}'?
 BREAKING CHANGE: The request '${unresolvedResource}' failed to resolve only because it was resolved as fully specified
-(probably because the origin is a '*.mjs' file or a '*.js' file where the package.json contains '"type": "module"').
+(probably because the origin is strict EcmaScript Module, e. g. a module with javascript mimetype, a '*.mjs' file, or a '*.js' file where the package.json contains '"type": "module"').
 The extension in the request is mandatory for it to be fully specified.
 Add the extension to the request.`
 									);

package/lib/Parser.js

@@ -12,6 +12,7 @@
 
 /**
  * @typedef {Object} ParserStateBase
+ * @property {string | Buffer} source
  * @property {NormalModule} current
  * @property {NormalModule} module
  * @property {Compilation} compilation

package/lib/WebpackOptionsApply.js

@@ -276,6 +276,14 @@ class WebpackOptionsApply extends OptionsApply {
 			}).apply(compiler);
 		}
 
+		if (options.experiments.buildHttp) {
+			const HttpUriPlugin = require("./schemes/HttpUriPlugin");
+			const httpOptions = options.experiments.buildHttp;
+			if (httpOptions === true)
+				throw new Error("Unexpected due to normalization");
+			new HttpUriPlugin(httpOptions).apply(compiler);
+		}
+
 		new EntryOptionPlugin().apply(compiler);
 		compiler.hooks.entryOption.call(options.context, options.entry);
 

package/lib/asset/AssetModulesPlugin.js

@@ -120,7 +120,6 @@ class AssetModulesPlugin {
 				for (const type of ["asset", "asset/inline", "asset/resource"]) {
 					normalModuleFactory.hooks.createGenerator
 						.for(type)
-						// eslint-disable-next-line no-loop-func
 						.tap(plugin, generatorOptions => {
 							validateGeneratorOptions[type](generatorOptions);
 

package/lib/config/defaults.js

@@ -171,7 +171,7 @@ const applyWebpackOptionsDefaults = options => {
 
 	applySnapshotDefaults(options.snapshot, { production });
 
-	applyExperimentsDefaults(options.experiments);
+	applyExperimentsDefaults(options.experiments, { production, development });
 
 	applyModuleDefaults(options.module, {
 		cache,
@@ -193,7 +193,10 @@ const applyWebpackOptionsDefaults = options => {
 		module: options.module
 	});
 
-	applyExternalsPresetsDefaults(options.externalsPresets, { targetProperties });
+	applyExternalsPresetsDefaults(options.externalsPresets, {
+		targetProperties,
+		buildHttp: !!options.experiments.buildHttp
+	});
 
 	applyLoaderDefaults(options.loader, { targetProperties });
 
@@ -245,13 +248,26 @@ const applyWebpackOptionsDefaults = options => {
 
 /**
  * @param {Experiments} experiments options
+ * @param {Object} options options
+ * @param {boolean} options.production is production
+ * @param {boolean} options.development is development mode
  * @returns {void}
  */
-const applyExperimentsDefaults = experiments => {
+const applyExperimentsDefaults = (experiments, { production, development }) => {
 	D(experiments, "topLevelAwait", false);
 	D(experiments, "syncWebAssembly", false);
 	D(experiments, "asyncWebAssembly", false);
 	D(experiments, "outputModule", false);
+	D(experiments, "asset", false);
+	D(experiments, "executeModule", false);
+	D(experiments, "layers", false);
+	D(experiments, "lazyCompilation", false);
+	D(experiments, "buildHttp", false);
+
+	if (typeof experiments.buildHttp === "object") {
+		D(experiments.buildHttp, "frozen", production);
+		D(experiments.buildHttp, "upgrade", development);
+	}
 };
 
 /**
@@ -298,7 +314,7 @@ const applyCacheDefaults = (cache, { name, mode, development }) => {
 			);
 			D(cache, "hashAlgorithm", "md4");
 			D(cache, "store", "pack");
-			D(cache, "compression", development ? false : "gzip");
+			D(cache, "compression", false);
 			D(cache, "profile", false);
 			D(cache, "idleTimeout", 60000);
 			D(cache, "idleTimeoutForInitialStore", 5000);
@@ -482,18 +498,6 @@ const applyModuleDefaults = (
 					or: ["text/javascript", "application/javascript"]
 				},
 				...esm
-			},
-			{
-				dependency: "url",
-				oneOf: [
-					{
-						scheme: /^data$/,
-						type: "asset/inline"
-					},
-					{
-						type: "asset/resource"
-					}
-				]
 			}
 		];
 		if (asyncWebAssembly) {
@@ -541,6 +545,24 @@ const applyModuleDefaults = (
 				...wasm
 			});
 		}
+		rules.push(
+			{
+				dependency: "url",
+				oneOf: [
+					{
+						scheme: /^data$/,
+						type: "asset/inline"
+					},
+					{
+						type: "asset/resource"
+					}
+				]
+			},
+			{
+				assert: { type: "json" },
+				type: "json"
+			}
+		);
 		return rules;
 	});
 };
@@ -854,13 +876,18 @@ const applyOutputDefaults = (
  * @param {ExternalsPresets} externalsPresets options
  * @param {Object} options options
  * @param {TargetProperties | false} options.targetProperties target properties
+ * @param {boolean} options.buildHttp buildHttp experiment enabled
  * @returns {void}
  */
 const applyExternalsPresetsDefaults = (
 	externalsPresets,
-	{ targetProperties }
+	{ targetProperties, buildHttp }
 ) => {
-	D(externalsPresets, "web", targetProperties && targetProperties.web);
+	D(
+		externalsPresets,
+		"web",
+		!buildHttp && targetProperties && targetProperties.web
+	);
 	D(externalsPresets, "node", targetProperties && targetProperties.node);
 	D(externalsPresets, "nwjs", targetProperties && targetProperties.nwjs);
 	D(

package/lib/config/normalization.js

@@ -171,7 +171,12 @@ const getNormalizedWebpackOptions = config => {
 							Promise.resolve().then(fn).then(getNormalizedEntryStatic)
 				  )(config.entry)
 				: getNormalizedEntryStatic(config.entry),
-		experiments: cloneObject(config.experiments),
+		experiments: nestedConfig(config.experiments, experiments => ({
+			...experiments,
+			buildHttp: optionalNestedConfig(experiments.buildHttp, options =>
+				options === true ? {} : options
+			)
+		})),
 		externals: config.externals,
 		externalsPresets: cloneObject(config.externalsPresets),
 		externalsType: config.externalsType,

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -12,7 +12,8 @@ const HarmonyExportHeaderDependency = require("./HarmonyExportHeaderDependency")
 const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImportedSpecifierDependency");
 const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
 const {
-	harmonySpecifierTag
+	harmonySpecifierTag,
+	getAssertions
 } = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 
@@ -48,7 +49,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				parser.state.module.addPresentationalDependency(clearDep);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					source,
-					parser.state.lastHarmonyImportOrder
+					parser.state.lastHarmonyImportOrder,
+					getAssertions(statement)
 				);
 				sideEffectDep.loc = Object.create(statement.loc);
 				sideEffectDep.loc.index = -1;
@@ -127,7 +129,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						harmonyNamedExports,
 						null,
 						this.strictExportPresence,
-						null
+						null,
+						settings.assertions
 					);
 				} else {
 					dep = new HarmonyExportSpecifierDependency(id, name);

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -159,6 +159,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | Iterable<HarmonyExportImportedSpecifierDependency>} otherStarExports other star exports in the module before this import
 	 * @param {boolean} strictExportPresence when true, missing exports in the imported module lead to errors instead of warnings
 	 * @param {HarmonyStarExportsList} allStarExports all star exports in the module
+	 * @param {Record<string, any>=} assertions import assertions
 	 */
 	constructor(
 		request,
@@ -168,9 +169,10 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		activeExports,
 		otherStarExports,
 		strictExportPresence,
-		allStarExports
+		allStarExports,
+		assertions
 	) {
-		super(request, sourceOrder);
+		super(request, sourceOrder, assertions);
 
 		this.ids = ids;
 		this.name = name;

package/lib/dependencies/HarmonyImportDependency.js

@@ -32,10 +32,12 @@ class HarmonyImportDependency extends ModuleDependency {
 	 *
 	 * @param {string} request request string
 	 * @param {number} sourceOrder source order
+	 * @param {Record<string, any>=} assertions import assertions
 	 */
-	constructor(request, sourceOrder) {
+	constructor(request, sourceOrder, assertions) {
 		super(request);
 		this.sourceOrder = sourceOrder;
+		this.assertions = assertions;
 	}
 
 	get category() {
@@ -201,12 +203,14 @@ class HarmonyImportDependency extends ModuleDependency {
 	serialize(context) {
 		const { write } = context;
 		write(this.sourceOrder);
+		write(this.assertions);
 		super.serialize(context);
 	}
 
 	deserialize(context) {
 		const { read } = context;
 		this.sourceOrder = read();
+		this.assertions = read();
 		super.deserialize(context);
 	}
 }