-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(node): Correctly handle Windows paths when resolving module name #5476
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.
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
082d66f
Fix getModule so it correctly handles Windows paths
timfish 423131d
Merge remote-tracking branch 'upstream/master' into fix/windows-modul…
timfish 8f44a26
Add test
timfish e9573b0
Restore filename
timfish d220b26
better function name
timfish 589b505
Review fixes
timfish d0d6dd8
Merge remote-tracking branch 'upstream/master' into fix/windows-modul…
timfish File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import { getModule } from '../src/module'; | ||
|
||
function reaplaceFilename(fn: () => void, filename: string) { | ||
timfish marked this conversation as resolved.
Show resolved
Hide resolved
|
||
const prevFilename = require.main?.filename; | ||
if (require.main?.filename) { | ||
require.main.filename = filename; | ||
} | ||
|
||
try { | ||
fn(); | ||
} finally { | ||
if (require.main && prevFilename) { | ||
require.main.filename = prevFilename; | ||
} | ||
} | ||
} | ||
|
||
describe('getModule', () => { | ||
test('Windows', async () => { | ||
timfish marked this conversation as resolved.
Show resolved
Hide resolved
|
||
reaplaceFilename(() => { | ||
expect(getModule('C:\\Users\\users\\Tim\\Desktop\\node_modules\\module.js')).toEqual('module'); | ||
}, 'C:\\Users\\Tim\\app.js'); | ||
}); | ||
|
||
test('POSIX', async () => { | ||
reaplaceFilename(() => { | ||
expect(getModule('/Users/users/Tim/Desktop/node_modules/module.js')).toEqual('module'); | ||
}, '/Users/Tim/app.js'); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.