webpack 5.104.1 → 5.105.4

package/lib/prefetch/ChunkPrefetchFunctionRuntimeModule.js

@@ -17,7 +17,9 @@ class ChunkPrefetchFunctionRuntimeModule extends RuntimeModule {
 	 */
 	constructor(type, runtimeFunction, runtimeHandlers) {
 		super(`chunk ${type} function`);
+		/** @type {string} */
 		this.runtimeFunction = runtimeFunction;
+		/** @type {string} */
 		this.runtimeHandlers = runtimeHandlers;
 	}
 

package/lib/prefetch/ChunkPrefetchStartupRuntimeModule.js

@@ -9,14 +9,16 @@ const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Chunk").ChunkChildOfTypeInOrder} ChunkChildOfTypeInOrder */
 /** @typedef {import("../Compilation")} Compilation */
 
 class ChunkPrefetchStartupRuntimeModule extends RuntimeModule {
 	/**
-	 * @param {{ onChunks: Chunk[], chunks: Set<Chunk> }[]} startupChunks chunk ids to trigger when chunks are loaded
+	 * @param {ChunkChildOfTypeInOrder[]} startupChunks chunk ids to trigger when chunks are loaded
 	 */
 	constructor(startupChunks) {
 		super("startup prefetch", RuntimeModule.STAGE_TRIGGER);
+		/** @type {ChunkChildOfTypeInOrder[]} */
 		this.startupChunks = startupChunks;
 	}
 

package/lib/prefetch/ChunkPrefetchTriggerRuntimeModule.js

@@ -17,6 +17,7 @@ class ChunkPrefetchTriggerRuntimeModule extends RuntimeModule {
 	 */
 	constructor(chunkMap) {
 		super("chunk prefetch trigger", RuntimeModule.STAGE_TRIGGER);
+		/** @type {ChunkChildIdsByOrdersMap} */
 		this.chunkMap = chunkMap;
 	}
 

package/lib/prefetch/ChunkPreloadTriggerRuntimeModule.js

@@ -17,6 +17,7 @@ class ChunkPreloadTriggerRuntimeModule extends RuntimeModule {
 	 */
 	constructor(chunkMap) {
 		super("chunk preload trigger", RuntimeModule.STAGE_TRIGGER);
+		/** @type {ChunkChildIdsByOrdersMap} */
 		this.chunkMap = chunkMap;
 	}
 

package/lib/rules/BasicEffectRulePlugin.js

@@ -24,7 +24,9 @@ class BasicEffectRulePlugin {
 	 * @param {string=} effectType the effect type
 	 */
 	constructor(ruleProperty, effectType) {
+		/** @type {BasicEffectRuleKeys} */
 		this.ruleProperty = ruleProperty;
+		/** @type {string | BasicEffectRuleKeys} */
 		this.effectType = effectType || ruleProperty;
 	}
 

package/lib/rules/BasicMatcherRulePlugin.js

@@ -27,8 +27,11 @@ class BasicMatcherRulePlugin {
 	 * @param {boolean=} invert if true, inverts the condition
 	 */
 	constructor(ruleProperty, dataProperty, invert) {
+		/** @type {BasicMatcherRuleKeys} */
 		this.ruleProperty = ruleProperty;
+		/** @type {string | BasicMatcherRuleKeys} */
 		this.dataProperty = dataProperty || ruleProperty;
+		/** @type {boolean} */
 		this.invert = invert || false;
 	}
 

package/lib/rules/ObjectMatcherRulePlugin.js

@@ -18,18 +18,22 @@
  */
 
 /** @typedef {KeysOfTypes<RuleSetRule, { [k: string]: RuleSetConditionOrConditions }>} ObjectMatcherRuleKeys */
+/** @typedef {keyof EffectData} DataProperty */
 
 const PLUGIN_NAME = "ObjectMatcherRulePlugin";
 
 class ObjectMatcherRulePlugin {
 	/**
 	 * @param {ObjectMatcherRuleKeys} ruleProperty the rule property
-	 * @param {keyof EffectData=} dataProperty the data property
+	 * @param {DataProperty=} dataProperty the data property
 	 * @param {RuleConditionFunction=} additionalConditionFunction need to check
 	 */
 	constructor(ruleProperty, dataProperty, additionalConditionFunction) {
+		/** @type {ObjectMatcherRuleKeys} */
 		this.ruleProperty = ruleProperty;
+		/** @type {DataProperty | ObjectMatcherRuleKeys} */
 		this.dataProperty = dataProperty || ruleProperty;
+		/** @type {RuleConditionFunction | undefined} */
 		this.additionalConditionFunction = additionalConditionFunction;
 	}
 

package/lib/rules/RuleSetCompiler.js

@@ -9,6 +9,7 @@ const { SyncHook } = require("tapable");
 
 /** @typedef {import("enhanced-resolve").ResolveRequest} ResolveRequest */
 /** @typedef {import("../../declarations/WebpackOptions").Falsy} Falsy */
+/** @typedef {import("../../declarations/WebpackOptions").RuleSetUseItem} RuleSetUseItem */
 /** @typedef {import("../../declarations/WebpackOptions").RuleSetLoaderOptions} RuleSetLoaderOptions */
 /** @typedef {import("../../declarations/WebpackOptions").RuleSetRule} RuleSetRule */
 
@@ -87,6 +88,9 @@ const { SyncHook } = require("tapable");
 
 /** @typedef {Set<string>} UnhandledProperties */
 
+/** @typedef {(data: EffectData) => (RuleSetUseItem | (Falsy | RuleSetUseItem)[])} RuleSetUseFn */
+/** @typedef {(value: string) => boolean} RuleSetConditionFn */
+
 /** @typedef {{ apply: (ruleSetCompiler: RuleSetCompiler) => void }} RuleSetPlugin */
 
 class RuleSetCompiler {
@@ -116,6 +120,7 @@ class RuleSetCompiler {
 	 * @returns {RuleSet} compiled RuleSet
 	 */
 	compile(ruleSet) {
+		/** @type {References} */
 		const refs = new Map();
 		const rules = this.compileRules("ruleSet", ruleSet, refs);
 
@@ -327,6 +332,7 @@ class RuleSetCompiler {
 			);
 		}
 
+		/** @type {Condition[]} */
 		const conditions = [];
 		for (const key of Object.keys(condition)) {
 			const value = condition[key];

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -16,6 +16,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 	 */
 	constructor(deferInterop = false) {
 		super("async module");
+		/** @type {boolean} */
 		this._deferInterop = deferInterop;
 	}
 

package/lib/runtime/ChunkNameRuntimeModule.js

@@ -13,6 +13,7 @@ class ChunkNameRuntimeModule extends RuntimeModule {
 	 */
 	constructor(chunkName) {
 		super("chunkName");
+		/** @type {string} */
 		this.chunkName = chunkName;
 	}
 

package/lib/runtime/CompatRuntimeModule.js

@@ -14,6 +14,7 @@ const RuntimeModule = require("../RuntimeModule");
 class CompatRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("compat", RuntimeModule.STAGE_ATTACH);
+		/** @type {boolean} */
 		this.fullHash = true;
 	}
 

package/lib/runtime/EnsureChunkRuntimeModule.js

@@ -17,6 +17,7 @@ class EnsureChunkRuntimeModule extends RuntimeModule {
 	 */
 	constructor(runtimeRequirements) {
 		super("ensure chunk");
+		/** @type {ReadOnlyRuntimeRequirements} */
 		this.runtimeRequirements = runtimeRequirements;
 	}
 

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -26,10 +26,15 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 	 */
 	constructor(contentType, name, global, getFilenameForChunk, allChunks) {
 		super(`get ${name} chunk filename`);
+		/** @type {string} */
 		this.contentType = contentType;
+		/** @type {string} */
 		this.global = global;
+		/** @type {(chunk: Chunk) => TemplatePath | false} */
 		this.getFilenameForChunk = getFilenameForChunk;
+		/** @type {boolean} */
 		this.allChunks = allChunks;
+		/** @type {boolean} */
 		this.dependentHash = true;
 	}
 

package/lib/runtime/GetFullHashRuntimeModule.js

@@ -12,6 +12,7 @@ const RuntimeModule = require("../RuntimeModule");
 class GetFullHashRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("getFullHash");
+		/** @type {boolean} */
 		this.fullHash = true;
 	}
 

package/lib/runtime/GetMainFilenameRuntimeModule.js

@@ -19,7 +19,9 @@ class GetMainFilenameRuntimeModule extends RuntimeModule {
 	 */
 	constructor(name, global, filename) {
 		super(`get ${name} filename`);
+		/** @type {string} */
 		this.global = global;
+		/** @type {string} */
 		this.filename = filename;
 	}
 

package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js

@@ -17,6 +17,7 @@ class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 	 */
 	constructor(runtimeRequirements) {
 		super("trusted types policy");
+		/** @type {ReadOnlyRuntimeRequirements} */
 		this.runtimeRequirements = runtimeRequirements;
 	}
 

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -47,7 +47,9 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 	 */
 	constructor(withCreateScriptUrl, withFetchPriority) {
 		super("load script");
+		/** @type {boolean | undefined} */
 		this._withCreateScriptUrl = withCreateScriptUrl;
+		/** @type {boolean | undefined} */
 		this._withFetchPriority = withFetchPriority;
 	}
 

package/lib/runtime/MakeDeferredNamespaceObjectRuntime.js

@@ -17,11 +17,12 @@ const HelperRuntimeModule = require("./HelperRuntimeModule");
  * @returns {string} mode
  */
 function getMakeDeferredNamespaceModeFromExportsType(exportsType) {
-	if (exportsType === "namespace") return `/* ${exportsType} */ 0`;
-	if (exportsType === "default-only") return `/* ${exportsType} */ 1`;
+	// number is from createFakeNamespaceObject mode ^ 1
+	if (exportsType === "namespace") return `/* ${exportsType} */ 8`;
+	if (exportsType === "default-only") return `/* ${exportsType} */ 0`;
 	if (exportsType === "default-with-named") return `/* ${exportsType} */ 2`;
-	if (exportsType === "dynamic") return `/* ${exportsType} */ 3`;
-	return "";
+	if (exportsType === "dynamic") return `/* ${exportsType} */ 6`;
+	throw new Error(`Unknown exports type: ${exportsType}`);
 }
 
 /**
@@ -52,6 +53,7 @@ class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeMod
 	 */
 	constructor(hasAsyncRuntime) {
 		super("make optimized deferred namespace object");
+		/** @type {boolean} */
 		this.hasAsyncRuntime = hasAsyncRuntime;
 	}
 
@@ -66,10 +68,6 @@ class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeMod
 			// Note: must be a function (not arrow), because this is used in body!
 			`${fn} = function(moduleId, mode${hasAsync ? ", asyncDeps" : ""}) {`,
 			Template.indent([
-				"// mode: 0 => namespace (esm)",
-				"// mode: 1 => default-only (esm strict cjs)",
-				"// mode: 2 => default-with-named (esm-cjs compat)",
-				"// mode: 3 => dynamic (if exports has __esModule, then esm, otherwise default-with-named)",
 				"var r = this;",
 				hasAsync ? "var isAsync = asyncDeps && asyncDeps.length;" : "",
 				"var obj = {",
@@ -83,7 +81,7 @@ class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeMod
 						// if exportsType is "namespace" we can generate the most optimized code,
 						// on the second access, we can avoid trigger the getter.
 						// we can also do this if exportsType is "dynamic" and there is a "__esModule" property on it.
-						'if(mode == 0 || (mode == 3 && exports.__esModule)) Object.defineProperty(this, "a", { value: exports });',
+						'if(mode & 8 || (mode & 4 && exports.__esModule)) Object.defineProperty(this, "a", { value: exports });',
 						"return exports;"
 					]),
 					"}"
@@ -105,6 +103,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 	 */
 	constructor(hasAsyncRuntime) {
 		super("make deferred namespace object");
+		/** @type {boolean} */
 		this.hasAsyncRuntime = hasAsyncRuntime;
 	}
 
@@ -120,11 +119,6 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 			? "init?.();"
 			: "if (init) init();";
 		return `${fn} = ${runtimeTemplate.basicFunction("moduleId, mode", [
-			"// mode: 0 => namespace (esm)",
-			"// mode: 1 => default-only (esm strict cjs)",
-			"// mode: 2 => default-with-named (esm-cjs compat)",
-			"// mode: 3 => dynamic (if exports has __esModule, then esm, otherwise default-with-named)",
-			"",
 			"var cachedModule = __webpack_module_cache__[moduleId];",
 			"if (cachedModule && cachedModule.error === undefined) {",
 			Template.indent([
@@ -132,10 +126,8 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				hasAsync
 					? `if (${RuntimeGlobals.asyncModuleExportSymbol} in exports) exports = exports[${RuntimeGlobals.asyncModuleExportSymbol}];`
 					: "",
-				"if (mode == 0) return exports;",
-				`if (mode == 1) return ${RuntimeGlobals.createFakeNamespaceObject}(exports);`,
-				`if (mode == 2) return ${RuntimeGlobals.createFakeNamespaceObject}(exports, 2);`,
-				`if (mode == 3) return ${RuntimeGlobals.createFakeNamespaceObject}(exports, 6);` // 2 | 4
+				"if (mode & 8) return exports;",
+				`return ${RuntimeGlobals.createFakeNamespaceObject}(exports, mode);`
 			]),
 			"}",
 			"",
@@ -145,7 +137,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 					? `if (${RuntimeGlobals.asyncModuleExportSymbol} in ns) ns = ns[${RuntimeGlobals.asyncModuleExportSymbol}];`
 					: "",
 				"init = null;",
-				"if (mode == 0 || mode == 3 && ns.__esModule && typeof ns === 'object') {",
+				"if (mode & 8 || mode & 4 && ns.__esModule && typeof ns === 'object') {",
 				Template.indent([
 					"delete handler.defineProperty;",
 					"delete handler.deleteProperty;",
@@ -155,17 +147,9 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 					"delete handler.ownKeys;",
 					"delete handler.getOwnPropertyDescriptor;"
 				]),
-				"} else if (mode == 1) {",
-				Template.indent([
-					`ns = ${RuntimeGlobals.createFakeNamespaceObject}(ns);`
-				]),
-				"} else if (mode == 2) {",
-				Template.indent([
-					`ns = ${RuntimeGlobals.createFakeNamespaceObject}(ns, 2);`
-				]),
-				"} else if (mode == 3) {",
+				"} else {",
 				Template.indent([
-					`ns = ${RuntimeGlobals.createFakeNamespaceObject}(ns, 6);`
+					`ns = ${RuntimeGlobals.createFakeNamespaceObject}(ns, mode);`
 				]),
 				"}"
 			])};`,
@@ -211,14 +195,14 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				`getOwnPropertyDescriptor: ${runtimeTemplate.basicFunction("_, name", [
 					"switch (name) {",
 					Template.indent([
-						'case "__esModule": return { value: true, configurable: !!mode };',
-						'case Symbol.toStringTag: return { value: "Deferred Module", configurable: !!mode };',
+						'case "__esModule": return { value: true, configurable: !(mode & 8) };',
+						'case Symbol.toStringTag: return { value: "Deferred Module", configurable: !(mode & 8) };',
 						'case "then": return undefined;'
 					]),
 					"}",
 					init,
 					"var desc = Reflect.getOwnPropertyDescriptor(ns, name);",
-					'if (mode == 2 && name == "default" && !desc) {',
+					'if (mode & 2 && name == "default" && !desc) {',
 					Template.indent("desc = { value: ns, configurable: true };"),
 					"}",
 					"return desc;"

package/lib/runtime/PublicPathRuntimeModule.js

@@ -16,6 +16,7 @@ class PublicPathRuntimeModule extends RuntimeModule {
 	 */
 	constructor(publicPath) {
 		super("publicPath", RuntimeModule.STAGE_BASIC);
+		/** @type {PublicPath} */
 		this.publicPath = publicPath;
 	}
 

package/lib/runtime/StartupChunkDependenciesPlugin.js

@@ -25,7 +25,9 @@ class StartupChunkDependenciesPlugin {
 	 * @param {Options} options options
 	 */
 	constructor(options) {
+		/** @type {ChunkLoadingType} */
 		this.chunkLoading = options.chunkLoading;
+		/** @type {boolean} */
 		this.asyncChunkLoading =
 			typeof options.asyncChunkLoading === "boolean"
 				? options.asyncChunkLoading

package/lib/runtime/StartupChunkDependenciesRuntimeModule.js

@@ -19,6 +19,7 @@ class StartupChunkDependenciesRuntimeModule extends RuntimeModule {
 	 */
 	constructor(asyncChunkLoading) {
 		super("startup chunk dependencies", RuntimeModule.STAGE_TRIGGER);
+		/** @type {boolean} */
 		this.asyncChunkLoading = asyncChunkLoading;
 	}
 

package/lib/runtime/StartupEntrypointRuntimeModule.js

@@ -15,6 +15,7 @@ class StartupEntrypointRuntimeModule extends RuntimeModule {
 	 */
 	constructor(asyncChunkLoading) {
 		super("startup entrypoint");
+		/** @type {boolean} */
 		this.asyncChunkLoading = asyncChunkLoading;
 	}
 

package/lib/runtime/ToBinaryRuntimeModule.js

@@ -29,30 +29,38 @@ class ToBinaryRuntimeModule extends RuntimeModule {
 		const isNodePlatform = compilation.compiler.platform.node;
 		const isWebPlatform = compilation.compiler.platform.web;
 		const isNeutralPlatform = runtimeTemplate.isNeutralPlatform();
+		const toImmutableBytes = runtimeTemplate.basicFunction("value", [
+			runtimeTemplate.destructureObject(["buffer"], "value"),
+			`${runtimeTemplate.renderConst()} throwErr = ${runtimeTemplate.basicFunction("", ["throw new TypeError('ArrayBuffer is immutable');"])};`,
+			"Object.defineProperties(buffer, { immutable: { value: true },  resize: { value: throwErr }, transfer: { value: throwErr }, transferToFixedLength: { value: throwErr } });",
+			"Object.freeze(buffer);",
+			"return value;"
+		]);
 
 		return Template.asString([
 			"// define to binary helper",
+			`${runtimeTemplate.renderConst()} toImmutableBytes = ${toImmutableBytes}`,
 			`${fn} = ${isNeutralPlatform ? "typeof Buffer !== 'undefined' ? " : ""}${
 				isNodePlatform || isNeutralPlatform
-					? `${runtimeTemplate.returningFunction("new Uint8Array(Buffer.from(base64, 'base64'))", "base64")}`
+					? `${runtimeTemplate.returningFunction("toImmutableBytes(new Uint8Array(Buffer.from(base64, 'base64')))", "base64")}`
 					: ""
 			} ${isNeutralPlatform ? ": " : ""}${
 				isWebPlatform || isNeutralPlatform
 					? `(${runtimeTemplate.basicFunction("", [
-							"var table = new Uint8Array(128);",
+							`${runtimeTemplate.renderConst()} table = new Uint8Array(128);`,
 							"for (var i = 0; i < 64; i++) table[i < 26 ? i + 65 : i < 52 ? i + 71 : i < 62 ? i - 4 : i * 4 - 205] = i;",
 							`return ${runtimeTemplate.basicFunction("base64", [
-								"var n = base64.length, bytes = new Uint8Array((n - (base64[n - 1] == '=') - (base64[n - 2] == '=')) * 3 / 4 | 0);",
+								`${runtimeTemplate.renderConst()} n = base64.length, bytes = new Uint8Array((n - (base64[n - 1] == '=') - (base64[n - 2] == '=')) * 3 / 4 | 0);`,
 								"for (var i = 0, j = 0; i < n;) {",
 								Template.indent([
-									"var c0 = table[base64.charCodeAt(i++)], c1 = table[base64.charCodeAt(i++)];",
-									"var c2 = table[base64.charCodeAt(i++)], c3 = table[base64.charCodeAt(i++)];",
+									`${runtimeTemplate.renderConst()} c0 = table[base64.charCodeAt(i++)], c1 = table[base64.charCodeAt(i++)];`,
+									`${runtimeTemplate.renderConst()} c2 = table[base64.charCodeAt(i++)], c3 = table[base64.charCodeAt(i++)];`,
 									"bytes[j++] = (c0 << 2) | (c1 >> 4);",
 									"bytes[j++] = (c1 << 4) | (c2 >> 2);",
 									"bytes[j++] = (c2 << 6) | c3;"
 								]),
 								"}",
-								"return bytes"
+								"return toImmutableBytes(bytes)"
 							])}`
 						])})();`
 					: ""

package/lib/schemes/HttpUriPlugin.js

@@ -36,12 +36,20 @@ const getHttps = memoize(() => require("https"));
 
 const MAX_REDIRECTS = 5;
 
+/** @typedef {(url: URL, requestOptions: RequestOptions, callback: (incomingMessage: IncomingMessage) => void) => EventEmitter} Fetch */
+
+/**
+ * @typedef {object} EventsMap
+ * @property {[Error]} error
+ */
+
 /**
  * @param {typeof import("http") | typeof import("https")} request request
  * @param {string | URL | undefined} proxy proxy
- * @returns {(url: URL, requestOptions: RequestOptions, callback: (incomingMessage: IncomingMessage) => void) => EventEmitter} fn
+ * @returns {Fetch} fn
  */
 const proxyFetch = (request, proxy) => (url, options, callback) => {
+	/** @type {EventEmitter<EventsMap>} */
 	const eventEmitter = new EventEmitter();
 
 	/**
@@ -104,9 +112,7 @@ const validate = createSchemaValidation(
  * @returns {string} safe path
  */
 const toSafePath = (str) =>
-	str
-		.replace(/^[^a-zA-Z0-9]+|[^a-zA-Z0-9]+$/g, "")
-		.replace(/[^a-zA-Z0-9._-]+/g, "_");
+	str.replace(/^[^a-z0-9]+|[^a-z0-9]+$/gi, "").replace(/[^a-z0-9._-]+/gi, "_");
 
 /**
  * @param {Buffer} content content
@@ -220,6 +226,7 @@ const sanitizeUrlForError = (href) => {
 
 class Lockfile {
 	constructor() {
+		/** @type {number} */
 		this.version = 1;
 		/** @type {Map<string, LockfileEntry | "ignore" | "no-cache">} */
 		this.entries = new Map();
@@ -430,6 +437,8 @@ const cachedWithKey = (fn, forceFn = fn) => {
 /** @typedef {FetchResultMeta & { entry: LockfileEntry, content: Buffer }} ContentFetchResult */
 /** @typedef {RedirectFetchResult | ContentFetchResult} FetchResult */
 
+/** @typedef {(uri: string) => boolean} AllowedUriFn */
+
 const PLUGIN_NAME = "HttpUriPlugin";
 
 class HttpUriPlugin {
@@ -438,12 +447,8 @@ class HttpUriPlugin {
 	 */
 	constructor(options) {
 		validate(options);
-		this._lockfileLocation = options.lockfileLocation;
-		this._cacheLocation = options.cacheLocation;
-		this._upgrade = options.upgrade;
-		this._frozen = options.frozen;
-		this._allowedUris = options.allowedUris;
-		this._proxy = options.proxy;
+		/** @type {HttpUriPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -453,7 +458,10 @@ class HttpUriPlugin {
 	 */
 	apply(compiler) {
 		const proxy =
-			this._proxy || process.env.http_proxy || process.env.HTTP_PROXY;
+			this.options.proxy || process.env.http_proxy || process.env.HTTP_PROXY;
+		/**
+		 * @type {{ scheme: "http" | "https", fetch: Fetch }[]}
+		 */
 		const schemes = [
 			{
 				scheme: "http",
@@ -477,7 +485,7 @@ class HttpUriPlugin {
 				const logger = compilation.getLogger(`webpack.${PLUGIN_NAME}`);
 				/** @type {string} */
 				const lockfileLocation =
-					this._lockfileLocation ||
+					this.options.lockfileLocation ||
 					join(
 						intermediateFs,
 						compiler.context,
@@ -487,15 +495,15 @@ class HttpUriPlugin {
 					);
 				/** @type {string | false} */
 				const cacheLocation =
-					this._cacheLocation !== undefined
-						? this._cacheLocation
+					this.options.cacheLocation !== undefined
+						? this.options.cacheLocation
 						: `${lockfileLocation}.data`;
-				const upgrade = this._upgrade || false;
-				const frozen = this._frozen || false;
+				const upgrade = this.options.upgrade || false;
+				const frozen = this.options.frozen || false;
 				const hashFunction = "sha512";
 				const hashDigest = "hex";
 				const hashDigestLength = 20;
-				const allowedUris = this._allowedUris;
+				const allowedUris = this.options.allowedUris;
 
 				let warnedAboutEol = false;
 
@@ -660,6 +668,7 @@ class HttpUriPlugin {
 					 * @returns {string} absolute, validated redirect target
 					 */
 					const validateRedirectLocation = (location, base) => {
+						/** @type {URL} */
 						let nextUrl;
 						try {
 							nextUrl = new URL(location, base);
@@ -707,6 +716,7 @@ class HttpUriPlugin {
 
 							if ("location" in result) {
 								// Validate redirect target before following
+								/** @type {string} */
 								let absolute;
 								try {
 									absolute = validateRedirectLocation(result.location, url);
@@ -845,6 +855,7 @@ class HttpUriPlugin {
 								res.statusCode >= 301 &&
 								res.statusCode <= 308
 							) {
+								/** @type {string} */
 								let absolute;
 								try {
 									absolute = validateRedirectLocation(location, url);
@@ -891,9 +902,15 @@ class HttpUriPlugin {
 								stream = stream.pipe(createInflate());
 							}
 
-							stream.on("data", (chunk) => {
-								bufferArr.push(chunk);
-							});
+							stream.on(
+								"data",
+								/**
+								 * @param {Buffer} chunk chunk
+								 */
+								(chunk) => {
+									bufferArr.push(chunk);
+								}
+							);
 
 							stream.on("end", () => {
 								if (!res.complete) {
@@ -953,6 +970,7 @@ class HttpUriPlugin {
 					 * @returns {boolean} true when allowed, otherwise false
 					 */
 					const isAllowed = (uri) => {
+						/** @type {URL} */
 						let parsedUri;
 						try {
 							// Parse the URI to prevent userinfo bypass attacks
@@ -963,6 +981,7 @@ class HttpUriPlugin {
 						}
 						for (const allowed of allowedUris) {
 							if (typeof allowed === "string") {
+								/** @type {URL} */
 								let parsedAllowed;
 								try {
 									parsedAllowed = new URL(allowed);

package/lib/schemes/VirtualUrlPlugin.js

@@ -58,17 +58,19 @@ function normalizeModule(virtualConfig) {
 	return virtualConfig;
 }
 
+/** @typedef {{ [key: string]: VirtualModuleConfig }} NormalizedModules */
+
 /**
  * Normalizes all virtual modules with the given scheme
  * @param {VirtualModules} virtualConfigs The virtual modules to normalize
  * @param {string} scheme The URL scheme to use
- * @returns {{ [key: string]: VirtualModuleConfig }} The normalized virtual modules
+ * @returns {NormalizedModules} The normalized virtual modules
  */
 function normalizeModules(virtualConfigs, scheme) {
 	return Object.keys(virtualConfigs).reduce((pre, id) => {
 		pre[toVid(id, scheme)] = normalizeModule(virtualConfigs[id]);
 		return pre;
-	}, /** @type {{ [key: string]: VirtualModuleConfig }} */ ({}));
+	}, /** @type {NormalizedModules} */ ({}));
 }
 
 /**
@@ -105,7 +107,9 @@ class VirtualUrlPlugin {
 	 * @param {string=} scheme The URL scheme to use
 	 */
 	constructor(modules, scheme) {
+		/** @type {string} */
 		this.scheme = scheme || DEFAULT_SCHEME;
+		/** @type {NormalizedModules} */
 		this.modules = normalizeModules(modules, this.scheme);
 	}
 
@@ -122,6 +126,27 @@ class VirtualUrlPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
+				compilation.hooks.assetPath.tap(
+					{ name: PLUGIN_NAME, before: "TemplatedPathPlugin" },
+					(path, data) => {
+						if (data.filename && this.modules[data.filename]) {
+							/**
+							 * @param {string} str path
+							 * @returns {string} safe path
+							 */
+							const toSafePath = (str) =>
+								`__${str
+									.replace(/:/g, "__")
+									.replace(/^[^a-z0-9]+|[^a-z0-9]+$/gi, "")
+									.replace(/[^a-z0-9._-]+/gi, "_")}`;
+
+							// filename: virtual:logo.svg -> __virtual__logo.svg
+							data.filename = toSafePath(data.filename);
+						}
+						return path;
+					}
+				);
+
 				normalModuleFactory.hooks.resolveForScheme
 					.for(scheme)
 					.tap(PLUGIN_NAME, (resourceData) => {
@@ -135,6 +160,7 @@ class VirtualUrlPlugin {
 						const type = virtualConfig.type;
 						resourceData.path = path + type;
 						resourceData.resource = path;
+						resourceData.context = compiler.context;
 
 						if (virtualConfig.version) {
 							const cacheKey = toCacheKey(resourceData.resource, scheme);