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

Jump to bottom

Fix Node v6 #80

Merged
merged 2 commits into from
May 25, 2016
Merged

Fix Node v6 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed39edd
Fix path.dirname(undefined) throwing on Node v6
msokk May 3, 2016
97666bf
Test with newer Node versions on Travis
msokk May 3, 2016
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ language: node_js
node_js:
- "0.8"
- "0.10"
- "4"
- "5"
- "6"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this just be "node" so it's always latest stable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depends how many Node versions we want to test against? 4 is still LTS.

3 changes: 3 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ function resolve(id, opts, cb) {
// opts.packageFilter

opts = opts || {};
opts.filename = opts.filename || '';

var base = path.dirname(opts.filename);

Expand Down Expand Up @@ -278,6 +279,8 @@ resolve.sync = function (id, opts) {
// opts.packageFilter

opts = opts || {};
opts.filename = opts.filename || '';

var base = path.dirname(opts.filename);

if (opts.basedir) {
Expand Down