Skip to content

Commit 9e06eff

Browse files
committed
[utils] [Refactor] inline pkgDir implementation; remove pkg-dir
1 parent 210e40a commit 9e06eff

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

utils/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ This change log adheres to standards from [Keep a CHANGELOG](https://keepachange
88
### Fixed
99
- [patch] Fix `@babel/eslint-parser` 8 compatibility ([#2343], thanks [@nicolo-ribaudo])
1010

11+
### Changed
12+
- [Refactor] inline `pkgDir` implementation; remove `pkg-dir`
13+
1114
## v2.7.1 - 2021-10-13
1215

1316
### Fixed

utils/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"homepage": "https://github.com/import-js/eslint-plugin-import#readme",
2828
"dependencies": {
2929
"debug": "^3.2.7",
30-
"find-up": "^2.1.0",
31-
"pkg-dir": "^2.0.0"
30+
"find-up": "^2.1.0"
3231
}
3332
}

utils/pkgDir.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
'use strict';
2+
3+
const path = require('path');
4+
const pkgUp = require('./pkgUp').default;
5+
6+
exports.__esModule = true;
7+
8+
exports.default = function (cwd) {
9+
const fp = pkgUp({ cwd });
10+
return fp ? path.dirname(fp) : null;
11+
};

utils/resolve.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
'use strict';
22
exports.__esModule = true;
33

4-
const pkgDir = require('pkg-dir');
5-
64
const fs = require('fs');
75
const Module = require('module');
86
const path = require('path');
97

108
const hashObject = require('./hash').hashObject;
119
const ModuleCache = require('./ModuleCache').default;
10+
const pkgDir = require('./pkgDir').default;
1211

1312
const CASE_SENSITIVE_FS = !fs.existsSync(path.join(__dirname.toUpperCase(), 'reSOLVE.js'));
1413
exports.CASE_SENSITIVE_FS = CASE_SENSITIVE_FS;
@@ -175,7 +174,7 @@ function resolverReducer(resolvers, map) {
175174
}
176175

177176
function getBaseDir(sourceFile) {
178-
return pkgDir.sync(sourceFile) || process.cwd();
177+
return pkgDir(sourceFile) || process.cwd();
179178
}
180179
function requireResolver(name, sourceFile) {
181180
// Try to resolve package with conventional name

0 commit comments

Comments
 (0)