update

Author: xiaoxiaojx

lib/ResolverFactory.js

@@ -85,7 +85,7 @@ const { PathType, getType } = require("./util/path");
  * @property {boolean=} useSyncFileSystemCalls Use only the sync constraints of the file system calls
  * @property {boolean=} preferRelative Prefer to resolve module requests as relative requests before falling back to modules
  * @property {boolean=} preferAbsolute Prefer to resolve server-relative urls as absolute paths before falling back to resolve in roots
- * @property {string=} tsconfig tsconfig file path
+ * @property {string|boolean=} tsconfig tsconfig file path
  */
 
 /**
@@ -117,7 +117,7 @@ const { PathType, getType } = require("./util/path");
  * @property {Set<string | RegExp>} restrictions restrictions
  * @property {boolean} preferRelative prefer relative
  * @property {boolean} preferAbsolute prefer absolute
- * @property {string} tsconfig tsconfig file path
+ * @property {string|boolean=} tsconfig tsconfig file path
  */
 
 /**
@@ -297,7 +297,8 @@ function createOptions(options) {
 		preferRelative: options.preferRelative || false,
 		preferAbsolute: options.preferAbsolute || false,
 		restrictions: new Set(options.restrictions),
-		tsconfig: options.tsconfig || "",
+		tsconfig:
+			typeof options.tsconfig === "undefined" ? "auto" : options.tsconfig,
 	};
 }
 

lib/TsconfigPathsPlugin.js

@@ -21,10 +21,12 @@ const DEFAULT_CONFIG_FILE = "tsconfig.json";
 
 module.exports = class TsconfigPathsPlugin {
 	/**
-	 * @param {"auto" | string} configFile tsconfig file path
+	 * @param {"auto" | true | string} configFile tsconfig file path
 	 */
 	constructor(configFile) {
-		this.configFile = configFile === "auto" ? DEFAULT_CONFIG_FILE : configFile;
+		this.configFile = ["auto", true].includes(configFile)
+			? DEFAULT_CONFIG_FILE
+			: /** @type {string} */ (configFile);
 	}
 
 	/**

lib/TsconfigPathsUtils.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const path = require("path");
+const { join, normalize } = require("./util/path");
 
 /** @typedef {import("./Resolver")} Resolver */
 /** @typedef {import("./Resolver").FileSystem} FileSystem */
@@ -65,7 +66,7 @@ function getAbsoluteMappingEntries(paths, baseUrl) {
 		const mappings = paths[pattern];
 		// const aliasName = pattern.replace(/\/\*$/, "");
 		// Convert targets like "dir/*" -> "dir"
-		const aliasTargets = mappings.map((mapping) => path.join(baseUrl, mapping));
+		const aliasTargets = mappings.map((mapping) => join(baseUrl, mapping));
 		if (aliasTargets.length > 0) {
 			absolutePaths.push({ name: pattern, alias: aliasTargets });
 		}
@@ -117,7 +118,7 @@ async function loadTsconfigFromExtends(
 	}
 
 	const currentDir = path.dirname(configFilePath);
-	let extendedConfigPath = path.join(currentDir, extendedConfigValue);
+	let extendedConfigPath = join(currentDir, extendedConfigValue);
 
 	// Check if file exists, if not try node_modules
 	const exists = await new Promise((resolve) => {
@@ -130,10 +131,9 @@ async function loadTsconfigFromExtends(
 		extendedConfigValue.includes("/") &&
 		extendedConfigValue.includes(".")
 	) {
-		extendedConfigPath = path.join(
+		extendedConfigPath = join(
 			currentDir,
-			"node_modules",
-			extendedConfigValue,
+			normalize(`node_modules/${extendedConfigValue}`),
 		);
 	}
 
@@ -147,7 +147,7 @@ async function loadTsconfigFromExtends(
 	// but we need to update it so it is relative to the original tsconfig being loaded
 	if (compilerOptions.baseUrl) {
 		const extendsDir = path.dirname(extendedConfigValue);
-		compilerOptions.baseUrl = path.join(extendsDir, compilerOptions.baseUrl);
+		compilerOptions.baseUrl = join(extendsDir, compilerOptions.baseUrl);
 	}
 
 	return /** @type {Tsconfig} */ (config);
@@ -238,7 +238,7 @@ async function readTsconfigCompilerOptions(fileSystem, absTsconfigPath) {
 		if (!baseUrl) {
 			baseUrl = path.dirname(absTsconfigPath);
 		} else if (!path.isAbsolute(baseUrl)) {
-			baseUrl = path.join(path.dirname(absTsconfigPath), baseUrl);
+			baseUrl = join(path.dirname(absTsconfigPath), baseUrl);
 		}
 
 		const paths = compilerOptions.paths || {};
@@ -295,7 +295,7 @@ async function loadTsconfigPathsData(
 	try {
 		const absTsconfigPath = path.isAbsolute(configFile)
 			? configFile
-			: path.join(context, configFile);
+			: join(context, configFile);
 
 		const result = await readTsconfigCompilerOptions(
 			fileSystem,

lib/index.js

@@ -94,6 +94,7 @@ const getSyncResolver = memoize(() =>
 		extensions: [".js", ".json", ".node"],
 		useSyncFileSystemCalls: true,
 		fileSystem: getNodeFileSystem(),
+		tsconfig: false,
 	}),
 );
 

test/alias.test.js

@@ -49,6 +49,7 @@ describe("alias", () => {
 			},
 			modules: "/",
 			useSyncFileSystemCalls: true,
+			tsconfig: false,
 			// @ts-expect-error for tests
 			fileSystem,
 		});

test/browserField.test.js

@@ -27,6 +27,7 @@ describe("browserField", () => {
 			],
 			useSyncFileSystemCalls: true,
 			fileSystem: fs,
+			tsconfig: false,
 		});
 	});
 

test/fallback.test.js

@@ -40,6 +40,7 @@ describe("fallback", () => {
 			},
 			modules: "/",
 			useSyncFileSystemCalls: true,
+			tsconfig: false,
 			// @ts-expect-error for test
 			fileSystem,
 		});

test/fullSpecified.test.js

@@ -37,6 +37,7 @@ describe("fullSpecified", () => {
 		aliasFields: ["browser"],
 		fullySpecified: true,
 		useSyncFileSystemCalls: true,
+		tsconfig: false,
 		// @ts-expect-error for test
 		fileSystem,
 	});
@@ -49,6 +50,7 @@ describe("fullSpecified", () => {
 		fullySpecified: true,
 		resolveToContext: true,
 		useSyncFileSystemCalls: true,
+		tsconfig: false,
 		// @ts-expect-error for test
 		fileSystem,
 	});

test/resolve.test.js

@@ -8,20 +8,24 @@ const fixtures = path.join(__dirname, "fixtures");
 const asyncContextResolve = resolve.create({
 	extensions: [".js", ".json", ".node"],
 	resolveToContext: true,
+	tsconfig: false,
 });
 
 const syncContextResolve = resolve.create.sync({
 	extensions: [".js", ".json", ".node"],
 	resolveToContext: true,
+	tsconfig: false,
 });
 
 const issue238Resolve = resolve.create({
 	extensions: [".js", ".jsx", ".ts", ".tsx"],
 	modules: ["src/a", "src/b", "src/common", "node_modules"],
+	tsconfig: false,
 });
 
 const preferRelativeResolve = resolve.create({
 	preferRelative: true,
+	tsconfig: false,
 });
 
 /**

test/symlink.test.js

@@ -104,9 +104,11 @@ describe("symlink", () => {
 
 		const resolveWithoutSymlinks = resolve.create({
 			symlinks: false,
+			tsconfig: false,
 		});
 		const resolveSyncWithoutSymlinks = resolve.create.sync({
 			symlinks: false,
+			tsconfig: false,
 		});
 
 		for (const pathToIt of [