From ed39edd62c2943a8b584d11edfa4fb2c2c03f34a Mon Sep 17 00:00:00 2001
From: Mihkel Sokk <mihkelsokk@gmail.com>
Date: Tue, 3 May 2016 20:51:52 +0300
Subject: [PATCH 1/2] Fix path.dirname(undefined) throwing on Node v6

---
 index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/index.js b/index.js
index aef07e2..97d8935 100644
--- a/index.js
+++ b/index.js
@@ -214,6 +214,7 @@ function resolve(id, opts, cb) {
     // opts.packageFilter
 
     opts = opts || {};
+    opts.filename = opts.filename || '';
 
     var base = path.dirname(opts.filename);
 
@@ -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) {

From 97666bf5082c81e26e79ad6f5af474fc619ef2d2 Mon Sep 17 00:00:00 2001
From: Mihkel Sokk <mihkelsokk@gmail.com>
Date: Tue, 3 May 2016 20:52:20 +0300
Subject: [PATCH 2/2] Test with newer Node versions on Travis

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 90ce570..a943bf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,3 +2,6 @@ language: node_js
 node_js:
     - "0.8"
     - "0.10"
+    - "4"
+    - "5"
+    - "6"