webpack 5.59.0 → 5.94.0

package/lib/RequireJsStuffPlugin.js

@@ -5,13 +5,21 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const ConstDependency = require("./dependencies/ConstDependency");
 const {
 	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
 
+/** @typedef {import("../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+
+const PLUGIN_NAME = "RequireJsStuffPlugin";
 
 module.exports = class RequireJsStuffPlugin {
 	/**
@@ -21,12 +29,17 @@ module.exports = class RequireJsStuffPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"RequireJsStuffPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ConstDependency,
 					new ConstDependency.Template()
 				);
+				/**
+				 * @param {JavascriptParser} parser the parser
+				 * @param {JavascriptParserOptions} parserOptions options
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (
 						parserOptions.requireJs === undefined ||
@@ -37,27 +50,21 @@ module.exports = class RequireJsStuffPlugin {
 
 					parser.hooks.call
 						.for("require.config")
-						.tap(
-							"RequireJsStuffPlugin",
-							toConstantDependency(parser, "undefined")
-						);
+						.tap(PLUGIN_NAME, toConstantDependency(parser, "undefined"));
 					parser.hooks.call
 						.for("requirejs.config")
-						.tap(
-							"RequireJsStuffPlugin",
-							toConstantDependency(parser, "undefined")
-						);
+						.tap(PLUGIN_NAME, toConstantDependency(parser, "undefined"));
 
 					parser.hooks.expression
 						.for("require.version")
 						.tap(
-							"RequireJsStuffPlugin",
+							PLUGIN_NAME,
 							toConstantDependency(parser, JSON.stringify("0.0.0"))
 						);
 					parser.hooks.expression
 						.for("requirejs.onError")
 						.tap(
-							"RequireJsStuffPlugin",
+							PLUGIN_NAME,
 							toConstantDependency(
 								parser,
 								RuntimeGlobals.uncaughtErrorHandler,
@@ -66,11 +73,11 @@ module.exports = class RequireJsStuffPlugin {
 						);
 				};
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("RequireJsStuffPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("RequireJsStuffPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/ResolverFactory.js

@@ -13,14 +13,16 @@ const {
 	resolveByProperty
 } = require("./util/cleverMerge");
 
+/** @typedef {import("enhanced-resolve").ResolveContext} ResolveContext */
 /** @typedef {import("enhanced-resolve").ResolveOptions} ResolveOptions */
+/** @typedef {import("enhanced-resolve").ResolveRequest} ResolveRequest */
 /** @typedef {import("enhanced-resolve").Resolver} Resolver */
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} WebpackResolveOptions */
 /** @typedef {import("../declarations/WebpackOptions").ResolvePluginInstance} ResolvePluginInstance */
 
 /** @typedef {WebpackResolveOptions & {dependencyType?: string, resolveToContext?: boolean }} ResolveOptionsWithDependencyType */
 /**
- * @typedef {Object} WithOptions
+ * @typedef {object} WithOptions
  * @property {function(Partial<ResolveOptionsWithDependencyType>): ResolverWithOptions} withOptions create a resolver with additional/different options
  */
 
@@ -59,13 +61,15 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 		);
 
 	return removeOperations(
-		resolveByProperty(options, "byDependency", dependencyType)
+		resolveByProperty(options, "byDependency", dependencyType),
+		// Keep the `unsafeCache` because it can be a `Proxy`
+		["unsafeCache"]
 	);
 };
 
 /**
- * @typedef {Object} ResolverCache
- * @property {WeakMap<Object, ResolverWithOptions>} direct
+ * @typedef {object} ResolverCache
+ * @property {WeakMap<object, ResolverWithOptions>} direct
  * @property {Map<string, ResolverWithOptions>} stringified
  */
 

package/lib/RuntimeGlobals.js

@@ -8,226 +8,260 @@
 /**
  * the internal require function
  */
-exports.require = "__webpack_require__";
+module.exports.require = "__webpack_require__";
 
 /**
  * access to properties of the internal require function/object
  */
-exports.requireScope = "__webpack_require__.*";
+module.exports.requireScope = "__webpack_require__.*";
 
 /**
  * the internal exports object
  */
-exports.exports = "__webpack_exports__";
+module.exports.exports = "__webpack_exports__";
 
 /**
  * top-level this need to be the exports object
  */
-exports.thisAsExports = "top-level-this-exports";
+module.exports.thisAsExports = "top-level-this-exports";
 
 /**
  * runtime need to return the exports of the last entry module
  */
-exports.returnExportsFromRuntime = "return-exports-from-runtime";
+module.exports.returnExportsFromRuntime = "return-exports-from-runtime";
 
 /**
  * the internal module object
  */
-exports.module = "module";
+module.exports.module = "module";
 
 /**
  * the internal module object
  */
-exports.moduleId = "module.id";
+module.exports.moduleId = "module.id";
 
 /**
  * the internal module object
  */
-exports.moduleLoaded = "module.loaded";
+module.exports.moduleLoaded = "module.loaded";
 
 /**
  * the bundle public path
  */
-exports.publicPath = "__webpack_require__.p";
+module.exports.publicPath = "__webpack_require__.p";
 
 /**
  * the module id of the entry point
  */
-exports.entryModuleId = "__webpack_require__.s";
+module.exports.entryModuleId = "__webpack_require__.s";
 
 /**
  * the module cache
  */
-exports.moduleCache = "__webpack_require__.c";
+module.exports.moduleCache = "__webpack_require__.c";
 
 /**
  * the module functions
  */
-exports.moduleFactories = "__webpack_require__.m";
+module.exports.moduleFactories = "__webpack_require__.m";
 
 /**
  * the module functions, with only write access
  */
-exports.moduleFactoriesAddOnly = "__webpack_require__.m (add only)";
+module.exports.moduleFactoriesAddOnly = "__webpack_require__.m (add only)";
 
 /**
  * the chunk ensure function
  */
-exports.ensureChunk = "__webpack_require__.e";
+module.exports.ensureChunk = "__webpack_require__.e";
 
 /**
  * an object with handlers to ensure a chunk
  */
-exports.ensureChunkHandlers = "__webpack_require__.f";
+module.exports.ensureChunkHandlers = "__webpack_require__.f";
 
 /**
  * a runtime requirement if ensureChunkHandlers should include loading of chunk needed for entries
  */
-exports.ensureChunkIncludeEntries = "__webpack_require__.f (include entries)";
+module.exports.ensureChunkIncludeEntries =
+	"__webpack_require__.f (include entries)";
 
 /**
  * the chunk prefetch function
  */
-exports.prefetchChunk = "__webpack_require__.E";
+module.exports.prefetchChunk = "__webpack_require__.E";
 
 /**
  * an object with handlers to prefetch a chunk
  */
-exports.prefetchChunkHandlers = "__webpack_require__.F";
+module.exports.prefetchChunkHandlers = "__webpack_require__.F";
 
 /**
  * the chunk preload function
  */
-exports.preloadChunk = "__webpack_require__.G";
+module.exports.preloadChunk = "__webpack_require__.G";
 
 /**
  * an object with handlers to preload a chunk
  */
-exports.preloadChunkHandlers = "__webpack_require__.H";
+module.exports.preloadChunkHandlers = "__webpack_require__.H";
 
 /**
  * the exported property define getters function
  */
-exports.definePropertyGetters = "__webpack_require__.d";
+module.exports.definePropertyGetters = "__webpack_require__.d";
 
 /**
  * define compatibility on export
  */
-exports.makeNamespaceObject = "__webpack_require__.r";
+module.exports.makeNamespaceObject = "__webpack_require__.r";
 
 /**
  * create a fake namespace object
  */
-exports.createFakeNamespaceObject = "__webpack_require__.t";
+module.exports.createFakeNamespaceObject = "__webpack_require__.t";
 
 /**
  * compatibility get default export
  */
-exports.compatGetDefaultExport = "__webpack_require__.n";
+module.exports.compatGetDefaultExport = "__webpack_require__.n";
 
 /**
  * harmony module decorator
  */
-exports.harmonyModuleDecorator = "__webpack_require__.hmd";
+module.exports.harmonyModuleDecorator = "__webpack_require__.hmd";
 
 /**
  * node.js module decorator
  */
-exports.nodeModuleDecorator = "__webpack_require__.nmd";
+module.exports.nodeModuleDecorator = "__webpack_require__.nmd";
 
 /**
  * the webpack hash
  */
-exports.getFullHash = "__webpack_require__.h";
+module.exports.getFullHash = "__webpack_require__.h";
 
 /**
  * an object containing all installed WebAssembly.Instance export objects keyed by module id
  */
-exports.wasmInstances = "__webpack_require__.w";
+module.exports.wasmInstances = "__webpack_require__.w";
 
 /**
  * instantiate a wasm instance from module exports object, id, hash and importsObject
  */
-exports.instantiateWasm = "__webpack_require__.v";
+module.exports.instantiateWasm = "__webpack_require__.v";
 
 /**
  * the uncaught error handler for the webpack runtime
  */
-exports.uncaughtErrorHandler = "__webpack_require__.oe";
+module.exports.uncaughtErrorHandler = "__webpack_require__.oe";
 
 /**
  * the script nonce
  */
-exports.scriptNonce = "__webpack_require__.nc";
+module.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";
+module.exports.loadScript = "__webpack_require__.l";
+
+/**
+ * function to promote a string to a TrustedScript using webpack's Trusted
+ * Types policy
+ * Arguments: (script: string) => TrustedScript
+ */
+module.exports.createScript = "__webpack_require__.ts";
 
 /**
  * function to promote a string to a TrustedScriptURL using webpack's Trusted
  * Types policy
  * Arguments: (url: string) => TrustedScriptURL
  */
-exports.createScriptUrl = "__webpack_require__.tu";
+module.exports.createScriptUrl = "__webpack_require__.tu";
+
+/**
+ * function to return webpack's Trusted Types policy
+ * Arguments: () => TrustedTypePolicy
+ */
+module.exports.getTrustedTypesPolicy = "__webpack_require__.tt";
+
+/**
+ * a flag when a chunk has a fetch priority
+ */
+module.exports.hasFetchPriority = "has fetch priority";
 
 /**
  * the chunk name of the chunk with the runtime
  */
-exports.chunkName = "__webpack_require__.cn";
+module.exports.chunkName = "__webpack_require__.cn";
 
 /**
  * the runtime id of the current runtime
  */
-exports.runtimeId = "__webpack_require__.j";
+module.exports.runtimeId = "__webpack_require__.j";
 
 /**
  * the filename of the script part of the chunk
  */
-exports.getChunkScriptFilename = "__webpack_require__.u";
+module.exports.getChunkScriptFilename = "__webpack_require__.u";
+
+/**
+ * the filename of the css part of the chunk
+ */
+module.exports.getChunkCssFilename = "__webpack_require__.k";
+
+/**
+ * a flag when a module/chunk/tree has css modules
+ */
+module.exports.hasCssModules = "has css modules";
 
 /**
  * the filename of the script part of the hot update chunk
  */
-exports.getChunkUpdateScriptFilename = "__webpack_require__.hu";
+module.exports.getChunkUpdateScriptFilename = "__webpack_require__.hu";
+
+/**
+ * the filename of the css part of the hot update chunk
+ */
+module.exports.getChunkUpdateCssFilename = "__webpack_require__.hk";
 
 /**
  * startup signal from runtime
  * This will be called when the runtime chunk has been loaded.
  */
-exports.startup = "__webpack_require__.x";
+module.exports.startup = "__webpack_require__.x";
 
 /**
  * @deprecated
  * creating a default startup function with the entry modules
  */
-exports.startupNoDefault = "__webpack_require__.x (no default handler)";
+module.exports.startupNoDefault = "__webpack_require__.x (no default handler)";
 
 /**
  * startup signal from runtime but only used to add logic after the startup
  */
-exports.startupOnlyAfter = "__webpack_require__.x (only after)";
+module.exports.startupOnlyAfter = "__webpack_require__.x (only after)";
 
 /**
  * startup signal from runtime but only used to add sync logic before the startup
  */
-exports.startupOnlyBefore = "__webpack_require__.x (only before)";
+module.exports.startupOnlyBefore = "__webpack_require__.x (only before)";
 
 /**
  * global callback functions for installing chunks
  */
-exports.chunkCallback = "webpackChunk";
+module.exports.chunkCallback = "webpackChunk";
 
 /**
  * method to startup an entrypoint with needed chunks.
  * Signature: (moduleId: Id, chunkIds: Id[]) => any.
  * Returns the exports of the module or a Promise
  */
-exports.startupEntrypoint = "__webpack_require__.X";
+module.exports.startupEntrypoint = "__webpack_require__.X";
 
 /**
  * register deferred code, which will run when certain
@@ -237,106 +271,106 @@ exports.startupEntrypoint = "__webpack_require__.X";
  * When (priority & 1) it will wait for all other handlers with lower priority to
  * be executed before itself is executed
  */
-exports.onChunksLoaded = "__webpack_require__.O";
+module.exports.onChunksLoaded = "__webpack_require__.O";
 
 /**
  * method to install a chunk that was loaded somehow
  * Signature: ({ id, ids, modules, runtime }) => void
  */
-exports.externalInstallChunk = "__webpack_require__.C";
+module.exports.externalInstallChunk = "__webpack_require__.C";
 
 /**
  * interceptor for module executions
  */
-exports.interceptModuleExecution = "__webpack_require__.i";
+module.exports.interceptModuleExecution = "__webpack_require__.i";
 
 /**
  * the global object
  */
-exports.global = "__webpack_require__.g";
+module.exports.global = "__webpack_require__.g";
 
 /**
  * an object with all share scopes
  */
-exports.shareScopeMap = "__webpack_require__.S";
+module.exports.shareScopeMap = "__webpack_require__.S";
 
 /**
  * The sharing init sequence function (only runs once per share scope).
  * Has one argument, the name of the share scope.
  * Creates a share scope if not existing
  */
-exports.initializeSharing = "__webpack_require__.I";
+module.exports.initializeSharing = "__webpack_require__.I";
 
 /**
  * The current scope when getting a module from a remote
  */
-exports.currentRemoteGetScope = "__webpack_require__.R";
+module.exports.currentRemoteGetScope = "__webpack_require__.R";
 
 /**
  * the filename of the HMR manifest
  */
-exports.getUpdateManifestFilename = "__webpack_require__.hmrF";
+module.exports.getUpdateManifestFilename = "__webpack_require__.hmrF";
 
 /**
  * function downloading the update manifest
  */
-exports.hmrDownloadManifest = "__webpack_require__.hmrM";
+module.exports.hmrDownloadManifest = "__webpack_require__.hmrM";
 
 /**
  * array with handler functions to download chunk updates
  */
-exports.hmrDownloadUpdateHandlers = "__webpack_require__.hmrC";
+module.exports.hmrDownloadUpdateHandlers = "__webpack_require__.hmrC";
 
 /**
  * object with all hmr module data for all modules
  */
-exports.hmrModuleData = "__webpack_require__.hmrD";
+module.exports.hmrModuleData = "__webpack_require__.hmrD";
 
 /**
  * array with handler functions when a module should be invalidated
  */
-exports.hmrInvalidateModuleHandlers = "__webpack_require__.hmrI";
+module.exports.hmrInvalidateModuleHandlers = "__webpack_require__.hmrI";
 
 /**
  * the prefix for storing state of runtime modules when hmr is enabled
  */
-exports.hmrRuntimeStatePrefix = "__webpack_require__.hmrS";
+module.exports.hmrRuntimeStatePrefix = "__webpack_require__.hmrS";
 
 /**
  * the AMD define function
  */
-exports.amdDefine = "__webpack_require__.amdD";
+module.exports.amdDefine = "__webpack_require__.amdD";
 
 /**
  * the AMD options
  */
-exports.amdOptions = "__webpack_require__.amdO";
+module.exports.amdOptions = "__webpack_require__.amdO";
 
 /**
  * the System polyfill object
  */
-exports.system = "__webpack_require__.System";
+module.exports.system = "__webpack_require__.System";
 
 /**
  * the shorthand for Object.prototype.hasOwnProperty
  * using of it decreases the compiled bundle size
  */
-exports.hasOwnProperty = "__webpack_require__.o";
+module.exports.hasOwnProperty = "__webpack_require__.o";
 
 /**
  * the System.register context object
  */
-exports.systemContext = "__webpack_require__.y";
+module.exports.systemContext = "__webpack_require__.y";
 
 /**
  * the baseURI of current document
  */
-exports.baseURI = "__webpack_require__.b";
+module.exports.baseURI = "__webpack_require__.b";
 
 /**
  * a RelativeURL class when relative URLs are used
  */
-exports.relativeUrl = "__webpack_require__.U";
+module.exports.relativeUrl = "__webpack_require__.U";
 
 /**
  * Creates an async module. The body function must be a async function.
@@ -350,4 +384,4 @@ exports.relativeUrl = "__webpack_require__.U";
  * hasAwaitAfterDependencies?: boolean
  * ) => void
  */
-exports.asyncModule = "__webpack_require__.a";
+module.exports.asyncModule = "__webpack_require__.a";

package/lib/RuntimeModule.js

@@ -8,6 +8,7 @@
 const { RawSource } = require("webpack-sources");
 const OriginalSource = require("webpack-sources").OriginalSource;
 const Module = require("./Module");
+const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
@@ -18,13 +19,14 @@ const Module = require("./Module");
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("./Module").SourceTypes} SourceTypes */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
-const TYPES = new Set(["runtime"]);
+const TYPES = new Set([WEBPACK_MODULE_TYPE_RUNTIME]);
 
 class RuntimeModule extends Module {
 	/**
@@ -32,20 +34,20 @@ class RuntimeModule extends Module {
 	 * @param {number=} stage an optional stage
 	 */
 	constructor(name, stage = 0) {
-		super("runtime");
+		super(WEBPACK_MODULE_TYPE_RUNTIME);
 		this.name = name;
 		this.stage = stage;
 		this.buildMeta = {};
 		this.buildInfo = {};
-		/** @type {Compilation} */
+		/** @type {Compilation | undefined} */
 		this.compilation = undefined;
-		/** @type {Chunk} */
+		/** @type {Chunk | undefined} */
 		this.chunk = undefined;
-		/** @type {ChunkGraph} */
+		/** @type {ChunkGraph | undefined} */
 		this.chunkGraph = undefined;
 		this.fullHash = false;
 		this.dependentHash = false;
-		/** @type {string} */
+		/** @type {string | undefined | null} */
 		this._cachedGeneratedCode = undefined;
 	}
 
@@ -78,7 +80,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) {
@@ -111,18 +113,18 @@ class RuntimeModule extends Module {
 			if (this.fullHash || this.dependentHash) {
 				// Do not use getGeneratedCode here, because i. e. compilation hash might be not
 				// ready at this point. We will cache it later instead.
-				hash.update(this.generate());
+				hash.update(/** @type {string} */ (this.generate()));
 			} else {
-				hash.update(this.getGeneratedCode());
+				hash.update(/** @type {string} */ (this.getGeneratedCode()));
 			}
 		} catch (err) {
-			hash.update(err.message);
+			hash.update(/** @type {Error} */ (err).message);
 		}
 		super.updateHash(hash, context);
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;
@@ -137,7 +139,7 @@ class RuntimeModule extends Module {
 		const generatedCode = this.getGeneratedCode();
 		if (generatedCode) {
 			sources.set(
-				"runtime",
+				WEBPACK_MODULE_TYPE_RUNTIME,
 				this.useSourceMap || this.useSimpleSourceMap
 					? new OriginalSource(generatedCode, this.identifier())
 					: new RawSource(generatedCode)
@@ -157,7 +159,7 @@ class RuntimeModule extends Module {
 		try {
 			const source = this.getGeneratedCode();
 			return source ? source.length : 0;
-		} catch (e) {
+		} catch (_err) {
 			return 0;
 		}
 	}
@@ -165,7 +167,7 @@ class RuntimeModule extends Module {
 	/* istanbul ignore next */
 	/**
 	 * @abstract
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
 		const AbstractMethodError = require("./AbstractMethodError");
@@ -173,7 +175,7 @@ class RuntimeModule extends Module {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	getGeneratedCode() {
 		if (this._cachedGeneratedCode) {