Commit 34bfbfe
tools: avoid using process.cwd in tools/lint-js
The first occurrence of path.join() can easily be replaced with
path.resolve().
The second occurrence should be unnecessary as ESLint will resolve the
path internally, and the old check probably did not work as intended
anyway.
PR-URL: #17121
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent c4eb683 commit 34bfbfe
1 file changed
Lines changed: 1 addition & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,7 +13,6 @@ const totalCPUs = require('os').cpus().length; | |||
| 13 | 13 | const CLIEngine = require('./eslint').CLIEngine; | |
| 14 | 14 | const glob = require('./eslint/node_modules/glob'); | |
| 15 | 15 | ||
| 16 | - const cwd = process.cwd(); | ||
| 17 | 16 | const cliOptions = { | |
| 18 | 17 | rulePaths: rulesDirs, | |
| 19 | 18 | extensions: extensions, | |
@@ -82,9 +81,7 @@ if (cluster.isMaster) { | |||
| 82 | 81 | if (i !== -1) { | |
| 83 | 82 | if (!process.argv[i + 1]) | |
| 84 | 83 | throw new Error('Missing output filename'); | |
| 85 | - var outPath = process.argv[i + 1]; | ||
| 86 | - if (!path.isAbsolute(outPath)) | ||
| 87 | - outPath = path.join(cwd, outPath); | ||
| 84 | + const outPath = path.resolve(process.argv[i + 1]); | ||
| 88 | 85 | fd = fs.openSync(outPath, 'w'); | |
| 89 | 86 | outFn = function(str) { | |
| 90 | 87 | fs.writeSync(fd, str, 'utf8'); | |
@@ -176,8 +173,6 @@ if (cluster.isMaster) { | |||
| 176 | 173 | while (paths.length) { | |
| 177 | 174 | var dir = paths.shift(); | |
| 178 | 175 | curPath = dir; | |
| 179 | - if (dir.indexOf('/') > 0) | ||
| 180 | - dir = path.join(cwd, dir); | ||
| 181 | 176 | const patterns = cli.resolveFileGlobPatterns([dir]); | |
| 182 | 177 | dir = path.resolve(patterns[0]); | |
| 183 | 178 | files = glob.sync(dir, globOptions); | |
0 commit comments