miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(js): normalize paths correctly in @nx/js/typescript plugin (#30216)

Browse Source 
## Current Behavior

The tsconfig files cache contains invalid relative paths when run on
Windows.

Failure logs (Windows):
https://github.com/nrwl/nx-console/actions/runs/13573129754/job/37942898562?pr=2415#step:11:29

## Expected Behavior

The tsconfig files cache should contain valid Unix-based paths.

Success logs (Windows):
https://github.com/nrwl/nx-console/actions/runs/13586015039/job/37981054104#step:11:49
(the job failed but due to a separate thing, note the project graph was
computed correctly)

## Related Issue(s)

Fixes #
This commit is contained in:
Leosvel Pérez Espinosa 2025-02-28 12:49:41 +01:00 committed by GitHub
parent 30f5a52d96
commit 9faafe5d7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/js/src/plugins/typescript/plugin.ts
View File

@ -1032,7 +1032,7 @@ function isExternalProjectReference(
workspaceRoot: string, workspaceRoot: string,
projectRoot: string projectRoot: string
): boolean { ): boolean {
const relativePath = posix.relative(workspaceRoot, refTsConfigPath); const relativePath = posixRelative(workspaceRoot, refTsConfigPath);
if (cache.isExternalProjectReference[relativePath] !== undefined) { if (cache.isExternalProjectReference[relativePath] !== undefined) {
return cache.isExternalProjectReference[relativePath]; return cache.isExternalProjectReference[relativePath];
} }
@ -1074,7 +1074,7 @@ function retrieveTsConfigFromCache(
tsConfigPath: string, tsConfigPath: string,
workspaceRoot: string workspaceRoot: string
): ParsedTsconfigData { ): ParsedTsconfigData {
const relativePath = posix.relative(workspaceRoot, tsConfigPath); const relativePath = posixRelative(workspaceRoot, tsConfigPath);
// we don't need to check the hash if it's in the cache, because we've already // we don't need to check the hash if it's in the cache, because we've already
// checked it when we initially populated the cache // checked it when we initially populated the cache
@ -1103,7 +1103,7 @@ function readTsConfigAndCache(
tsConfigPath: string, tsConfigPath: string,
workspaceRoot: string workspaceRoot: string
): ParsedTsconfigData { ): ParsedTsconfigData {
const relativePath = posix.relative(workspaceRoot, tsConfigPath); const relativePath = posixRelative(workspaceRoot, tsConfigPath);
const hash = getFileHash(tsConfigPath, workspaceRoot); const hash = getFileHash(tsConfigPath, workspaceRoot);
let extendedFilesHash: string; let extendedFilesHash: string;
@ -1261,7 +1261,7 @@ function resolveExtendedTsConfigPath(
} }
function getFileHash(filePath: string, workspaceRoot: string): string { function getFileHash(filePath: string, workspaceRoot: string): string {
const relativePath = posix.relative(workspaceRoot, filePath); const relativePath = posixRelative(workspaceRoot, filePath);
if (!cache.fileHashes[relativePath]) { if (!cache.fileHashes[relativePath]) {
const content = readFile(filePath, workspaceRoot); const content = readFile(filePath, workspaceRoot);
cache.fileHashes[relativePath] = hashArray([content]); cache.fileHashes[relativePath] = hashArray([content]);
@ -1271,7 +1271,7 @@ function getFileHash(filePath: string, workspaceRoot: string): string {
} }
function readFile(filePath: string, workspaceRoot: string): string { function readFile(filePath: string, workspaceRoot: string): string {
const relativePath = posix.relative(workspaceRoot, filePath); const relativePath = posixRelative(workspaceRoot, filePath);
if (!cache.rawFiles[relativePath]) { if (!cache.rawFiles[relativePath]) {
const content = readFileSync(filePath, 'utf8'); const content = readFileSync(filePath, 'utf8');
cache.rawFiles[relativePath] = content; cache.rawFiles[relativePath] = content;
@ -1353,41 +1353,48 @@ function toRelativePaths(
hash, hash,
}; };
if (data.options.rootDir) { if (data.options.rootDir) {
updatedCache[key].data.options.rootDir = posix.relative( updatedCache[key].data.options.rootDir = posixRelative(
workspaceRoot, workspaceRoot,
data.options.rootDir data.options.rootDir
); );
} }
if (data.options.outDir) { if (data.options.outDir) {
updatedCache[key].data.options.outDir = posix.relative( updatedCache[key].data.options.outDir = posixRelative(
workspaceRoot, workspaceRoot,
data.options.outDir data.options.outDir
); );
} }
if (data.options.outFile) { if (data.options.outFile) {
updatedCache[key].data.options.outFile = posix.relative( updatedCache[key].data.options.outFile = posixRelative(
workspaceRoot, workspaceRoot,
data.options.outFile data.options.outFile
); );
} }
if (data.options.tsBuildInfoFile) { if (data.options.tsBuildInfoFile) {
updatedCache[key].data.options.tsBuildInfoFile = posix.relative( updatedCache[key].data.options.tsBuildInfoFile = posixRelative(
workspaceRoot, workspaceRoot,
data.options.tsBuildInfoFile data.options.tsBuildInfoFile
); );
} }
if (data.extendedConfigFile?.filePath) { if (data.extendedConfigFile?.filePath) {
updatedCache[key].data.extendedConfigFile.filePath = posix.relative( updatedCache[key].data.extendedConfigFile.filePath = posixRelative(
workspaceRoot, workspaceRoot,
data.extendedConfigFile.filePath data.extendedConfigFile.filePath
); );
} }
if (data.projectReferences) { if (data.projectReferences) {
updatedCache[key].data.projectReferences = data.projectReferences.map( updatedCache[key].data.projectReferences = data.projectReferences.map(
(ref) => ({ ...ref, path: posix.relative(workspaceRoot, ref.path) }) (ref) => ({
...ref,
path: posixRelative(workspaceRoot, ref.path),
})
); );
} }
} }
return updatedCache; return updatedCache;
} }
function posixRelative(workspaceRoot: string, path: string): string {
return posix.normalize(relative(workspaceRoot, path));
}