Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

cherry-pick(#29766): fix(tsload): fix tsconfig inheritance resolution

Browse source
This commit is contained in:
Pavel Feldman 2024-03-01 09:36:04 -08:00
parent 3a4381303c
commit b67050638b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/playwright/src/third_party/tsconfig-loader.ts vendored
View file

@ -101,7 +101,8 @@ function resolveConfigFile(baseConfigFile: string, referencedConfigFile: string)
referencedConfigFile += '.json'; referencedConfigFile += '.json';
const currentDir = path.dirname(baseConfigFile); const currentDir = path.dirname(baseConfigFile);
let resolvedConfigFile = path.resolve(currentDir, referencedConfigFile); let resolvedConfigFile = path.resolve(currentDir, referencedConfigFile);
if (referencedConfigFile.indexOf('/') !== -1 && referencedConfigFile.indexOf('.') !== -1 && !fs.existsSync(referencedConfigFile)) // TODO: I don't see how this makes sense, delete in the next minor release.
if (referencedConfigFile.includes('/') && referencedConfigFile.includes('.') && !fs.existsSync(resolvedConfigFile))
resolvedConfigFile = path.join(currentDir, 'node_modules', referencedConfigFile); resolvedConfigFile = path.join(currentDir, 'node_modules', referencedConfigFile);
return resolvedConfigFile; return resolvedConfigFile;
} }
@ -117,6 +118,7 @@ function loadTsConfig(
let result: LoadedTsConfig = { let result: LoadedTsConfig = {
tsConfigPath: configFilePath, tsConfigPath: configFilePath,
}; };
// Retain result instance below, so that caching works.
visited.set(configFilePath, result); visited.set(configFilePath, result);
if (!fs.existsSync(configFilePath)) if (!fs.existsSync(configFilePath))
@ -137,7 +139,8 @@ function loadTsConfig(
const extendsDir = path.dirname(extendedConfig); const extendsDir = path.dirname(extendedConfig);
base.baseUrl = path.join(extendsDir, base.baseUrl); base.baseUrl = path.join(extendsDir, base.baseUrl);
} }
result = { ...result, ...base, tsConfigPath: configFilePath }; // Retain result instance, so that caching works.
Object.assign(result, base, { tsConfigPath: configFilePath });
} }
const loadedConfig = Object.fromEntries(Object.entries({ const loadedConfig = Object.fromEntries(Object.entries({
@ -146,7 +149,8 @@ function loadTsConfig(
allowJs: parsedConfig?.compilerOptions?.allowJs, allowJs: parsedConfig?.compilerOptions?.allowJs,
}).filter(([, value]) => value !== undefined)); }).filter(([, value]) => value !== undefined));
result = { ...result, ...loadedConfig }; // Retain result instance, so that caching works.
Object.assign(result, loadedConfig);
for (const ref of parsedConfig.references || []) for (const ref of parsedConfig.references || [])
references.push(loadTsConfig(resolveConfigFile(configFilePath, ref.path), references, visited)); references.push(loadTsConfig(resolveConfigFile(configFilePath, ref.path), references, visited));