@depup/webpack 5.111.1-depup.2 → 5.112.0-depup.1

package/lib/{ExternalModule.js → externals/ExternalModule.js}

@@ -7,36 +7,38 @@
 
 const { SyncBailHook } = require("tapable");
 const { OriginalSource, RawSource } = require("webpack-sources");
-const ConcatenationScope = require("./ConcatenationScope");
-const { UsageState } = require("./ExportsInfo");
-const InitFragment = require("./InitFragment");
-const Module = require("./Module");
+const WebpackError = require("../WebpackError");
+const { DEFAULTS } = require("../config/defaults");
+const { ImportPhaseUtils } = require("../dependencies/core/ImportPhase");
+const StaticExportsDependency = require("../dependencies/core/StaticExportsDependency");
+const { UsageState } = require("../graph/ExportsInfo");
+const Module = require("../module/Module");
 const {
 	ASSET_URL_TYPE,
 	ASSET_URL_TYPES,
 	CSS_IMPORT_TYPES,
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES
-} = require("./ModuleSourceTypeConstants");
-const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const Template = require("./Template");
-const WebpackError = require("./WebpackError");
-const { DEFAULTS } = require("./config/defaults");
-const { ImportPhaseUtils } = require("./dependencies/ImportPhase");
-const StaticExportsDependency = require("./dependencies/StaticExportsDependency");
-const { coreModules } = require("./node/nodeBuiltins");
-const createHash = require("./util/createHash");
-const createHooksRegistry = require("./util/createHooksRegistry");
-const extractUrlAndGlobal = require("./util/extractUrlAndGlobal");
-const { toJsStringLiteral } = require("./util/identifier");
-const makeSerializable = require("./util/makeSerializable");
-const memoize = require("./util/memoize");
-const { propertyAccess } = require("./util/property");
-const { register } = require("./util/serialization");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../module/ModuleTypeConstants");
+const { coreModules } = require("../node/nodeBuiltins");
+const ConcatenationScope = require("../optimize/ConcatenationScope");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const InitFragment = require("../template/InitFragment");
+const Template = require("../template/Template");
+const createHash = require("../util/createHash");
+const createHooksRegistry = require("../util/createHooksRegistry");
+const { toJsStringLiteral } = require("../util/identifier");
+const makeSerializable = require("../util/makeSerializable");
+const memoize = require("../util/memoize");
+const { propertyAccess } = require("../util/property");
+const { register, registerLegacyRequest } = require("../util/serialization");
+const extractUrlAndGlobal = require("./extractUrlAndGlobal");
 
 const getEnvironmentNotSupportAsyncWarning = memoize(() =>
-	require("./errors/EnvironmentNotSupportAsyncWarning")
+	require("../errors/EnvironmentNotSupportAsyncWarning")
 );
 
 /** @import { Source } from "webpack-sources" */
@@ -45,19 +47,19 @@ const getEnvironmentNotSupportAsyncWarning = memoize(() =>
  * 	ExternalsType,
  * 	HashFunction,
  * 	ExternalItemInterop as ExternalInterop
- * } from "../declarations/WebpackOptions"
+ * } from "../../declarations/WebpackOptions"
  */
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
+ * } from "../config/defaults"
  */
-/** @import Chunk from "./Chunk" */
-/** @import ChunkGraph, { ModuleId } from "./ChunkGraph" */
-/** @import Compilation, { UnsafeCacheData } from "./Compilation" */
-/** @import { UpdateHashContext } from "./Dependency" */
-/** @import ExportsInfo from "./ExportsInfo" */
-/** @import { GenerateContext } from "./Generator" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph, { ModuleId } from "../graph/ChunkGraph" */
+/** @import Compilation, { UnsafeCacheData } from "../Compilation" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
+/** @import ExportsInfo from "../graph/ExportsInfo" */
+/** @import { GenerateContext } from "../module/Generator" */
 /**
  * @import {
  * 	BuildMeta,
@@ -74,27 +76,28 @@ const getEnvironmentNotSupportAsyncWarning = memoize(() =>
  * 	RuntimeRequirements,
  * 	ReadOnlyRuntimeRequirements,
  * 	Sources,
- * 	SourceTypes
- * } from "./Module"
+ * 	SourceTypes,
+ * 	ModuleKinds
+ * } from "../module/Module"
  */
-/** @import ModuleGraph from "./ModuleGraph" */
-/** @import { ConnectionState } from "./ModuleGraphConnection" */
-/** @import NormalModuleFactory from "./NormalModuleFactory" */
-/** @import RequestShortener from "./RequestShortener" */
-/** @import { ResolverWithOptions } from "./ResolverFactory" */
-/** @import RuntimeTemplate from "./RuntimeTemplate" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import { ConnectionState } from "../graph/ModuleGraphConnection" */
+/** @import NormalModuleFactory from "../module/NormalModuleFactory" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 /**
  * @import {
  * 	ChunkRenderContext
- * } from "./javascript/JavascriptModulesPlugin"
+ * } from "../javascript/JavascriptModulesPlugin"
  */
-/** @import { ImportAttributes } from "./javascript/JavascriptParser" */
-/** @import { ImportPhaseType } from "./dependencies/ImportPhase" */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext<[ExternalModuleRequest, ExternalsType, string, DependencyMeta | undefined, ExternalInterop | undefined, boolean | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext<[ExternalModuleRequest, ExternalsType, string, DependencyMeta | undefined, ExternalInterop | undefined, boolean | undefined]>} ObjectSerializerContext */
-/** @import Hash from "./util/Hash" */
-/** @import { InputFileSystem } from "./util/fs" */
-/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import { ImportAttributes } from "../javascript/JavascriptParser" */
+/** @import { ImportPhaseType } from "../dependencies/core/ImportPhase" */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ExternalModuleRequest, ExternalsType, string, DependencyMeta | undefined, ExternalInterop | undefined, boolean | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ExternalModuleRequest, ExternalsType, string, DependencyMeta | undefined, ExternalInterop | undefined, boolean | undefined]>} ObjectSerializerContext */
+/** @import Hash from "../util/Hash" */
+/** @import { InputFileSystem } from "../fs/fs" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 /** @typedef {{ attributes?: ImportAttributes, phase?: ImportPhaseType, externalType: "import" | "module" | undefined }} ImportDependencyMeta */
 /** @typedef {{ layer?: string, supports?: string, media?: string }} CssImportDependencyMeta */
@@ -247,7 +250,7 @@ const getExternalModuleNodeCommonjsInitFragment = (
 	if (!universal) {
 		return new InitFragment(
 			`import { createRequire as __WEBPACK_EXTERNAL_createRequire } from ${moduleId};\n${runtimeTemplate.renderConst()} __WEBPACK_EXTERNAL_createRequire_require = __WEBPACK_EXTERNAL_createRequire(${importMetaName}.url);\n`,
-			InitFragment.STAGE_HARMONY_IMPORTS,
+			InitFragment.STAGE_ESM_IMPORTS,
 			0,
 			"external module node-commonjs"
 		);
@@ -261,7 +264,7 @@ const getExternalModuleNodeCommonjsInitFragment = (
 
 	return new InitFragment(
 		content,
-		InitFragment.STAGE_HARMONY_IMPORTS,
+		InitFragment.STAGE_ESM_IMPORTS,
 		0,
 		"external module node-commonjs universal"
 	);
@@ -470,7 +473,7 @@ class ModuleExternalInitFragment extends InitFragment {
 
 		super(
 			"",
-			InitFragment.STAGE_HARMONY_IMPORTS,
+			InitFragment.STAGE_ESM_IMPORTS,
 			0,
 			`external module import ${ident} ${
 				imported === true ? imported : imported.join(" ")
@@ -589,7 +592,7 @@ class ModuleExternalInitFragment extends InitFragment {
 
 register(
 	ModuleExternalInitFragment,
-	"webpack/lib/ExternalModule",
+	"webpack/lib/externals/ExternalModule",
 	"ModuleExternalInitFragment",
 	{
 		serialize(obj, { write }) {
@@ -980,7 +983,7 @@ class ExternalModule extends Module {
 		// resolved, so a type rendering no javascript is never reported as a
 		// javascript module — that would emit a dead `false` factory in the chunk
 		const type = this._resolveExternalType(this.externalType);
-		// TODO webpack 6 drop "css-url" once the alias is removed
+		// TODO in the next major release: drop "css-url" once the alias is removed
 		if (type === ASSET_URL_TYPE || type === "css-url") {
 			return ASSET_URL_TYPES;
 		}
@@ -1236,6 +1239,8 @@ class ExternalModule extends Module {
 	}
 
 	/**
+	 * Whether a concatenation may defer this module behind its lazy CommonJS
+	 * accessor. A generator ignoring `ConcatenationScope#isWrapped` answers false.
 	 * @returns {boolean} true, when it may be wrapped
 	 */
 	canBeWrappedInConcatenation() {
@@ -1291,7 +1296,7 @@ class ExternalModule extends Module {
 			}
 			return "module";
 		} else if (
-			// TODO webpack 6 drop "css-url" once the alias is removed
+			// TODO in the next major release: drop "css-url" once the alias is removed
 			externalType === "asset" ||
 			externalType === ASSET_URL_TYPE ||
 			externalType === "css-url"
@@ -1464,7 +1469,7 @@ class ExternalModule extends Module {
 				data.set("url", { javascript: /** @type {string} */ (request) });
 				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
 			}
-			// TODO webpack 6 remove "css-url" alias
+			// TODO in the next major release: remove "css-url" alias
 			case "css-url":
 			case "asset-url": {
 				/** @type {Sources} */
@@ -1573,7 +1578,7 @@ class ExternalModule extends Module {
 				}
 
 				let runtimeRequirements = sourceData.runtimeRequirements;
-				if (!concatenationScope) {
+				if (!concatenationScope || wrapped) {
 					if (!runtimeRequirements) {
 						runtimeRequirements = RUNTIME_REQUIREMENTS;
 					} else {
@@ -1674,10 +1679,29 @@ ExternalModule.getCompilationHooks = createHooksRegistry(
 	createCompilationHooks
 );
 
-makeSerializable(ExternalModule, "webpack/lib/ExternalModule");
+makeSerializable(ExternalModule, [
+	"webpack/lib/externals/ExternalModule",
+	// TODO in the next major release: remove, it restores caches written
+	// before this moved into lib/externals/
+	"webpack/lib/ExternalModule"
+]);
+
+// WHY: `ModuleExternalInitFragment` is registered with `register` and a
+// serializer of its own, not `makeSerializable`, so the request it moved from
+// cannot ride along in the array above.
+// TODO in the next major release: remove, it restores caches written
+// before this moved into lib/externals/
+registerLegacyRequest(
+	ModuleExternalInitFragment,
+	"webpack/lib/ExternalModule",
+	"ModuleExternalInitFragment"
+);
 
 ExternalModule.ModuleExternalInitFragment = ModuleExternalInitFragment;
 ExternalModule.getExternalModuleNodeCommonjsInitFragment =
 	getExternalModuleNodeCommonjsInitFragment;
 
+/** @type {Set<keyof ModuleKinds>} */
+ExternalModule.KINDS = new Set([...Module.KINDS, "external"]);
+
 module.exports = ExternalModule;

package/lib/{ExternalModuleFactoryPlugin.js → externals/ExternalModuleFactoryPlugin.js}

@@ -6,15 +6,11 @@
 "use strict";
 
 const util = require("util");
+const isDependencyKind = require("../graph/isDependencyKind");
+const { ASSET_URL_TYPE } = require("../module/ModuleSourceTypeConstants");
+const { coreModules } = require("../node/nodeBuiltins");
+const { cachedSetProperty, resolveByProperty } = require("../util/cleverMerge");
 const ExternalModule = require("./ExternalModule");
-const { ASSET_URL_TYPE } = require("./ModuleSourceTypeConstants");
-const ContextElementDependency = require("./dependencies/ContextElementDependency");
-const CssImportDependency = require("./dependencies/CssImportDependency");
-const CssUrlDependency = require("./dependencies/CssUrlDependency");
-const HarmonyImportDependency = require("./dependencies/HarmonyImportDependency");
-const ImportDependency = require("./dependencies/ImportDependency");
-const { coreModules } = require("./node/nodeBuiltins");
-const { cachedSetProperty, resolveByProperty } = require("./util/cleverMerge");
 
 /** @import { ResolveContext } from "enhanced-resolve" */
 /**
@@ -22,22 +18,23 @@ const { cachedSetProperty, resolveByProperty } = require("./util/cleverMerge");
  * 	ResolveOptions,
  * 	ExternalsType,
  * 	ExternalItem,
+ * 	ExternalItemFunction,
  * 	ExternalItemValue,
  * 	ExternalItemObjectKnown,
  * 	ExternalItemObjectUnknown,
  * 	ExternalItemInterop,
  * 	Externals
- * } from "../declarations/WebpackOptions"
+ * } from "../../declarations/WebpackOptions"
  */
-/** @import Dependency from "./Dependency" */
+/** @import Dependency from "../graph/Dependency" */
 /** @import { DependencyMeta, ExternalModuleRequest } from "./ExternalModule" */
 /**
  * @import {
  * 	IssuerLayer,
  * 	ModuleFactoryCreateDataContextInfo
- * } from "./ModuleFactory"
+ * } from "../module/ModuleFactory"
  */
-/** @import NormalModuleFactory from "./NormalModuleFactory" */
+/** @import NormalModuleFactory from "../module/NormalModuleFactory" */
 
 /** @typedef {((context: string, request: string, callback: (err?: Error | null, result?: string | false, resolveRequest?: import("enhanced-resolve").ResolveRequest) => void) => void)} ExternalItemFunctionDataGetResolveCallbackResult */
 /** @typedef {((context: string, request: string) => Promise<string>)} ExternalItemFunctionDataGetResolveResult */
@@ -55,7 +52,7 @@ const { cachedSetProperty, resolveByProperty } = require("./util/cleverMerge");
  */
 
 /** @typedef {((data: ExternalItemFunctionData, callback: (err?: (Error | null), result?: ExternalItemValue) => void) => void)} ExternalItemFunctionCallback */
-/** @typedef {((data: import("../lib/ExternalModuleFactoryPlugin").ExternalItemFunctionData) => Promise<ExternalItemValue>)} ExternalItemFunctionPromise */
+/** @typedef {((data: ExternalItemFunctionData) => Promise<ExternalItemValue>)} ExternalItemFunctionPromise */
 
 const UNSPECIFIED_EXTERNAL_TYPE_REGEXP = /^[a-z0-9-]+ /;
 const EMPTY_RESOLVE_OPTIONS = {};
@@ -75,18 +72,17 @@ const getAlternateCoreModuleRequest = (request) => {
 	return coreModules.has(request) ? NODE_PREFIX + request : undefined;
 };
 
-// TODO webpack 6 remove this
+// TODO in the next major release: remove this
 const callDeprecatedExternals = util.deprecate(
 	/**
 	 * Handles the callback logic for this hook.
-	 * @param {EXPECTED_FUNCTION} externalsFunction externals function
+	 * @param {ExternalItemFunction} externalsFunction externals function, written in the deprecated `(context, request, callback)` form
 	 * @param {string} context context
 	 * @param {string} request request
 	 * @param {(err: Error | null | undefined, value: ExternalValue | undefined, ty: ExternalsType | undefined) => void} cb cb
 	 */
 	(externalsFunction, context, request, cb) => {
-		// eslint-disable-next-line no-useless-call
-		externalsFunction.call(null, context, request, cb);
+		Reflect.apply(externalsFunction, null, [context, request, cb]);
 	},
 	"The externals-function should be defined like ({context, request}, cb) => { ... }",
 	"DEP_WEBPACK_EXTERNALS_FUNCTION_PARAMETERS"
@@ -162,10 +158,9 @@ class ExternalModuleFactoryPlugin {
 				const request = dependency.request;
 				// a context element's request is relative to the resolved directory
 				// (`./file.mjs`), externals are written against what the user wrote
-				const originalRequest =
-					dependency instanceof ContextElementDependency
-						? dependency.originalRequest
-						: request;
+				const originalRequest = isDependencyKind(dependency, "context-element")
+					? dependency.originalRequest
+					: request;
 				const hasOriginalRequest = originalRequest !== request;
 
 				/** @typedef {(err?: Error | null, externalModule?: ExternalModule) => void} HandleExternalCallback */
@@ -175,9 +170,15 @@ class ExternalModuleFactoryPlugin {
 				 * @param {ExternalValue} value the external config
 				 * @param {ExternalsType | undefined} type type of external
 				 * @param {HandleExternalCallback} callback callback
+				 * @param {string=} userRequest the request naming the module, the one written when omitted
 				 * @returns {void}
 				 */
-				const handleExternal = (value, type, callback) => {
+				const handleExternal = (
+					value,
+					type,
+					callback,
+					userRequest = originalRequest
+				) => {
 					/** @type {boolean | undefined} */
 					let sideEffects;
 					/** @type {ExternalTargetValue} */
@@ -259,27 +260,26 @@ class ExternalModuleFactoryPlugin {
 					let dependencyMeta;
 
 					if (
-						dependency instanceof HarmonyImportDependency ||
-						dependency instanceof ImportDependency ||
-						dependency instanceof ContextElementDependency
+						isDependencyKind(dependency, "esm-import") ||
+						isDependencyKind(dependency, "dynamic-import") ||
+						isDependencyKind(dependency, "context-element")
 					) {
-						const externalType =
-							dependency instanceof HarmonyImportDependency
-								? "module"
-								: dependency instanceof ImportDependency
-									? "import"
-									: undefined;
+						const externalType = isDependencyKind(dependency, "esm-import")
+							? "module"
+							: isDependencyKind(dependency, "dynamic-import")
+								? "import"
+								: undefined;
 
 						dependencyMeta = {
 							attributes: dependency.attributes,
 							phase:
-								dependency instanceof HarmonyImportDependency ||
-								dependency instanceof ImportDependency
+								isDependencyKind(dependency, "esm-import") ||
+								isDependencyKind(dependency, "dynamic-import")
 									? dependency.phase
 									: undefined,
 							externalType
 						};
-					} else if (dependency instanceof CssImportDependency) {
+					} else if (isDependencyKind(dependency, "css-import")) {
 						dependencyMeta = {
 							layer: dependency.layer,
 							supports: dependency.supports,
@@ -288,12 +288,12 @@ class ExternalModuleFactoryPlugin {
 					}
 
 					// a css `url()` reads the url out of the external: no js wrapper
-					// TODO webpack 6 drop "css-url" once the alias is removed
+					// TODO in the next major release: drop "css-url" once the alias is removed
 					if (
 						(resolvedType === "asset" ||
 							resolvedType === ASSET_URL_TYPE ||
 							resolvedType === "css-url") &&
-						dependency instanceof CssUrlDependency
+						isDependencyKind(dependency, "css-url")
 					) {
 						dependencyMeta = { sourceType: ASSET_URL_TYPE };
 					}
@@ -303,7 +303,7 @@ class ExternalModuleFactoryPlugin {
 						new ExternalModule(
 							externalConfig,
 							resolvedType,
-							originalRequest,
+							userRequest,
 							dependencyMeta,
 							interop,
 							sideEffects
@@ -383,7 +383,7 @@ class ExternalModuleFactoryPlugin {
 							}
 						};
 						if (externals.length === 3) {
-							// TODO webpack 6 remove this
+							// TODO in the next major release: remove this
 							callDeprecatedExternals(externals, context, request, cb);
 						} else {
 							const promise = externals(
@@ -479,10 +479,12 @@ class ExternalModuleFactoryPlugin {
 								alternateRequest
 							)
 						) {
+							// Named by the key, so both spellings share one module id.
 							return handleExternal(
 								resolvedExternals[alternateRequest],
 								undefined,
-								callback
+								callback,
+								alternateRequest
 							);
 						}
 					}

package/lib/externals/ExternalsPlugin.js

@@ -0,0 +1,99 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const ConcatenatedModule = require("../optimize/ConcatenatedModule");
+const { ModuleExternalInitFragment } = require("./ExternalModule");
+const ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
+
+/**
+ * @import {
+ * 	ExternalsType,
+ * 	Externals
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import { Imported } from "./ExternalModule" */
+/** @import Dependency from "../graph/Dependency" */
+
+const PLUGIN_NAME = "ExternalsPlugin";
+
+class ExternalsPlugin {
+	/**
+	 * Creates an instance of ExternalsPlugin.
+	 * @param {ExternalsType | ((dependency: Dependency) => ExternalsType)} type default external type
+	 * @param {Externals} externals externals config
+	 */
+	constructor(type, externals) {
+		this.type = type;
+		/** @type {Externals} */
+		this.externals = externals;
+	}
+
+	/**
+	 * Applies the plugin by registering its hooks on the compiler.
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.compile.tap(PLUGIN_NAME, ({ normalModuleFactory }) => {
+			new ExternalModuleFactoryPlugin(this.type, this.externals).apply(
+				normalModuleFactory
+			);
+		});
+
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			const { concatenatedModuleInfo } =
+				ConcatenatedModule.getCompilationHooks(compilation);
+			concatenatedModuleInfo.tap(PLUGIN_NAME, (updatedInfo, moduleInfo) => {
+				const rawExportMap = updatedInfo.rawExportMap;
+
+				if (!rawExportMap) {
+					return;
+				}
+
+				const chunkInitFragments = moduleInfo.chunkInitFragments;
+				const moduleExternalInitFragments =
+					/** @type {InstanceType<ModuleExternalInitFragment>[]} */
+					(
+						chunkInitFragments
+							? /** @type {unknown[]} */
+								(chunkInitFragments).filter(
+									(fragment) => fragment instanceof ModuleExternalInitFragment
+								)
+							: []
+					);
+
+				let initFragmentChanged = false;
+
+				for (const fragment of moduleExternalInitFragments) {
+					const imported = fragment.getImported();
+
+					if (Array.isArray(imported)) {
+						const newImported =
+							/** @type {Imported} */
+							(
+								imported.map(([specifier, finalName]) => [
+									specifier,
+									rawExportMap.has(specifier)
+										? rawExportMap.get(specifier)
+										: finalName
+								])
+							);
+						fragment.setImported(newImported);
+						initFragmentChanged = true;
+					}
+				}
+
+				if (initFragmentChanged) {
+					return true;
+				}
+			});
+		});
+	}
+}
+
+module.exports = ExternalsPlugin;