Skip to content

Commit 5209a43

Browse files
committed
[resolvers] [*] [deps] update is-core-module, resolve
1 parent 132a433 commit 5209a43

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

resolvers/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ If the resolver cannot resolve `source` relative to `file`, it should just retur
6868
Here is most of the [Node resolver] at the time of this writing. It is just a wrapper around substack/Browserify's synchronous [`resolve`]:
6969

7070
```js
71-
var resolve = require('resolve');
71+
var resolve = require('resolve/sync');
7272
var isCoreModule = require('is-core-module');
7373
7474
exports.resolve = function (source, file, config) {
7575
if (isCoreModule(source)) return { found: true, path: null };
7676
try {
77-
return { found: true, path: resolve.sync(source, opts(file, config)) };
77+
return { found: true, path: resolve(source, opts(file, config)) };
7878
} catch (err) {
7979
return { found: false };
8080
}

resolvers/node/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const resolve = require('resolve');
3+
const resolve = require('resolve/sync');
44
const isCoreModule = require('is-core-module');
55
const path = require('path');
66

@@ -19,7 +19,7 @@ exports.resolve = function (source, file, config) {
1919

2020
try {
2121
const cachedFilter = function (pkg, dir) { return packageFilter(pkg, dir, config); };
22-
resolvedPath = resolve.sync(source, opts(file, config, cachedFilter));
22+
resolvedPath = resolve(source, opts(file, config, cachedFilter));
2323
log('Resolved to:', resolvedPath);
2424
return { found: true, path: resolvedPath };
2525
} catch (err) {
@@ -46,7 +46,7 @@ function packageFilter(pkg, dir, config) {
4646
const file = path.join(dir, 'dummy.js');
4747
if (pkg.module) {
4848
try {
49-
resolve.sync(String(pkg.module).replace(/^(?:\.\/)?/, './'), opts(file, config, identity));
49+
resolve(String(pkg.module).replace(/^(?:\.\/)?/, './'), opts(file, config, identity));
5050
pkg.main = pkg.module;
5151
found = true;
5252
} catch (err) {
@@ -55,7 +55,7 @@ function packageFilter(pkg, dir, config) {
5555
}
5656
if (!found && pkg['jsnext:main']) {
5757
try {
58-
resolve.sync(String(pkg['jsnext:main']).replace(/^(?:\.\/)?/, './'), opts(file, config, identity));
58+
resolve(String(pkg['jsnext:main']).replace(/^(?:\.\/)?/, './'), opts(file, config, identity));
5959
pkg.main = pkg['jsnext:main'];
6060
found = true;
6161
} catch (err) {

resolvers/node/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"homepage": "https://github.com/import-js/eslint-plugin-import",
3131
"dependencies": {
3232
"debug": "^3.2.7",
33-
"is-core-module": "^2.12.0",
34-
"resolve": "^1.22.2"
33+
"is-core-module": "^2.13.0",
34+
"resolve": "^1.22.4"
3535
},
3636
"devDependencies": {
3737
"chai": "^3.5.0",

resolvers/webpack/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const find = require('array-find');
88
const interpret = require('interpret');
99
const fs = require('fs');
1010
const isCore = require('is-core-module');
11-
const resolve = require('resolve');
11+
const resolve = require('resolve/sync');
1212
const semver = require('semver');
1313
const has = require('has');
1414
const isRegex = require('is-regex');
@@ -190,11 +190,11 @@ function createResolveSync(configPath, webpackConfig, cwd) {
190190

191191
try {
192192
// Attempt to resolve webpack from the given `basedir`
193-
const webpackFilename = resolve.sync('webpack', { basedir, preserveSymlinks: false });
193+
const webpackFilename = resolve('webpack', { basedir, preserveSymlinks: false });
194194
const webpackResolveOpts = { basedir: path.dirname(webpackFilename), preserveSymlinks: false };
195195

196196
webpackRequire = function (id) {
197-
return require(resolve.sync(id, webpackResolveOpts));
197+
return require(resolve(id, webpackResolveOpts));
198198
};
199199
} catch (e) {
200200
// Something has gone wrong (or we're in a test). Use our own bundled

resolvers/webpack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
"find-root": "^1.1.0",
3737
"has": "^1.0.3",
3838
"interpret": "^1.4.0",
39-
"is-core-module": "^2.12.0",
39+
"is-core-module": "^2.13.0",
4040
"is-regex": "^1.1.4",
4141
"lodash": "^4.17.21",
42-
"resolve": "^1.22.2",
42+
"resolve": "^1.22.4",
4343
"semver": "^5.7.1"
4444
},
4545
"peerDependencies": {

0 commit comments

Comments
 (0)