Skip to content

Commit 515b7b0

Browse files
committed
[resolvers] [node] [deps] update is-core-module, resolve
1 parent 809fd2a commit 515b7b0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

resolvers/node/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ function opts(file, config, packageFilter) {
1212
return Object.assign({ // more closely matches Node (#333)
1313
// plus 'mjs' for native modules! (#939)
1414
extensions: ['.mjs', '.js', '.json', '.node'],
15+
// TODO: semver-major: remove this to match Node's default behavior
16+
preserveSymlinks: true,
1517
}, config, {
1618
// path.resolve will handle paths relative to CWD
1719
basedir: path.dirname(path.resolve(file)),
@@ -55,7 +57,7 @@ exports.resolve = function (source, file, config) {
5557
}
5658

5759
try {
58-
const cachedFilter = function (pkg, dir) { return packageFilter(pkg, dir, config); };
60+
const cachedFilter = function (pkg, _pkgFile, dir) { return packageFilter(pkg, dir, config); };
5961
resolvedPath = resolve(source, opts(file, config, cachedFilter));
6062
log('Resolved to:', resolvedPath);
6163
return { found: true, path: resolvedPath };

resolvers/node/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"homepage": "https://github.com/import-js/eslint-plugin-import",
3232
"dependencies": {
3333
"debug": "^3.2.7",
34-
"is-core-module": "^2.13.0",
35-
"resolve": "^1.22.4"
34+
"is-core-module": "^2.16.1",
35+
"resolve": "^2.0.0-next.6"
3636
},
3737
"devDependencies": {
3838
"chai": "^3.5.0",

0 commit comments

Comments
 (0)