Skip to content

Packager - Fix absolute imports on Windows #12530

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

Closed
janicduplessis wants to merge 4 commits into from
Closed

Packager - Fix absolute imports on Windows #12530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02af91d
Fix resolving absolute path modules on Windows
janicduplessis Feb 22, 2017
b7539f4
Update tests to use actual absolute path format on Windows
janicduplessis Feb 22, 2017
24927d6
Fix test
janicduplessis Feb 22, 2017
f1a67c6
Use path.resolve
janicduplessis Feb 22, 2017
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
12 changes: 11 additions & 1 deletion packager/src/node-haste/DependencyGraph/ResolutionRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ class ResolutionRequest {

_resolveFileOrDir(fromModule, toModuleName) {
const potentialModulePath = isAbsolutePath(toModuleName) ?
toModuleName :
resolveWindowsPath(toModuleName) :
path.join(path.dirname(fromModule.path), toModuleName);

return this._redirectRequire(fromModule, potentialModulePath).then(
Expand Down Expand Up @@ -509,6 +509,16 @@ function normalizePath(modulePath) {
return modulePath.replace(/\/$/, '');
}

// HasteFS stores paths with backslashes on Windows, this ensures the path is
// in the proper format. Will also add drive letter if not present so `/root` will
// resolve to `C:\root`. Noop on other platforms.
function resolveWindowsPath(modulePath) {
if (path.sep !== '\\') {
return modulePath;
}
return path.resolve(modulePath);
}

function resolveKeyWithPromise([key, promise]) {
return promise.then(value => [key, value]);
}
Expand Down
4 changes: 2 additions & 2 deletions packager/src/node-haste/__tests__/DependencyGraph-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2533,7 +2533,7 @@ describe('DependencyGraph', function() {
const root = 'C:\\root';
setMockFileSystem({
'root': {
'index.js': 'require("C:\\\\root\\\\apple.js");',
'index.js': 'require("C:/root/apple.js");',
'apple.js': '',
},
});
Expand All @@ -2548,7 +2548,7 @@ describe('DependencyGraph', function() {
{
id: 'C:\\root\\index.js',
path: 'C:\\root\\index.js',
dependencies: ['C:\\root\\apple.js'],
dependencies: ['C:/root/apple.js'],
isAsset: false,
isJSON: false,
isPolyfill: false,
Expand Down