webpack 5.3.2 → 5.4.0

package/lib/Module.js

@@ -415,19 +415,20 @@ class Module extends DependenciesBlock {
 	getExportsType(moduleGraph, strict) {
 		switch (this.buildMeta && this.buildMeta.exportsType) {
 			case "flagged":
-				return strict ? "default-only" : "namespace";
+				return strict ? "default-with-named" : "namespace";
 			case "namespace":
 				return "namespace";
 			case "default":
 				switch (this.buildMeta.defaultObject) {
 					case "redirect":
+						return "default-with-named";
 					case "redirect-warn":
 						return strict ? "default-only" : "default-with-named";
 					default:
 						return "default-only";
 				}
 			case "dynamic": {
-				if (strict) return "default-only";
+				if (strict) return "default-with-named";
 				// Try to figure out value of __esModule by following reexports
 				const handleDefault = () => {
 					switch (this.buildMeta.defaultObject) {
@@ -465,7 +466,7 @@ class Module extends DependenciesBlock {
 				}
 			}
 			default:
-				return strict ? "default-only" : "dynamic";
+				return strict ? "default-with-named" : "dynamic";
 		}
 	}
 

package/lib/WebpackOptionsApply.js

@@ -124,7 +124,7 @@ class WebpackOptionsApply extends OptionsApply {
 				}
 				case "module":
 					throw new Error(
-						"EcmaScript Module CHunk Format is not implemented yet"
+						"EcmaScript Module Chunk Format is not implemented yet"
 					);
 				default:
 					throw new Error(

package/lib/config/browserslistTargetHandler.js

@@ -75,29 +75,6 @@ const load = (input, context) => {
  * @returns {EcmaTargetProperties & PlatformTargetProperties & ApiTargetProperties} target properties
  */
 const resolve = browsers => {
-	/**
-	 * Checks only browser against the browserslist feature query
-	 * @param {string} feature an ES feature to test
-	 * @returns {boolean} true if supports
-	 */
-	const browserslistChecker = feature => {
-		const supportsFeature = browserslist(`supports ${feature}`);
-		return browsers.every(v => /^node /.test(v) || supportsFeature.includes(v));
-	};
-	/**
-	 * Checks only node.js version against a version
-	 * @param {number} major major version
-	 * @param {number} minor minor version
-	 * @returns {boolean} true if supports
-	 */
-	const nodeChecker = (major, minor = 0) => {
-		return browsers.every(v => {
-			const match = /^node (\d+)(?:\.\d+)?/.exec(v);
-			if (!match) return true;
-			const [, v1, v2] = match;
-			return major === +v1 ? +v2 >= minor : +v1 > major;
-		});
-	};
 	/**
 	 * Checks all against a version number
 	 * @param {Record<string, number | [number, number]>} versions first supported version
@@ -105,50 +82,197 @@ const resolve = browsers => {
 	 */
 	const rawChecker = versions => {
 		return browsers.every(v => {
-			const match = /^([^ ]+) (\d+)(?:\.\d+)?/.exec(v);
-			if (!match) return false;
-			const [, name, major, minor] = match;
-			const version = versions[name];
-			if (!version) return false;
-			if (typeof version === "number") return +major >= version;
-			return version[0] === +major ? +minor >= version[1] : +major > version[0];
+			const [name, parsedVersion] = v.split(" ");
+			if (!name) return false;
+			const requiredVersion = versions[name];
+			if (!requiredVersion) return false;
+			const [parsedMajor, parserMinor] =
+				// safari TP supports all features for normal safari
+				parsedVersion === "TP"
+					? [Infinity, Infinity]
+					: parsedVersion.split(".");
+			if (typeof requiredVersion === "number") {
+				return +parsedMajor >= requiredVersion;
+			}
+			return requiredVersion[0] === +parsedMajor
+				? +parserMinor >= requiredVersion[1]
+				: +parsedMajor > requiredVersion[0];
 		});
 	};
 	const anyNode = browsers.some(b => /^node /.test(b));
 	const anyBrowser = browsers.some(b => /^(?!node)/.test(b));
 	const browserProperty = !anyBrowser ? false : anyNode ? null : true;
 	const nodeProperty = !anyNode ? false : anyBrowser ? null : true;
-	const es6 = browserslistChecker("es6");
-	const letConst = browserslistChecker("let");
-	const arrowFunctions = browserslistChecker("arrow-functions");
-	const es6DynamicImport = browserslistChecker("es6-module-dynamic-import");
-	const node6 = nodeChecker(6);
+	// Internet Explorer Mobile, Blackberry browser and Opera Mini are very old browsers, they do not support new features
+	const es6DynamicImport = 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: Not supported
+		// and_uc: Not supported
+		// kaios: Not supported
+		// Since Node.js 13.14.0 no warning about usage, but it was added 8.5.0 with some limitations and it was improved in 12.0.0 and 13.2.0
+		node: [13, 14]
+	});
+
 	return {
-		const: letConst && node6,
-		arrowFunction: arrowFunctions && node6,
-		forOf: es6 && nodeChecker(5),
-		destructuring: es6 && node6,
-		bigIntLiteral: browserslistChecker("bigint") && nodeChecker(10, 4),
-		module: browserslistChecker("es6-module") && nodeChecker(12, 17),
-		dynamicImport: es6DynamicImport && nodeChecker(10, 17),
-		dynamicImportInWorker: es6DynamicImport && nodeChecker(Infinity),
+		const: rawChecker({
+			chrome: 49,
+			and_chr: 49,
+			edge: 12,
+			// Prior to Firefox 13, <code>const</code> is implemented, but re-assignment is not failing.
+			// Prior to Firefox 46, a <code>TypeError</code> was thrown on redeclaration instead of a <code>SyntaxError</code>.
+			firefox: 36,
+			and_ff: 36,
+			// Not supported in for-in and for-of loops
+			// ie: Not supported
+			opera: 36,
+			op_mob: 36,
+			safari: [10, 0],
+			ios_saf: [10, 0],
+			// Before 5.0 supported correctly in strict mode, otherwise supported without block scope
+			samsung: [5, 0],
+			android: 37,
+			and_qq: [10, 4],
+			// Supported correctly in strict mode, otherwise supported without block scope
+			// baidu: Not supported
+			and_uc: [12, 12],
+			kaios: [2, 5],
+			node: [6, 0]
+		}),
+		arrowFunction: rawChecker({
+			chrome: 45,
+			and_chr: 45,
+			edge: 12,
+			// The initial implementation of arrow functions in Firefox made them automatically strict. This has been changed as of Firefox 24. The use of <code>'use strict';</code> is now required.
+			// Prior to Firefox 39, a line terminator (<code>\\n</code>) was incorrectly allowed after arrow function arguments. This has been fixed to conform to the ES2015 specification and code like <code>() \\n => {}</code> will now throw a <code>SyntaxError</code> in this and later versions.
+			firefox: 39,
+			and_ff: 39,
+			// ie: Not supported,
+			opera: 32,
+			op_mob: 32,
+			safari: 10,
+			ios_saf: 10,
+			samsung: [5, 0],
+			android: 45,
+			and_qq: [10, 4],
+			baidu: [7, 12],
+			and_uc: [12, 12],
+			kaios: [2, 5],
+			node: [6, 0]
+		}),
+		forOf: rawChecker({
+			chrome: 38,
+			and_chr: 38,
+			edge: 12,
+			// Prior to Firefox 51, using the for...of loop construct with the const keyword threw a SyntaxError ("missing = in const declaration").
+			firefox: 51,
+			and_ff: 51,
+			// ie: Not supported,
+			opera: 25,
+			op_mob: 25,
+			safari: 7,
+			ios_saf: 7,
+			samsung: [3, 0],
+			android: 38,
+			// and_qq: Unknown support
+			// baidu: Unknown support
+			// and_uc: Unknown support
+			// kaios: Unknown support
+			node: [0, 12]
+		}),
+		destructuring: rawChecker({
+			chrome: 49,
+			and_chr: 49,
+			edge: 14,
+			firefox: 41,
+			and_ff: 41,
+			// ie: Not supported,
+			opera: 36,
+			op_mob: 36,
+			safari: 8,
+			ios_saf: 8,
+			samsung: [5, 0],
+			android: 49,
+			// and_qq: Unknown support
+			// baidu: Unknown support
+			// and_uc: Unknown support
+			// kaios: Unknown support
+			node: [6, 0]
+		}),
+		bigIntLiteral: rawChecker({
+			chrome: 67,
+			and_chr: 67,
+			edge: 79,
+			firefox: 68,
+			and_ff: 68,
+			// ie: Not supported,
+			opera: 54,
+			op_mob: 48,
+			safari: 14,
+			ios_saf: 14,
+			samsung: [9, 2],
+			android: 67,
+			// and_qq: Not supported
+			// baidu: Not supported
+			// and_uc: Not supported
+			// kaios: Not supported
+			node: [10, 4]
+		}),
+		// Support syntax `import` and `export` and no limitations and bugs on Node.js
+		// Not include `export * as namespace`
+		module: rawChecker({
+			chrome: 61,
+			and_chr: 61,
+			edge: 16,
+			firefox: 60,
+			and_ff: 60,
+			// ie: Not supported,
+			opera: 48,
+			op_mob: 45,
+			safari: [10, 1],
+			ios_saf: [10, 3],
+			samsung: [8, 0],
+			android: 61,
+			and_qq: [10, 4],
+			// baidu: Not supported
+			// and_uc: Not supported
+			// kaios: Not supported
+			// Since Node.js 13.14.0 no warning about usage, but it was added 8.5.0 with some limitations and it was improved in 12.0.0 and 13.2.0
+			node: [13, 14]
+		}),
+		dynamicImport: es6DynamicImport,
+		dynamicImportInWorker: es6DynamicImport && !anyNode,
 		// browserslist does not have info about globalThis
 		// so this is based on mdn-browser-compat-data
 		globalThis: rawChecker({
 			chrome: 71,
-			chrome_android: 71,
+			and_chr: 71,
 			edge: 79,
 			firefox: 65,
-			firefox_android: 65,
+			and_ff: 65,
 			// ie: Not supported,
-			nodejs: 12,
 			opera: 58,
-			opera_android: 50,
+			op_mob: 50,
 			safari: [12, 1],
-			safari_ios: [12, 2],
-			// cspell:word samsunginternet
-			samsunginternet_android: [10, 0],
-			webview_android: 71
+			ios_saf: [12, 2],
+			samsung: [10, 1],
+			android: 71,
+			// and_qq: Unknown support
+			// baidu: Unknown support
+			// and_uc: Unknown support
+			// kaios: Unknown support
+			node: [12, 0]
 		}),
 
 		browser: browserProperty,

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -244,11 +244,6 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 						mode.fakeType = 2;
 						break;
 					case "dynamic":
-						mode = new ExportMode("reexport-fake-namespace-object");
-						mode.name = name;
-						mode.partialNamespaceExportInfo = exportInfo;
-						mode.fakeType = 6;
-						break;
 					default:
 						mode = new ExportMode("reexport-namespace-object");
 						mode.name = name;

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -59,9 +59,13 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			(statement, source) => {
 				parser.state.lastHarmonyImportOrder =
 					(parser.state.lastHarmonyImportOrder || 0) + 1;
-				const clearDep = new ConstDependency("", statement.range);
+				const clearDep = new ConstDependency(
+					parser.isAsiPosition(statement.range[0]) ? ";" : "",
+					statement.range
+				);
 				clearDep.loc = statement.loc;
 				parser.state.module.addPresentationalDependency(clearDep);
+				parser.unsetAsiPosition(statement.range[1]);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					source,
 					parser.state.lastHarmonyImportOrder

package/lib/javascript/JavascriptParser.js

@@ -1405,7 +1405,11 @@ class JavascriptParser extends Parser {
 	}
 
 	preWalkStatement(statement) {
-		if (this.hooks.preStatement.call(statement)) return;
+		this.statementPath.push(statement);
+		if (this.hooks.preStatement.call(statement)) {
+			this.prevStatement = this.statementPath.pop();
+			return;
+		}
 		switch (statement.type) {
 			case "BlockStatement":
 				this.preWalkBlockStatement(statement);
@@ -1447,10 +1451,15 @@ class JavascriptParser extends Parser {
 				this.preWalkWithStatement(statement);
 				break;
 		}
+		this.prevStatement = this.statementPath.pop();
 	}
 
 	blockPreWalkStatement(statement) {
-		if (this.hooks.blockPreStatement.call(statement)) return;
+		this.statementPath.push(statement);
+		if (this.hooks.blockPreStatement.call(statement)) {
+			this.prevStatement = this.statementPath.pop();
+			return;
+		}
 		switch (statement.type) {
 			case "ImportDeclaration":
 				this.blockPreWalkImportDeclaration(statement);
@@ -1471,6 +1480,7 @@ class JavascriptParser extends Parser {
 				this.blockPreWalkClassDeclaration(statement);
 				break;
 		}
+		this.prevStatement = this.statementPath.pop();
 	}
 
 	walkStatement(statement) {
@@ -1549,7 +1559,9 @@ class JavascriptParser extends Parser {
 	walkBlockStatement(statement) {
 		this.inBlockScope(() => {
 			const body = statement.body;
+			const prev = this.prevStatement;
 			this.blockPreWalkStatements(body);
+			this.prevStatement = prev;
 			this.walkStatements(body);
 		});
 	}
@@ -1689,7 +1701,9 @@ class JavascriptParser extends Parser {
 			const body = statement.body;
 			if (body.type === "BlockStatement") {
 				// no need to add additional scope
+				const prev = this.prevStatement;
 				this.blockPreWalkStatements(body.body);
+				this.prevStatement = prev;
 				this.walkStatements(body.body);
 			} else {
 				this.walkStatement(body);
@@ -1716,7 +1730,9 @@ class JavascriptParser extends Parser {
 			const body = statement.body;
 			if (body.type === "BlockStatement") {
 				// no need to add additional scope
+				const prev = this.prevStatement;
 				this.blockPreWalkStatements(body.body);
+				this.prevStatement = prev;
 				this.walkStatements(body.body);
 			} else {
 				this.walkStatement(body);
@@ -1746,7 +1762,9 @@ class JavascriptParser extends Parser {
 			const body = statement.body;
 			if (body.type === "BlockStatement") {
 				// no need to add additional scope
+				const prev = this.prevStatement;
 				this.blockPreWalkStatements(body.body);
+				this.prevStatement = prev;
 				this.walkStatements(body.body);
 			} else {
 				this.walkStatement(body);
@@ -1770,7 +1788,9 @@ class JavascriptParser extends Parser {
 			}
 			if (statement.body.type === "BlockStatement") {
 				this.detectMode(statement.body.body);
+				const prev = this.prevStatement;
 				this.preWalkStatement(statement.body);
+				this.prevStatement = prev;
 				this.walkStatement(statement.body);
 			} else {
 				this.walkExpression(statement.body);
@@ -1848,7 +1868,9 @@ class JavascriptParser extends Parser {
 			if (
 				!this.hooks.exportDeclaration.call(statement, statement.declaration)
 			) {
+				const prev = this.prevStatement;
 				this.preWalkStatement(statement.declaration);
+				this.prevStatement = prev;
 				this.blockPreWalkStatement(statement.declaration);
 				let index = 0;
 				this.enterDeclaration(statement.declaration, def => {
@@ -1896,7 +1918,9 @@ class JavascriptParser extends Parser {
 	}
 
 	blockPreWalkExportDefaultDeclaration(statement) {
+		const prev = this.prevStatement;
 		this.preWalkStatement(statement.declaration);
+		this.prevStatement = prev;
 		this.blockPreWalkStatement(statement.declaration);
 		if (
 			statement.declaration.id &&
@@ -2049,7 +2073,9 @@ class JavascriptParser extends Parser {
 				const switchCase = switchCases[index];
 
 				if (switchCase.consequent.length > 0) {
+					const prev = this.prevStatement;
 					this.blockPreWalkStatements(switchCase.consequent);
+					this.prevStatement = prev;
 				}
 			}
 
@@ -2079,7 +2105,9 @@ class JavascriptParser extends Parser {
 				});
 				this.walkPattern(catchClause.param);
 			}
+			const prev = this.prevStatement;
 			this.blockPreWalkStatement(catchClause.body);
+			this.prevStatement = prev;
 			this.walkStatement(catchClause.body);
 		});
 	}
@@ -2276,7 +2304,9 @@ class JavascriptParser extends Parser {
 			}
 			if (expression.body.type === "BlockStatement") {
 				this.detectMode(expression.body.body);
+				const prev = this.prevStatement;
 				this.preWalkStatement(expression.body);
+				this.prevStatement = prev;
 				this.walkStatement(expression.body);
 			} else {
 				this.walkExpression(expression.body);
@@ -2294,7 +2324,9 @@ class JavascriptParser extends Parser {
 			}
 			if (expression.body.type === "BlockStatement") {
 				this.detectMode(expression.body.body);
+				const prev = this.prevStatement;
 				this.preWalkStatement(expression.body);
+				this.prevStatement = prev;
 				this.walkStatement(expression.body);
 			} else {
 				this.walkExpression(expression.body);
@@ -2561,7 +2593,9 @@ class JavascriptParser extends Parser {
 			}
 			if (functionExpression.body.type === "BlockStatement") {
 				this.detectMode(functionExpression.body.body);
+				const prev = this.prevStatement;
 				this.preWalkStatement(functionExpression.body);
+				this.prevStatement = prev;
 				this.walkStatement(functionExpression.body);
 			} else {
 				this.walkExpression(functionExpression.body);
@@ -3224,7 +3258,9 @@ class JavascriptParser extends Parser {
 		if (this.hooks.program.call(ast, comments) === undefined) {
 			this.detectMode(ast.body);
 			this.preWalkStatements(ast.body);
+			this.prevStatement = undefined;
 			this.blockPreWalkStatements(ast.body);
+			this.prevStatement = undefined;
 			this.walkStatements(ast.body);
 		}
 		this.hooks.finish.call(ast, comments);
@@ -3337,14 +3373,24 @@ class JavascriptParser extends Parser {
 	 * @returns {boolean} true when a semicolon has been inserted before this position, false if not
 	 */
 	isAsiPosition(pos) {
-		if (this.prevStatement === undefined) return false;
 		const currentStatement = this.statementPath[this.statementPath.length - 1];
+		if (currentStatement === undefined) return true;
 		return (
-			currentStatement.range[0] === pos &&
-			this.semicolons.has(this.prevStatement.range[1])
+			(currentStatement.range[1] === pos && this.semicolons.has(pos)) ||
+			(currentStatement.range[0] === pos &&
+				(this.prevStatement === undefined ||
+					this.semicolons.has(this.prevStatement.range[1])))
 		);
 	}
 
+	/**
+	 * @param {number} pos source code position
+	 * @returns {void}
+	 */
+	unsetAsiPosition(pos) {
+		this.semicolons.delete(pos);
+	}
+
 	isStatementLevelExpression(expr) {
 		const currentStatement = this.statementPath[this.statementPath.length - 1];
 		return (

package/lib/optimize/ConcatenatedModule.js

@@ -104,6 +104,8 @@ const {
  * @property {string} namespaceObjectName
  * @property {boolean} interopNamespaceObjectUsed
  * @property {string} interopNamespaceObjectName
+ * @property {boolean} interopNamespaceObject2Used
+ * @property {string} interopNamespaceObject2Name
  * @property {boolean} interopDefaultAccessUsed
  * @property {string} interopDefaultAccessName
  */
@@ -117,6 +119,8 @@ const {
  * @property {string} name
  * @property {boolean} interopNamespaceObjectUsed
  * @property {string} interopNamespaceObjectName
+ * @property {boolean} interopNamespaceObject2Used
+ * @property {string} interopNamespaceObject2Name
  * @property {boolean} interopDefaultAccessUsed
  * @property {string} interopDefaultAccessName
  */
@@ -241,6 +245,13 @@ const getFinalBinding = (
 	if (exportName.length === 0) {
 		switch (exportsType) {
 			case "default-only":
+				info.interopNamespaceObject2Used = true;
+				return {
+					info,
+					rawName: info.interopNamespaceObject2Name,
+					ids: exportName,
+					exportName
+				};
 			case "default-with-named":
 				info.interopNamespaceObjectUsed = true;
 				return {
@@ -1045,16 +1056,20 @@ class ConcatenatedModule extends Module {
 		// get all global names
 		for (const info of modulesWithInfo) {
 			if (info.type === "concatenated") {
-				const superClassExpressions = [];
-
 				// ignore symbols from moduleScope
 				if (info.moduleScope) {
 					ignoredScopes.add(info.moduleScope);
+				}
 
-					// The super class expression in class scopes behaves weird
-					// We store ranges of all super class expressions to make
-					// renaming to work correctly
-					for (const childScope of info.moduleScope.childScopes) {
+				// The super class expression in class scopes behaves weird
+				// We get ranges of all super class expressions to make
+				// renaming to work correctly
+				const superClassCache = new WeakMap();
+				const getSuperClassExpressions = scope => {
+					const cacheEntry = superClassCache.get(scope);
+					if (cacheEntry !== undefined) return cacheEntry;
+					const superClassExpressions = [];
+					for (const childScope of scope.childScopes) {
 						if (childScope.type !== "class") continue;
 						const block = childScope.block;
 						if (
@@ -1068,7 +1083,9 @@ class ConcatenatedModule extends Module {
 							});
 						}
 					}
-				}
+					superClassCache.set(scope, superClassExpressions);
+					return superClassExpressions;
+				};
 
 				// add global symbols
 				if (info.globalScope) {
@@ -1101,7 +1118,7 @@ class ConcatenatedModule extends Module {
 								binding.info.module.identifier(),
 								"name" in binding ? binding.name : ""
 							);
-							for (const expr of superClassExpressions) {
+							for (const expr of getSuperClassExpressions(reference.from)) {
 								if (
 									expr.range[0] <= reference.identifier.range[0] &&
 									expr.range[1] >= reference.identifier.range[1]
@@ -1209,12 +1226,7 @@ class ConcatenatedModule extends Module {
 					break;
 				}
 			}
-			if (
-				info.module.buildMeta.exportsType === "default" ||
-				info.module.buildMeta.exportsType === "flagged" ||
-				info.module.buildMeta.exportsType === "dynamic" ||
-				!info.module.buildMeta.exportsType
-			) {
+			if (info.module.buildMeta.exportsType !== "namespace") {
 				const externalNameInterop = this.findNewName(
 					"namespaceObject",
 					allUsedNames,
@@ -1224,6 +1236,19 @@ class ConcatenatedModule extends Module {
 				allUsedNames.add(externalNameInterop);
 				info.interopNamespaceObjectName = externalNameInterop;
 			}
+			if (
+				info.module.buildMeta.exportsType === "default" &&
+				info.module.buildMeta.defaultObject !== "redirect"
+			) {
+				const externalNameInterop = this.findNewName(
+					"namespaceObject2",
+					allUsedNames,
+					namespaceObjectUsedNames,
+					info.module.readableIdentifier(requestShortener)
+				);
+				allUsedNames.add(externalNameInterop);
+				info.interopNamespaceObject2Name = externalNameInterop;
+			}
 			if (
 				info.module.buildMeta.exportsType === "dynamic" ||
 				!info.module.buildMeta.exportsType
@@ -1471,21 +1496,16 @@ ${defineGetters}`
 					throw new Error(`Unsupported concatenation entry type ${info.type}`);
 			}
 			if (info.interopNamespaceObjectUsed) {
-				if (info.module.buildMeta.exportsType === "default") {
-					runtimeRequirements.add(RuntimeGlobals.createFakeNamespaceObject);
-					result.add(
-						`\nvar ${info.interopNamespaceObjectName} = /*#__PURE__*/${RuntimeGlobals.createFakeNamespaceObject}(${name}, 2);`
-					);
-				} else if (
-					info.module.buildMeta.exportsType === "flagged" ||
-					info.module.buildMeta.exportsType === "dynamic" ||
-					!info.module.buildMeta.exportsType
-				) {
-					runtimeRequirements.add(RuntimeGlobals.createFakeNamespaceObject);
-					result.add(
-						`\nvar ${info.interopNamespaceObjectName} = /*#__PURE__*/${RuntimeGlobals.createFakeNamespaceObject}(${name});`
-					);
-				}
+				runtimeRequirements.add(RuntimeGlobals.createFakeNamespaceObject);
+				result.add(
+					`\nvar ${info.interopNamespaceObjectName} = /*#__PURE__*/${RuntimeGlobals.createFakeNamespaceObject}(${name}, 2);`
+				);
+			}
+			if (info.interopNamespaceObject2Used) {
+				runtimeRequirements.add(RuntimeGlobals.createFakeNamespaceObject);
+				result.add(
+					`\nvar ${info.interopNamespaceObject2Name} = /*#__PURE__*/${RuntimeGlobals.createFakeNamespaceObject}(${name});`
+				);
 			}
 			if (info.interopDefaultAccessUsed) {
 				runtimeRequirements.add(RuntimeGlobals.compatGetDefaultExport);
@@ -1634,6 +1654,8 @@ ${defineGetters}`
 							namespaceObjectName: undefined,
 							interopNamespaceObjectUsed: false,
 							interopNamespaceObjectName: undefined,
+							interopNamespaceObject2Used: false,
+							interopNamespaceObject2Name: undefined,
 							interopDefaultAccessUsed: false,
 							interopDefaultAccessName: undefined
 						};
@@ -1647,6 +1669,8 @@ ${defineGetters}`
 							name: undefined,
 							interopNamespaceObjectUsed: false,
 							interopNamespaceObjectName: undefined,
+							interopNamespaceObject2Used: false,
+							interopNamespaceObject2Name: undefined,
 							interopDefaultAccessUsed: false,
 							interopDefaultAccessName: undefined
 						};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.3.2",
+  "version": "5.4.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",

package/types.d.ts

@@ -4320,6 +4320,7 @@ declare class JavascriptParser extends Parser {
 	): boolean;
 	getComments(range?: any): any;
 	isAsiPosition(pos: number): boolean;
+	unsetAsiPosition(pos: number): void;
 	isStatementLevelExpression(expr?: any): boolean;
 	getTagData(name?: any, tag?: any): any;
 	tagVariable(name?: any, tag?: any, data?: any): void;