Merge d5b4b50c10 into 9f98d803c0

lib/Compilation.js

@@ -1988,6 +1988,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 						? /** @type {NameForCondition} */ (originModule.nameForCondition())
 						: "",
 					issuerLayer: originModule ? originModule.layer : null,
+					issuerDependency: originModule ? originModule.issuerDependencyType : null,
 					compiler: this.compiler.name,
 					...contextInfo
 				},

lib/NormalModule.js

@@ -335,6 +335,7 @@ class NormalModule extends Module {
 	constructor({
 		layer,
 		type,
+		issuerDependencyType,
 		request,
 		userRequest,
 		rawRequest,
@@ -352,6 +353,7 @@ class NormalModule extends Module {
 	}) {
 		super(type, context || getContext(resource), layer);
 
+		this.issuerDependencyType = issuerDependencyType;
 		// Info from Factory
 		/** @type {string} */
 		this.request = request;

lib/NormalModuleFactory.js

@@ -514,6 +514,7 @@ class NormalModuleFactory extends ModuleFactory {
 					context,
 					dependencies,
 					dependencyType,
+					issuerDependencyType,
 					request,
 					attributes,
 					resolveOptions,
@@ -776,6 +777,7 @@ class NormalModuleFactory extends ModuleFactory {
 							Object.assign(data.createData, {
 								layer:
 									layer === undefined ? contextInfo.issuerLayer || null : layer,
+								issuerDependencyType: issuerDependencyType,
 								request: stringifyLoadersAndResource(
 									allLoaders,
 									resourceData.resource
@@ -864,7 +866,6 @@ class NormalModuleFactory extends ModuleFactory {
 						};
 						continueCallback();
 					}
-
 					// resource without scheme and with path
 					else {
 						const normalResolver = this.getResolver(
@@ -875,6 +876,13 @@ class NormalModuleFactory extends ModuleFactory {
 										"dependencyType",
 										dependencyType
 									)
+								: resolveOptions,
+							issuerDependencyType
+								? cachedSetProperty(
+										resolveOptions || EMPTY_RESOLVE_OPTIONS,
+										"issuerDependency",
+										issuerDependencyType
+									)
 								: resolveOptions
 						);
 						this.resolveResource(
@@ -972,6 +980,7 @@ class NormalModuleFactory extends ModuleFactory {
 			(dependency).attributes;
 		const dependencyType = dependency.category || "";
 		const contextInfo = data.contextInfo;
+		const issuerDependencyType = dependency.issuerCategory || contextInfo.issuerDependency || null;
 		const fileDependencies = new LazySet();
 		const missingDependencies = new LazySet();
 		const contextDependencies = new LazySet();
@@ -984,6 +993,7 @@ class NormalModuleFactory extends ModuleFactory {
 			attributes,
 			dependencies,
 			dependencyType,
+			issuerDependencyType,
 			fileDependencies,
 			missingDependencies,
 			contextDependencies,
@@ -1432,10 +1442,11 @@ If changing the source code is not an option there is also a resolve options cal
 	/**
 	 * @param {Parameters<ResolverFactory["get"]>[0]} type type of resolver
 	 * @param {Parameters<ResolverFactory["get"]>[1]=} resolveOptions options
+	 * @param {Parameters<ResolverFactory["get"]>[1]=} issuerResolveOptions options
 	 * @returns {ReturnType<ResolverFactory["get"]>} the resolver
 	 */
-	getResolver(type, resolveOptions) {
+	getResolver(type, resolveOptions, issuerResolveOptions) {
-		return this.resolverFactory.get(type, resolveOptions);
+		return this.resolverFactory.get(type, resolveOptions, issuerResolveOptions);
 	}
 }
 

lib/ResolverFactory.js

@@ -32,9 +32,13 @@ const EMPTY_RESOLVE_OPTIONS = {};
 
 /**
  * @param {ResolveOptionsWithDependencyType} resolveOptionsWithDepType enhanced options
+ * @param {ResolveOptionsWithDependencyType} issuerResolveOptions enhanced options
  * @returns {ResolveOptions} merged options
  */
-const convertToResolveOptions = (resolveOptionsWithDepType) => {
+const convertToResolveOptions = (
+	resolveOptionsWithDepType,
+	issuerResolveOptions
+) => {
 	const { dependencyType, plugins, ...remaining } = resolveOptionsWithDepType;
 
 	// check type compat
@@ -58,10 +62,24 @@ const convertToResolveOptions = (resolveOptionsWithDepType) => {
 		/** @type {Partial<ResolveOptionsWithDependencyType> & Pick<ResolveOptionsWithDependencyType, "fileSystem">} */ (
 			partialOptions
 		);
+	const { issuerDependency } = issuerResolveOptions;
+
+	const resolvedByDependency = resolveByProperty(
+		options,
+		"byDependency",
+		dependencyType
+	);
 
 	return /** @type {ResolveOptions} */ (
+		// byIssuerDependencyType
 		removeOperations(
-			resolveByProperty(options, "byDependency", dependencyType),
+			issuerDependency
+				? resolveByProperty(
+						resolvedByDependency,
+						"byIssuerDependency",
+						issuerDependency
+					)
+				: resolvedByDependency,
 			// Keep the `unsafeCache` because it can be a `Proxy`
 			["unsafeCache"]
 		)
@@ -93,44 +111,55 @@ module.exports = class ResolverFactory {
 	/**
 	 * @param {string} type type of resolver
 	 * @param {ResolveOptionsWithDependencyType=} resolveOptions options
+	 * @param {ResolveOptionsWithDependencyType=} issuerResolveOptions options
 	 * @returns {ResolverWithOptions} the resolver
 	 */
-	get(type, resolveOptions = EMPTY_RESOLVE_OPTIONS) {
+	get(
-		let typedCaches = this.cache.get(type);
+		type,
-		if (!typedCaches) {
+		resolveOptions = EMPTY_RESOLVE_OPTIONS,
-			typedCaches = {
+		issuerResolveOptions = EMPTY_RESOLVE_OPTIONS
-				direct: new WeakMap(),
+	) {
-				stringified: new Map()
+		// let typedCaches = this.cache.get(type);
-			};
+		// if (!typedCaches) {
-			this.cache.set(type, typedCaches);
+		// 	typedCaches = {
-		}
+		// 		direct: new WeakMap(),
-		const cachedResolver = typedCaches.direct.get(resolveOptions);
+		// 		stringified: new Map()
-		if (cachedResolver) {
+		// 	};
-			return cachedResolver;
+		// 	this.cache.set(type, typedCaches);
-		}
+		// }
-		const ident = JSON.stringify(resolveOptions);
+		// const cachedResolver = typedCaches.direct.get(resolveOptions);
-		const resolver = typedCaches.stringified.get(ident);
+		// if (cachedResolver) {
-		if (resolver) {
+		// 	return cachedResolver;
-			typedCaches.direct.set(resolveOptions, resolver);
+		// }
-			return resolver;
+		// const ident = JSON.stringify(resolveOptions);
-		}
+		// const resolver = typedCaches.stringified.get(ident);
-		const newResolver = this._create(type, resolveOptions);
+		// if (resolver) {
-		typedCaches.direct.set(resolveOptions, newResolver);
+		// 	typedCaches.direct.set(resolveOptions, resolver);
-		typedCaches.stringified.set(ident, newResolver);
+		// 	return resolver;
+		// }
+		const newResolver = this._create(
+			type,
+			resolveOptions,
+			issuerResolveOptions
+		);
+		// typedCaches.direct.set(resolveOptions, newResolver);
+		// typedCaches.stringified.set(ident, newResolver);
 		return newResolver;
 	}
 
 	/**
 	 * @param {string} type type of resolver
 	 * @param {ResolveOptionsWithDependencyType} resolveOptionsWithDepType options
+	 * @param {ResolveOptionsWithIssuerDependencyType} issuerResolveOptions options
 	 * @returns {ResolverWithOptions} the resolver
 	 */
-	_create(type, resolveOptionsWithDepType) {
+	_create(type, resolveOptionsWithDepType, issuerResolveOptions) {
 		/** @type {ResolveOptionsWithDependencyType} */
 		const originalResolveOptions = { ...resolveOptionsWithDepType };
 
 		const resolveOptions = convertToResolveOptions(
-			this.hooks.resolveOptions.for(type).call(resolveOptionsWithDepType)
+			this.hooks.resolveOptions.for(type).call(resolveOptionsWithDepType),
+			issuerResolveOptions
 		);
 		const resolver = /** @type {ResolverWithOptions} */ (
 			Factory.createResolver(resolveOptions)

lib/config/defaults.js

@@ -1795,12 +1795,17 @@ const getResolveDefaults = ({
 		conditionNames: ["require", "module", "..."],
 		extensions: [...jsExtensions]
 	});
-	/** @type {() => ResolveOptions} */
+	/** @type {(options?: { worker?: boolean }) => ResolveOptions} */
-	const esmDeps = () => ({
+	const esmDeps = ({ worker } = {}) => ({
 		aliasFields: browserField ? ["browser"] : [],
 		mainFields: browserField ? ["browser", "module", "..."] : ["module", "..."],
-		conditionNames: ["import", "module", "..."],
+		conditionNames: [...(worker ? ["worker"] : []), "import", "module", "..."],
-		extensions: [...jsExtensions]
+		extensions: [...jsExtensions],
+		byIssuerDependency: {
+			worker: {
+				conditionNames: ["worker", "import", "module", "..."]
+			}
+		}
 	});
 
 	/** @type {ResolveOptions} */
@@ -1823,7 +1828,7 @@ const getResolveDefaults = ({
 				preferRelative: true
 			},
 			worker: {
-				...esmDeps(),
+				...esmDeps({ worker: true }),
 				preferRelative: true
 			},
 			commonjs: cjsDeps(),

lib/dependencies/WorkerDependency.js

@@ -58,6 +58,10 @@ class WorkerDependency extends ModuleDependency {
 		return "worker";
 	}
 
+	get issuerCategory() {
+		return "worker";
+	}
+
 	/**
 	 * Update the hash
 	 * @param {Hash} hash hash to be updated