Skip to content

Update resolve dependency #97

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

Merged
merged 3 commits into from
Aug 3, 2020
Merged

Update resolve dependency #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb26bd2
Update resolve to 1.17
goto-bus-stop Jun 27, 2018
ed75d00
Fix tests
goto-bus-stop Jun 18, 2020
03d3067
Revert #92, use resolve's `preserveSymlinks` option
goto-bus-stop Jun 18, 2020
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
20 changes: 1 addition & 19 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ function build_resolve_opts(opts, base) {
return opts;
}

function resolve(id, opts, callback) {
function resolve(id, opts, cb) {

// opts.filename
// opts.paths
Expand All @@ -216,24 +216,6 @@ function resolve(id, opts, callback) {
opts = opts || {};
opts.filename = opts.filename || '';

var cb = function(err, path, pkg) {
fs.stat(path, function(notPath) {
if (notPath) {
callback(err, path, pkg);
}
else {
fs.realpath(path, function(notReal, real) {
if (notReal) {
callback(err, path, pkg);
}
else {
callback(err, real, pkg);
}
});
}
});
}

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

if (opts.basedir) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"author": "Roman Shtylman <[email protected]>",
"license": "MIT",
"dependencies": {
"resolve": "1.1.7"
"resolve": "^1.17.0"
},
"devDependencies": {
"mocha": "^2.5.3"
Expand Down
21 changes: 9 additions & 12 deletions test/modules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ test('index.js of module dir', function(done) {
resolve('module-a', { paths: [ fixtures_dir ], package: { main: 'fixtures' } }, function(err, path, pkg) {
assert.ifError(err);
assert.equal(path, require.resolve('./fixtures/node_modules/module-a/index'));
assert.strictEqual(pkg, undefined);
assert.strictEqual(pkg.main, 'fixtures');
done();
});
});
Expand Down Expand Up @@ -70,7 +70,7 @@ test('string alt browser field as main - require subfile', function(done) {
// one of the keys replaces the main file
// this would be done if the user needed to replace main and some other module
test('object browser field as main', function(done) {
resolve('module-d', { paths: [ fixtures_dir ], package: { main: 'fixtures' } }, function(err, path, pkg) {
resolve('module-d', { paths: [ fixtures_dir ] }, function(err, path, pkg) {
assert.ifError(err);
assert.equal(path, require.resolve('./fixtures/node_modules/module-d/browser'));
assert.equal(pkg.main, './browser.js');
Expand All @@ -82,7 +82,7 @@ test('object browser field as main', function(done) {
// one of the keys replaces the main file
// however the main has no prefix and browser uses ./ prefix for the same file
test('object browser field as main', function(done) {
resolve('module-k', { paths: [ fixtures_dir ], package: { main: 'fixtures' } }, function(err, path, pkg) {
resolve('module-k', { paths: [ fixtures_dir ] }, function(err, path, pkg) {
assert.ifError(err);
assert.equal(path, require.resolve('./fixtures/node_modules/module-k/browser'));
assert.equal(pkg.main, './browser.js');
Expand All @@ -91,7 +91,7 @@ test('object browser field as main', function(done) {
});

test('deep module reference mapping', function(done) {
resolve('module-l/direct', { basedir: __dirname + '/fixtures', package: { main: 'fixtures' } }, function(err, path, pkg) {
resolve('module-l/direct', { basedir: __dirname + '/fixtures' }, function(err, path, pkg) {
assert.ifError(err);
assert.equal(path, require.resolve('./fixtures/node_modules/module-l/browser-direct'));
assert.equal(pkg.main, './browser.js');
Expand All @@ -102,14 +102,14 @@ test('deep module reference mapping', function(done) {
// package.json has browser field as object
// test that file resolves even though the file extension is omitted
test('deep module reference mapping without file extension - .js', function(done) {
resolve('module-n/foo', { basedir: __dirname + '/fixtures', package: { main: 'fixtures' } }, function(err, path, pkg) {
resolve('module-n/foo', { basedir: __dirname + '/fixtures' }, function(err, path, pkg) {
assert.ifError(err);
assert.equal(path, require.resolve('./fixtures/node_modules/module-n/browser-foo'));
done();
});
});
test('deep module reference mapping without file extension - .json', function(done) {
resolve('module-n/bar', { basedir: __dirname + '/fixtures', package: { main: 'fixtures' } }, function(err, path, pkg) {
resolve('module-n/bar', { basedir: __dirname + '/fixtures' }, function(err, path, pkg) {
assert.ifError(err);
assert.equal(path, require.resolve('./fixtures/node_modules/module-n/browser-bar'));
done();
Expand Down Expand Up @@ -285,7 +285,6 @@ test('alt-browser field', function(done) {
test('alt-browser deep module reference mapping', function(done) {
resolve('alt-browser-field/direct', {
basedir: __dirname + '/fixtures',
package: { main: 'fixtures' },
browser: 'chromeapp'
}, function(err, path, pkg) {
assert.ifError(err);
Expand All @@ -312,10 +311,9 @@ test('alt-browser fallback to "browser" on deps of deps', function(done) {
});

test('not fail on accessing path name defined in Object.prototype', function (done) {
resolve('toString', { paths: [ fixtures_dir ], package: { main: 'fixtures' } }, function(err, path, pkg) {
resolve('toString', { paths: [ fixtures_dir ] }, function(err, path, pkg) {
assert.ifError(err);
assert.equal(path, require.resolve('./fixtures/node_modules/toString/index'));
assert.strictEqual(pkg, undefined);
done();
});
});
Expand All @@ -334,10 +332,9 @@ test('respect symlinks', function (done) {
// - node_modules
// - symlink to x
//
resolve('linked', { paths: [ fixtures_dir + '/linker/node_modules' ], package: { main: 'fixtures' } }, function(err, path, pkg) {
resolve('linked', { paths: [ fixtures_dir + '/linker/node_modules' ], preserveSymlinks: false }, function(err, path, pkg) {
assert.ifError(err);
assert.equal(path, require.resolve('./fixtures/linked/index'));
assert.strictEqual(pkg, undefined);
done();
});
});
});