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

package/lib/sharing/ProvideSharedModule.js

@@ -27,12 +27,13 @@ const ProvideForSharedDependency = require("./ProvideForSharedDependency");
 /** @typedef {import("../Module").CodeGenerationResultData} CodeGenerationResultData */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, string | false, string, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string, string | false, string, boolean]>} ObjectSerializerContext */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
 class ProvideSharedModule extends Module {
 	/**
+	 * Creates an instance of ProvideSharedModule.
 	 * @param {string} shareScope shared scope name
 	 * @param {string} name shared key
 	 * @param {string | false} version version
@@ -41,21 +42,28 @@ class ProvideSharedModule extends Module {
 	 */
 	constructor(shareScope, name, version, request, eager) {
 		super(WEBPACK_MODULE_TYPE_PROVIDE);
+		/** @type {string} */
 		this._shareScope = shareScope;
+		/** @type {string} */
 		this._name = name;
+		/** @type {string | false} */
 		this._version = version;
+		/** @type {string} */
 		this._request = request;
+		/** @type {boolean} */
 		this._eager = eager;
 	}
 
 	/**
+	 * Returns the unique identifier used to reference this module.
 	 * @returns {string} a unique identifier of the module
 	 */
 	identifier() {
-		return `provide module (${this._shareScope}) ${this._name}@${this._version} = ${this._request}`;
+		return `provide module (${this._shareScope}) ${this._name}@${this._version}|${this._request}`;
 	}
 
 	/**
+	 * Returns a human-readable identifier for this module.
 	 * @param {RequestShortener} requestShortener the request shortener
 	 * @returns {string} a user readable identifier of the module
 	 */
@@ -66,6 +74,7 @@ class ProvideSharedModule extends Module {
 	}
 
 	/**
+	 * Gets the library identifier.
 	 * @param {LibIdentOptions} options options
 	 * @returns {LibIdent | null} an identifier for library inclusion
 	 */
@@ -76,6 +85,7 @@ class ProvideSharedModule extends Module {
 	}
 
 	/**
+	 * Checks whether the module needs to be rebuilt for the current build state.
 	 * @param {NeedBuildContext} context context info
 	 * @param {NeedBuildCallback} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
@@ -85,6 +95,7 @@ class ProvideSharedModule extends Module {
 	}
 
 	/**
+	 * Builds the module using the provided compilation context.
 	 * @param {WebpackOptions} options webpack options
 	 * @param {Compilation} compilation the compilation
 	 * @param {ResolverWithOptions} resolver the resolver
@@ -112,6 +123,7 @@ class ProvideSharedModule extends Module {
 	}
 
 	/**
+	 * Returns the estimated size for the requested source type.
 	 * @param {string=} type the source type for which the size should be estimated
 	 * @returns {number} the estimated size of the module (must be non-zero)
 	 */
@@ -120,6 +132,7 @@ class ProvideSharedModule extends Module {
 	}
 
 	/**
+	 * Returns the source types this module can generate.
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
@@ -127,6 +140,7 @@ class ProvideSharedModule extends Module {
 	}
 
 	/**
+	 * Generates code and runtime requirements for this module.
 	 * @param {CodeGenerationContext} context context for code generation
 	 * @returns {CodeGenerationResult} result
 	 */
@@ -164,26 +178,42 @@ class ProvideSharedModule extends Module {
 	}
 
 	/**
+	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this._shareScope);
-		write(this._name);
-		write(this._version);
-		write(this._request);
-		write(this._eager);
+		context
+			.write(this._shareScope)
+			.write(this._name)
+			.write(this._version)
+			.write(this._request)
+			.write(this._eager);
 		super.serialize(context);
 	}
 
 	/**
+	 * Restores this instance from the provided deserializer context.
 	 * @param {ObjectDeserializerContext} context context
 	 * @returns {ProvideSharedModule} deserialize fallback dependency
 	 */
 	static deserialize(context) {
-		const { read } = context;
-		const obj = new ProvideSharedModule(read(), read(), read(), read(), read());
-		obj.deserialize(context);
+		const shareScope = context.read();
+		const c1 = context.rest;
+		const name = c1.read();
+		const c2 = c1.rest;
+		const version = c2.read();
+		const c3 = c2.rest;
+		const request = c3.read();
+		const c4 = c3.rest;
+		const eager = c4.read();
+		const obj = new ProvideSharedModule(
+			shareScope,
+			name,
+			version,
+			request,
+			eager
+		);
+		obj.deserialize(c4.rest);
 		return obj;
 	}
 }

package/lib/sharing/ProvideSharedModuleFactory.js

@@ -14,6 +14,7 @@ const ProvideSharedModule = require("./ProvideSharedModule");
 
 class ProvideSharedModuleFactory extends ModuleFactory {
 	/**
+	 * Processes the provided data.
 	 * @param {ModuleFactoryCreateData} data data object
 	 * @param {ModuleFactoryCallback} callback callback
 	 * @returns {void}

package/lib/sharing/ProvideSharedPlugin.js

@@ -5,8 +5,9 @@
 
 "use strict";
 
-const WebpackError = require("../WebpackError");
 const { parseOptions } = require("../container/options");
+const WebpackError = require("../errors/WebpackError");
+const { ABSOLUTE_PATH_REGEXP } = require("../util/identifier");
 const ProvideForSharedDependency = require("./ProvideForSharedDependency");
 const ProvideSharedDependency = require("./ProvideSharedDependency");
 const ProvideSharedModuleFactory = require("./ProvideSharedModuleFactory");
@@ -17,6 +18,7 @@ const ProvideSharedModuleFactory = require("./ProvideSharedModuleFactory");
 /** @typedef {import("../NormalModuleFactory").NormalModuleCreateData} NormalModuleCreateData */
 
 /**
+ * Defines the provide options type used by this module.
  * @typedef {object} ProvideOptions
  * @property {string} shareKey
  * @property {string} shareScope
@@ -30,14 +32,16 @@ const PLUGIN_NAME = "ProvideSharedPlugin";
 
 class ProvideSharedPlugin {
 	/**
+	 * Creates an instance of ProvideSharedPlugin.
 	 * @param {ProvideSharedPluginOptions} options options
 	 */
 	constructor(options) {
+		/** @type {ProvideSharedPluginOptions} */
 		this.options = options;
 	}
 
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
@@ -98,13 +102,13 @@ class ProvideSharedPlugin {
 				/** @type {Map<string, ProvideOptions>} */
 				const prefixMatchProvides = new Map();
 				for (const [request, config] of provides) {
-					if (/^(?:\/|[A-Z]:\\|\\\\|\.\.?(?:\/|$))/i.test(request)) {
+					if (/^\.\.?(?:\/|$)/.test(request)) {
 						// relative request
 						resolvedProvideMap.set(request, {
 							config,
 							version: config.version
 						});
-					} else if (/^(?:\/|[A-Z]:\\|\\\\)/i.test(request)) {
+					} else if (ABSOLUTE_PATH_REGEXP.test(request)) {
 						// absolute path
 						resolvedProvideMap.set(request, {
 							config,
@@ -120,6 +124,7 @@ class ProvideSharedPlugin {
 				}
 				compilationData.set(compilation, resolvedProvideMap);
 				/**
+				 * Provide shared module.
 				 * @param {string} key key
 				 * @param {ProvideOptions} config config
 				 * @param {NormalModuleCreateData["resource"]} resource resource
@@ -166,7 +171,7 @@ class ProvideSharedPlugin {
 				normalModuleFactory.hooks.module.tap(
 					PLUGIN_NAME,
 					(module, { resource, resourceResolveData }, resolveData) => {
-						if (resolvedProvideMap.has(/** @type {string} */ (resource))) {
+						if (resolvedProvideMap.has(resource)) {
 							return module;
 						}
 						const { request } = resolveData;
@@ -176,7 +181,7 @@ class ProvideSharedPlugin {
 								provideSharedModule(
 									request,
 									config,
-									/** @type {string} */ (resource),
+									resource,
 									resourceResolveData
 								);
 								resolveData.cacheable = false;
@@ -186,12 +191,12 @@ class ProvideSharedPlugin {
 							if (request.startsWith(prefix)) {
 								const remainder = request.slice(prefix.length);
 								provideSharedModule(
-									/** @type {string} */ (resource),
+									resource,
 									{
 										...config,
 										shareKey: config.shareKey + remainder
 									},
-									/** @type {string} */ (resource),
+									resource,
 									resourceResolveData
 								);
 								resolveData.cacheable = false;

package/lib/sharing/SharePlugin.js

@@ -18,6 +18,7 @@ const { isRequiredVersion } = require("./utils");
 
 class SharePlugin {
 	/**
+	 * Creates an instance of SharePlugin.
 	 * @param {SharePluginOptions} options options
 	 */
 	constructor(options) {
@@ -66,13 +67,16 @@ class SharePlugin {
 					eager: options.eager
 				}
 			}));
+		/** @type {string | undefined} */
 		this._shareScope = options.shareScope;
+		/** @type {Record<string, ConsumesConfig>[]} */
 		this._consumes = consumes;
+		/** @type {Record<string, ProvidesConfig>[]} */
 		this._provides = provides;
 	}
 
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */

package/lib/sharing/ShareRuntimeModule.js

@@ -24,6 +24,7 @@ class ShareRuntimeModule extends RuntimeModule {
 	}
 
 	/**
+	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code
 	 */
 	generate() {
@@ -68,16 +69,18 @@ class ShareRuntimeModule extends RuntimeModule {
 				}
 			}
 		}
+		const cst = runtimeTemplate.renderConst();
+		const lt = runtimeTemplate.renderLet();
 		return Template.asString([
 			`${RuntimeGlobals.shareScopeMap} = {};`,
-			"var initPromises = {};",
-			"var initTokens = {};",
+			`${cst} initPromises = {};`,
+			`${cst} initTokens = {};`,
 			`${RuntimeGlobals.initializeSharing} = ${runtimeTemplate.basicFunction(
 				"name, initScope",
 				[
 					"if(!initScope) initScope = [];",
 					"// handling circular init calls",
-					"var initToken = initTokens[name];",
+					`${lt} initToken = initTokens[name];`,
 					"if(!initToken) initToken = initTokens[name] = {};",
 					"if(initScope.indexOf(initToken) >= 0) return;",
 					"initScope.push(initToken);",
@@ -86,43 +89,43 @@ class ShareRuntimeModule extends RuntimeModule {
 					"// creates a new share scope if needed",
 					`if(!${RuntimeGlobals.hasOwnProperty}(${RuntimeGlobals.shareScopeMap}, name)) ${RuntimeGlobals.shareScopeMap}[name] = {};`,
 					"// runs all init snippets from all modules reachable",
-					`var scope = ${RuntimeGlobals.shareScopeMap}[name];`,
-					`var warn = ${
+					`${cst} scope = ${RuntimeGlobals.shareScopeMap}[name];`,
+					`${cst} warn = ${
 						ignoreBrowserWarnings
 							? runtimeTemplate.basicFunction("", "")
 							: runtimeTemplate.basicFunction("msg", [
 									'if (typeof console !== "undefined" && console.warn) console.warn(msg);'
 								])
 					};`,
-					`var uniqueName = ${JSON.stringify(uniqueName || undefined)};`,
-					`var register = ${runtimeTemplate.basicFunction(
+					`${cst} uniqueName = ${JSON.stringify(uniqueName || undefined)};`,
+					`${cst} register = ${runtimeTemplate.basicFunction(
 						"name, version, factory, eager",
 						[
-							"var versions = scope[name] = scope[name] || {};",
-							"var activeVersion = versions[version];",
+							`${cst} versions = ${runtimeTemplate.assignOr("scope[name]", "{}")};`,
+							`${cst} activeVersion = versions[version];`,
 							"if(!activeVersion || (!activeVersion.loaded && (!eager != !activeVersion.eager ? eager : uniqueName > activeVersion.from))) versions[version] = { get: factory, from: uniqueName, eager: !!eager };"
 						]
 					)};`,
-					`var initExternal = ${runtimeTemplate.basicFunction("id", [
-						`var handleError = ${runtimeTemplate.expressionFunction(
+					`${cst} initExternal = ${runtimeTemplate.basicFunction("id", [
+						`${cst} handleError = ${runtimeTemplate.expressionFunction(
 							'warn("Initialization of sharing external failed: " + err)',
 							"err"
 						)};`,
 						"try {",
 						Template.indent([
-							`var module = ${RuntimeGlobals.require}(id);`,
+							`${cst} module = ${RuntimeGlobals.require}(id);`,
 							"if(!module) return;",
-							`var initFn = ${runtimeTemplate.returningFunction(
+							`${cst} initFn = ${runtimeTemplate.returningFunction(
 								`module && module.init && module.init(${RuntimeGlobals.shareScopeMap}[name], initScope)`,
 								"module"
 							)}`,
 							"if(module.then) return promises.push(module.then(initFn, handleError));",
-							"var initResult = initFn(module);",
-							"if(initResult && initResult.then) return promises.push(initResult['catch'](handleError));"
+							`${cst} initResult = initFn(module);`,
+							`if(${runtimeTemplate.optionalChaining("initResult", "then")}) return promises.push(initResult['catch'](handleError));`
 						]),
 						"} catch(err) { handleError(err); }"
 					])}`,
-					"var promises = [];",
+					`${cst} promises = [];`,
 					"switch(name) {",
 					...[...initCodePerScope]
 						.sort(([a], [b]) => compareStrings(a, b))

package/lib/sharing/resolveMatchedConfigs.js

@@ -5,8 +5,9 @@
 
 "use strict";
 
-const ModuleNotFoundError = require("../ModuleNotFoundError");
+const ModuleNotFoundError = require("../errors/ModuleNotFoundError");
 const LazySet = require("../util/LazySet");
+const { ABSOLUTE_PATH_REGEXP } = require("../util/identifier");
 
 /** @typedef {import("enhanced-resolve").ResolveContext} ResolveContext */
 /** @typedef {import("../Compilation")} Compilation */
@@ -14,11 +15,13 @@ const LazySet = require("../util/LazySet");
 /** @typedef {import("../ResolverFactory").ResolveOptionsWithDependencyType} ResolveOptionsWithDependencyType */
 
 /**
+ * Defines the matched configs item type used by this module.
  * @template T
  * @typedef {Map<string, T>} MatchedConfigsItem
  */
 
 /**
+ * Defines the matched configs type used by this module.
  * @template T
  * @typedef {object} MatchedConfigs
  * @property {MatchedConfigsItem<T>} resolved
@@ -30,6 +33,7 @@ const LazySet = require("../util/LazySet");
 const RESOLVE_OPTIONS = { dependencyType: "esm" };
 
 /**
+ * Returns resolved matchers.
  * @template T
  * @param {Compilation} compilation the compilation
  * @param {[string, T][]} configs to be processed configs
@@ -77,7 +81,7 @@ module.exports.resolveMatchedConfigs = (compilation, configs) => {
 						}
 					);
 				});
-			} else if (/^(?:\/|[a-z]:\\|\\\\)/i.test(request)) {
+			} else if (ABSOLUTE_PATH_REGEXP.test(request)) {
 				// absolute path
 				resolved.set(request, config);
 			} else if (request.endsWith("/")) {

package/lib/sharing/utils.js

@@ -28,7 +28,7 @@ const RE_CUSTOM_PROTOCOL = /^(?:(?:git\+)?(?:ssh|https?|file)|git):\/\//i;
 const RE_URL_HASH_VERSION = /#(?:semver:)?(.+)/;
 
 // Simple hostname validate
-const RE_HOSTNAME = /^(?:[^/.]+(?:\.[^/]+)+|localhost)$/;
+const RE_HOSTNAME = /^(?:[^/.]+(?:\.[^/.]+)+|localhost)$/;
 
 // For hostname with colon. eg: ssh://user@github.com:foo/bar
 const RE_HOSTNAME_WITH_COLON =
@@ -55,6 +55,7 @@ const DEF_GIT_PROTOCOL = "git+ssh://";
 // thanks to https://github.com/npm/hosted-git-info/blob/latest/git-host-info.js
 const extractCommithashByDomain = {
 	/**
+	 * Returns hash.
 	 * @param {string} pathname pathname
 	 * @param {string} hash hash
 	 * @returns {string | undefined} hash
@@ -78,6 +79,7 @@ const extractCommithashByDomain = {
 		return commithash;
 	},
 	/**
+	 * Returns hash.
 	 * @param {string} pathname pathname
 	 * @param {string} hash hash
 	 * @returns {string | undefined} hash
@@ -102,6 +104,7 @@ const extractCommithashByDomain = {
 		return hash;
 	},
 	/**
+	 * Returns hash.
 	 * @param {string} pathname pathname
 	 * @param {string} hash hash
 	 * @returns {string | undefined} hash
@@ -123,6 +126,7 @@ const extractCommithashByDomain = {
 		return hash;
 	},
 	/**
+	 * Returns hash.
 	 * @param {string} pathname pathname
 	 * @param {string} hash hash
 	 * @returns {string | undefined} hash
@@ -291,6 +295,7 @@ function getGitUrlVersion(gitUrl) {
 /** @typedef {{ data: JsonObject, path: string }} DescriptionFile */
 
 /**
+ * Gets description file.
  * @param {InputFileSystem} fs file system
  * @param {string} directory directory to start looking into
  * @param {string[]} descriptionFiles possible description filenames
@@ -361,6 +366,7 @@ const getDescriptionFile = (
 module.exports.getDescriptionFile = getDescriptionFile;
 
 /**
+ * Gets required version from description file.
  * @param {JsonObject} data description file data i.e.: package.json
  * @param {string} packageName name of the dependency
  * @returns {string | undefined} normalized version
@@ -393,6 +399,7 @@ module.exports.getRequiredVersionFromDescriptionFile =
 	getRequiredVersionFromDescriptionFile;
 
 /**
+ * Checks whether this object is required version.
  * @param {string} str maybe required version
  * @returns {boolean} true, if it looks like a version
  */
@@ -403,6 +410,7 @@ function isRequiredVersion(str) {
 module.exports.isRequiredVersion = isRequiredVersion;
 
 /**
+ * Normalizes version.
  * @see https://docs.npmjs.com/cli/v7/configuring-npm/package-json#urls-as-dependencies
  * @param {string} versionDesc version to be normalized
  * @returns {string} normalized version