webpack 5.47.1 → 5.48.0

package/hot/only-dev-server.js

@@ -13,7 +13,7 @@ if (module.hot) {
 		module.hot
 			.check()
 			.then(function (updatedModules) {
-				if (!updatedModules) {
+				if (!updatedModules || updatedModules.length === 0) {
 					log("warning", "[HMR] Cannot find update. Need to do a full reload!");
 					log(
 						"warning",

package/hot/poll.js

@@ -12,7 +12,7 @@ if (module.hot) {
 			module.hot
 				.check(true)
 				.then(function (updatedModules) {
-					if (!updatedModules) {
+					if (!updatedModules || updatedModules.length === 0) {
 						if (fromUpdate) log("info", "[HMR] Update applied.");
 						return;
 					}

package/hot/signal.js

@@ -9,7 +9,7 @@ if (module.hot) {
 		module.hot
 			.check()
 			.then(function (updatedModules) {
-				if (!updatedModules) {
+				if (!updatedModules || updatedModules.length === 0) {
 					if (fromUpdate) log("info", "[HMR] Update applied.");
 					else log("warning", "[HMR] Cannot find update.");
 					return;

package/lib/NormalModule.js

@@ -293,9 +293,13 @@ class NormalModule extends Module {
 	 */
 	identifier() {
 		if (this.layer === null) {
-			return this.request;
+			if (this.type === "javascript/auto") {
+				return this.request;
+			} else {
+				return `${this.type}|${this.request}`;
+			}
 		} else {
-			return `${this.request}|${this.layer}`;
+			return `${this.type}|${this.request}|${this.layer}`;
 		}
 	}
 

package/lib/NormalModuleFactory.js

@@ -20,7 +20,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,6 +44,7 @@ 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 {Object} createData
  * @property {LazySet<string>} fileDependencies
@@ -182,7 +183,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"),
@@ -339,6 +341,7 @@ class NormalModuleFactory extends ModuleFactory {
 					context,
 					dependencies,
 					request,
+					assertions,
 					resolveOptions,
 					fileDependencies,
 					missingDependencies,
@@ -447,6 +450,7 @@ class NormalModuleFactory extends ModuleFactory {
 						resourceQuery: resourceDataForRules.query,
 						resourceFragment: resourceDataForRules.fragment,
 						scheme,
+						assertions,
 						mimetype: matchResourceData ? "" : resourceData.data.mimetype || "",
 						dependency: dependencyType,
 						descriptionData: matchResourceData
@@ -694,6 +698,7 @@ 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();
@@ -704,6 +709,7 @@ class NormalModuleFactory extends ModuleFactory {
 			resolveOptions,
 			context,
 			request,
+			assertions,
 			dependencies,
 			fileDependencies,
 			missingDependencies,

package/lib/config/defaults.js

@@ -482,18 +482,6 @@ const applyModuleDefaults = (
 					or: ["text/javascript", "application/javascript"]
 				},
 				...esm
-			},
-			{
-				dependency: "url",
-				oneOf: [
-					{
-						scheme: /^data$/,
-						type: "asset/inline"
-					},
-					{
-						type: "asset/resource"
-					}
-				]
 			}
 		];
 		if (asyncWebAssembly) {
@@ -541,6 +529,24 @@ const applyModuleDefaults = (
 				...wasm
 			});
 		}
+		rules.push(
+			{
+				dependency: "url",
+				oneOf: [
+					{
+						scheme: /^data$/,
+						type: "asset/inline"
+					},
+					{
+						type: "asset/resource"
+					}
+				]
+			},
+			{
+				assert: { type: "json" },
+				type: "json"
+			}
+		);
 		return rules;
 	});
 };

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);
 	}
 }

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -14,7 +14,11 @@ const HarmonyExports = require("./HarmonyExports");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
+/** @typedef {import("estree").ExportAllDeclaration} ExportAllDeclaration */
+/** @typedef {import("estree").ExportNamedDeclaration} ExportNamedDeclaration */
 /** @typedef {import("estree").Identifier} Identifier */
+/** @typedef {import("estree").ImportDeclaration} ImportDeclaration */
+/** @typedef {import("estree").ImportExpression} ImportExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
 /** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
@@ -29,8 +33,32 @@ const harmonySpecifierTag = Symbol("harmony import");
  * @property {number} sourceOrder
  * @property {string} name
  * @property {boolean} await
+ * @property {Record<string, any> | undefined} assertions
  */
 
+/**
+ * @param {ImportDeclaration | ExportNamedDeclaration | ExportAllDeclaration | ImportExpression} node node with assertions
+ * @returns {Record<string, any> | undefined} assertions
+ */
+function getAssertions(node) {
+	// TODO remove cast when @types/estree has been updated to import assertions
+	const assertions = /** @type {{ assertions?: ImportAttributeNode[] }} */ (
+		node
+	).assertions;
+	if (assertions === undefined) {
+		return undefined;
+	}
+	const result = {};
+	for (const assertion of assertions) {
+		const key =
+			assertion.key.type === "Identifier"
+				? assertion.key.name
+				: assertion.key.value;
+		result[key] = assertion.value.value;
+	}
+	return result;
+}
+
 module.exports = class HarmonyImportDependencyParserPlugin {
 	constructor(options) {
 		this.strictExportPresence = options.strictExportPresence;
@@ -65,9 +93,11 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				clearDep.loc = statement.loc;
 				parser.state.module.addPresentationalDependency(clearDep);
 				parser.unsetAsiPosition(statement.range[1]);
+				const assertions = getAssertions(statement);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					source,
-					parser.state.lastHarmonyImportOrder
+					parser.state.lastHarmonyImportOrder,
+					assertions
 				);
 				sideEffectDep.loc = statement.loc;
 				parser.state.module.addDependency(sideEffectDep);
@@ -82,7 +112,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					name,
 					source,
 					ids,
-					sourceOrder: parser.state.lastHarmonyImportOrder
+					sourceOrder: parser.state.lastHarmonyImportOrder,
+					assertions: getAssertions(statement)
 				});
 				return true;
 			}
@@ -97,7 +128,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.ids,
 					settings.name,
 					expr.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.shorthand = parser.scope.inShorthand;
 				dep.directImport = true;
@@ -118,7 +150,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					ids,
 					settings.name,
 					expr.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
 				dep.loc = expr.loc;
@@ -138,7 +171,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					ids,
 					settings.name,
 					callee.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.directImport = members.length === 0;
 				dep.call = true;
@@ -206,3 +240,4 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 };
 
 module.exports.harmonySpecifierTag = harmonySpecifierTag;
+module.exports.getAssertions = getAssertions;

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -20,8 +20,8 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
-	constructor(request, sourceOrder) {
-		super(request, sourceOrder);
+	constructor(request, sourceOrder, assertions) {
+		super(request, sourceOrder, assertions);
 	}
 
 	get type() {

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -29,8 +29,16 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
 
 class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
-	constructor(request, sourceOrder, ids, name, range, strictExportPresence) {
-		super(request, sourceOrder);
+	constructor(
+		request,
+		sourceOrder,
+		ids,
+		name,
+		range,
+		strictExportPresence,
+		assertions
+	) {
+		super(request, sourceOrder, assertions);
 		this.ids = ids;
 		this.name = name;
 		this.range = range;

package/lib/dependencies/ModuleDependency.js

@@ -22,13 +22,20 @@ class ModuleDependency extends Dependency {
 		this.request = request;
 		this.userRequest = request;
 		this.range = undefined;
+		// assertions must be serialized by subclasses that use it
+		/** @type {Record<string, any> | undefined} */
+		this.assertions = undefined;
 	}
 
 	/**
 	 * @returns {string | null} an identifier to merge equal requests
 	 */
 	getResourceIdentifier() {
-		return `module${this.request}`;
+		let str = `module${this.request}`;
+		if (this.assertions !== undefined) {
+			str += JSON.stringify(this.assertions);
+		}
+		return str;
 	}
 
 	/**

package/lib/javascript/JavascriptParser.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const { Parser: AcornParser } = require("acorn");
+const { importAssertions } = require("acorn-import-assertions");
 const { SyncBailHook, HookMap } = require("tapable");
 const vm = require("vm");
 const Parser = require("../Parser");
@@ -42,6 +43,10 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 /** @typedef {import("estree").Node} AnyNode */
 /** @typedef {import("estree").Program} ProgramNode */
 /** @typedef {import("estree").Statement} StatementNode */
+/** @typedef {import("estree").ImportDeclaration} ImportDeclarationNode */
+/** @typedef {import("estree").ExportNamedDeclaration} ExportNamedDeclarationNode */
+/** @typedef {import("estree").ExportDefaultDeclaration} ExportDefaultDeclarationNode */
+/** @typedef {import("estree").ExportAllDeclaration} ExportAllDeclarationNode */
 /** @typedef {import("estree").Super} SuperNode */
 /** @typedef {import("estree").TaggedTemplateExpression} TaggedTemplateExpressionNode */
 /** @typedef {import("estree").TemplateLiteral} TemplateLiteralNode */
@@ -61,7 +66,7 @@ const ALLOWED_MEMBER_TYPES_ALL = 0b11;
 
 // Syntax: https://developer.mozilla.org/en/SpiderMonkey/Parser_API
 
-const parser = AcornParser;
+const parser = AcornParser.extend(importAssertions);
 
 class VariableInfo {
 	/**
@@ -190,31 +195,31 @@ class JavascriptParser extends Parser {
 			]),
 			/** @type {HookMap<SyncBailHook<[LabeledStatementNode], boolean | void>>} */
 			label: new HookMap(() => new SyncBailHook(["statement"])),
-			/** @type {SyncBailHook<[StatementNode, ImportSource], boolean | void>} */
+			/** @type {SyncBailHook<[ImportDeclarationNode, ImportSource], boolean | void>} */
 			import: new SyncBailHook(["statement", "source"]),
-			/** @type {SyncBailHook<[StatementNode, ImportSource, string, string], boolean | void>} */
+			/** @type {SyncBailHook<[ImportDeclarationNode, ImportSource, string, string], boolean | void>} */
 			importSpecifier: new SyncBailHook([
 				"statement",
 				"source",
 				"exportName",
 				"identifierName"
 			]),
-			/** @type {SyncBailHook<[StatementNode], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode], boolean | void>} */
 			export: new SyncBailHook(["statement"]),
-			/** @type {SyncBailHook<[StatementNode, ImportSource], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode, ImportSource], boolean | void>} */
 			exportImport: new SyncBailHook(["statement", "source"]),
-			/** @type {SyncBailHook<[StatementNode, DeclarationNode], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode, DeclarationNode], boolean | void>} */
 			exportDeclaration: new SyncBailHook(["statement", "declaration"]),
-			/** @type {SyncBailHook<[StatementNode, DeclarationNode], boolean | void>} */
+			/** @type {SyncBailHook<[ExportDefaultDeclarationNode, DeclarationNode], boolean | void>} */
 			exportExpression: new SyncBailHook(["statement", "declaration"]),
-			/** @type {SyncBailHook<[StatementNode, string, string, number | undefined], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode, string, string, number | undefined], boolean | void>} */
 			exportSpecifier: new SyncBailHook([
 				"statement",
 				"identifierName",
 				"exportName",
 				"index"
 			]),
-			/** @type {SyncBailHook<[StatementNode, ImportSource, string, string, number | undefined], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode, ImportSource, string, string, number | undefined], boolean | void>} */
 			exportImportSpecifier: new SyncBailHook([
 				"statement",
 				"source",

package/lib/rules/{DescriptionDataMatcherRulePlugin.js → ObjectMatcherRulePlugin.js}

@@ -8,28 +8,32 @@
 /** @typedef {import("./RuleSetCompiler")} RuleSetCompiler */
 /** @typedef {import("./RuleSetCompiler").RuleCondition} RuleCondition */
 
-const RULE_PROPERTY = "descriptionData";
+class ObjectMatcherRulePlugin {
+	constructor(ruleProperty, dataProperty) {
+		this.ruleProperty = ruleProperty;
+		this.dataProperty = dataProperty || ruleProperty;
+	}
 
-class DescriptionDataMatcherRulePlugin {
 	/**
 	 * @param {RuleSetCompiler} ruleSetCompiler the rule set compiler
 	 * @returns {void}
 	 */
 	apply(ruleSetCompiler) {
+		const { ruleProperty, dataProperty } = this;
 		ruleSetCompiler.hooks.rule.tap(
-			"DescriptionDataMatcherRulePlugin",
+			"ObjectMatcherRulePlugin",
 			(path, rule, unhandledProperties, result) => {
-				if (unhandledProperties.has(RULE_PROPERTY)) {
-					unhandledProperties.delete(RULE_PROPERTY);
-					const value = rule[RULE_PROPERTY];
+				if (unhandledProperties.has(ruleProperty)) {
+					unhandledProperties.delete(ruleProperty);
+					const value = rule[ruleProperty];
 					for (const property of Object.keys(value)) {
-						const dataProperty = property.split(".");
+						const nestedDataProperties = property.split(".");
 						const condition = ruleSetCompiler.compileCondition(
-							`${path}.${RULE_PROPERTY}.${property}`,
+							`${path}.${ruleProperty}.${property}`,
 							value[property]
 						);
 						result.conditions.push({
-							property: ["descriptionData", ...dataProperty],
+							property: [dataProperty, ...nestedDataProperties],
 							matchWhenEmpty: condition.matchWhenEmpty,
 							fn: condition.fn
 						});
@@ -40,4 +44,4 @@ class DescriptionDataMatcherRulePlugin {
 	}
 }
 
-module.exports = DescriptionDataMatcherRulePlugin;
+module.exports = ObjectMatcherRulePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.47.1",
+  "version": "5.48.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",
@@ -11,6 +11,7 @@
     "@webassemblyjs/wasm-edit": "1.11.1",
     "@webassemblyjs/wasm-parser": "1.11.1",
     "acorn": "^8.4.1",
+    "acorn-import-assertions": "^1.7.6",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
     "enhanced-resolve": "^5.8.0",
@@ -27,7 +28,7 @@
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.1.3",
     "watchpack": "^2.2.0",
-    "webpack-sources": "^3.1.1"
+    "webpack-sources": "^3.2.0"
   },
   "peerDependenciesMeta": {
     "webpack-cli": {