[Fix] make check whether subpath changed work on Windows

Author: bgotink

lib/async.js

@@ -303,11 +303,11 @@ module.exports = function resolve(x, options, callback) {
         });
     }
 
-    function processDirs(cb, dirs, subpath) {
+    function processDirs(cb, dirs, subpath, endsWithSubpath) {
         if (dirs.length === 0) return cb(null, undefined);
         var dir = dirs[0];
 
-        if (env.length > 0 && dir.substring(dir.length - subpath.length) === subpath) {
+        if (env.length > 0 && endsWithSubpath(dir)) {
             var pkgDir = dir.substring(0, dir.length - subpath.length);
             loadManifestInDir(pkgDir, onmanifestWithExports);
         } else {
@@ -337,21 +337,21 @@ module.exports = function resolve(x, options, callback) {
 
             function isdir(err, isdir) {
                 if (err) return cb(err);
-                if (!isdir) return processDirs(cb, dirs.slice(1), subpath);
+                if (!isdir) return processDirs(cb, dirs.slice(1), subpath, endsWithSubpath);
                 loadAsFile(dir, opts.package, onfile);
             }
 
             function onfile(err, m, pkg) {
                 if (err) return cb(err);
                 if (m) return cb(null, m, pkg);
-                if (!tryLoadAsDirectory) return processDirs(cb, dirs.slice(1), subpath);
+                if (!tryLoadAsDirectory) return processDirs(cb, dirs.slice(1), subpath, endsWithSubpath);
                 loadAsDirectory(dir, opts.package, ondir);
             }
 
             function ondir(err, n, pkg) {
                 if (err) return cb(err);
                 if (n) return cb(null, n, pkg);
-                processDirs(cb, dirs.slice(1), subpath);
+                processDirs(cb, dirs.slice(1), subpath, endsWithSubpath);
             }
         }
 
@@ -369,10 +369,16 @@ module.exports = function resolve(x, options, callback) {
         }
 
         var thunk = function () { return getPackageCandidates(x, start, opts); };
+        var endsWithSubpath = function (dir) {
+            var endOfDir = dir.substring(dir.length - subpath.length);
+
+            return endOfDir === subpath || endOfDir.replace(/\\/g, '/') === subpath;
+        }
         processDirs(
             cb,
             packageIterator ? packageIterator(x, start, thunk, opts) : thunk(),
-            subpath
+            subpath,
+            endsWithSubpath
         );
     }
 };

lib/sync.js

@@ -219,12 +219,18 @@ module.exports = function resolveSync(x, options) {
         }
         var subpathLength = subpath.length;
 
+        var endsWithSubpath = function (dir) {
+            var endOfDir = dir.substring(dir.length - subpathLength);
+
+            return endOfDir === subpath || endOfDir.replace(/\\/g, '/') === subpath;
+        };
+
         for (var i = 0; i < dirs.length; i++) {
             var dir = dirs[i];
 
             var pkg;
             var tryLoadAsDirectory = true;
-            if (dir.substring(dir.length - subpathLength) === subpath) {
+            if (endsWithSubpath(dir)) {
                 var pkgDir = dir.substring(0, dir.length - subpathLength);
                 if ((pkg = loadManifestInDir(pkgDir)) && pkg.exports) {
                     var resolvedExport = resolveExports(pkgDir, parent, subpath, pkg.exports, env);