Skip to content

fix(gen): relativeRequire always returns posix style paths #1214

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

Merged
merged 1 commit into from
Aug 26, 2015
Merged

fix(gen): relativeRequire always returns posix style paths #1214

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
5 changes: 3 additions & 2 deletions util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ function relativeRequire (self, to, fr) {
fr = destinationPath(self, fr);
to = destinationPath(self, to);
return path.relative(path.dirname(fr), to)
.replace(/^(?!\.\.)(.*)/, './$1')
.replace(/[\/\\]index\.js$/, '');
.replace(/\\/g, '/') // convert win32 separator to posix
.replace(/^(?!\.\.)(.*)/, './$1') // prefix non parent path with ./
.replace(/[\/\\]index\.js$/, ''); // strip index.js suffix from path
}

function filterFile (template) {
Expand Down