@depup/webpack 5.105.4-depup.37 → 5.106.0-depup.0

package/lib/dependencies/CssIcssImportDependency.js

@@ -6,9 +6,7 @@
 "use strict";
 
 const WebpackError = require("../WebpackError");
-const { cssExportConvention } = require("../util/conventions");
 const makeSerializable = require("../util/makeSerializable");
-const memoize = require("../util/memoize");
 const CssImportDependency = require("./CssImportDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -26,10 +24,6 @@ const CssImportDependency = require("./CssImportDependency");
 /** @typedef {import("./CssIcssExportDependency").ExportMode} ExportMode */
 /** @typedef {import("./CssIcssExportDependency").ExportType} ExportType */
 
-const getCssIcssExportDependency = memoize(() =>
-	require("./CssIcssExportDependency")
-);
-
 class CssIcssImportDependency extends CssImportDependency {
 	/**
 	 * Example of dependency:
@@ -38,48 +32,19 @@ class CssIcssImportDependency extends CssImportDependency {
 	 * @param {string} request request request path which needs resolving
 	 * @param {Range} range the range of dependency
 	 * @param {"local" | "global"} mode mode of the parsed CSS
-	 * @param {string} name name
-	 * @param {string=} exportName export value
-	 * @param {ExportMode=} exportMode export mode
-	 * @param {ExportType=} exportType export type
+	 * @param {string} importName import name (`name` from example)
+	 * @param {string} localName local name (`value` from example)
 	 */
-	constructor(
-		request,
-		range,
-		mode,
-		name,
-		exportName = undefined,
-		exportMode = getCssIcssExportDependency().EXPORT_MODE.NONE,
-		exportType = getCssIcssExportDependency().EXPORT_TYPE.NORMAL
-	) {
+	constructor(request, range, mode, importName, localName) {
 		super(request, range, mode);
-		this.name = name;
-		this.value = exportName;
-		this.interpolate = true;
-		this.exportMode = exportMode;
-		this.exportType = exportType;
+		this.importName = importName;
+		this.localName = localName;
 	}
 
 	get type() {
 		return "css :import";
 	}
 
-	/**
-	 * @returns {string | null} an identifier to merge equal requests
-	 */
-	getResourceIdentifier() {
-		return `${super.getResourceIdentifier()}|mode${this.mode}|name${this.name}`;
-	}
-
-	/**
-	 * @param {string} name export name
-	 * @param {CssGeneratorExportsConvention} convention convention of the export name
-	 * @returns {string[]} convention results
-	 */
-	getExportsConventionNames(name, convention) {
-		return cssExportConvention(name, convention);
-	}
-
 	/**
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
@@ -89,7 +54,7 @@ class CssIcssImportDependency extends CssImportDependency {
 	getReferencedExports(moduleGraph, runtime) {
 		return [
 			{
-				name: [this.name],
+				name: [this.importName],
 				canMangle: true
 			}
 		];
@@ -105,10 +70,10 @@ class CssIcssImportDependency extends CssImportDependency {
 
 		if (
 			module &&
-			!moduleGraph.getExportsInfo(module).isExportProvided(this.name)
+			!moduleGraph.getExportsInfo(module).isExportProvided(this.importName)
 		) {
 			const error = new WebpackError(
-				`Referenced name "${this.name}" in "${this.userRequest}" not found`
+				`Referenced name "${this.importName}" in "${this.userRequest}" not found`
 			);
 			error.module = module;
 
@@ -123,11 +88,8 @@ class CssIcssImportDependency extends CssImportDependency {
 	 */
 	serialize(context) {
 		const { write } = context;
-		write(this.name);
-		write(this.value);
-		write(this.interpolate);
-		write(this.exportMode);
-		write(this.exportType);
+		write(this.importName);
+		write(this.localName);
 		super.serialize(context);
 	}
 
@@ -136,11 +98,8 @@ class CssIcssImportDependency extends CssImportDependency {
 	 */
 	deserialize(context) {
 		const { read } = context;
-		this.name = read();
-		this.value = read();
-		this.interpolate = read();
-		this.exportMode = read();
-		this.exportType = read();
+		this.importName = read();
+		this.localName = read();
 		super.deserialize(context);
 	}
 }
@@ -155,23 +114,7 @@ CssIcssImportDependency.Template = class CssIcssImportDependencyTemplate extends
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		const dep = /** @type {CssIcssImportDependency} */ (dependency);
-
-		if (dep.value) {
-			const { moduleGraph } = templateContext;
-			const module =
-				/** @type {CssModule} */
-				(moduleGraph.getModule(dep));
-			const CssIcssExportDependency = getCssIcssExportDependency();
-			const template = new CssIcssExportDependency.Template();
-			const originalName = dep.name;
-			const originalExportName = dep.value;
-			dep.value = originalName;
-			dep.name = originalExportName;
-			template.apply(dep, source, { ...templateContext, module });
-			dep.name = originalName;
-			dep.value = originalExportName;
-		}
+		// Nothing
 	}
 };
 

package/lib/dependencies/CssIcssSymbolDependency.js

@@ -25,17 +25,17 @@ const NullDependency = require("./NullDependency");
 
 class CssIcssSymbolDependency extends NullDependency {
 	/**
-	 * @param {string} name name
-	 * @param {string} symbol symbol
+	 * @param {string} localName local name
 	 * @param {Range} range range
-	 * @param {boolean=} isReference true when is reference, otherwise false
+	 * @param {string=} value value when it was defined in this module
+	 * @param {string=} importName import name when it was imported from other module
 	 */
-	constructor(name, symbol, range, isReference) {
+	constructor(localName, range, value, importName) {
 		super();
-		this.name = name;
-		this.symbol = symbol;
+		this.localName = localName;
 		this.range = range;
-		this.isReference = isReference;
+		this.value = value;
+		this.importName = importName;
 		/** @type {undefined | string} */
 		this._hashUpdate = undefined;
 	}
@@ -52,31 +52,20 @@ class CssIcssSymbolDependency extends NullDependency {
 	 */
 	updateHash(hash, context) {
 		if (this._hashUpdate === undefined) {
-			this._hashUpdate = `${this.range}${this.name}${this.value}`;
+			this._hashUpdate = `${this.range}${this.localName}${this.value || this.importName}`;
 		}
 		hash.update(this._hashUpdate);
 	}
 
-	/**
-	 * Returns list of exports referenced by this dependency
-	 * @param {ModuleGraph} moduleGraph module graph
-	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
-	 * @returns {ReferencedExports} referenced exports
-	 */
-	getReferencedExports(moduleGraph, runtime) {
-		return [[this.symbol]];
-	}
-
 	/**
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
 		const { write } = context;
-		write(this.name);
-		write(this.symbol);
-		write(this.value);
+		write(this.localName);
 		write(this.range);
-		write(this.isReference);
+		write(this.value);
+		write(this.importName);
 		super.serialize(context);
 	}
 
@@ -85,11 +74,10 @@ class CssIcssSymbolDependency extends NullDependency {
 	 */
 	deserialize(context) {
 		const { read } = context;
-		this.name = read();
-		this.symbol = read();
-		this.value = read();
+		this.localName = read();
 		this.range = read();
-		this.isReference = read();
+		this.value = read();
+		this.importName = read();
 		super.deserialize(context);
 	}
 }
@@ -107,12 +95,13 @@ CssIcssSymbolDependency.Template = class CssIcssSymbolDependencyTemplate extends
 		if (templateContext.type === CSS_TYPE) {
 			const dep = /** @type {CssIcssSymbolDependency} */ (dependency);
 			/** @type {string | undefined} */
-			const value = dep.isReference
-				? CssIcssExportDependency.Template.findReference(
-						dep.symbol,
+			const value = dep.importName
+				? CssIcssExportDependency.Template.resolve(
+						dep.localName,
+						dep.importName,
 						templateContext
 					)
-				: dep.symbol;
+				: dep.value;
 
 			if (!value) {
 				return;

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -21,6 +21,7 @@ const {
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const { ImportPhaseUtils, createGetImportPhase } = require("./ImportPhase");
 
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").ClassDeclaration} ClassDeclaration */
@@ -35,7 +36,7 @@ const PLUGIN_NAME = "HarmonyExportDependencyParserPlugin";
 
 module.exports = class HarmonyExportDependencyParserPlugin {
 	/**
-	 * @param {import("../../declarations/WebpackOptions").JavascriptParserOptions} options options
+	 * @param {JavascriptParserOptions} options options
 	 */
 	constructor(options) {
 		this.options = options;
@@ -51,7 +52,10 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 	 */
 	apply(parser) {
 		const { exportPresenceMode } = this;
-		const getImportPhase = createGetImportPhase(this.options.deferImport);
+		const getImportPhase = createGetImportPhase(
+			this.options.deferImport,
+			false
+		);
 
 		parser.hooks.export.tap(PLUGIN_NAME, (statement) => {
 			const dep = new HarmonyExportHeaderDependency(
@@ -137,6 +141,13 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 							}
 						: undefined
 			);
+			dep.isAnonymousDefault =
+				node.type === "ArrowFunctionExpression" ||
+				((node.type === "FunctionDeclaration" ||
+					node.type === "FunctionExpression" ||
+					node.type === "ClassDeclaration" ||
+					node.type === "ClassExpression") &&
+					!node.id);
 			dep.loc = Object.create(
 				/** @type {DependencyLocation} */ (statement.loc)
 			);

package/lib/dependencies/HarmonyExportExpressionDependency.js

@@ -6,9 +6,10 @@
 "use strict";
 
 const ConcatenationScope = require("../ConcatenationScope");
+const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
-const propertyAccess = require("../util/propertyAccess");
+const { propertyAccess } = require("../util/property");
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
 const NullDependency = require("./NullDependency");
 
@@ -36,6 +37,7 @@ class HarmonyExportExpressionDependency extends NullDependency {
 		this.rangeStatement = rangeStatement;
 		this.prefix = prefix;
 		this.declarationId = declarationId;
+		this.isAnonymousDefault = false;
 	}
 
 	get type() {
@@ -74,6 +76,7 @@ class HarmonyExportExpressionDependency extends NullDependency {
 		write(this.rangeStatement);
 		write(this.prefix);
 		write(this.declarationId);
+		write(this.isAnonymousDefault);
 		super.serialize(context);
 	}
 
@@ -86,6 +89,7 @@ class HarmonyExportExpressionDependency extends NullDependency {
 		this.rangeStatement = read();
 		this.prefix = read();
 		this.declarationId = read();
+		this.isAnonymousDefault = read();
 		super.deserialize(context);
 	}
 }
@@ -153,6 +157,18 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				dep.range[0] - 1,
 				`/* harmony default export */ ${dep.prefix}`
 			);
+
+			if (typeof declarationId !== "string" && dep.isAnonymousDefault) {
+				// Fix .name for anonymous default export function declarations
+				// see test/test262-cases/test/language/module-code/instn-named-bndng-dflt-fun-anon.js cspell:disable-line
+				initFragments.push(
+					new InitFragment(
+						`Reflect.defineProperty(${name}, "name", { value: "default", configurable: true });\n`,
+						InitFragment.STAGE_HARMONY_EXPORTS,
+						2
+					)
+				);
+			}
 		} else {
 			/** @type {string} */
 			let content;
@@ -199,7 +215,17 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 					dep.range[0] - 1,
 					`${content}(${dep.prefix}`
 				);
-				source.replace(dep.range[1], dep.rangeStatement[1] - 0.5, ");");
+				if (dep.isAnonymousDefault) {
+					// Fix .name for anonymous default export expressions
+					// see test/test262-cases/test/language/module-code/eval-export-dflt-cls-anon.js cspell:disable-line
+					source.replace(
+						dep.range[1],
+						dep.rangeStatement[1] - 0.5,
+						`);\nReflect.getOwnPropertyDescriptor(${name}, "name").writable || Reflect.defineProperty(${name}, "name", { value: "default", configurable: true });`
+					);
+				} else {
+					source.replace(dep.range[1], dep.rangeStatement[1] - 0.5, ");");
+				}
 				return;
 			}
 

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -18,8 +18,7 @@ const {
 const { countIterable } = require("../util/IterableHelpers");
 const { combine, first } = require("../util/SetHelpers");
 const makeSerializable = require("../util/makeSerializable");
-const propertyAccess = require("../util/propertyAccess");
-const { propertyName } = require("../util/propertyName");
+const { propertyAccess, propertyName } = require("../util/property");
 const {
 	filterRuntime,
 	getRuntimeKey,
@@ -65,7 +64,9 @@ const processExportInfo = require("./processExportInfo");
 
 const { ExportPresenceModes } = HarmonyImportDependency;
 
-const idsSymbol = Symbol("HarmonyExportImportedSpecifierDependency.ids");
+const idsSymbol = /** @type {symbol} */ (
+	Symbol("HarmonyExportImportedSpecifierDependency.ids")
+);
 
 class NormalReexportItem {
 	/**
@@ -413,16 +414,25 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	// TODO webpack 6 remove
+	/**
+	 * @deprecated
+	 */
 	get id() {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}
 
 	// TODO webpack 6 remove
+	/**
+	 * @deprecated
+	 */
 	getId() {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}
 
 	// TODO webpack 6 remove
+	/**
+	 * @deprecated
+	 */
 	setId() {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}

package/lib/dependencies/HarmonyExportInitFragment.js

@@ -8,7 +8,7 @@
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const { first } = require("../util/SetHelpers");
-const { propertyName } = require("../util/propertyName");
+const { propertyName } = require("../util/property");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */

package/lib/dependencies/HarmonyImportDependency.js

@@ -16,6 +16,7 @@ const { ImportPhase, ImportPhaseUtils } = require("./ImportPhase");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
@@ -57,7 +58,7 @@ const ExportPresenceModes = {
 	/**
 	 * Resolve export presence mode from parser options with a specific key and shared fallbacks.
 	 * @param {string | false | undefined} specificValue the type-specific option value (e.g. importExportsPresence or reexportExportsPresence)
-	 * @param {import("../../declarations/WebpackOptions").JavascriptParserOptions} options parser options
+	 * @param {JavascriptParserOptions} options parser options
 	 * @returns {ExportPresenceMode} resolved mode
 	 */
 	resolveFromOptions(specificValue, options) {
@@ -114,11 +115,12 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
-		if (ImportPhaseUtils.isDefer(this.phase)) {
-			str += "|defer";
+		// We specifically use this check to avoid writing the default (`evaluation` or `0`) value and save memory
+		if (this.phase) {
+			str += `|phase${ImportPhaseUtils.stringify(this.phase)}`;
 		}
 		if (this.attributes) {
-			str += `|importAttributes${JSON.stringify(this.attributes)}`;
+			str += `|attributes${JSON.stringify(this.attributes)}`;
 		}
 		return str;
 	}
@@ -156,9 +158,9 @@ class HarmonyImportDependency extends ModuleDependency {
 
 		let importVar = importVarMap.get(importedModule);
 		if (importVar) return importVar;
-		importVar = `${Template.toIdentifier(
-			`${this.userRequest}`
-		)}__WEBPACK_${isDeferred ? "DEFERRED_" : ""}IMPORTED_MODULE_${importVarMap.size}__`;
+		importVar = `${Template.toIdentifier(`${this.userRequest}`)}__WEBPACK_${
+			isDeferred ? "DEFERRED_" : ""
+		}IMPORTED_MODULE_${importVarMap.size}__`;
 		importVarMap.set(importedModule, importVar);
 		return importVar;
 	}
@@ -210,6 +212,11 @@ class HarmonyImportDependency extends ModuleDependency {
 	 * @returns {WebpackError[] | undefined} errors
 	 */
 	getLinkingErrors(moduleGraph, ids, additionalMessage) {
+		// Source phase imports don't have exports to check
+		if (ImportPhaseUtils.isSource(this.phase)) {
+			return;
+		}
+
 		const importedModule = moduleGraph.getModule(this);
 		// ignore errors for missing or failed modules
 		if (!importedModule || importedModule.getNumberOfErrors() > 0) {
@@ -374,7 +381,13 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 		const moduleKey = referencedModule
 			? referencedModule.identifier()
 			: dep.request;
-		const key = `${ImportPhaseUtils.isDefer(dep.phase) ? "deferred " : ""}harmony import ${moduleKey}`;
+		const key = `${
+			ImportPhaseUtils.isDefer(dep.phase)
+				? "deferred "
+				: ImportPhaseUtils.isSource(dep.phase)
+					? "source "
+					: ""
+		}harmony import ${moduleKey}`;
 
 		const runtimeCondition = dep.weak
 			? false

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -151,7 +151,10 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 	 * @returns {void}
 	 */
 	apply(parser) {
-		const getImportPhase = createGetImportPhase(this.options.deferImport);
+		const getImportPhase = createGetImportPhase(
+			this.options.deferImport,
+			this.options.sourceImport
+		);
 
 		/**
 		 * @param {MemberExpression} node member expression

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const Module = require("../Module");
 const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const makeSerializable = require("../util/makeSerializable");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
@@ -13,7 +14,6 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
@@ -76,7 +76,7 @@ HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDepend
 
 		const module = /** @type {Module} */ (moduleGraph.getModule(dependency));
 
-		if (module && !module.getSourceBasicTypes().has(JAVASCRIPT_TYPE)) {
+		if (module && !Module.getSourceBasicTypes(module).has(JAVASCRIPT_TYPE)) {
 			// no need to render import
 			return;
 		}

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -13,7 +13,7 @@ const {
 } = require("../optimize/InnerGraph");
 const { getTrimmedIdsAndRange } = require("../util/chainedImports");
 const makeSerializable = require("../util/makeSerializable");
-const propertyAccess = require("../util/propertyAccess");
+const { propertyAccess } = require("../util/property");
 const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
 const { ImportPhaseUtils } = require("./ImportPhase");
@@ -40,7 +40,9 @@ const { ImportPhaseUtils } = require("./ImportPhase");
 /** @typedef {HarmonyImportDependency.Ids} Ids */
 /** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
 
-const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
+const idsSymbol = /** @type {symbol} */ (
+	Symbol("HarmonyImportSpecifierDependency.ids")
+);
 
 const { ExportPresenceModes } = HarmonyImportDependency;
 
@@ -90,16 +92,25 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	// TODO webpack 6 remove
+	/**
+	 * @deprecated
+	 */
 	get id() {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}
 
 	// TODO webpack 6 remove
+	/**
+	 * @deprecated
+	 */
 	getId() {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}
 
 	// TODO webpack 6 remove
+	/**
+	 * @deprecated
+	 */
 	setId() {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}

package/lib/dependencies/ImportContextDependency.js

@@ -42,7 +42,7 @@ class ImportContextDependency extends ContextDependency {
 		let str = super.getResourceIdentifier();
 
 		if (this.options.attributes) {
-			str += `|importAttributes${JSON.stringify(this.options.attributes)}`;
+			str += `|attributes${JSON.stringify(this.options.attributes)}`;
 		}
 
 		return str;

package/lib/dependencies/ImportDependency.js

@@ -7,6 +7,7 @@
 
 const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
+const { ImportPhaseUtils } = require("./ImportPhase");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -53,8 +54,12 @@ class ImportDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
+		// We specifically use this check to avoid writing the default (`evaluation` or `0`) value and save memory
+		if (this.phase) {
+			str += `|phase${ImportPhaseUtils.stringify(this.phase)}`;
+		}
 		if (this.attributes) {
-			str += `|importAttributes${JSON.stringify(this.attributes)}`;
+			str += `|attributes${JSON.stringify(this.attributes)}`;
 		}
 		return str;
 	}
@@ -140,7 +145,7 @@ ImportDependency.Template = class ImportDependencyTemplate extends (
 		const block = /** @type {AsyncDependenciesBlock} */ (
 			moduleGraph.getParentBlock(dep)
 		);
-		const content = runtimeTemplate.moduleNamespacePromise({
+		let content = runtimeTemplate.moduleNamespacePromise({
 			chunkGraph,
 			block,
 			module: /** @type {Module} */ (moduleGraph.getModule(dep)),
@@ -151,6 +156,15 @@ ImportDependency.Template = class ImportDependencyTemplate extends (
 			runtimeRequirements
 		});
 
+		// For source phase imports, unwrap the default export
+		// import.source() should return the source directly, not a namespace
+		if (ImportPhaseUtils.isSource(dep.phase)) {
+			content = `${content}.then(${runtimeTemplate.returningFunction(
+				'm["default"]',
+				"m"
+			)})`;
+		}
+
 		source.replace(dep.range[0], dep.range[1] - 1, content);
 	}
 };