Update checked-in dependencies

node_modules/enhanced-resolve/lib/ImportsFieldPlugin.js

@@ -5,14 +5,18 @@
 
 "use strict";
 
-const path = require("path");
 const DescriptionFileUtils = require("./DescriptionFileUtils");
 const forEachBail = require("./forEachBail");
 const { processImportsField } = require("./util/entrypoints");
 const { parseIdentifier } = require("./util/identifier");
-const { checkImportsExportsFieldTarget } = require("./util/path");
+const {
+	invalidSegmentRegEx,
+	deprecatedInvalidSegmentRegEx
+} = require("./util/path");
 
 /** @typedef {import("./Resolver")} Resolver */
+/** @typedef {import("./Resolver").JsonObject} JsonObject */
+/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
 /** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
 /** @typedef {import("./util/entrypoints").FieldProcessor} FieldProcessor */
 /** @typedef {import("./util/entrypoints").ImportsField} ImportsField */
@@ -39,7 +43,7 @@ module.exports = class ImportsFieldPlugin {
 		this.targetPackage = targetPackage;
 		this.conditionNames = conditionNames;
 		this.fieldName = fieldNamePath;
-		/** @type {WeakMap<any, FieldProcessor>} */
+		/** @type {WeakMap<JsonObject, FieldProcessor>} */
 		this.fieldProcessorCache = new WeakMap();
 	}
 
@@ -61,11 +65,14 @@ module.exports = class ImportsFieldPlugin {
 
 				const remainingRequest =
 					request.request + request.query + request.fragment;
-				/** @type {ImportsField|null} */
-				const importsField = DescriptionFileUtils.getField(
-					request.descriptionFileData,
-					this.fieldName
-				);
+				const importsField =
+					/** @type {ImportsField|null|undefined} */
+					(
+						DescriptionFileUtils.getField(
+							/** @type {JsonObject} */ (request.descriptionFileData),
+							this.fieldName
+						)
+					);
 				if (!importsField) return callback();
 
 				if (request.directory) {
@@ -76,30 +83,36 @@ module.exports = class ImportsFieldPlugin {
 					);
 				}
 
+				/** @type {string[]} */
 				let paths;
+				/** @type {string | null} */
+				let usedField;
 
 				try {
 					// We attach the cache to the description file instead of the importsField value
 					// because we use a WeakMap and the importsField could be a string too.
 					// Description file is always an object when exports field can be accessed.
 					let fieldProcessor = this.fieldProcessorCache.get(
-						request.descriptionFileData
+						/** @type {JsonObject} */ (request.descriptionFileData)
 					);
 					if (fieldProcessor === undefined) {
 						fieldProcessor = processImportsField(importsField);
 						this.fieldProcessorCache.set(
-							request.descriptionFileData,
+							/** @type {JsonObject} */ (request.descriptionFileData),
 							fieldProcessor
 						);
 					}
-					paths = fieldProcessor(remainingRequest, this.conditionNames);
-				} catch (err) {
+					[paths, usedField] = fieldProcessor(
+						remainingRequest,
+						this.conditionNames
+					);
+				} catch (/** @type {unknown} */ err) {
 					if (resolveContext.log) {
 						resolveContext.log(
 							`Imports field in ${request.descriptionFilePath} can't be processed: ${err}`
 						);
 					}
-					return callback(err);
+					return callback(/** @type {Error} */ (err));
 				}
 
 				if (paths.length === 0) {
@@ -112,26 +125,42 @@ module.exports = class ImportsFieldPlugin {
 
 				forEachBail(
 					paths,
-					(p, callback) => {
+					/**
+					 * @param {string} p path
+					 * @param {(err?: null|Error, result?: null|ResolveRequest) => void} callback callback
+					 * @param {number} i index
+					 * @returns {void}
+					 */
+					(p, callback, i) => {
 						const parsedIdentifier = parseIdentifier(p);
 
 						if (!parsedIdentifier) return callback();
 
 						const [path_, query, fragment] = parsedIdentifier;
 
-						const error = checkImportsExportsFieldTarget(path_);
-
-						if (error) {
-							return callback(error);
-						}
-
 						switch (path_.charCodeAt(0)) {
 							// should be relative
 							case dotCode: {
+								if (
+									invalidSegmentRegEx.exec(path_.slice(2)) !== null &&
+									deprecatedInvalidSegmentRegEx.test(path_.slice(2)) !== null
+								) {
+									if (paths.length === i) {
+										return callback(
+											new Error(
+												`Invalid "imports" target "${p}" defined for "${usedField}" in the package config ${request.descriptionFilePath}, targets must start with "./"`
+											)
+										);
+									}
+
+									return callback();
+								}
+
+								/** @type {ResolveRequest} */
 								const obj = {
 									...request,
 									request: undefined,
-									path: path.join(
+									path: resolver.join(
 										/** @type {string} */ (request.descriptionFileRoot),
 										path_
 									),
@@ -145,13 +174,19 @@ module.exports = class ImportsFieldPlugin {
 									obj,
 									"using imports field: " + p,
 									resolveContext,
-									callback
+									(err, result) => {
+										if (err) return callback(err);
+										// Don't allow to continue - https://github.com/webpack/enhanced-resolve/issues/400
+										if (result === undefined) return callback(null, null);
+										callback(null, result);
+									}
 								);
 								break;
 							}
 
 							// package resolving
 							default: {
+								/** @type {ResolveRequest} */
 								const obj = {
 									...request,
 									request: path_,
@@ -166,11 +201,21 @@ module.exports = class ImportsFieldPlugin {
 									obj,
 									"using imports field: " + p,
 									resolveContext,
-									callback
+									(err, result) => {
+										if (err) return callback(err);
+										// Don't allow to continue - https://github.com/webpack/enhanced-resolve/issues/400
+										if (result === undefined) return callback(null, null);
+										callback(null, result);
+									}
 								);
 							}
 						}
 					},
+					/**
+					 * @param {null|Error} [err] error
+					 * @param {null|ResolveRequest} [result] result
+					 * @returns {void}
+					 */
 					(err, result) => callback(err, result || null)
 				);
 			});