webpack 5.111.0 → 5.112.0

package/lib/RawModule.js

@@ -5,200 +5,6 @@
 
 "use strict";
 
-const { OriginalSource, RawSource } = require("webpack-sources");
-const Module = require("./Module");
-const {
-	JAVASCRIPT_TYPE,
-	JAVASCRIPT_TYPES
-} = require("./ModuleSourceTypeConstants");
-const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
-const makeSerializable = require("./util/makeSerializable");
-
-/**
- * @import {
- * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
- */
-/** @import Compilation from "./Compilation" */
-/** @import { UpdateHashContext } from "./Dependency" */
-/**
- * @import {
- * 	BuildCallback,
- * 	CodeGenerationContext,
- * 	CodeGenerationResult,
- * 	NeedBuildCallback,
- * 	NeedBuildContext,
- * 	ReadOnlyRuntimeRequirements,
- * 	Sources,
- * 	SourceTypes
- * } from "./Module"
- */
-/** @import ModuleGraph from "./ModuleGraph" */
-/** @import { ConnectionState } from "./ModuleGraphConnection" */
-/** @import RequestShortener from "./RequestShortener" */
-/** @import { ResolverWithOptions } from "./ResolverFactory" */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, string, ReadOnlyRuntimeRequirements | null]>} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext<[string, string, string, ReadOnlyRuntimeRequirements | null]>} ObjectSerializerContext */
-/** @import Hash from "./util/Hash" */
-/** @import { InputFileSystem } from "./util/fs" */
-
-class RawModule extends Module {
-	/**
-	 * Creates an instance of RawModule.
-	 * @param {string} source source code
-	 * @param {string} identifier unique identifier
-	 * @param {string=} readableIdentifier readable identifier
-	 * @param {ReadOnlyRuntimeRequirements=} runtimeRequirements runtime requirements needed for the source code
-	 */
-	constructor(source, identifier, readableIdentifier, runtimeRequirements) {
-		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, null);
-		/** @type {string} */
-		this.sourceStr = source;
-		/** @type {string} */
-		this.identifierStr = identifier || this.sourceStr;
-		/** @type {string} */
-		this.readableIdentifierStr = readableIdentifier || this.identifierStr;
-		/** @type {ReadOnlyRuntimeRequirements | null} */
-		this.runtimeRequirements = runtimeRequirements || null;
-	}
-
-	/**
-	 * Returns the source types this module can generate.
-	 * @returns {SourceTypes} types available (do not mutate)
-	 */
-	getSourceTypes() {
-		return JAVASCRIPT_TYPES;
-	}
-
-	/**
-	 * Returns the unique identifier used to reference this module.
-	 * @returns {string} a unique identifier of the module
-	 */
-	identifier() {
-		return this.identifierStr;
-	}
-
-	/**
-	 * Returns the estimated size for the requested source type.
-	 * @param {string=} type the source type for which the size should be estimated
-	 * @returns {number} the estimated size of the module (must be non-zero)
-	 */
-	size(type) {
-		return Math.max(1, this.sourceStr.length);
-	}
-
-	/**
-	 * Returns a human-readable identifier for this module.
-	 * @param {RequestShortener} requestShortener the request shortener
-	 * @returns {string} a user readable identifier of the module
-	 */
-	readableIdentifier(requestShortener) {
-		return /** @type {string} */ (
-			requestShortener.shorten(this.readableIdentifierStr)
-		);
-	}
-
-	/**
-	 * Checks whether the module needs to be rebuilt for the current build state.
-	 * @param {NeedBuildContext} context context info
-	 * @param {NeedBuildCallback} callback callback function, returns true, if the module needs a rebuild
-	 * @returns {void}
-	 */
-	needBuild(context, callback) {
-		return callback(null, !this.buildMeta);
-	}
-
-	/**
-	 * Builds the module using the provided compilation context.
-	 * @param {WebpackOptions} options webpack options
-	 * @param {Compilation} compilation the compilation
-	 * @param {ResolverWithOptions} resolver the resolver
-	 * @param {InputFileSystem} fs the file system
-	 * @param {BuildCallback} callback callback function
-	 * @returns {void}
-	 */
-	build(options, compilation, resolver, fs, callback) {
-		this.buildMeta = {};
-		this.buildInfo = {
-			cacheable: true
-		};
-		callback();
-	}
-
-	/**
-	 * Gets side effects connection state.
-	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @returns {ConnectionState} how this module should be connected to referencing modules when consumed for side-effects only
-	 */
-	getSideEffectsConnectionState(moduleGraph) {
-		if (this.factoryMeta !== undefined) {
-			if (this.factoryMeta.sideEffectFree) return false;
-			if (this.factoryMeta.sideEffectFree === false) return true;
-		}
-		return true;
-	}
-
-	/**
-	 * Generates code and runtime requirements for this module.
-	 * @param {CodeGenerationContext} context context for code generation
-	 * @returns {CodeGenerationResult} result
-	 */
-	codeGeneration(context) {
-		/** @type {Sources} */
-		const sources = new Map();
-		if (this.useSourceMap || this.useSimpleSourceMap) {
-			sources.set(
-				JAVASCRIPT_TYPE,
-				new OriginalSource(this.sourceStr, this.identifier())
-			);
-		} else {
-			sources.set(JAVASCRIPT_TYPE, new RawSource(this.sourceStr));
-		}
-		return { sources, runtimeRequirements: this.runtimeRequirements };
-	}
-
-	/**
-	 * Updates the hash with the data contributed by this instance.
-	 * @param {Hash} hash the hash used to track dependencies
-	 * @param {UpdateHashContext} context context
-	 * @returns {void}
-	 */
-	updateHash(hash, context) {
-		hash.update(this.sourceStr);
-		super.updateHash(hash, context);
-	}
-
-	/**
-	 * Serializes this instance into the provided serializer context.
-	 * @param {ObjectSerializerContext} context context
-	 */
-	serialize(context) {
-		context
-			.write(this.sourceStr)
-			.write(this.identifierStr)
-			.write(this.readableIdentifierStr)
-			.write(this.runtimeRequirements);
-
-		super.serialize(context);
-	}
-
-	/**
-	 * Restores this instance from the provided deserializer context.
-	 * @param {ObjectDeserializerContext} context context
-	 */
-	deserialize(context) {
-		this.sourceStr = context.read();
-		const c1 = context.rest;
-		this.identifierStr = c1.read();
-		const c2 = c1.rest;
-		this.readableIdentifierStr = c2.read();
-		const c3 = c2.rest;
-		this.runtimeRequirements = c3.read();
-
-		super.deserialize(c3.rest);
-	}
-}
-
-makeSerializable(RawModule, "webpack/lib/RawModule");
-
-module.exports = RawModule;
+// TODO in the next major release: remove
+// Some old plugins use `require("webpack/lib/RawModule")`, in the next major release developer should migrate to `compiler.webpack.RawModule`
+module.exports = require("./module/RawModule");

package/lib/RequestShortener.js

@@ -5,40 +5,6 @@
 
 "use strict";
 
-const { contextify } = require("./util/identifier");
-
-/** @import { AssociatedObjectForCache } from "./util/identifier" */
-
-/**
- * Shortens absolute or verbose request strings so diagnostics and stats output
- * can be rendered relative to a chosen base directory.
- */
-class RequestShortener {
-	/**
-	 * Binds a context-aware shortening function to the provided directory and
-	 * optional cache owner.
-	 * @param {string} dir the directory
-	 * @param {AssociatedObjectForCache=} associatedObjectForCache an object to which the cache will be attached
-	 */
-	constructor(dir, associatedObjectForCache) {
-		this.contextify = contextify.bindContextCache(
-			dir,
-			associatedObjectForCache
-		);
-	}
-
-	/**
-	 * Returns a request string rewritten relative to the configured directory
-	 * when one is provided.
-	 * @param {string | undefined | null} request the request to shorten
-	 * @returns {string | undefined | null} the shortened request
-	 */
-	shorten(request) {
-		if (!request) {
-			return request;
-		}
-		return this.contextify(request);
-	}
-}
-
-module.exports = RequestShortener;
+// TODO in the next major release: remove
+// Some old plugins use `require("webpack/lib/RequestShortener")`, in the next major release developer should migrate to `compiler.webpack.util.RequestShortener`
+module.exports = require("./util/RequestShortener");

package/lib/SingleEntryPlugin.js

@@ -5,4 +5,4 @@
 
 "use strict";
 
-module.exports = require("./EntryPlugin");
+module.exports = require("./entry/EntryPlugin");

package/lib/WebpackError.js

@@ -5,6 +5,6 @@
 
 "use strict";
 
-// TODO remove in webpack 6
-// Some old plugins use `require("webpack/lib/WebpackError")`, in webpack@6 developer should migrate to `compiler.webpack.WebpackError`
+// TODO in the next major release: remove
+// Some old plugins use `require("webpack/lib/WebpackError")`, in the next major release developer should migrate to `compiler.webpack.WebpackError`
 module.exports = require("./errors/WebpackError");

package/lib/asset/AssetBytesGenerator.js

@@ -6,8 +6,7 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const ConcatenationScope = require("../ConcatenationScope");
-const Generator = require("../Generator");
+const Generator = require("../module/Generator");
 const {
 	ASSET_URL_TYPE,
 	ASSET_URL_TYPES,
@@ -17,20 +16,21 @@ const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
-} = require("../ModuleSourceTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
+} = require("../module/ModuleSourceTypeConstants");
+const ConcatenationScope = require("../optimize/ConcatenationScope");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext } from "../Generator" */
+/** @import { GenerateContext } from "../module/Generator" */
 /**
  * @import {
  * 	ConcatenationBailoutReasonContext,
  * 	SourceType,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import NormalModule from "../NormalModule" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import NormalModule from "../module/NormalModule" */
 
 class AssetBytesGenerator extends Generator {
 	/**
@@ -114,7 +114,13 @@ class AssetBytesGenerator extends Generator {
 	generateError(error, module, generateContext) {
 		switch (generateContext.type) {
 			case JAVASCRIPT_TYPE: {
-				return new RawSource(Generator.throwBuildErrorCode(error));
+				return new RawSource(
+					Generator.throwBuildErrorCode(
+						error,
+						undefined,
+						generateContext.runtimeTemplate.requestShortener
+					)
+				);
 			}
 			default:
 				return null;

package/lib/asset/AssetBytesParser.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const Parser = require("../Parser");
+const Parser = require("../module/Parser");
 
-/** @import { BuildInfo, BuildMeta } from "../Module" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import { BuildInfo, BuildMeta } from "../module/Module" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 class AssetBytesParser extends Parser {
 	/**

package/lib/asset/AssetGenerator.js

@@ -7,8 +7,8 @@
 
 const path = require("path");
 const { RawSource } = require("webpack-sources");
-const ConcatenationScope = require("../ConcatenationScope");
-const Generator = require("../Generator");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Generator = require("../module/Generator");
 const {
 	ASSET_AND_ASSET_URL_TYPES,
 	ASSET_AND_JAVASCRIPT_AND_ASSET_URL_TYPES,
@@ -20,14 +20,17 @@ const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
-} = require("../ModuleSourceTypeConstants");
-const { ASSET_MODULE_TYPE } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { toTemplateSourceFileName } = require("../TemplatedPathPlugin");
-const URLDependency = require("../dependencies/URLDependency");
+} = require("../module/ModuleSourceTypeConstants");
+const { ASSET_MODULE_TYPE } = require("../module/ModuleTypeConstants");
+const ConcatenationScope = require("../optimize/ConcatenationScope");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const { toTemplateSourceFileName } = require("../template/TemplatedPathPlugin");
 const { getScheme } = require("../util/URLAbsoluteSpecifier");
 const createHash = require("../util/createHash");
-const { languageOfMediaType } = require("../util/dataURL");
+const {
+	encodeDataURIPayload,
+	languageOfMediaType
+} = require("../util/dataURL");
 const { makePathsRelative, parseResource } = require("../util/identifier");
 const memoize = require("../util/memoize");
 const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
@@ -50,20 +53,20 @@ const getMimeTypes = memoize(() => require("../util/mimeTypes"));
  * 	RawPublicPath
  * } from "../../declarations/WebpackOptions"
  */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation, { AssetInfo } from "../Compilation" */
-/** @import { GenerateContext, UpdateHashContext } from "../Generator" */
+/** @import { GenerateContext, UpdateHashContext } from "../module/Generator" */
 /**
  * @import Module, {
  * 	ConcatenationBailoutReasonContext,
  * 	SourceType,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
 /** @import { AssetModuleBuildInfo } from "./AssetModule" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import NormalModule from "../NormalModule" */
-/** @import RuntimeTemplate from "../RuntimeTemplate" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import NormalModule from "../module/NormalModule" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 /** @import Hash from "../util/Hash" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 
@@ -272,7 +275,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Gets the source file name as seen by a filename template. With
-	 * `experiments.futureDefaults` (webpack 6 default) `[path]` and `[file]` of a
+	 * `experiments.futureDefaults` (the next major release's default) `[path]` and `[file]` of a
 	 * module outside of `context` behave like `[containedpath]`/`[containedfile]`,
 	 * so they can't emit the asset outside of `output.path`.
 	 * @param {NormalModule} module module
@@ -635,6 +638,17 @@ class AssetGenerator extends Generator {
 				encodedContent =
 					/** @type {string} */
 					(module.resourceResolveData.encodedContent);
+			} else if (
+				renderedSource !== undefined &&
+				encoding === false &&
+				module.resourceResolveData &&
+				module.resourceResolveData.encoding === false
+			) {
+				// A rendered payload of a `data:` URI written as text is written back
+				// as text: percent-encoding all of it outgrows what minifying saved.
+				encodedContent = encodeDataURIPayload(
+					/** @type {string} */ (source.source())
+				);
 			} else {
 				encodedContent = encodeDataUri(
 					/** @type {"base64" | false} */ (encoding),
@@ -676,13 +690,12 @@ class AssetGenerator extends Generator {
 			(module.buildInfo).dataUrl &&
 			needContent
 		) {
-			// A payload bound for CSS or HTML is offered by their serializers, which
-			// see the `url()` it ends up in; only the JavaScript one is ours.
+			// WHY: CSS and HTML serializers offer the payload in the `url()` or
+			// attribute it lands in, but the `asset-url` value is also what an
+			// analyzable `new URL` copies into JavaScript, which nothing re-reads.
 			const encodedSource = this.generateDataUri(
 				module,
-				type === JAVASCRIPT_TYPE
-					? this._renderEmbedded(module, runtimeTemplate)
-					: undefined
+				this._renderEmbedded(module, runtimeTemplate)
 			);
 			content =
 				type === JAVASCRIPT_TYPE
@@ -748,7 +761,7 @@ class AssetGenerator extends Generator {
 
 			// Due to code generation caching module.buildInfo.XXX can't used to store such information
 			// It need to be stored in the code generation results instead, where it's cached too
-			// TODO webpack 6 For back-compat reasons we also store in on module.buildInfo
+			// TODO in the next major release: remove the back-compat writes to module.buildInfo
 			/** @type {AssetModuleBuildInfo} */
 			(module.buildInfo).filename = filename;
 
@@ -791,10 +804,21 @@ class AssetGenerator extends Generator {
 	generateError(error, module, generateContext) {
 		switch (generateContext.type) {
 			case "asset": {
-				return new RawSource(error.message);
+				return new RawSource(
+					Generator.buildErrorMessage(
+						error,
+						generateContext.runtimeTemplate.requestShortener
+					)
+				);
 			}
 			case JAVASCRIPT_TYPE: {
-				return new RawSource(Generator.throwBuildErrorCode(error));
+				return new RawSource(
+					Generator.throwBuildErrorCode(
+						error,
+						undefined,
+						generateContext.runtimeTemplate.requestShortener
+					)
+				);
 			}
 			default:
 				return null;
@@ -836,13 +860,14 @@ class AssetGenerator extends Generator {
 				/** @type {AssetModuleBuildInfo} */ (module.buildInfo).dataUrl
 			) && this.emit !== false;
 
-		// Only analyzable ESM output can drop a bare `new URL()` to an asset-url; without
-		// it every JS consumer needs the wrapper, so skip the per-connection dependency
-		// probe entirely and keep the pre-existing cheap path. Must match the condition
-		// `URLDependency` uses to emit the literal, or the wrapper is dropped while the
-		// call site still requires the module — except where the fallback spells the name
-		// itself (`.p + <file>`), which needs no wrapper to read it out of.
-		// Build-time execution instead emulates the wrapper (`AssetModulesPlugin`).
+		// WHY: only analyzable ESM output can drop a bare `new URL()` to an asset
+		// url; without it every JS consumer needs the wrapper, so the per-connection
+		// dependency probe is skipped entirely and the cheap path stands. This must
+		// match the condition `URLDependency` emits the literal under, or the wrapper
+		// is dropped while the call site still requires the module — except where the
+		// fallback spells the name itself (`.p + <file>`), which needs no wrapper to
+		// read it out of. Build-time execution emulates the wrapper instead
+		// (`AssetModulesPlugin`).
 		const isModule = Boolean(
 			this._compilation &&
 			this._compilation.runtimeTemplate.supportsAnalyzable(
@@ -874,11 +899,11 @@ class AssetGenerator extends Generator {
 				hasUrl = true;
 			} else if (
 				// Only a bare `new URL()` becomes the analyzable literal; a relative ref
-				// keeps the runtime form and still needs the wrapper. Prefetch/preload
-				// refs don't: their `<link>` is emitted at chunk startup, which resolves
-				// the href from the asset filename when there is no wrapper.
+				// keeps the runtime form and its wrapper. A prefetch or preload ref needs
+				// none: its `<link>` resolves the href at chunk startup.
 				isModule &&
-				dependency instanceof URLDependency &&
+				dependency !== null &&
+				isDependencyKind(dependency, "url") &&
 				!dependency.relative
 			) {
 				hasUrlJs = true;
@@ -961,10 +986,8 @@ class AssetGenerator extends Generator {
 						return 0;
 					}
 
-					// roughly for data url
-					// Example: m.exports="data:image/png;base64,ag82/f+2=="
-					// 4/3 = base64 encoding
-					// 34 = ~ data url header + footer + rounding
+					// Rough data-url size: 4/3 for the base64 encoding, plus about 34 bytes
+					// of header, footer and rounding.
 					return originalSource.size() * 1.34 + 36;
 				}
 				// it's only estimated so this number is probably fine

package/lib/asset/AssetModule.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
+const NormalModule = require("../module/NormalModule");
 const makeSerializable = require("../util/makeSerializable");
 
 /** @import { AssetInfo } from "../Compilation" */
@@ -12,7 +12,7 @@ const makeSerializable = require("../util/makeSerializable");
  * @import {
  * 	NormalModuleBuildInfo,
  * 	NormalModuleCreateData
- * } from "../NormalModule"
+ * } from "../module/NormalModule"
  */
 
 /**

package/lib/asset/AssetModulesPlugin.js

@@ -6,11 +6,10 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const HotUpdateChunk = require("../HotUpdateChunk");
 const {
 	ASSET_URL_TYPE,
 	JAVASCRIPT_TYPE
-} = require("../ModuleSourceTypeConstants");
+} = require("../module/ModuleSourceTypeConstants");
 const {
 	ASSET_MODULE_TYPE,
 	ASSET_MODULE_TYPE_BYTES,
@@ -18,7 +17,7 @@ const {
 	ASSET_MODULE_TYPE_RESOURCE,
 	ASSET_MODULE_TYPE_SOURCE,
 	ASSET_MODULE_TYPE_WEBMANIFEST
-} = require("../ModuleTypeConstants");
+} = require("../module/ModuleTypeConstants");
 const { compareModulesByFullName } = require("../util/comparators");
 const createHash = require("../util/createHash");
 const { getUndoPath } = require("../util/identifier");
@@ -45,8 +44,8 @@ const { PUBLIC_PATH_AUTO } = require("../util/publicPathPlaceholder");
  */
 /** @import Compiler from "../Compiler" */
 /** @import { AssetModuleBuildInfo } from "./AssetModule" */
-/** @import { CodeGenerationResult } from "../Module" */
-/** @import NormalModule from "../NormalModule" */
+/** @import { CodeGenerationResult } from "../module/Module" */
+/** @import NormalModule from "../module/NormalModule" */
 
 /**
  * Returns definition.
@@ -54,9 +53,7 @@ const { PUBLIC_PATH_AUTO } = require("../util/publicPathPlaceholder");
  * @returns {Schema} definition
  */
 const getSchema = (name) => {
-	const { definitions } =
-		/** @type {EXPECTED_ANY} */
-		(require("../../schemas/WebpackOptions.json"));
+	const { definitions } = require("../../schemas/WebpackOptions.json");
 
 	return {
 		definitions,
@@ -432,7 +429,7 @@ class AssetModulesPlugin {
 						PLUGIN_NAME,
 						(result, options) => {
 							const { chunk, codeGenerationResults } = options;
-							if (chunk instanceof HotUpdateChunk) return result;
+							if (chunk.isHotUpdate()) return result;
 							const { chunkGraph, outputOptions } = compilation;
 							const modules =
 								chunkGraph.getOrderedChunkModulesIterableBySourceType(

package/lib/asset/AssetParser.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const Parser = require("../Parser");
+const Parser = require("../module/Parser");
 
 /**
  * @import {
@@ -13,9 +13,9 @@ const Parser = require("../Parser");
  * 	AssetParserOptions
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Module, { BuildMeta } from "../Module" */
+/** @import Module, { BuildMeta } from "../module/Module" */
 /** @import { AssetModuleBuildInfo } from "./AssetModule" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 /** @typedef {((source: string | Buffer, context: { filename: string, module: Module }) => boolean)} AssetParserDataUrlFunction */
 

package/lib/asset/AssetSourceGenerator.js

@@ -6,8 +6,7 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const ConcatenationScope = require("../ConcatenationScope");
-const Generator = require("../Generator");
+const Generator = require("../module/Generator");
 const {
 	ASSET_URL_TYPE,
 	ASSET_URL_TYPES,
@@ -17,22 +16,23 @@ const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
-} = require("../ModuleSourceTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
+} = require("../module/ModuleSourceTypeConstants");
+const ConcatenationScope = require("../optimize/ConcatenationScope");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const { languageOfFilename } = require("../util/dataURL");
 
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext, UpdateHashContext } from "../Generator" */
+/** @import { GenerateContext, UpdateHashContext } from "../module/Generator" */
 /** @import Hash from "../util/Hash" */
 /**
  * @import {
  * 	ConcatenationBailoutReasonContext,
  * 	SourceType,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import NormalModule from "../NormalModule" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import NormalModule from "../module/NormalModule" */
 
 class AssetSourceGenerator extends Generator {
 	/**
@@ -158,7 +158,13 @@ class AssetSourceGenerator extends Generator {
 	generateError(error, module, generateContext) {
 		switch (generateContext.type) {
 			case JAVASCRIPT_TYPE: {
-				return new RawSource(Generator.throwBuildErrorCode(error));
+				return new RawSource(
+					Generator.throwBuildErrorCode(
+						error,
+						undefined,
+						generateContext.runtimeTemplate.requestShortener
+					)
+				);
 			}
 			default:
 				return null;