Skip to content

Fix: Resolving normalPath when it belongs to a separate drive location (as absolute path) #1696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MxKevinBeqo wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −0
Open

Fix: Resolving normalPath when it belongs to a separate drive location (as absolute path) #1696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/metro-file-map/src/lib/RootPathUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ export class RootPathUtils {
if (right.length === 0) {
return left;
}
if (path.isAbsolute(right)) {
return right;
}
// left may already end in a path separator only if it is a filesystem root,
// '/' or 'X:\'.
if (i === this.#rootDepth) {
Expand Down
14 changes: 14 additions & 0 deletions packages/metro-file-map/src/lib/__tests__/RootPathUtils-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,20 @@ describe.each([['win32'], ['posix']])('RootPathUtils on %s', platform => {
expect(pathUtils.normalToAbsolute(normalPath)).toEqual(expected);
});

if (platform === 'win32') {
test.each(['D:\\some\\file.js', 'D:\\some\\', 'D:\\'])(
`normalToAbsolute('%s') returns cross-drive absolute normal path as-is`,
normalPath => {
// On Windows, path.relative() returns an absolute path when source
// and target are on different drives. Such paths are stored as the
// "normal path" in the file map and must be returned as-is by
// normalToAbsolute rather than being prepended with rootDir (which
// would produce invalid paths like C:\project\root\D:\file.js).
expect(pathUtils.normalToAbsolute(normalPath)).toEqual(normalPath);
},
);
}

test.each([
p('..'),
p('../root'),
Expand Down