Framework updates
🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
30
node_modules/enhanced-resolve/lib/TsconfigPathsPlugin.js
generated
vendored
30
node_modules/enhanced-resolve/lib/TsconfigPathsPlugin.js
generated
vendored
@@ -184,6 +184,8 @@ module.exports = class TsconfigPathsPlugin {
|
||||
} else {
|
||||
this.references = [];
|
||||
}
|
||||
/** @type {string | undefined} */
|
||||
this.baseUrl = configFileOrOptions.baseUrl;
|
||||
} else {
|
||||
this.configFile =
|
||||
configFileOrOptions === true
|
||||
@@ -191,6 +193,8 @@ module.exports = class TsconfigPathsPlugin {
|
||||
: /** @type {string} */ (configFileOrOptions);
|
||||
/** @type {TsconfigReference[] | "auto"} */
|
||||
this.references = [];
|
||||
/** @type {string | undefined} */
|
||||
this.baseUrl = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -330,10 +334,13 @@ module.exports = class TsconfigPathsPlugin {
|
||||
const compilerOptions = config.compilerOptions || {};
|
||||
const mainContext = dirname(absTsconfigPath);
|
||||
|
||||
const baseUrl =
|
||||
this.baseUrl !== undefined ? this.baseUrl : compilerOptions.baseUrl;
|
||||
|
||||
const main = tsconfigPathsToResolveOptions(
|
||||
mainContext,
|
||||
compilerOptions.paths || {},
|
||||
compilerOptions.baseUrl,
|
||||
baseUrl,
|
||||
);
|
||||
/** @type {{ [baseUrl: string]: TsconfigPathsData }} */
|
||||
const refs = {};
|
||||
@@ -406,6 +413,7 @@ module.exports = class TsconfigPathsPlugin {
|
||||
* @param {string} configFilePath current config file path
|
||||
* @param {string} extendedConfigValue extends value
|
||||
* @param {Set<string>} fileDependencies the file dependencies
|
||||
* @param {Set<string>} visitedConfigPaths config paths being loaded (for circular extends detection)
|
||||
* @returns {Promise<Tsconfig>} the extended tsconfig
|
||||
*/
|
||||
async _loadTsconfigFromExtends(
|
||||
@@ -413,6 +421,7 @@ module.exports = class TsconfigPathsPlugin {
|
||||
configFilePath,
|
||||
extendedConfigValue,
|
||||
fileDependencies,
|
||||
visitedConfigPaths,
|
||||
) {
|
||||
const currentDir = dirname(configFilePath);
|
||||
|
||||
@@ -444,6 +453,7 @@ module.exports = class TsconfigPathsPlugin {
|
||||
fileSystem,
|
||||
extendedConfigPath,
|
||||
fileDependencies,
|
||||
visitedConfigPaths,
|
||||
);
|
||||
const compilerOptions = config.compilerOptions || { baseUrl: undefined };
|
||||
|
||||
@@ -520,10 +530,22 @@ module.exports = class TsconfigPathsPlugin {
|
||||
* @param {FileSystem} fileSystem the file system
|
||||
* @param {string} configFilePath absolute path to tsconfig.json
|
||||
* @param {Set<string>} fileDependencies the file dependencies
|
||||
* @param {Set<string>=} visitedConfigPaths config paths being loaded (for circular extends detection)
|
||||
* @returns {Promise<Tsconfig>} the merged tsconfig
|
||||
*/
|
||||
async _loadTsconfig(fileSystem, configFilePath, fileDependencies) {
|
||||
const config = await readJson(fileSystem, configFilePath);
|
||||
async _loadTsconfig(
|
||||
fileSystem,
|
||||
configFilePath,
|
||||
fileDependencies,
|
||||
visitedConfigPaths = new Set(),
|
||||
) {
|
||||
if (visitedConfigPaths.has(configFilePath)) {
|
||||
return /** @type {Tsconfig} */ ({});
|
||||
}
|
||||
visitedConfigPaths.add(configFilePath);
|
||||
const config = await readJson(fileSystem, configFilePath, {
|
||||
stripComments: true,
|
||||
});
|
||||
fileDependencies.add(configFilePath);
|
||||
|
||||
let result = config;
|
||||
@@ -540,6 +562,7 @@ module.exports = class TsconfigPathsPlugin {
|
||||
configFilePath,
|
||||
extendedConfigElement,
|
||||
fileDependencies,
|
||||
visitedConfigPaths,
|
||||
);
|
||||
base = mergeTsconfigs(base, extendedTsconfig);
|
||||
}
|
||||
@@ -549,6 +572,7 @@ module.exports = class TsconfigPathsPlugin {
|
||||
configFilePath,
|
||||
extendedConfig,
|
||||
fileDependencies,
|
||||
visitedConfigPaths,
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user