Skip to content

Commit 267a8d1

Browse files
committed
fix: replace rimraf with fs.rm
1 parent 7018b3d commit 267a8d1

File tree

6 files changed

+7
-16
lines changed

6 files changed

+7
-16
lines changed

DEPENDENCIES.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,6 @@ graph LR;
548548
npm-->remark-gfm;
549549
npm-->remark-github;
550550
npm-->remark;
551-
npm-->rimraf;
552551
npm-->semver;
553552
npm-->spawk;
554553
npm-->ssri;

lib/commands/cache.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
const cacache = require('cacache')
22
const Arborist = require('@npmcli/arborist')
3-
const { promisify } = require('util')
43
const pacote = require('pacote')
4+
const fs = require('fs/promises')
55
const path = require('path')
6-
const rimraf = promisify(require('rimraf'))
76
const semver = require('semver')
87
const BaseCommand = require('../base-command.js')
98
const npa = require('npm-package-arg')
@@ -130,7 +129,7 @@ class Cache extends BaseCommand {
130129
If you're sure you want to delete the entire cache, rerun this command
131130
with --force.`)
132131
}
133-
return rimraf(cachePath)
132+
return fs.rm(cachePath, { recursive: true, force: true })
134133
}
135134
for (const key of args) {
136135
let entry

lib/commands/ci.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
const util = require('util')
21
const Arborist = require('@npmcli/arborist')
3-
const rimraf = util.promisify(require('rimraf'))
42
const reifyFinish = require('../utils/reify-finish.js')
53
const runScript = require('@npmcli/run-script')
6-
const fs = require('fs')
7-
const readdir = util.promisify(fs.readdir)
4+
const fs = require('fs/promises')
85
const log = require('../utils/log-shim.js')
96
const validateLockfile = require('../utils/validate-lockfile.js')
107

@@ -69,8 +66,8 @@ class CI extends ArboristWorkspaceCmd {
6966
await this.npm.time('npm-ci:rm', async () => {
7067
const path = `${where}/node_modules`
7168
// get the list of entries so we can skip the glob for performance
72-
const entries = await readdir(path, null).catch(er => [])
73-
return Promise.all(entries.map(f => rimraf(`${path}/${f}`, { glob: false })))
69+
const entries = await fs.readdir(path, null).catch(er => [])
70+
return Promise.all(entries.map(f => fs.rm(`${path}/${f}`, { force: true })))
7471
})
7572

7673
await arb.reify(opts)

lib/utils/log-file.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
const os = require('os')
22
const path = require('path')
33
const { format, promisify } = require('util')
4-
const rimraf = promisify(require('rimraf'))
54
const glob = promisify(require('glob'))
65
const MiniPass = require('minipass')
76
const fsMiniPass = require('fs-minipass')
7+
const fs = require('fs/promises')
88
const log = require('./log-shim')
99

1010
const padZero = (n, length) => n.toString().padStart(length.toString().length, '0')
@@ -217,7 +217,7 @@ class LogFiles {
217217

218218
for (const file of files.slice(0, toDelete)) {
219219
try {
220-
await rimraf(file, { glob: false })
220+
await fs.rm(file, { force: true })
221221
} catch (e) {
222222
log.silly('logfile', 'error removing log file', file, e)
223223
}

package-lock.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
"read",
6767
"read-package-json",
6868
"read-package-json-fast",
69-
"rimraf",
7069
"semver",
7170
"ssri",
7271
"tar",
@@ -143,7 +142,6 @@
143142
"read": "~1.0.7",
144143
"read-package-json": "^6.0.0",
145144
"read-package-json-fast": "^3.0.1",
146-
"rimraf": "^3.0.2",
147145
"semver": "^7.3.8",
148146
"ssri": "^10.0.1",
149147
"tar": "^6.1.13",

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
"read": "~1.0.7",
111111
"read-package-json": "^6.0.0",
112112
"read-package-json-fast": "^3.0.1",
113-
"rimraf": "^3.0.2",
114113
"semver": "^7.3.8",
115114
"ssri": "^10.0.1",
116115
"tar": "^6.1.13",
@@ -180,7 +179,6 @@
180179
"read",
181180
"read-package-json",
182181
"read-package-json-fast",
183-
"rimraf",
184182
"semver",
185183
"ssri",
186184
"tar",

0 commit comments

Comments
 (0)