Skip to content

Commit

Permalink
Merge pull request #80 from msokk/fix-node6
Browse files Browse the repository at this point in the history
path.dirname does not accept undefined anymore
  • Loading branch information
defunctzombie committed May 25, 2016
2 parents a238dd1 + 97666bf commit 8e6eca2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
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"
3 changes: 3 additions & 0 deletions index.js
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

0 comments on commit 8e6eca2

Please sign in to comment.