resolve - npm Package Compare versions

Comparing version 1.8.0 to 1.8.1

lib/async.js

@@ -41,8 +41,8 @@ var core = require('./core');
     if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
-        var res = path.resolve(parent, x);
+        var res = path.resolve(basedir, x);
         if (x === '..' || x.slice(-1) === '/') res += '/';
-        if (/\/$/.test(x) && res === parent) {
+        if (/\/$/.test(x) && res === basedir) {
             loadAsDirectory(res, opts.package, onfile);
         } else loadAsFile(res, opts.package, onfile);
-    } else loadNodeModules(x, parent, function (err, n, pkg) {
+    } else loadNodeModules(x, basedir, function (err, n, pkg) {
         if (err) cb(err);
@@ -49,0 +49,0 @@ else if (n) cb(null, n, pkg);

lib/sync.js

@@ -32,3 +32,3 @@ var core = require('./core');
     if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
-        var res = path.resolve(parent, x);
+        var res = path.resolve(basedir, x);
         if (x === '..' || x.slice(-1) === '/') res += '/';
@@ -38,3 +38,3 @@ var m = loadAsFileSync(res) || loadAsDirectorySync(res);
     } else {
-        var n = loadNodeModulesSync(x, parent);
+        var n = loadNodeModulesSync(x, basedir);
         if (n) return n;
@@ -41,0 +41,0 @@ }

package.json

 {
   "name": "resolve",
   "description": "resolve like require.resolve() on behalf of files asynchronously and synchronously",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "repository": {
@@ -6,0 +6,0 @@ "type": "git",

test/resolver_sync.js

@@ -18,2 +18,7 @@ var path = require('path');
 
+    t.equal(
+        resolve.sync('./foo.js', { basedir: dir, filename: path.join(dir, 'bar.js') }),
+        path.join(dir, 'foo.js')
+    );
+
     t.throws(function () {
@@ -20,0 +25,0 @@ resolve.sync('foo', { basedir: dir });

test/resolver.js

@@ -6,3 +6,3 @@ var path = require('path');
 test('async foo', function (t) {
-    t.plan(11);
+    t.plan(12);
     var dir = path.join(__dirname, 'resolver');
@@ -34,2 +34,7 @@
 
+    resolve('./foo', { basedir: dir, filename: path.join(dir, 'baz.js') }, function (err, res) {
+        if (err) t.fail(err);
+        t.equal(res, path.join(dir, 'foo.js'));
+    });
+
     resolve('foo', { basedir: dir }, function (err) {
@@ -36,0 +41,0 @@ t.equal(err.message, "Cannot find module 'foo' from '" + path.resolve(dir) + "'");

test/symlinks.js

@@ -44,3 +44,5 @@ var path = require('path');
     var start = new Date();
-    t.equal(resolve.sync('foo', { basedir: symlinkDir, preserveSymlinks: false }), path.join(__dirname, 'resolver', 'symlinked', '_', 'node_modules', 'foo.js'));
+    t.doesNotThrow(function () {
+        t.equal(resolve.sync('foo', { basedir: symlinkDir, preserveSymlinks: false }), path.join(__dirname, 'resolver', 'symlinked', '_', 'node_modules', 'foo.js'));
+    });
     t.ok(new Date() - start < 50, 'resolve.sync timedout');
@@ -47,0 +49,0 @@ t.end();

No alert changes

Improved metrics

Total package byte prevSize

78538

increased by1.06%

Number of package files

75

increased by1.35%

Lines of code

1732

increased by0.58%

No dependency changes