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

package/lib/NodeStuffPlugin.js

@@ -16,20 +16,26 @@ const ConstDependency = require("./dependencies/ConstDependency");
 const ExternalModuleDependency = require("./dependencies/ExternalModuleDependency");
 const ExternalModuleInitFragmentDependency = require("./dependencies/ExternalModuleInitFragmentDependency");
 const ImportMetaPlugin = require("./dependencies/ImportMetaPlugin");
-const NodeStuffInWebError = require("./errors/NodeStuffInWebError");
 const { evaluateToString } = require("./javascript/JavascriptParserHelpers");
 const { relative } = require("./util/fs");
 const { parseResource } = require("./util/identifier");
-
-/** @typedef {import("../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../declarations/WebpackOptions").NodeOptions} NodeOptions */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./NormalModule")} NormalModule */
-/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("./javascript/JavascriptParser").Expression} Expression */
-/** @typedef {import("./javascript/JavascriptParser").Range} Range */
-/** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
+const memoize = require("./util/memoize");
+
+const getNodeStuffInWebError = memoize(() =>
+	require("./errors/NodeStuffInWebError")
+);
+
+/** @import { Expression } from "estree" */
+/**
+ * @import {
+ * 	JavascriptParserOptions,
+ * 	NodeOptions
+ * } from "../declarations/WebpackOptions"
+ */
+/** @import Compiler from "./Compiler" */
+/** @import NormalModule from "./NormalModule" */
+/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
+/** @import { InputFileSystem } from "./util/fs" */
 
 const PLUGIN_NAME = "NodeStuffPlugin";
 const URL_MODULE_CONSTANT_FUNCTION_NAME = "__webpack_fileURLToPath__";
@@ -103,7 +109,7 @@ class NodeStuffPlugin {
 
 						if (withWarning) {
 							parser.state.module.addWarning(
-								new NodeStuffInWebError(
+								new (getNodeStuffInWebError())(
 									dep.loc,
 									"global",
 									"The global namespace object is a Node.js feature and isn't available in browsers."
@@ -125,7 +131,7 @@ class NodeStuffPlugin {
 				/**
 				 * Sets module constant.
 				 * @param {JavascriptParser} parser the parser
-				 * @param {"__filename" | "__dirname" | "import.meta.filename" | "import.meta.dirname"} expressionName expression name
+				 * @param {string} expressionName expression name
 				 * @param {(module: NormalModule) => string} fn function
 				 * @param {"filename" | "dirname"} property a property
 				 * @returns {void}
@@ -159,7 +165,7 @@ class NodeStuffPlugin {
 				/**
 				 * Sets cached module constant.
 				 * @param {JavascriptParser} parser the parser
-				 * @param {"__filename" | "__dirname" | "import.meta.filename" | "import.meta.dirname"} expressionName expression name
+				 * @param {string} expressionName expression name
 				 * @param {(module: NormalModule) => string} fn function
 				 * @param {"filename" | "dirname"} property a property
 				 * @param {string=} warning warning
@@ -186,7 +192,11 @@ class NodeStuffPlugin {
 
 							if (warning) {
 								parser.state.module.addWarning(
-									new NodeStuffInWebError(dep.loc, expressionName, warning)
+									new (getNodeStuffInWebError())(
+										dep.loc,
+										expressionName,
+										warning
+									)
 								);
 							}
 
@@ -201,7 +211,7 @@ class NodeStuffPlugin {
 							if (property === usingProperty.id) {
 								if (warning) {
 									parser.state.module.addWarning(
-										new NodeStuffInWebError(
+										new (getNodeStuffInWebError())(
 											parser.getLocation(usingProperty),
 											expressionName,
 											warning
@@ -220,7 +230,7 @@ class NodeStuffPlugin {
 				/**
 				 * Updates constant using the provided parser.
 				 * @param {JavascriptParser} parser the parser
-				 * @param {"__filename" | "__dirname" | "import.meta.filename" | "import.meta.dirname"} expressionName expression name
+				 * @param {string} expressionName expression name
 				 * @param {string} value value
 				 * @param {"filename" | "dirname"} property a property
 				 * @param {string=} warning warning
@@ -244,7 +254,7 @@ class NodeStuffPlugin {
 				/**
 				 * Sets url module constant.
 				 * @param {JavascriptParser} parser the parser
-				 * @param {"__filename" | "__dirname" | "import.meta.filename" | "import.meta.dirname"} expressionName expression name
+				 * @param {string} expressionName expression name
 				 * @param {"dirname" | "filename"} property property
 				 * @param {() => string} value function to get value
 				 * @returns {void}
@@ -358,7 +368,7 @@ class NodeStuffPlugin {
 				 * Dirname and filename handler.
 				 * @param {JavascriptParser} parser the parser
 				 * @param {NodeOptions} nodeOptions options
-				 * @param {{ dirname: "__dirname" | "import.meta.dirname", filename: "__filename" | "import.meta.filename", dirnameEnabled?: boolean, filenameEnabled?: boolean }} identifiers options
+				 * @param {{ dirname: string, filename: string, dirnameEnabled?: boolean, filenameEnabled?: boolean }} identifiers options
 				 * @returns {void}
 				 */
 				const dirnameAndFilenameHandler = (

package/lib/NormalModule.js

@@ -23,13 +23,8 @@ const Module = require("./Module");
 const ModuleGraphConnection = require("./ModuleGraphConnection");
 const { JAVASCRIPT_MODULE_TYPE_AUTO } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
+const HarmonyImportSideEffectDependency = require("./dependencies/HarmonyImportSideEffectDependency");
 const HookWebpackError = require("./errors/HookWebpackError");
-const ModuleBuildError = require("./errors/ModuleBuildError");
-const ModuleError = require("./errors/ModuleError");
-const ModuleParseError = require("./errors/ModuleParseError");
-const ModuleWarning = require("./errors/ModuleWarning");
-const NonErrorEmittedError = require("./errors/NonErrorEmittedError");
-const UnhandledSchemeError = require("./errors/UnhandledSchemeError");
 const {
 	createLoaderContext,
 	getContext,
@@ -58,57 +53,99 @@ const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
 const parseJson = require("./util/parseJson");
 
-/** @typedef {import("enhanced-resolve").ResolveContext} ResolveContext */
-/** @typedef {import("enhanced-resolve").ResolveRequest} ResolveRequest */
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
-/** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
-/** @typedef {import("../declarations/WebpackOptions").NoParse} NoParse */
-/** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
-/** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("./Generator")} Generator */
-/** @typedef {import("./Generator").GenerateErrorFn} GenerateErrorFn */
-/** @typedef {import("./FileSystemInfo").Snapshot} Snapshot */
-/** @typedef {import("./Module").BuildInfo} BuildInfo */
-/** @typedef {import("./Module").FileSystemDependencies} FileSystemDependencies */
-/** @typedef {import("./Module").ValueCacheVersions} ValueCacheVersions */
-/** @typedef {import("./Module").BuildMeta} BuildMeta */
-/** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
-/** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
-/** @typedef {import("./Module").CodeGenerationResultData} CodeGenerationResultData */
-/** @typedef {import("./Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
-/** @typedef {import("./Module").KnownBuildInfo} KnownBuildInfo */
-/** @typedef {import("./Module").LibIdentOptions} LibIdentOptions */
-/** @typedef {import("./Module").LibIdent} LibIdent */
-/** @typedef {import("./Module").NameForCondition} NameForCondition */
-/** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
-/** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
-/** @typedef {import("./Module").BuildCallback} BuildCallback */
-/** @typedef {import("./Module").RuntimeRequirements} RuntimeRequirements */
-/** @typedef {import("./Module").Sources} Sources */
-/** @typedef {import("./Module").SourceType} SourceType */
-/** @typedef {import("./Module").SourceTypes} SourceTypes */
-/** @typedef {import("./Module").UnsafeCacheData} UnsafeCacheData */
-/** @typedef {import("./ModuleGraph")} ModuleGraph */
-/** @typedef {import("./ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
-/** @typedef {import("./NormalModuleFactory").NormalModuleTypes} NormalModuleTypes */
-/** @typedef {import("./NormalModuleFactory").ParserByType} ParserByType */
-/** @typedef {import("./NormalModuleFactory").ParserOptionsByType} ParserOptionsByType */
-/** @typedef {import("./NormalModuleFactory").GeneratorByType} GeneratorByType */
-/** @typedef {import("./NormalModuleFactory").GeneratorOptionsByType} GeneratorOptionsByType */
-/** @typedef {import("./NormalModuleFactory").ResourceSchemeData} ResourceSchemeData */
-/** @typedef {import("./Parser")} Parser */
-/** @typedef {import("./Parser").PreparsedAst} PreparsedAst */
-/** @typedef {import("./RequestShortener")} RequestShortener */
-/** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("./util/Hash")} Hash */
-/** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
-/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
-/** @typedef {import("./util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
+const getValidate = memoize(() => require("schema-utils").validate);
+
+const getGenerator = memoize(() => require("./Generator"));
+
+const getExtractSourceMap = memoize(() => require("./util/extractSourceMap"));
+
+const getInvalidDependenciesModuleWarning = memoize(() =>
+	require("./errors/InvalidDependenciesModuleWarning")
+);
+
+const getUnhandledSchemeError = memoize(() =>
+	require("./errors/UnhandledSchemeError")
+);
+
+const getNonErrorEmittedError = memoize(() =>
+	require("./errors/NonErrorEmittedError")
+);
+
+const getModuleWarning = memoize(() => require("./errors/ModuleWarning"));
+
+const getModuleParseError = memoize(() => require("./errors/ModuleParseError"));
+
+const getModuleError = memoize(() => require("./errors/ModuleError"));
+
+const getModuleBuildError = memoize(() => require("./errors/ModuleBuildError"));
+
+/** @import { ResolveContext, ResolveRequest } from "enhanced-resolve" */
+/** @import { Source, RawSourceMap } from "webpack-sources" */
+/**
+ * @import {
+ * 	ResolveOptions,
+ * 	NoParse,
+ * 	HashFunction
+ * } from "../declarations/WebpackOptions"
+ */
+/**
+ * @import Compilation, {
+ * 	FileSystemDependencies,
+ * 	UnsafeCacheData
+ * } from "./Compilation"
+ */
+/**
+ * @import {
+ * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
+ * } from "./config/defaults"
+ */
+/** @import { UpdateHashContext } from "./Dependency" */
+/** @import Generator, { GenerateErrorFn } from "./Generator" */
+/** @import { Snapshot } from "./FileSystemInfo" */
+/**
+ * @import {
+ * 	BuildInfo,
+ * 	ValueCacheVersions,
+ * 	BuildMeta,
+ * 	CodeGenerationContext,
+ * 	CodeGenerationResult,
+ * 	ConcatenationBailoutReasonContext,
+ * 	KnownBuildInfo,
+ * 	LibIdentOptions,
+ * 	LibIdent,
+ * 	NameForCondition,
+ * 	NeedBuildContext,
+ * 	NeedBuildCallback,
+ * 	BuildCallback,
+ * 	RuntimeRequirements,
+ * 	SourceType,
+ * 	SourceTypes
+ * } from "./Module"
+ */
+/** @import ModuleGraph from "./ModuleGraph" */
+/** @import { ConnectionState } from "./ModuleGraphConnection" */
+/**
+ * @import NormalModuleFactory, {
+ * 	NormalModuleTypes,
+ * 	ParserByType,
+ * 	ParserOptionsByType,
+ * 	GeneratorByType,
+ * 	GeneratorOptionsByType,
+ * 	ResourceSchemeData
+ * } from "./NormalModuleFactory"
+ */
+/** @import Parser, { PreparsedAst } from "./Parser" */
+/** @import RequestShortener from "./RequestShortener" */
+/** @import { ResolverWithOptions } from "./ResolverFactory" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "./serialization/ObjectMiddleware"
+ */
+/** @import Hash from "./util/Hash" */
+/** @import { InputFileSystem } from "./util/fs" */
+/** @import { AssociatedObjectForCache } from "./util/identifier" */
 /**
  * @template T
  * @typedef {import("./util/deprecation").FakeHook<T>} FakeHook
@@ -129,18 +166,6 @@ const parseJson = require("./util/parseJson");
 
 /** @typedef {(content: string) => boolean} NoParseFn */
 
-const getInvalidDependenciesModuleWarning = memoize(() =>
-	require("./errors/InvalidDependenciesModuleWarning")
-);
-
-const getExtractSourceMap = memoize(() => require("./util/extractSourceMap"));
-
-const getValidate = memoize(() => require("schema-utils").validate);
-
-const getHarmonyImportSideEffectDependency = memoize(() =>
-	require("./dependencies/HarmonyImportSideEffectDependency")
-);
-
 /**
  * @param {NormalModule} mod the module
  * @param {ModuleGraph} moduleGraph the module graph
@@ -566,7 +591,7 @@ const createCompilationHooks = () => {
  * @property {FileSystemDependencies=} missingDependencies
  * @property {FileSystemDependencies=} buildDependencies
  * @property {ValueCacheVersions=} valueDependencies
- * @property {(Snapshot | null)=} snapshot
+ * @property {(InstanceType<Snapshot> | null)=} snapshot
  * @property {string=} resourceIntegrity using in HttpUriPlugin
  */
 
@@ -701,11 +726,6 @@ class NormalModule extends Module {
 		this._sideEffectsStateGraph = undefined;
 		/** @type {ConnectionState | undefined} */
 		this._sideEffectsStateValue = undefined;
-		/**
-		 * @private
-		 * @type {CodeGenerationResultData}
-		 */
-		this._codeGeneratorData = new Map();
 	}
 
 	/**
@@ -815,6 +835,29 @@ class NormalModule extends Module {
 		this._sideEffectsStateValue = undefined;
 	}
 
+	/**
+	 * Releases the cached parser between incremental rebuilds so it doesn't keep
+	 * the previous compilation alive.
+	 * @returns {void}
+	 */
+	_cleanupParserForCache() {
+		this.parser = undefined;
+	}
+
+	/**
+	 * Re-acquire factory-derived helpers (parser/generator) for an incremental
+	 * rebuild so this compilation's plugin hooks apply.
+	 * @param {NormalModuleFactory} normalModuleFactory the normal module factory
+	 * @returns {void}
+	 */
+	_restoreParserAndGenerator(normalModuleFactory) {
+		this.parser = normalModuleFactory.getParser(this.type, this.parserOptions);
+		this.generator = normalModuleFactory.getGenerator(
+			this.type,
+			this.generatorOptions
+		);
+	}
+
 	/**
 	 * Module should be unsafe cached. Get data that's needed for that.
 	 * This data will be passed to restoreFromUnsafeCache later.
@@ -1036,10 +1079,10 @@ class NormalModule extends Module {
 			/** @type {LoaderContext<EXPECTED_ANY>["emitWarning"]} */
 			emitWarning: (warning) => {
 				if (!(warning instanceof Error)) {
-					warning = new NonErrorEmittedError(warning);
+					warning = new (getNonErrorEmittedError())(warning);
 				}
 				this.addWarning(
-					new ModuleWarning(warning, {
+					new (getModuleWarning())(warning, {
 						from: getCurrentLoaderName()
 					})
 				);
@@ -1047,10 +1090,10 @@ class NormalModule extends Module {
 			/** @type {LoaderContext<EXPECTED_ANY>["emitError"]} */
 			emitError: (error) => {
 				if (!(error instanceof Error)) {
-					error = new NonErrorEmittedError(error);
+					error = new (getNonErrorEmittedError())(error);
 				}
 				this.addError(
-					new ModuleError(error, {
+					new (getModuleError())(error, {
 						from: getCurrentLoaderName()
 					})
 				);
@@ -1243,10 +1286,10 @@ class NormalModule extends Module {
 		const processResult = (err, result_) => {
 			if (err) {
 				if (!(err instanceof Error)) {
-					err = new NonErrorEmittedError(err);
+					err = new (getNonErrorEmittedError())(err);
 				}
 				const currentLoader = this.getCurrentLoader(loaderContext);
-				const error = new ModuleBuildError(err, {
+				const error = new (getModuleBuildError())(err, {
 					from:
 						currentLoader &&
 						compilation.runtimeTemplate.requestShortener.shorten(
@@ -1275,7 +1318,7 @@ class NormalModule extends Module {
 							: "unknown"
 					}) didn't return a Buffer or String`
 				);
-				const error = new ModuleBuildError(err);
+				const error = new (getModuleBuildError())(err);
 				return callback(error);
 			}
 
@@ -1349,7 +1392,7 @@ class NormalModule extends Module {
 									} else {
 										if (typeof result !== "string" && !result) {
 											return reject(
-												new UnhandledSchemeError(
+												new (getUnhandledSchemeError())(
 													/** @type {string} */
 													(scheme),
 													resourcePath
@@ -1397,7 +1440,9 @@ class NormalModule extends Module {
 								);
 								return callback(null, source, sourceMap);
 							} catch (err) {
-								this.addWarning(new ModuleWarning(/** @type {Error} */ (err)));
+								this.addWarning(
+									new (getModuleWarning())(/** @type {Error} */ (err))
+								);
 								return callback(null, result);
 							}
 						}
@@ -1575,7 +1620,8 @@ class NormalModule extends Module {
 			pureFunctions: undefined,
 			inlineExports: undefined,
 			moduleConcatenationBailout: undefined,
-			needCreateRequire: undefined
+			needCreateRequire: undefined,
+			usesTopLevelUsingDeclaration: undefined
 		};
 
 		const startTime = compilation.compiler.fsStartTime || Date.now();
@@ -1599,7 +1645,12 @@ class NormalModule extends Module {
 				const loaders = this.loaders.map((item) =>
 					contextify(options.context, item.loader, compilation.compiler.root)
 				);
-				const error = new ModuleParseError(source, e, loaders, this.type);
+				const error = new (getModuleParseError())(
+					source,
+					e,
+					loaders,
+					this.type
+				);
 				this.markModuleAsErrored(error);
 				this._initBuildHash(compilation);
 				return callback();
@@ -1779,7 +1830,7 @@ class NormalModule extends Module {
 		return walkSideEffects(
 			this,
 			moduleGraph,
-			getHarmonyImportSideEffectDependency()
+			HarmonyImportSideEffectDependency
 		);
 	}
 
@@ -1834,10 +1885,19 @@ class NormalModule extends Module {
 			runtimeRequirements.add(RuntimeGlobals.thisAsExports);
 		}
 
-		const getData = () => this._codeGeneratorData;
+		/** @type {CodeGenerationResult} */
+		const resultEntry = {
+			sources: new Map(),
+			runtimeRequirements,
+			data: undefined,
+			hash: undefined
+		};
+
+		const getData = () => {
+			if (resultEntry.data === undefined) resultEntry.data = new Map();
+			return resultEntry.data;
+		};
 
-		/** @type {Sources} */
-		const sources = new Map();
 		for (const type of sourceTypes || chunkGraph.getModuleSourceTypes(this)) {
 			// TODO webpack@6 make generateError required
 			const generator =
@@ -1857,9 +1917,7 @@ class NormalModule extends Module {
 							getData,
 							type
 						})
-					: new RawSource(
-							`throw new Error(${JSON.stringify(this.error.message)});`
-						)
+					: new RawSource(getGenerator().throwBuildErrorCode(this.error))
 				: generator.generate(this, {
 						dependencyTemplates,
 						runtimeTemplate,
@@ -1874,17 +1932,10 @@ class NormalModule extends Module {
 					});
 
 			if (source) {
-				sources.set(type, new CachedSource(source));
+				resultEntry.sources.set(type, new CachedSource(source));
 			}
 		}
 
-		/** @type {CodeGenerationResult} */
-		const resultEntry = {
-			sources,
-			runtimeRequirements,
-			data: this._codeGeneratorData,
-			hash: undefined
-		};
 		return resultEntry;
 	}
 
@@ -2060,7 +2111,6 @@ class NormalModule extends Module {
 		write(this.error);
 		write(this._lastSuccessfulBuildMeta);
 		write(this._forceBuild);
-		write(this._codeGeneratorData);
 		write(this.hot);
 		super.serialize(context);
 	}
@@ -2104,7 +2154,6 @@ class NormalModule extends Module {
 		this.error = read();
 		this._lastSuccessfulBuildMeta = read();
 		this._forceBuild = read();
-		this._codeGeneratorData = read();
 		this.hot = read();
 		super.deserialize(context);
 	}