Skip to content
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

fix: handle windows \ path separator #1726

Merged
merged 1 commit into from
Aug 27, 2020
Merged

fix: handle windows \ path separator #1726

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
6 changes: 4 additions & 2 deletions packages/electrode-node-resolver/lib/node-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ function resolve(req, atPath) {

if (!resolved) return undefined;

const ix = resolved.lastIndexOf(name);
const path = resolved.substr(0, ix + name.length);
// ensure windows \ path separator changed to / when matching for require
// req name, which should always be using /.
const ix = resolved.replace(/\\/g, "/").lastIndexOf(`${name}/`);
jchip marked this conversation as resolved.
Show resolved Hide resolved
const path = ix >= 0 ? resolved.substr(0, ix + name.length) : Path.dirname(resolved);

splits.splice(0, nameX, ".");
const request = splits.join("/");
Expand Down