webpack 5.64.3 → 5.67.0

package/lib/RuntimeGlobals.js

@@ -164,10 +164,17 @@ exports.scriptNonce = "__webpack_require__.nc";
  * function to load a script tag.
  * Arguments: (url: string, done: (event) => void), key?: string | number, chunkId?: string | number) => void
  * done function is called when loading has finished or timeout occurred.
- * It will attach to existing script tags with data-webpack == key or src == url.
+ * It will attach to existing script tags with data-webpack == uniqueName + ":" + key or src == url.
  */
 exports.loadScript = "__webpack_require__.l";
 
+/**
+ * function to promote a string to a TrustedScript using webpack's Trusted
+ * Types policy
+ * Arguments: (script: string) => TrustedScript
+ */
+exports.createScript = "__webpack_require__.ts";
+
 /**
  * function to promote a string to a TrustedScriptURL using webpack's Trusted
  * Types policy
@@ -175,6 +182,12 @@ exports.loadScript = "__webpack_require__.l";
  */
 exports.createScriptUrl = "__webpack_require__.tu";
 
+/**
+ * function to return webpack's Trusted Types policy
+ * Arguments: () => TrustedTypePolicy
+ */
+exports.getTrustedTypesPolicy = "__webpack_require__.tt";
+
 /**
  * the chunk name of the chunk with the runtime
  */
@@ -190,11 +203,26 @@ exports.runtimeId = "__webpack_require__.j";
  */
 exports.getChunkScriptFilename = "__webpack_require__.u";
 
+/**
+ * the filename of the css part of the chunk
+ */
+exports.getChunkCssFilename = "__webpack_require__.k";
+
+/**
+ * a flag when a module/chunk/tree has css modules
+ */
+exports.hasCssModules = "has css modules";
+
 /**
  * the filename of the script part of the hot update chunk
  */
 exports.getChunkUpdateScriptFilename = "__webpack_require__.hu";
 
+/**
+ * the filename of the css part of the hot update chunk
+ */
+exports.getChunkUpdateCssFilename = "__webpack_require__.hk";
+
 /**
  * startup signal from runtime
  * This will be called when the runtime chunk has been loaded.

package/lib/RuntimeModule.js

@@ -78,7 +78,7 @@ class RuntimeModule extends Module {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {

package/lib/RuntimePlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const RuntimeGlobals = require("./RuntimeGlobals");
+const { getChunkFilenameTemplate } = require("./css/CssModulesPlugin");
 const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const AsyncModuleRuntimeModule = require("./runtime/AsyncModuleRuntimeModule");
@@ -13,11 +14,13 @@ const AutoPublicPathRuntimeModule = require("./runtime/AutoPublicPathRuntimeModu
 const CompatGetDefaultExportRuntimeModule = require("./runtime/CompatGetDefaultExportRuntimeModule");
 const CompatRuntimeModule = require("./runtime/CompatRuntimeModule");
 const CreateFakeNamespaceObjectRuntimeModule = require("./runtime/CreateFakeNamespaceObjectRuntimeModule");
+const CreateScriptRuntimeModule = require("./runtime/CreateScriptRuntimeModule");
 const CreateScriptUrlRuntimeModule = require("./runtime/CreateScriptUrlRuntimeModule");
 const DefinePropertyGettersRuntimeModule = require("./runtime/DefinePropertyGettersRuntimeModule");
 const EnsureChunkRuntimeModule = require("./runtime/EnsureChunkRuntimeModule");
 const GetChunkFilenameRuntimeModule = require("./runtime/GetChunkFilenameRuntimeModule");
 const GetMainFilenameRuntimeModule = require("./runtime/GetMainFilenameRuntimeModule");
+const GetTrustedTypesPolicyRuntimeModule = require("./runtime/GetTrustedTypesPolicyRuntimeModule");
 const GlobalRuntimeModule = require("./runtime/GlobalRuntimeModule");
 const HasOwnPropertyRuntimeModule = require("./runtime/HasOwnPropertyRuntimeModule");
 const LoadScriptRuntimeModule = require("./runtime/LoadScriptRuntimeModule");
@@ -39,7 +42,9 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.runtimeId,
 	RuntimeGlobals.compatGetDefaultExport,
 	RuntimeGlobals.createFakeNamespaceObject,
+	RuntimeGlobals.createScript,
 	RuntimeGlobals.createScriptUrl,
+	RuntimeGlobals.getTrustedTypesPolicy,
 	RuntimeGlobals.definePropertyGetters,
 	RuntimeGlobals.ensureChunk,
 	RuntimeGlobals.entryModuleId,
@@ -261,6 +266,30 @@ class RuntimePlugin {
 					);
 					return true;
 				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.getChunkCssFilename)
+				.tap("RuntimePlugin", (chunk, set) => {
+					if (
+						typeof compilation.outputOptions.cssChunkFilename === "string" &&
+						/\[(full)?hash(:\d+)?\]/.test(
+							compilation.outputOptions.cssChunkFilename
+						)
+					) {
+						set.add(RuntimeGlobals.getFullHash);
+					}
+					compilation.addRuntimeModule(
+						chunk,
+						new GetChunkFilenameRuntimeModule(
+							"css",
+							"css",
+							RuntimeGlobals.getChunkCssFilename,
+							chunk =>
+								getChunkFilenameTemplate(chunk, compilation.outputOptions),
+							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers)
+						)
+					);
+					return true;
+				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.getChunkUpdateScriptFilename)
 				.tap("RuntimePlugin", (chunk, set) => {
@@ -339,15 +368,36 @@ class RuntimePlugin {
 					);
 					return true;
 				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.createScript)
+				.tap("RuntimePlugin", (chunk, set) => {
+					if (compilation.outputOptions.trustedTypes) {
+						set.add(RuntimeGlobals.getTrustedTypesPolicy);
+					}
+					compilation.addRuntimeModule(chunk, new CreateScriptRuntimeModule());
+					return true;
+				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.createScriptUrl)
 				.tap("RuntimePlugin", (chunk, set) => {
+					if (compilation.outputOptions.trustedTypes) {
+						set.add(RuntimeGlobals.getTrustedTypesPolicy);
+					}
 					compilation.addRuntimeModule(
 						chunk,
 						new CreateScriptUrlRuntimeModule()
 					);
 					return true;
 				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.getTrustedTypesPolicy)
+				.tap("RuntimePlugin", (chunk, set) => {
+					compilation.addRuntimeModule(
+						chunk,
+						new GetTrustedTypesPolicyRuntimeModule(set)
+					);
+					return true;
+				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.relativeUrl)
 				.tap("RuntimePlugin", (chunk, set) => {

package/lib/RuntimeTemplate.js

@@ -16,6 +16,7 @@ const { forEachRuntime, subtractRuntime } = require("./util/runtime");
 /** @typedef {import("../declarations/WebpackOptions").OutputNormalized} OutputOptions */
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
+/** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Module")} Module */
@@ -50,6 +51,27 @@ Module has these incoming connections: ${Array.from(
 	).join("")}`;
 };
 
+/**
+ * @param {string|undefined} definition global object definition
+ * @returns {string} save to use global object
+ */
+function getGlobalObject(definition) {
+	if (!definition) return definition;
+	const trimmed = definition.trim();
+
+	if (
+		// identifier, we do not need real identifier regarding ECMAScript/Unicode
+		trimmed.match(/^[_\p{L}][_0-9\p{L}]*$/iu) ||
+		// iife
+		// call expression
+		// expression in parentheses
+		trimmed.match(/^([_\p{L}][_0-9\p{L}]*)?\(.*\)$/iu)
+	)
+		return trimmed;
+
+	return `Object(${trimmed})`;
+}
+
 class RuntimeTemplate {
 	/**
 	 * @param {Compilation} compilation the compilation
@@ -60,6 +82,7 @@ class RuntimeTemplate {
 		this.compilation = compilation;
 		this.outputOptions = outputOptions || {};
 		this.requestShortener = requestShortener;
+		this.globalObject = getGlobalObject(outputOptions.globalObject);
 	}
 
 	isIIFE() {
@@ -78,6 +101,10 @@ class RuntimeTemplate {
 		return this.outputOptions.environment.arrowFunction;
 	}
 
+	supportsOptionalChaining() {
+		return this.outputOptions.environment.optionalChaining;
+	}
+
 	supportsForOf() {
 		return this.outputOptions.environment.forOf;
 	}
@@ -99,8 +126,7 @@ class RuntimeTemplate {
 	}
 
 	supportTemplateLiteral() {
-		// TODO
-		return false;
+		return this.outputOptions.environment.templateLiteral;
 	}
 
 	returningFunction(returnValue, args = "") {
@@ -115,6 +141,71 @@ class RuntimeTemplate {
 			: `function(${args}) {\n${Template.indent(body)}\n}`;
 	}
 
+	/**
+	 * @param {Array<string|{expr: string}>} args args
+	 * @returns {string} result expression
+	 */
+	concatenation(...args) {
+		const len = args.length;
+
+		if (len === 2) return this._es5Concatenation(args);
+		if (len === 0) return '""';
+		if (len === 1) {
+			return typeof args[0] === "string"
+				? JSON.stringify(args[0])
+				: `"" + ${args[0].expr}`;
+		}
+		if (!this.supportTemplateLiteral()) return this._es5Concatenation(args);
+
+		// cost comparison between template literal and concatenation:
+		// both need equal surroundings: `xxx` vs "xxx"
+		// template literal has constant cost of 3 chars for each expression
+		// es5 concatenation has cost of 3 + n chars for n expressions in row
+		// when a es5 concatenation ends with an expression it reduces cost by 3
+		// when a es5 concatenation starts with an single expression it reduces cost by 3
+		// e. g. `${a}${b}${c}` (3*3 = 9) is longer than ""+a+b+c ((3+3)-3 = 3)
+		// e. g. `x${a}x${b}x${c}x` (3*3 = 9) is shorter than "x"+a+"x"+b+"x"+c+"x" (4+4+4 = 12)
+
+		let templateCost = 0;
+		let concatenationCost = 0;
+
+		let lastWasExpr = false;
+		for (const arg of args) {
+			const isExpr = typeof arg !== "string";
+			if (isExpr) {
+				templateCost += 3;
+				concatenationCost += lastWasExpr ? 1 : 4;
+			}
+			lastWasExpr = isExpr;
+		}
+		if (lastWasExpr) concatenationCost -= 3;
+		if (typeof args[0] !== "string" && typeof args[1] === "string")
+			concatenationCost -= 3;
+
+		if (concatenationCost <= templateCost) return this._es5Concatenation(args);
+
+		return `\`${args
+			.map(arg => (typeof arg === "string" ? arg : `\${${arg.expr}}`))
+			.join("")}\``;
+	}
+
+	/**
+	 * @param {Array<string|{expr: string}>} args args (len >= 2)
+	 * @returns {string} result expression
+	 * @private
+	 */
+	_es5Concatenation(args) {
+		const str = args
+			.map(arg => (typeof arg === "string" ? JSON.stringify(arg) : arg.expr))
+			.join(" + ");
+
+		// when the first two args are expression, we need to prepend "" + to force string
+		// concatenation instead of number addition.
+		return typeof args[0] !== "string" && typeof args[1] !== "string"
+			? `"" + ${str}`
+			: str;
+	}
+
 	expressionFunction(expression, args = "") {
 		return this.supportsArrowFunction()
 			? `(${args}) => (${expression})`
@@ -924,6 +1015,26 @@ class RuntimeTemplate {
 		runtimeRequirements.add(RuntimeGlobals.exports);
 		return `${RuntimeGlobals.makeNamespaceObject}(${exportsArgument});\n`;
 	}
+
+	/**
+	 * @param {Object} options options object
+	 * @param {Module} options.module the module
+	 * @param {string} options.publicPath the public path
+	 * @param {RuntimeSpec=} options.runtime runtime
+	 * @param {CodeGenerationResults} options.codeGenerationResults the code generation results
+	 * @returns {string} the url of the asset
+	 */
+	assetUrl({ publicPath, runtime, module, codeGenerationResults }) {
+		if (!module) {
+			return "data:,";
+		}
+		const codeGen = codeGenerationResults.get(module, runtime);
+		const { data } = codeGen;
+		const url = data.get("url");
+		if (url) return url.toString();
+		const filename = data.get("filename");
+		return publicPath + filename;
+	}
 }
 
 module.exports = RuntimeTemplate;

package/lib/Template.js

@@ -370,7 +370,8 @@ class Template {
 					dependencyTemplates: renderContext.dependencyTemplates,
 					moduleGraph: renderContext.moduleGraph,
 					runtimeTemplate: renderContext.runtimeTemplate,
-					runtime: renderContext.chunk.runtime
+					runtime: renderContext.chunk.runtime,
+					codeGenerationResults
 				});
 				if (!codeGenResult) continue;
 				runtimeSource = codeGenResult.sources.get("runtime");

package/lib/WatchIgnorePlugin.js

@@ -87,7 +87,20 @@ class IgnoringWatchFileSystem {
 					fileTimestamps.set(path, IGNORE_TIME_ENTRY);
 				}
 				return fileTimestamps;
-			}
+			},
+			getInfo:
+				watcher.getInfo &&
+				(() => {
+					const info = watcher.getInfo();
+					const { fileTimeInfoEntries, contextTimeInfoEntries } = info;
+					for (const path of ignoredFiles) {
+						fileTimeInfoEntries.set(path, IGNORE_TIME_ENTRY);
+					}
+					for (const path of ignoredDirs) {
+						contextTimeInfoEntries.set(path, IGNORE_TIME_ENTRY);
+					}
+					return info;
+				})
 		};
 	}
 }

package/lib/Watching.js

@@ -15,7 +15,7 @@ const Stats = require("./Stats");
 /**
  * @template T
  * @callback Callback
- * @param {Error=} err
+ * @param {(Error | null)=} err
  * @param {T=} result
  */
 
@@ -49,7 +49,7 @@ class Watching {
 			this.watchOptions = {};
 		}
 		if (typeof this.watchOptions.aggregateTimeout !== "number") {
-			this.watchOptions.aggregateTimeout = 200;
+			this.watchOptions.aggregateTimeout = 20;
 		}
 		this.compiler = compiler;
 		this.running = false;
@@ -109,30 +109,44 @@ class Watching {
 			this.lastWatcherStartTime = Date.now();
 		}
 		this.compiler.fsStartTime = Date.now();
-		this._mergeWithCollected(
-			changedFiles ||
-				(this.pausedWatcher &&
+		if (
+			changedFiles &&
+			removedFiles &&
+			fileTimeInfoEntries &&
+			contextTimeInfoEntries
+		) {
+			this._mergeWithCollected(changedFiles, removedFiles);
+			this.compiler.fileTimestamps = fileTimeInfoEntries;
+			this.compiler.contextTimestamps = contextTimeInfoEntries;
+		} else if (this.pausedWatcher) {
+			if (this.pausedWatcher.getInfo) {
+				const {
+					changes,
+					removals,
+					fileTimeInfoEntries,
+					contextTimeInfoEntries
+				} = this.pausedWatcher.getInfo();
+				this._mergeWithCollected(changes, removals);
+				this.compiler.fileTimestamps = fileTimeInfoEntries;
+				this.compiler.contextTimestamps = contextTimeInfoEntries;
+			} else {
+				this._mergeWithCollected(
 					this.pausedWatcher.getAggregatedChanges &&
-					this.pausedWatcher.getAggregatedChanges()),
-			(this.compiler.removedFiles =
-				removedFiles ||
-				(this.pausedWatcher &&
+						this.pausedWatcher.getAggregatedChanges(),
 					this.pausedWatcher.getAggregatedRemovals &&
-					this.pausedWatcher.getAggregatedRemovals()))
-		);
-
+						this.pausedWatcher.getAggregatedRemovals()
+				);
+				this.compiler.fileTimestamps =
+					this.pausedWatcher.getFileTimeInfoEntries();
+				this.compiler.contextTimestamps =
+					this.pausedWatcher.getContextTimeInfoEntries();
+			}
+		}
 		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());
-
 		const run = () => {
 			if (this.compiler.idle) {
 				return this.compiler.cache.endIdle(err => {

package/lib/WebpackOptionsApply.js

@@ -118,11 +118,47 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.externalsPresets.webAsync) {
 			//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 			const ExternalsPlugin = require("./ExternalsPlugin");
-			new ExternalsPlugin("import", /^(https?:\/\/|std:)/).apply(compiler);
+			new ExternalsPlugin(
+				"import",
+				options.experiments.css
+					? ({ request, dependencyType }, callback) => {
+							if (dependencyType === "url") {
+								if (/^(\/\/|https?:\/\/)/.test(request))
+									return callback(null, `asset ${request}`);
+							} else if (dependencyType === "css-import") {
+								if (/^(\/\/|https?:\/\/)/.test(request))
+									return callback(null, `css-import ${request}`);
+							} else if (/^(\/\/|https?:\/\/|std:)/.test(request)) {
+								if (/^\.css(\?|$)/.test(request))
+									return callback(null, `css-import ${request}`);
+								return callback(null, `import ${request}`);
+							}
+							callback();
+					  }
+					: /^(\/\/|https?:\/\/|std:)/
+			).apply(compiler);
 		} else if (options.externalsPresets.web) {
 			//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 			const ExternalsPlugin = require("./ExternalsPlugin");
-			new ExternalsPlugin("module", /^(https?:\/\/|std:)/).apply(compiler);
+			new ExternalsPlugin(
+				"module",
+				options.experiments.css
+					? ({ request, dependencyType }, callback) => {
+							if (dependencyType === "url") {
+								if (/^(\/\/|https?:\/\/)/.test(request))
+									return callback(null, `asset ${request}`);
+							} else if (dependencyType === "css-import") {
+								if (/^(\/\/|https?:\/\/)/.test(request))
+									return callback(null, `css-import ${request}`);
+							} else if (/^(\/\/|https?:\/\/|std:)/.test(request)) {
+								if (/^\.css(\?|$)/.test(request))
+									return callback(null, `css-import ${request}`);
+								return callback(null, `module ${request}`);
+							}
+							callback();
+					  }
+					: /^(\/\/|https?:\/\/|std:)/
+			).apply(compiler);
 		}
 
 		new ChunkPrefetchPreloadPlugin().apply(compiler);
@@ -253,6 +289,11 @@ class WebpackOptionsApply extends OptionsApply {
 			}).apply(compiler);
 		}
 
+		if (options.experiments.css) {
+			const CssModulesPlugin = require("./css/CssModulesPlugin");
+			new CssModulesPlugin(options.experiments.css).apply(compiler);
+		}
+
 		if (options.experiments.lazyCompilation) {
 			const LazyCompilationPlugin = require("./hmr/LazyCompilationPlugin");
 			const lazyOptions =

package/lib/asset/AssetGenerator.js

@@ -15,6 +15,7 @@ const { makePathsRelative } = require("../util/identifier");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../../declarations/WebpackOptions").AssetGeneratorOptions} AssetGeneratorOptions */
+/** @typedef {import("../../declarations/WebpackOptions").AssetModuleOutputPath} AssetModuleOutputPath */
 /** @typedef {import("../../declarations/WebpackOptions").RawPublicPath} RawPublicPath */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
@@ -49,7 +50,7 @@ const mergeAssetInfo = (a, b) => {
 				case "immutable":
 				case "development":
 				case "hotModuleReplacement":
-				case "javascriptModule	":
+				case "javascriptModule":
 					result[key] = a[key] || b[key];
 					break;
 				case "related":
@@ -74,6 +75,41 @@ const mergeRelatedInfo = (a, b) => {
 	return result;
 };
 
+const encodeDataUri = (encoding, source) => {
+	let encodedContent;
+
+	switch (encoding) {
+		case "base64": {
+			encodedContent = source.buffer().toString("base64");
+			break;
+		}
+		case false: {
+			const content = source.source();
+
+			if (typeof content !== "string") {
+				encodedContent = content.toString("utf-8");
+			}
+
+			encodedContent = encodeURIComponent(encodedContent).replace(
+				/[!'()*]/g,
+				character => "%" + character.codePointAt(0).toString(16)
+			);
+			break;
+		}
+		default:
+			throw new Error(`Unsupported encoding '${encoding}'`);
+	}
+
+	return encodedContent;
+};
+
+const decodeDataUriContent = (encoding, content) => {
+	const isBase64 = encoding === "base64";
+	return isBase64
+		? Buffer.from(content, "base64")
+		: Buffer.from(decodeURIComponent(content), "ascii");
+};
+
 const JS_TYPES = new Set(["javascript"]);
 const JS_AND_ASSET_TYPES = new Set(["javascript", "asset"]);
 
@@ -82,13 +118,15 @@ class AssetGenerator extends Generator {
 	 * @param {AssetGeneratorOptions["dataUrl"]=} dataUrlOptions the options for the data url
 	 * @param {string=} filename override for output.assetModuleFilename
 	 * @param {RawPublicPath=} publicPath override for output.assetModulePublicPath
+	 * @param {AssetModuleOutputPath=} outputPath the output path for the emitted file which is not included in the runtime import
 	 * @param {boolean=} emit generate output asset
 	 */
-	constructor(dataUrlOptions, filename, publicPath, emit) {
+	constructor(dataUrlOptions, filename, publicPath, outputPath, emit) {
 		super();
 		this.dataUrlOptions = dataUrlOptions;
 		this.filename = filename;
 		this.publicPath = publicPath;
+		this.outputPath = outputPath;
 		this.emit = emit;
 	}
 
@@ -158,39 +196,26 @@ class AssetGenerator extends Generator {
 						}
 
 						let encodedContent;
+
 						if (
 							module.resourceResolveData &&
-							module.resourceResolveData.encoding === encoding
+							module.resourceResolveData.encoding === encoding &&
+							decodeDataUriContent(
+								module.resourceResolveData.encoding,
+								module.resourceResolveData.encodedContent
+							).equals(originalSource.buffer())
 						) {
 							encodedContent = module.resourceResolveData.encodedContent;
 						} else {
-							switch (encoding) {
-								case "base64": {
-									encodedContent = originalSource.buffer().toString("base64");
-									break;
-								}
-								case false: {
-									const content = originalSource.source();
-
-									if (typeof content !== "string") {
-										encodedContent = content.toString("utf-8");
-									}
-
-									encodedContent = encodeURIComponent(encodedContent).replace(
-										/[!'()*]/g,
-										character => "%" + character.codePointAt(0).toString(16)
-									);
-									break;
-								}
-								default:
-									throw new Error(`Unsupported encoding '${encoding}'`);
-							}
+							encodedContent = encodeDataUri(encoding, originalSource);
 						}
 
 						encodedSource = `data:${mimeType}${
 							encoding ? `;${encoding}` : ""
 						},${encodedContent}`;
 					}
+					const data = getData();
+					data.set("url", Buffer.from(encodedSource));
 					return new RawSource(
 						`${RuntimeGlobals.module}.exports = ${JSON.stringify(
 							encodedSource
@@ -228,7 +253,7 @@ class AssetGenerator extends Generator {
 								contentHash
 							}
 						);
-					let publicPath;
+					let assetPath;
 					if (this.publicPath !== undefined) {
 						const { path, info } =
 							runtimeTemplate.compilation.getAssetPathWithInfo(
@@ -241,16 +266,34 @@ class AssetGenerator extends Generator {
 									contentHash
 								}
 							);
-						publicPath = JSON.stringify(path);
 						assetInfo = mergeAssetInfo(assetInfo, info);
+						assetPath = JSON.stringify(path + filename);
 					} else {
-						publicPath = RuntimeGlobals.publicPath;
 						runtimeRequirements.add(RuntimeGlobals.publicPath); // add __webpack_require__.p
+						assetPath = runtimeTemplate.concatenation(
+							{ expr: RuntimeGlobals.publicPath },
+							filename
+						);
 					}
 					assetInfo = {
 						sourceFilename,
 						...assetInfo
 					};
+					if (this.outputPath) {
+						const { path: outputPath, info } =
+							runtimeTemplate.compilation.getAssetPathWithInfo(
+								this.outputPath,
+								{
+									module,
+									runtime,
+									filename: sourceFilename,
+									chunkGraph,
+									contentHash
+								}
+							);
+						assetInfo = mergeAssetInfo(assetInfo, info);
+						filename = path.posix.join(outputPath, filename);
+					}
 					module.buildInfo.filename = filename;
 					module.buildInfo.assetInfo = assetInfo;
 					if (getData) {
@@ -264,9 +307,7 @@ class AssetGenerator extends Generator {
 					}
 
 					return new RawSource(
-						`${
-							RuntimeGlobals.module
-						}.exports = ${publicPath} + ${JSON.stringify(filename)};`
+						`${RuntimeGlobals.module}.exports = ${assetPath};`
 					);
 				}
 			}