webpack 5.36.0 → 5.37.1

package/lib/NormalModule.js

@@ -41,10 +41,12 @@ const { contextify, absolutify } = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
 
-/** @typedef {import("source-map").RawSourceMap} SourceMap */
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../declarations/LoaderContext").NormalModuleLoaderContext} NormalModuleLoaderContext */
+/** @typedef {import("../declarations/WebpackOptions").Mode} Mode */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
+/** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Generator")} Generator */
@@ -60,10 +62,22 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("./logging/Logger").Logger} WebpackLogger */
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
+/**
+ * @typedef {Object} SourceMap
+ * @property {number} version
+ * @property {string[]} sources
+ * @property {string} mappings
+ * @property {string=} file
+ * @property {string=} sourceRoot
+ * @property {string[]=} sourcesContent
+ * @property {string[]=} names
+ */
+
 const getInvalidDependenciesModuleWarning = memoize(() =>
 	require("./InvalidDependenciesModuleWarning")
 );
@@ -262,6 +276,8 @@ class NormalModule extends Module {
 		this._source = null;
 		/** @private @type {Map<string, number> | undefined} **/
 		this._sourceSizes = undefined;
+		/** @private @type {Set<string>} */
+		this._sourceTypes = undefined;
 
 		// Cache
 		this._lastSuccessfulBuildMeta = {};
@@ -333,12 +349,19 @@ class NormalModule extends Module {
 		this.resource = m.resource;
 		this.matchResource = m.matchResource;
 		this.loaders = m.loaders;
+		this._sourceTypes = m._sourceTypes;
+		this._sourceSizes = m._sourceSizes;
 	}
 
 	/**
 	 * Assuming this module is in the cache. Remove internal references to allow freeing some memory.
 	 */
 	cleanupForCache() {
+		// Make sure to cache types and sizes before cleanup
+		if (this._sourceTypes === undefined) this.getSourceTypes();
+		for (const type of this._sourceTypes) {
+			this.size(type);
+		}
 		super.cleanupForCache();
 		this.parser = undefined;
 		this.parserOptions = undefined;
@@ -376,6 +399,7 @@ class NormalModule extends Module {
 			this.type,
 			this.generatorOptions
 		);
+		// we assume the generator behaves identically and keep cached sourceTypes/Sizes
 	}
 
 	/**
@@ -421,7 +445,7 @@ class NormalModule extends Module {
 	 * @param {WebpackOptions} options webpack options
 	 * @param {Compilation} compilation the compilation
 	 * @param {InputFileSystem} fs file system from reading
-	 * @returns {any} loader context
+	 * @returns {NormalModuleLoaderContext} loader context
 	 */
 	createLoaderContext(resolver, options, compilation, fs) {
 		const { requestShortener } = compilation.runtimeTemplate;
@@ -751,7 +775,11 @@ class NormalModule extends Module {
 			},
 			(err, result) => {
 				// Cleanup loaderContext to avoid leaking memory in ICs
-				loaderContext._compilation = loaderContext._compiler = loaderContext._module = loaderContext.fs = undefined;
+				loaderContext._compilation =
+					loaderContext._compiler =
+					loaderContext._module =
+					loaderContext.fs =
+						undefined;
 
 				if (!result) {
 					return processResult(
@@ -855,6 +883,7 @@ class NormalModule extends Module {
 		this._forceBuild = false;
 		this._source = null;
 		if (this._sourceSizes !== undefined) this._sourceSizes.clear();
+		this._sourceTypes = undefined;
 		this._ast = null;
 		this.error = null;
 		this.clearWarningsAndErrors();
@@ -944,7 +973,8 @@ class NormalModule extends Module {
 				checkDependencies(this.buildInfo.missingDependencies);
 				checkDependencies(this.buildInfo.contextDependencies);
 				if (nonAbsoluteDependencies !== undefined) {
-					const InvalidDependenciesModuleWarning = getInvalidDependenciesModuleWarning();
+					const InvalidDependenciesModuleWarning =
+						getInvalidDependenciesModuleWarning();
 					this.addWarning(
 						new InvalidDependenciesModuleWarning(this, nonAbsoluteDependencies)
 					);
@@ -1056,7 +1086,10 @@ class NormalModule extends Module {
 	 * @returns {Set<string>} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return this.generator.getTypes(this);
+		if (this._sourceTypes === undefined) {
+			this._sourceTypes = this.generator.getTypes(this);
+		}
+		return this._sourceTypes;
 	}
 
 	/**
@@ -1245,7 +1278,6 @@ class NormalModule extends Module {
 		const { write } = context;
 		// deserialize
 		write(this._source);
-		write(this._sourceSizes);
 		write(this.error);
 		write(this._lastSuccessfulBuildMeta);
 		write(this._forceBuild);
@@ -1277,7 +1309,6 @@ class NormalModule extends Module {
 	deserialize(context) {
 		const { read } = context;
 		this._source = read();
-		this._sourceSizes = read();
 		this.error = read();
 		this._lastSuccessfulBuildMeta = read();
 		this._forceBuild = read();

package/lib/NormalModuleFactory.js

@@ -520,29 +520,33 @@ class NormalModuleFactory extends ModuleFactory {
 								)
 							);
 						}
-						Object.assign(data.createData, {
-							layer:
-								layer === undefined ? contextInfo.issuerLayer || null : layer,
-							request: stringifyLoadersAndResource(
-								allLoaders,
-								resourceData.resource
-							),
-							userRequest,
-							rawRequest: request,
-							loaders: allLoaders,
-							resource: resourceData.resource,
-							matchResource: matchResourceData
-								? matchResourceData.resource
-								: undefined,
-							resourceResolveData: resourceData.data,
-							settings,
-							type,
-							parser: this.getParser(type, settings.parser),
-							parserOptions: settings.parser,
-							generator: this.getGenerator(type, settings.generator),
-							generatorOptions: settings.generator,
-							resolveOptions
-						});
+						try {
+							Object.assign(data.createData, {
+								layer:
+									layer === undefined ? contextInfo.issuerLayer || null : layer,
+								request: stringifyLoadersAndResource(
+									allLoaders,
+									resourceData.resource
+								),
+								userRequest,
+								rawRequest: request,
+								loaders: allLoaders,
+								resource: resourceData.resource,
+								matchResource: matchResourceData
+									? matchResourceData.resource
+									: undefined,
+								resourceResolveData: resourceData.data,
+								settings,
+								type,
+								parser: this.getParser(type, settings.parser),
+								parserOptions: settings.parser,
+								generator: this.getGenerator(type, settings.generator),
+								generatorOptions: settings.generator,
+								resolveOptions
+							});
+						} catch (e) {
+							return callback(e);
+						}
 						callback();
 					});
 					this.resolveRequestArray(

package/lib/RecordIdsPlugin.js

@@ -48,10 +48,11 @@ class RecordIdsPlugin {
 	apply(compiler) {
 		const portableIds = this.options.portableIds;
 
-		const makePathsRelative = identifierUtils.makePathsRelative.bindContextCache(
-			compiler.context,
-			compiler.root
-		);
+		const makePathsRelative =
+			identifierUtils.makePathsRelative.bindContextCache(
+				compiler.context,
+				compiler.root
+			);
 
 		/**
 		 * @param {Module} module the module

package/lib/ResolverFactory.js

@@ -42,9 +42,9 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 		...remaining,
 		plugins:
 			plugins &&
-			/** @type {ResolvePluginInstance[]} */ (plugins.filter(
-				item => item !== "..."
-			))
+			/** @type {ResolvePluginInstance[]} */ (
+				plugins.filter(item => item !== "...")
+			)
 	};
 
 	if (!partialOptions.fileSystem) {
@@ -53,7 +53,10 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 		);
 	}
 	// These weird types validate that we checked all non-optional properties
-	const options = /** @type {Partial<ResolveOptions> & Pick<ResolveOptions, "fileSystem">} */ (partialOptions);
+	const options =
+		/** @type {Partial<ResolveOptions> & Pick<ResolveOptions, "fileSystem">} */ (
+			partialOptions
+		);
 
 	return removeOperations(
 		resolveByProperty(options, "byDependency", dependencyType)
@@ -124,9 +127,9 @@ module.exports = class ResolverFactory {
 		const resolveOptions = convertToResolveOptions(
 			this.hooks.resolveOptions.for(type).call(resolveOptionsWithDepType)
 		);
-		const resolver = /** @type {ResolverWithOptions} */ (Factory.createResolver(
-			resolveOptions
-		));
+		const resolver = /** @type {ResolverWithOptions} */ (
+			Factory.createResolver(resolveOptions)
+		);
 		if (!resolver) {
 			throw new Error("No resolver created");
 		}

package/lib/RuntimeGlobals.js

@@ -168,6 +168,13 @@ exports.scriptNonce = "__webpack_require__.nc";
  */
 exports.loadScript = "__webpack_require__.l";
 
+/**
+ * function to promote a string to a TrustedScriptURL using webpack's Trusted
+ * Types policy
+ * Arguments: (url: string) => TrustedScriptURL
+ */
+exports.createScriptUrl = "__webpack_require__.tu";
+
 /**
  * the chunk name of the chunk with the runtime
  */

package/lib/RuntimePlugin.js

@@ -13,6 +13,7 @@ const AutoPublicPathRuntimeModule = require("./runtime/AutoPublicPathRuntimeModu
 const CompatGetDefaultExportRuntimeModule = require("./runtime/CompatGetDefaultExportRuntimeModule");
 const CompatRuntimeModule = require("./runtime/CompatRuntimeModule");
 const CreateFakeNamespaceObjectRuntimeModule = require("./runtime/CreateFakeNamespaceObjectRuntimeModule");
+const CreateScriptUrlRuntimeModule = require("./runtime/CreateScriptUrlRuntimeModule");
 const DefinePropertyGettersRuntimeModule = require("./runtime/DefinePropertyGettersRuntimeModule");
 const EnsureChunkRuntimeModule = require("./runtime/EnsureChunkRuntimeModule");
 const GetChunkFilenameRuntimeModule = require("./runtime/GetChunkFilenameRuntimeModule");
@@ -38,6 +39,7 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.runtimeId,
 	RuntimeGlobals.compatGetDefaultExport,
 	RuntimeGlobals.createFakeNamespaceObject,
+	RuntimeGlobals.createScriptUrl,
 	RuntimeGlobals.definePropertyGetters,
 	RuntimeGlobals.ensureChunk,
 	RuntimeGlobals.entryModuleId,
@@ -319,7 +321,23 @@ class RuntimePlugin {
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.loadScript)
 				.tap("RuntimePlugin", (chunk, set) => {
-					compilation.addRuntimeModule(chunk, new LoadScriptRuntimeModule());
+					const withCreateScriptUrl = !!compilation.outputOptions.trustedTypes;
+					if (withCreateScriptUrl) {
+						set.add(RuntimeGlobals.createScriptUrl);
+					}
+					compilation.addRuntimeModule(
+						chunk,
+						new LoadScriptRuntimeModule(withCreateScriptUrl)
+					);
+					return true;
+				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.createScriptUrl)
+				.tap("RuntimePlugin", (chunk, set) => {
+					compilation.addRuntimeModule(
+						chunk,
+						new CreateScriptUrlRuntimeModule()
+					);
 					return true;
 				});
 			compilation.hooks.runtimeRequirementInTree

package/lib/SourceMapDevToolPlugin.js

@@ -16,7 +16,6 @@ const createHash = require("./util/createHash");
 const { relative, dirname } = require("./util/fs");
 const { absolutify } = require("./util/identifier");
 
-/** @typedef {import("source-map").RawSourceMap} SourceMap */
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
@@ -26,6 +25,7 @@ const { absolutify } = require("./util/identifier");
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module")} Module */
+/** @typedef {import("./NormalModule").SourceMap} SourceMap */
 /** @typedef {import("./util/Hash")} Hash */
 
 const validate = createSchemaValidation(
@@ -430,19 +430,20 @@ class SourceMapDevToolPlugin {
 										currentSourceMappingURLComment !== false &&
 										/\.css($|\?)/i.test(file)
 									) {
-										currentSourceMappingURLComment = currentSourceMappingURLComment.replace(
-											/^\n\/\/(.*)$/,
-											"\n/*$1*/"
-										);
+										currentSourceMappingURLComment =
+											currentSourceMappingURLComment.replace(
+												/^\n\/\/(.*)$/,
+												"\n/*$1*/"
+											);
 									}
 									const sourceMapString = JSON.stringify(sourceMap);
 									if (sourceMapFilename) {
 										let filename = file;
 										const sourceMapContentHash =
 											usesContentHash &&
-											/** @type {string} */ (createHash("md4")
-												.update(sourceMapString)
-												.digest("hex"));
+											/** @type {string} */ (
+												createHash("md4").update(sourceMapString).digest("hex")
+											);
 										const pathParams = {
 											chunk,
 											filename: options.fileContext
@@ -454,13 +455,11 @@ class SourceMapDevToolPlugin {
 												: filename,
 											contentHash: sourceMapContentHash
 										};
-										const {
-											path: sourceMapFile,
-											info: sourceMapInfo
-										} = compilation.getPathWithInfo(
-											sourceMapFilename,
-											pathParams
-										);
+										const { path: sourceMapFile, info: sourceMapInfo } =
+											compilation.getPathWithInfo(
+												sourceMapFilename,
+												pathParams
+											);
 										const sourceMapUrl = options.publicPath
 											? options.publicPath + sourceMapFile
 											: relative(

package/lib/Template.js

@@ -413,5 +413,7 @@ class Template {
 }
 
 module.exports = Template;
-module.exports.NUMBER_OF_IDENTIFIER_START_CHARS = NUMBER_OF_IDENTIFIER_START_CHARS;
-module.exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS = NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS;
+module.exports.NUMBER_OF_IDENTIFIER_START_CHARS =
+	NUMBER_OF_IDENTIFIER_START_CHARS;
+module.exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS =
+	NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS;

package/lib/Watching.js

@@ -57,16 +57,53 @@ class Watching {
 		this._needRecords = true;
 		this.watcher = undefined;
 		this.pausedWatcher = undefined;
+		/** @type {Set<string>} */
+		this._collectedChangedFiles = undefined;
+		/** @type {Set<string>} */
+		this._collectedRemovedFiles = undefined;
 		this._done = this._done.bind(this);
 		process.nextTick(() => {
 			if (this._initial) this._invalidate();
 		});
 	}
 
-	_go() {
+	_mergeWithCollected(changedFiles, removedFiles) {
+		if (!changedFiles) return;
+		if (!this._collectedChangedFiles) {
+			this._collectedChangedFiles = new Set(changedFiles);
+			this._collectedRemovedFiles = new Set(removedFiles);
+		} else {
+			for (const file of changedFiles) {
+				this._collectedChangedFiles.add(file);
+				this._collectedRemovedFiles.delete(file);
+			}
+			for (const file of removedFiles) {
+				this._collectedChangedFiles.delete(file);
+				this._collectedRemovedFiles.add(file);
+			}
+		}
+	}
+
+	_go(fileTimeInfoEntries, contextTimeInfoEntries, changedFiles, removedFiles) {
 		this._initial = false;
 		this.startTime = Date.now();
 		this.running = true;
+		if (this.watcher) {
+			this.pausedWatcher = this.watcher;
+			this.watcher.pause();
+			this.watcher = null;
+		}
+		this._mergeWithCollected(
+			changedFiles ||
+				(this.pausedWatcher &&
+					this.pausedWatcher.getAggregatedChanges &&
+					this.pausedWatcher.getAggregatedChanges()),
+			(this.compiler.removedFiles =
+				removedFiles ||
+				(this.pausedWatcher &&
+					this.pausedWatcher.getAggregatedRemovals &&
+					this.pausedWatcher.getAggregatedRemovals()))
+		);
 		const run = () => {
 			if (this.compiler.idle) {
 				return this.compiler.cache.endIdle(err => {
@@ -83,6 +120,19 @@ class Watching {
 					run();
 				});
 			}
+
+			this.compiler.modifiedFiles = this._collectedChangedFiles;
+			this._collectedChangedFiles = undefined;
+			this.compiler.removedFiles = this._collectedRemovedFiles;
+			this._collectedRemovedFiles = undefined;
+
+			this.compiler.fileTimestamps =
+				fileTimeInfoEntries ||
+				(this.pausedWatcher && this.pausedWatcher.getFileTimeInfoEntries());
+			this.compiler.contextTimestamps =
+				contextTimeInfoEntries ||
+				(this.pausedWatcher && this.pausedWatcher.getContextTimeInfoEntries());
+
 			this.invalid = false;
 			this._invalidReported = false;
 			this.compiler.hooks.watchRun.callAsync(this.compiler, err => {
@@ -159,13 +209,16 @@ class Watching {
 
 		let stats = null;
 
-		const handleError = err => {
+		const handleError = (err, cbs) => {
 			this.compiler.hooks.failed.call(err);
 			this.compiler.cache.beginIdle();
 			this.compiler.idle = true;
 			this.handler(err, stats);
-			for (const cb of this.callbacks) cb();
-			this.callbacks.length = 0;
+			if (!cbs) {
+				cbs = this.callbacks;
+				this.callbacks = [];
+			}
+			for (const cb of cbs) cb(err);
 		};
 
 		if (
@@ -197,17 +250,19 @@ class Watching {
 		}
 		if (err) return handleError(err);
 
+		const cbs = this.callbacks;
+		this.callbacks = [];
 		logger.time("done hook");
 		this.compiler.hooks.done.callAsync(stats, err => {
 			logger.timeEnd("done hook");
-			if (err) return handleError(err);
+			if (err) return handleError(err, cbs);
 			this.handler(null, stats);
 			logger.time("storeBuildDependencies");
 			this.compiler.cache.storeBuildDependencies(
 				compilation.buildDependencies,
 				err => {
 					logger.timeEnd("storeBuildDependencies");
-					if (err) return handleError(err);
+					if (err) return handleError(err, cbs);
 					logger.time("beginIdle");
 					this.compiler.cache.beginIdle();
 					this.compiler.idle = true;
@@ -221,8 +276,7 @@ class Watching {
 							);
 						}
 					});
-					for (const cb of this.callbacks) cb();
-					this.callbacks.length = 0;
+					for (const cb of cbs) cb(null);
 					this.compiler.hooks.afterDone.call(stats);
 				}
 			);
@@ -250,8 +304,6 @@ class Watching {
 				changedFiles,
 				removedFiles
 			) => {
-				this.pausedWatcher = this.watcher;
-				this.watcher = null;
 				if (err) {
 					this.compiler.modifiedFiles = undefined;
 					this.compiler.removedFiles = undefined;
@@ -259,16 +311,12 @@ class Watching {
 					this.compiler.contextTimestamps = undefined;
 					return this.handler(err);
 				}
-				this.compiler.fileTimestamps = fileTimeInfoEntries;
-				this.compiler.contextTimestamps = contextTimeInfoEntries;
-				this.compiler.removedFiles = removedFiles;
-				this.compiler.modifiedFiles = changedFiles;
-				if (this.watcher) {
-					this.pausedWatcher = this.watcher;
-					this.watcher.pause();
-					this.watcher = null;
-				}
-				this._invalidate();
+				this._invalidate(
+					fileTimeInfoEntries,
+					contextTimeInfoEntries,
+					changedFiles,
+					removedFiles
+				);
 				this._onChange();
 			},
 			(fileName, changeTime) => {
@@ -293,33 +341,30 @@ class Watching {
 			this._invalidReported = true;
 			this.compiler.hooks.invalid.call(null, Date.now());
 		}
+		this._onChange();
 		this._invalidate();
 	}
 
-	_invalidate() {
-		if (this.suspended) return;
-		if (this._isBlocked()) {
-			this.blocked = true;
+	_invalidate(
+		fileTimeInfoEntries,
+		contextTimeInfoEntries,
+		changedFiles,
+		removedFiles
+	) {
+		if (this.suspended || (this._isBlocked() && (this.blocked = true))) {
+			this._mergeWithCollected(changedFiles, removedFiles);
 			return;
 		}
-		if (this.watcher) {
-			this.compiler.modifiedFiles =
-				this.watcher.getAggregatedChanges &&
-				this.watcher.getAggregatedChanges();
-			this.compiler.removedFiles =
-				this.watcher.getAggregatedRemovals &&
-				this.watcher.getAggregatedRemovals();
-			this.compiler.fileTimestamps = this.watcher.getFileTimeInfoEntries();
-			this.compiler.contextTimestamps = this.watcher.getContextTimeInfoEntries();
-			this.pausedWatcher = this.watcher;
-			this.watcher.pause();
-			this.watcher = null;
-		}
 
 		if (this.running) {
 			this.invalid = true;
 		} else {
-			this._go();
+			this._go(
+				fileTimeInfoEntries,
+				contextTimeInfoEntries,
+				changedFiles,
+				removedFiles
+			);
 		}
 	}
 
@@ -334,14 +379,6 @@ class Watching {
 		}
 	}
 
-	_checkUnblocked() {
-		if (this.blocked && !this._isBlocked()) {
-			this.blocked = false;
-			this._needWatcherInfo = true;
-			this._invalidate();
-		}
-	}
-
 	/**
 	 * @param {Callback<void>} callback signals when the watcher is closed
 	 * @returns {void}

package/lib/WebpackOptionsApply.js

@@ -569,6 +569,7 @@ class WebpackOptionsApply extends OptionsApply {
 									),
 									snapshot: options.snapshot,
 									maxAge: cacheOptions.maxAge,
+									profile: cacheOptions.profile,
 									allowCollectingMemory: cacheOptions.allowCollectingMemory
 								}),
 								cacheOptions.idleTimeout,

package/lib/asset/AssetGenerator.js

@@ -170,9 +170,9 @@ class AssetGenerator extends Generator {
 						hash.update(runtimeTemplate.outputOptions.hashSalt);
 					}
 					hash.update(originalSource.buffer());
-					const fullHash = /** @type {string} */ (hash.digest(
-						runtimeTemplate.outputOptions.hashDigest
-					));
+					const fullHash = /** @type {string} */ (
+						hash.digest(runtimeTemplate.outputOptions.hashDigest)
+					);
 					const contentHash = fullHash.slice(
 						0,
 						runtimeTemplate.outputOptions.hashDigestLength
@@ -183,26 +183,9 @@ class AssetGenerator extends Generator {
 						module.matchResource || module.resource,
 						runtimeTemplate.compilation.compiler.root
 					).replace(/^\.\//, "");
-					let {
-						path: filename,
-						info: assetInfo
-					} = runtimeTemplate.compilation.getAssetPathWithInfo(
-						assetModuleFilename,
-						{
-							module,
-							runtime,
-							filename: sourceFilename,
-							chunkGraph,
-							contentHash
-						}
-					);
-					let publicPath;
-					if (this.publicPath) {
-						const {
-							path,
-							info
-						} = runtimeTemplate.compilation.getAssetPathWithInfo(
-							this.publicPath,
+					let { path: filename, info: assetInfo } =
+						runtimeTemplate.compilation.getAssetPathWithInfo(
+							assetModuleFilename,
 							{
 								module,
 								runtime,
@@ -211,6 +194,19 @@ class AssetGenerator extends Generator {
 								contentHash
 							}
 						);
+					let publicPath;
+					if (this.publicPath) {
+						const { path, info } =
+							runtimeTemplate.compilation.getAssetPathWithInfo(
+								this.publicPath,
+								{
+									module,
+									runtime,
+									filename: sourceFilename,
+									chunkGraph,
+									contentHash
+								}
+							);
 						publicPath = JSON.stringify(path);
 						assetInfo = mergeAssetInfo(assetInfo, info);
 					} else {