webpack 5.97.1 → 5.104.1

package/lib/sharing/ProvideSharedPlugin.js

@@ -18,7 +18,7 @@ const ProvideSharedModuleFactory = require("./ProvideSharedModuleFactory");
 /** @typedef {import("../NormalModuleFactory").NormalModuleCreateData} NormalModuleCreateData */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/sharing/ProvideSharedPlugin.check.js"),
+	require("../../schemas/plugins/sharing/ProvideSharedPlugin.check"),
 	() => require("../../schemas/plugins/sharing/ProvideSharedPlugin.json"),
 	{
 		name: "Provide Shared Plugin",
@@ -36,6 +36,8 @@ const validate = createSchemaValidation(
 
 /** @typedef {Map<string, { config: ProvideOptions, version: string | undefined | false }>} ResolvedProvideMap */
 
+const PLUGIN_NAME = "ProvideSharedPlugin";
+
 class ProvideSharedPlugin {
 	/**
 	 * @param {ProvideSharedPluginOptions} options options
@@ -46,9 +48,10 @@ class ProvideSharedPlugin {
 		this._provides = /** @type {[string, ProvideOptions][]} */ (
 			parseOptions(
 				options.provides,
-				item => {
-					if (Array.isArray(item))
+				(item) => {
+					if (Array.isArray(item)) {
 						throw new Error("Unexpected array of provides");
+					}
 					/** @type {ProvideOptions} */
 					const result = {
 						shareKey: item,
@@ -58,7 +61,7 @@ class ProvideSharedPlugin {
 					};
 					return result;
 				},
-				item => ({
+				(item) => ({
 					shareKey: item.shareKey,
 					version: item.version,
 					shareScope: item.shareScope || options.shareScope || "default",
@@ -83,7 +86,7 @@ class ProvideSharedPlugin {
 		const compilationData = new WeakMap();
 
 		compiler.hooks.compilation.tap(
-			"ProvideSharedPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				/** @type {ResolvedProvideMap} */
 				const resolvedProvideMap = new Map();
@@ -139,7 +142,9 @@ class ProvideSharedPlugin {
 							} else if (!descriptionFileData.version) {
 								details = `No version in description file (usually package.json). Add version to description file ${resourceResolveData.descriptionFilePath}, or manually specify version in shared config.`;
 							} else {
-								version = descriptionFileData.version;
+								version = /** @type {string | false | undefined} */ (
+									descriptionFileData.version
+								);
 							}
 						}
 						if (!version) {
@@ -156,7 +161,7 @@ class ProvideSharedPlugin {
 					});
 				};
 				normalModuleFactory.hooks.module.tap(
-					"ProvideSharedPlugin",
+					PLUGIN_NAME,
 					(module, { resource, resourceResolveData }, resolveData) => {
 						if (resolvedProvideMap.has(/** @type {string} */ (resource))) {
 							return module;
@@ -194,7 +199,7 @@ class ProvideSharedPlugin {
 				);
 			}
 		);
-		compiler.hooks.finishMake.tapPromise("ProvideSharedPlugin", compilation => {
+		compiler.hooks.finishMake.tapPromise(PLUGIN_NAME, (compilation) => {
 			const resolvedProvideMap = compilationData.get(compilation);
 			if (!resolvedProvideMap) return Promise.resolve();
 			return Promise.all(
@@ -214,7 +219,7 @@ class ProvideSharedPlugin {
 								{
 									name: undefined
 								},
-								err => {
+								(err) => {
 									if (err) return reject(err);
 									resolve(null);
 								}
@@ -225,7 +230,7 @@ class ProvideSharedPlugin {
 		});
 
 		compiler.hooks.compilation.tap(
-			"ProvideSharedPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyFactories.set(
 					ProvideForSharedDependency,

package/lib/sharing/SharePlugin.js

@@ -10,9 +10,7 @@ const ConsumeSharedPlugin = require("./ConsumeSharedPlugin");
 const ProvideSharedPlugin = require("./ProvideSharedPlugin");
 const { isRequiredVersion } = require("./utils");
 
-/** @typedef {import("../../declarations/plugins/sharing/ConsumeSharedPlugin").ConsumeSharedPluginOptions} ConsumeSharedPluginOptions */
 /** @typedef {import("../../declarations/plugins/sharing/ConsumeSharedPlugin").ConsumesConfig} ConsumesConfig */
-/** @typedef {import("../../declarations/plugins/sharing/ProvideSharedPlugin").ProvideSharedPluginOptions} ProvideSharedPluginOptions */
 /** @typedef {import("../../declarations/plugins/sharing/ProvideSharedPlugin").ProvidesConfig} ProvidesConfig */
 /** @typedef {import("../../declarations/plugins/sharing/SharePlugin").SharePluginOptions} SharePluginOptions */
 /** @typedef {import("../../declarations/plugins/sharing/SharePlugin").SharedConfig} SharedConfig */
@@ -27,8 +25,9 @@ class SharePlugin {
 		const sharedOptions = parseOptions(
 			options.shared,
 			(item, key) => {
-				if (typeof item !== "string")
+				if (typeof item !== "string") {
 					throw new Error("Unexpected array in shared");
+				}
 				/** @type {SharedConfig} */
 				const config =
 					item === key || !isRequiredVersion(item)
@@ -41,7 +40,7 @@ class SharePlugin {
 							};
 				return config;
 			},
-			item => item
+			(item) => item
 		);
 		/** @type {Record<string, ConsumesConfig>[]} */
 		const consumes = sharedOptions.map(([key, options]) => ({

package/lib/sharing/ShareRuntimeModule.js

@@ -16,6 +16,7 @@ const {
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
 
 class ShareRuntimeModule extends RuntimeModule {
 	constructor() {
@@ -29,9 +30,11 @@ class ShareRuntimeModule extends RuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const {
 			runtimeTemplate,
-			codeGenerationResults,
 			outputOptions: { uniqueName, ignoreBrowserWarnings }
 		} = compilation;
+		const codeGenerationResults =
+			/** @type {CodeGenerationResults} */
+			(compilation.codeGenerationResults);
 		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
 		/** @type {Map<string, Map<number, Set<string>>>} */
 		const initCodePerScope = new Map();
@@ -121,17 +124,15 @@ class ShareRuntimeModule extends RuntimeModule {
 					])}`,
 					"var promises = [];",
 					"switch(name) {",
-					...Array.from(initCodePerScope)
+					...[...initCodePerScope]
 						.sort(([a], [b]) => compareStrings(a, b))
 						.map(([name, stages]) =>
 							Template.indent([
 								`case ${JSON.stringify(name)}: {`,
 								Template.indent(
-									Array.from(stages)
+									[...stages]
 										.sort(([a], [b]) => a - b)
-										.map(([, initCode]) =>
-											Template.asString(Array.from(initCode))
-										)
+										.map(([, initCode]) => Template.asString([...initCode]))
 								),
 								"}",
 								"break;"

package/lib/sharing/resolveMatchedConfigs.js

@@ -8,15 +8,22 @@
 const ModuleNotFoundError = require("../ModuleNotFoundError");
 const LazySet = require("../util/LazySet");
 
+/** @typedef {import("enhanced-resolve").ResolveContext} ResolveContext */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../Compilation").FileSystemDependencies} FileSystemDependencies */
 /** @typedef {import("../ResolverFactory").ResolveOptionsWithDependencyType} ResolveOptionsWithDependencyType */
 
+/**
+ * @template T
+ * @typedef {Map<string, T>} MatchedConfigsItem
+ */
+
 /**
  * @template T
  * @typedef {object} MatchedConfigs
- * @property {Map<string, T>} resolved
- * @property {Map<string, T>} unresolved
- * @property {Map<string, T>} prefixed
+ * @property {MatchedConfigsItem<T>} resolved
+ * @property {MatchedConfigsItem<T>} unresolved
+ * @property {MatchedConfigsItem<T>} prefixed
  */
 
 /** @type {ResolveOptionsWithDependencyType} */
@@ -29,18 +36,16 @@ const RESOLVE_OPTIONS = { dependencyType: "esm" };
  * @returns {Promise<MatchedConfigs<T>>} resolved matchers
  */
 module.exports.resolveMatchedConfigs = (compilation, configs) => {
-	/** @type {Map<string, T>} */
+	/** @type {MatchedConfigsItem<T>} */
 	const resolved = new Map();
-	/** @type {Map<string, T>} */
+	/** @type {MatchedConfigsItem<T>} */
 	const unresolved = new Map();
-	/** @type {Map<string, T>} */
+	/** @type {MatchedConfigsItem<T>} */
 	const prefixed = new Map();
+	/** @type {ResolveContext} */
 	const resolveContext = {
-		/** @type {LazySet<string>} */
 		fileDependencies: new LazySet(),
-		/** @type {LazySet<string>} */
 		contextDependencies: new LazySet(),
-		/** @type {LazySet<string>} */
 		missingDependencies: new LazySet()
 	};
 	const resolver = compilation.resolverFactory.get("normal", RESOLVE_OPTIONS);
@@ -51,7 +56,7 @@ module.exports.resolveMatchedConfigs = (compilation, configs) => {
 		configs.map(([request, config]) => {
 			if (/^\.\.?(\/|$)/.test(request)) {
 				// relative request
-				return new Promise(resolve => {
+				return new Promise((resolve) => {
 					resolver.resolve(
 						{},
 						context,
@@ -84,9 +89,18 @@ module.exports.resolveMatchedConfigs = (compilation, configs) => {
 			}
 		})
 	).then(() => {
-		compilation.contextDependencies.addAll(resolveContext.contextDependencies);
-		compilation.fileDependencies.addAll(resolveContext.fileDependencies);
-		compilation.missingDependencies.addAll(resolveContext.missingDependencies);
+		compilation.contextDependencies.addAll(
+			/** @type {FileSystemDependencies} */
+			(resolveContext.contextDependencies)
+		);
+		compilation.fileDependencies.addAll(
+			/** @type {FileSystemDependencies} */
+			(resolveContext.fileDependencies)
+		);
+		compilation.missingDependencies.addAll(
+			/** @type {FileSystemDependencies} */
+			(resolveContext.missingDependencies)
+		);
 		return { resolved, unresolved, prefixed };
 	});
 };

package/lib/sharing/utils.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { join, dirname, readJson } = require("../util/fs");
+const { dirname, join, readJson } = require("../util/fs");
 
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("../util/fs").JsonObject} JsonObject */
@@ -151,7 +151,6 @@ const extractCommithashByDomain = {
 
 /**
  * extract commit hash from parsed url
- * @inner
  * @param {URL} urlParsed parsed url
  * @returns {string} commithash
  */
@@ -181,7 +180,6 @@ function getCommithash(urlParsed) {
 
 /**
  * make url right for URL parse
- * @inner
  * @param {string} gitUrl git url
  * @returns {string} fixed url
  */
@@ -193,7 +191,6 @@ function correctUrl(gitUrl) {
 
 /**
  * make url protocol right for URL parse
- * @inner
  * @param {string} gitUrl git url
  * @returns {string} fixed url
  */
@@ -213,7 +210,6 @@ function correctProtocol(gitUrl) {
 
 /**
  * extract git dep version from hash
- * @inner
  * @param {string} hash hash
  * @returns {string} git dep version
  */
@@ -225,7 +221,6 @@ function getVersionFromHash(hash) {
 
 /**
  * if string can be decoded
- * @inner
  * @param {string} str str to be checked
  * @returns {boolean} if can be decoded
  */
@@ -241,7 +236,6 @@ function canBeDecoded(str) {
 
 /**
  * get right dep version from git url
- * @inner
  * @param {string} gitUrl git url
  * @returns {string} dep version
  */
@@ -292,42 +286,14 @@ function getGitUrlVersion(gitUrl) {
 	return getVersionFromHash(gitUrl);
 }
 
-/**
- * @param {string} str maybe required version
- * @returns {boolean} true, if it looks like a version
- */
-function isRequiredVersion(str) {
-	return VERSION_PATTERN_REGEXP.test(str);
-}
-
-module.exports.isRequiredVersion = isRequiredVersion;
-
-/**
- * @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
- */
-function normalizeVersion(versionDesc) {
-	versionDesc = (versionDesc && versionDesc.trim()) || "";
-
-	if (isRequiredVersion(versionDesc)) {
-		return versionDesc;
-	}
-
-	// add handle for URL Dependencies
-	return getGitUrlVersion(versionDesc.toLowerCase());
-}
-
-module.exports.normalizeVersion = normalizeVersion;
-
 /** @typedef {{ data: JsonObject, path: string }} DescriptionFile */
 
 /**
  * @param {InputFileSystem} fs file system
  * @param {string} directory directory to start looking into
  * @param {string[]} descriptionFiles possible description filenames
- * @param {function((Error | null)=, DescriptionFile=, string[]=): void} callback callback
- * @param {function(DescriptionFile=): boolean} satisfiesDescriptionFileData file data compliance check
+ * @param {(err?: Error | null, descriptionFile?: DescriptionFile, paths?: string[]) => void} callback callback
+ * @param {(descriptionFile?: DescriptionFile) => boolean} satisfiesDescriptionFileData file data compliance check
  * @param {Set<string>} checkedFilePaths set of file paths that have been checked
  */
 const getDescriptionFile = (
@@ -349,11 +315,9 @@ const getDescriptionFile = (
 		if (i >= descriptionFiles.length) {
 			const parentDirectory = dirname(fs, directory);
 			if (!parentDirectory || parentDirectory === directory) {
-				return callback(
-					null,
-					undefined,
-					Array.from(satisfiesDescriptionFileDataInternal.checkedFilePaths)
-				);
+				return callback(null, undefined, [
+					...satisfiesDescriptionFileDataInternal.checkedFilePaths
+				]);
 			}
 			return getDescriptionFile(
 				fs,
@@ -391,6 +355,7 @@ const getDescriptionFile = (
 	};
 	tryLoadCurrent();
 };
+
 module.exports.getDescriptionFile = getDescriptionFile;
 
 /**
@@ -414,12 +379,41 @@ const getRequiredVersionFromDescriptionFile = (data, packageName) => {
 			packageName in dependency
 		) {
 			return normalizeVersion(
-				/** @type {Exclude<JsonPrimitive, null | boolean| number>} */ (
+				/** @type {Exclude<JsonPrimitive, null | boolean | number>} */ (
 					dependency[packageName]
 				)
 			);
 		}
 	}
 };
+
 module.exports.getRequiredVersionFromDescriptionFile =
 	getRequiredVersionFromDescriptionFile;
+
+/**
+ * @param {string} str maybe required version
+ * @returns {boolean} true, if it looks like a version
+ */
+function isRequiredVersion(str) {
+	return VERSION_PATTERN_REGEXP.test(str);
+}
+
+module.exports.isRequiredVersion = isRequiredVersion;
+
+/**
+ * @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
+ */
+function normalizeVersion(versionDesc) {
+	versionDesc = (versionDesc && versionDesc.trim()) || "";
+
+	if (isRequiredVersion(versionDesc)) {
+		return versionDesc;
+	}
+
+	// add handle for URL Dependencies
+	return getGitUrlVersion(versionDesc.toLowerCase());
+}
+
+module.exports.normalizeVersion = normalizeVersion;