@depup/webpack 5.109.0-depup.0 → 5.109.2-depup.0

package/lib/NormalModule.js

@@ -52,7 +52,7 @@ const {
 	ABSOLUTE_PATH_REGEXP,
 	absolutify,
 	contextify,
-	makePathsRelative
+	contextifySourceUrl
 } = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
@@ -391,21 +391,6 @@ const walkSideEffects = (rootMod, moduleGraph, SideEffectDep) => {
  * @property {string | null=} type
  */
 
-/**
- * @param {string} context absolute context path
- * @param {string} source a source path
- * @param {AssociatedObjectForCache=} associatedObjectForCache an object to which the cache will be attached
- * @returns {string} new source path
- */
-const contextifySourceUrl = (context, source, associatedObjectForCache) => {
-	if (source.startsWith("webpack://")) return source;
-	return `webpack://${makePathsRelative(
-		context,
-		source,
-		associatedObjectForCache
-	)}`;
-};
-
 /**
  * @param {string} context absolute context path
  * @param {string | RawSourceMap} sourceMap a source map
@@ -471,16 +456,79 @@ const asBuffer = (input) => {
  * @typedef {HookMap<FakeHook<AsyncSeriesBailHook<[string, NormalModule], string | Buffer | null>>>} DeprecatedReadResourceForScheme
  */
 
+const createCompilationHooks = () => {
+	/** @type {HookMap<AsyncSeriesBailHook<[AnyLoaderContext], string | Buffer | null>>} */
+	const readResource = new HookMap(
+		() => new AsyncSeriesBailHook(["loaderContext"])
+	);
+	return {
+		// TODO webpack 6 deprecate
+		/**
+		 * @deprecated Use the `readResource` hook instead.
+		 * @type {DeprecatedReadResourceForScheme}
+		 */
+		readResourceForScheme: new HookMap((scheme) => {
+			const hook = readResource.for(scheme);
+			return createFakeHook(
+				/** @type {AsyncSeriesBailHook<[string, NormalModule], string | Buffer | null>} */ ({
+					tap: (options, fn) =>
+						hook.tap(options, (loaderContext) =>
+							fn(
+								loaderContext.resource,
+								/** @type {NormalModule} */ (loaderContext._module)
+							)
+						),
+					tapAsync: (options, fn) =>
+						hook.tapAsync(options, (loaderContext, callback) =>
+							fn(
+								loaderContext.resource,
+								/** @type {NormalModule} */ (loaderContext._module),
+								callback
+							)
+						),
+					tapPromise: (options, fn) =>
+						hook.tapPromise(options, (loaderContext) =>
+							fn(
+								loaderContext.resource,
+								/** @type {NormalModule} */ (loaderContext._module)
+							)
+						)
+				})
+			);
+		}),
+		/**
+		 * @since 5.58.0
+		 */
+		readResource,
+		/** @type {SyncHook<[AnyLoaderContext, NormalModule]>} */
+		loader: new SyncHook(["loaderContext", "module"]),
+		/** @type {SyncHook<[LoaderItem[], NormalModule, AnyLoaderContext]>} */
+		beforeLoaders: new SyncHook(["loaders", "module", "loaderContext"]),
+		/**
+		 * @type {SyncHook<[NormalModule]>}
+		 * @since 5.59.0
+		 */
+		beforeParse: new SyncHook(["module"]),
+		/**
+		 * @type {SyncHook<[NormalModule]>}
+		 * @since 5.59.0
+		 */
+		beforeSnapshot: new SyncHook(["module"]),
+		/**
+		 * @type {SyncWaterfallHook<[Result, NormalModule]>}
+		 * @since 5.99.0
+		 */
+		processResult: new SyncWaterfallHook(["result", "module"]),
+		/**
+		 * @type {AsyncSeriesBailHook<[NormalModule, NeedBuildContext], boolean>}
+		 * @since 5.49.0
+		 */
+		needBuild: new AsyncSeriesBailHook(["module", "context"])
+	};
+};
+
 /**
- * @typedef {object} NormalModuleCompilationHooks
- * @property {SyncHook<[AnyLoaderContext, NormalModule]>} loader
- * @property {SyncHook<[LoaderItem[], NormalModule, AnyLoaderContext]>} beforeLoaders
- * @property {SyncHook<[NormalModule]>} beforeParse
- * @property {SyncHook<[NormalModule]>} beforeSnapshot
- * @property {DeprecatedReadResourceForScheme} readResourceForScheme
- * @property {HookMap<AsyncSeriesBailHook<[AnyLoaderContext], string | Buffer | null>>} readResource
- * @property {SyncWaterfallHook<[Result, NormalModule]>} processResult
- * @property {AsyncSeriesBailHook<[NormalModule, NeedBuildContext], boolean>} needBuild
+ * @typedef {ReturnType<typeof createCompilationHooks>} NormalModuleCompilationHooks
  */
 
 /**
@@ -524,52 +572,7 @@ const asBuffer = (input) => {
 
 /** @typedef {BuildInfo & KnownNormalModuleBuildInfo} NormalModuleBuildInfo */
 
-const normalModuleHooksRegistry = createHooksRegistry(() => {
-	// TODO webpack 6 deprecate
-	/** @type {Partial<NormalModuleCompilationHooks>} */
-	const hooks = {};
-	hooks.readResourceForScheme = new HookMap((scheme) => {
-		const hook =
-			/** @type {NormalModuleCompilationHooks} */
-			(hooks).readResource.for(scheme);
-		return createFakeHook(
-			/** @type {AsyncSeriesBailHook<[string, NormalModule], string | Buffer | null>} */ ({
-				tap: (options, fn) =>
-					hook.tap(options, (loaderContext) =>
-						fn(
-							loaderContext.resource,
-							/** @type {NormalModule} */ (loaderContext._module)
-						)
-					),
-				tapAsync: (options, fn) =>
-					hook.tapAsync(options, (loaderContext, callback) =>
-						fn(
-							loaderContext.resource,
-							/** @type {NormalModule} */ (loaderContext._module),
-							callback
-						)
-					),
-				tapPromise: (options, fn) =>
-					hook.tapPromise(options, (loaderContext) =>
-						fn(
-							loaderContext.resource,
-							/** @type {NormalModule} */ (loaderContext._module)
-						)
-					)
-			})
-		);
-	});
-	hooks.readResource = new HookMap(
-		() => new AsyncSeriesBailHook(["loaderContext"])
-	);
-	hooks.loader = new SyncHook(["loaderContext", "module"]);
-	hooks.beforeLoaders = new SyncHook(["loaders", "module", "loaderContext"]);
-	hooks.beforeParse = new SyncHook(["module"]);
-	hooks.beforeSnapshot = new SyncHook(["module"]);
-	hooks.processResult = new SyncWaterfallHook(["result", "module"]);
-	hooks.needBuild = new AsyncSeriesBailHook(["module", "context"]);
-	return /** @type {NormalModuleCompilationHooks} */ (hooks);
-});
+const normalModuleHooksRegistry = createHooksRegistry(createCompilationHooks);
 
 class NormalModule extends Module {
 	/**
@@ -651,6 +654,12 @@ class NormalModule extends Module {
 		 * @type {Source | null}
 		 */
 		this._source = null;
+		// Set at build time; declared here so the instance shape is fixed at construction
+		/**
+		 * @private
+		 * @type {PreparsedAst | null}
+		 */
+		this._ast = null;
 		/**
 		 * @private
 		 * @type {Map<undefined | SourceType, number> | undefined}

package/lib/NormalModuleFactory.js

@@ -435,7 +435,10 @@ class NormalModuleFactory extends ModuleFactory {
 			resolveForScheme: new HookMap(
 				() => new AsyncSeriesBailHook(["resourceData", "resolveData"])
 			),
-			/** @type {HookMap<AsyncSeriesBailHook<[ResourceDataWithData, ResolveData], true | void>>} */
+			/**
+			 * @type {HookMap<AsyncSeriesBailHook<[ResourceDataWithData, ResolveData], true | void>>}
+			 * @since 5.49.0
+			 */
 			resolveInScheme: new HookMap(
 				() => new AsyncSeriesBailHook(["resourceData", "resolveData"])
 			),
@@ -461,7 +464,10 @@ class NormalModuleFactory extends ModuleFactory {
 			generator: new HookMap(
 				() => new SyncHook(["generator", "generatorOptions"])
 			),
-			/** @type {HookMap<SyncBailHook<[CreateData, ResolveData], Module | void>>} */
+			/**
+			 * @type {HookMap<SyncBailHook<[CreateData, ResolveData], Module | void>>}
+			 * @since 5.81.0
+			 */
 			createModuleClass: new HookMap(
 				() => new SyncBailHook(["createData", "resolveData"])
 			)

package/lib/RuntimePlugin.js

@@ -119,6 +119,33 @@ const TREE_DEPENDENCIES = {
 	[RuntimeGlobals.shareScopeMap]: [RuntimeGlobals.hasOwnProperty]
 };
 
+// Tree runtime requirements whose only effect is attaching a zero-arg runtime
+// module to the chunk. Conditional / argument-taking ones stay as explicit taps.
+/** @type {[string, (new () => import("./RuntimeModule"))][]} */
+const SIMPLE_TREE_RUNTIME_MODULES = [
+	[RuntimeGlobals.definePropertyGetters, DefinePropertyGettersRuntimeModule],
+	[RuntimeGlobals.makeNamespaceObject, MakeNamespaceObjectRuntimeModule],
+	[
+		RuntimeGlobals.createFakeNamespaceObject,
+		CreateFakeNamespaceObjectRuntimeModule
+	],
+	[RuntimeGlobals.hasOwnProperty, HasOwnPropertyRuntimeModule],
+	[RuntimeGlobals.compatGetDefaultExport, CompatGetDefaultExportRuntimeModule],
+	[RuntimeGlobals.commonJsWrap, CommonJsWrapRuntimeModule],
+	[
+		RuntimeGlobals.setAnonymousDefaultName,
+		SetAnonymousDefaultNameRuntimeModule
+	],
+	[RuntimeGlobals.runtimeId, RuntimeIdRuntimeModule],
+	[RuntimeGlobals.global, GlobalRuntimeModule],
+	[RuntimeGlobals.shareScopeMap, ShareRuntimeModule],
+	[RuntimeGlobals.relativeUrl, RelativeUrlRuntimeModule],
+	[RuntimeGlobals.worker, WorkerRuntimeModule],
+	[RuntimeGlobals.onChunksLoaded, OnChunksLoadedRuntimeModule],
+	[RuntimeGlobals.scriptNonce, NonceRuntimeModule],
+	[RuntimeGlobals.toBinary, ToBinaryRuntimeModule]
+];
+
 /**
  * @param {string} template path template
  * @returns {boolean} true when it references the compilation `[fullhash]`/`[hash]`
@@ -198,36 +225,20 @@ class RuntimePlugin {
 						for (const dep of deps) set.add(dep);
 					});
 			}
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.definePropertyGetters)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new DefinePropertyGettersRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.makeNamespaceObject)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new MakeNamespaceObjectRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.createFakeNamespaceObject)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new CreateFakeNamespaceObjectRuntimeModule()
-					);
-					return true;
-				});
+			for (const [
+				runtimeGlobal,
+				RuntimeModule
+			] of SIMPLE_TREE_RUNTIME_MODULES) {
+				compilation.hooks.runtimeRequirementInTree
+					.for(runtimeGlobal)
+					.tap(PLUGIN_NAME, (chunk) => {
+						compilation.addRuntimeModule(chunk, new RuntimeModule());
+						return true;
+					});
+			}
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.makeOptimizedDeferredNamespaceObject)
-				.tap("RuntimePlugin", (chunk, runtimeRequirement) => {
+				.tap(PLUGIN_NAME, (chunk, runtimeRequirement) => {
 					compilation.addRuntimeModule(
 						chunk,
 						new MakeOptimizedDeferredNamespaceObjectRuntimeModule(
@@ -238,7 +249,7 @@ class RuntimePlugin {
 				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.makeDeferredNamespaceObject)
-				.tap("RuntimePlugin", (chunk, runtimeRequirement) => {
+				.tap(PLUGIN_NAME, (chunk, runtimeRequirement) => {
 					compilation.addRuntimeModule(
 						chunk,
 						new MakeDeferredNamespaceObjectRuntimeModule(
@@ -247,45 +258,6 @@ class RuntimePlugin {
 					);
 					return true;
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.hasOwnProperty)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new HasOwnPropertyRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.compatGetDefaultExport)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new CompatGetDefaultExportRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.commonJsWrap)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new CommonJsWrapRuntimeModule());
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.setAnonymousDefaultName)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new SetAnonymousDefaultNameRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.runtimeId)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new RuntimeIdRuntimeModule());
-					return true;
-				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.publicPath)
 				.tap(PLUGIN_NAME, (chunk, set) => {
@@ -321,12 +293,6 @@ class RuntimePlugin {
 					}
 					return true;
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.global)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new GlobalRuntimeModule());
-					return true;
-				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.asyncModule)
 				.tap(PLUGIN_NAME, (chunk) => {
@@ -500,12 +466,6 @@ class RuntimePlugin {
 				.tap(PLUGIN_NAME, (chunk, set) => {
 					set.add(RuntimeGlobals.ensureChunkHandlers);
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.shareScopeMap)
-				.tap(PLUGIN_NAME, (chunk, set) => {
-					compilation.addRuntimeModule(chunk, new ShareRuntimeModule());
-					return true;
-				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.loadScript)
 				.tap(PLUGIN_NAME, (chunk, set) => {
@@ -552,27 +512,6 @@ class RuntimePlugin {
 					);
 					return true;
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.relativeUrl)
-				.tap(PLUGIN_NAME, (chunk, _set) => {
-					compilation.addRuntimeModule(chunk, new RelativeUrlRuntimeModule());
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.worker)
-				.tap(PLUGIN_NAME, (chunk, _set) => {
-					compilation.addRuntimeModule(chunk, new WorkerRuntimeModule());
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.onChunksLoaded)
-				.tap(PLUGIN_NAME, (chunk, _set) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new OnChunksLoadedRuntimeModule()
-					);
-					return true;
-				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.baseURI)
 				.tap(PLUGIN_NAME, (chunk) => {
@@ -581,18 +520,6 @@ class RuntimePlugin {
 						return true;
 					}
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.scriptNonce)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new NonceRuntimeModule());
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.toBinary)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new ToBinaryRuntimeModule());
-					return true;
-				});
 			// TODO webpack 6: remove CompatRuntimeModule
 			compilation.hooks.additionalTreeRuntimeRequirements.tap(
 				PLUGIN_NAME,

package/lib/Template.js

@@ -46,6 +46,22 @@ const COMMENT_END_REGEX = /\*\//g;
 const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-z0-9_!§$()=\-^°]+/gi;
 const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
+/**
+ * Decimal digit count of a non-negative integer, without allocating a string.
+ * @param {number} n non-negative integer
+ * @returns {number} number of decimal digits
+ */
+const numberLength = (n) => {
+	if (n < 10) return 1;
+	if (n < 100) return 2;
+	if (n < 1000) return 3;
+	if (n < 10000) return 4;
+	if (n < 100000) return 5;
+	if (n < 1000000) return 6;
+	if (n < 10000000) return 7;
+	return String(n).length;
+};
+
 /**
  * Defines the render manifest options type used by this module.
  * @typedef {object} RenderManifestOptions
@@ -296,11 +312,15 @@ class Template {
 		// start with -1 because the first module needs no comma
 		let objectOverhead = -1;
 		for (const module of modules) {
-			// module id + colon + comma
-			objectOverhead += `${module.id}`.length + 2;
+			// module id digits + colon + comma; ids are non-negative integers here
+			// (non-number ids already returned false above), so count digits
+			// arithmetically instead of allocating a string per module.
+			const id = /** @type {number} */ (module.id);
+			objectOverhead += numberLength(id) + 2;
 		}
 		// number of commas, or when starting non-zero the length of Array(minId).concat()
-		const arrayOverhead = minId === 0 ? maxId : 16 + `${minId}`.length + maxId;
+		const arrayOverhead =
+			minId === 0 ? maxId : 16 + numberLength(minId) + maxId;
 		return arrayOverhead < objectOverhead ? [minId, maxId] : false;
 	}