Skip to content

Commit d7f4fd9

Browse files
committed
fixup! fix: prefer fs/promises over promisify
1 parent 21a004b commit d7f4fd9

23 files changed

Lines changed: 25 additions & 26 deletions

File tree

test/lib/commands/doctor.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ t.test('error reading directory', async t => {
449449
if (s.endsWith('_logs')) {
450450
return fs.readdir(s, ...args)
451451
}
452-
// if (s.endsWith)
453452
throw new Error('Test Error')
454453
},
455454
},

workspaces/arborist/lib/arborist/build-ideal-tree.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const realpath = require('../../lib/realpath.js')
99
const { resolve, dirname } = require('path')
1010
const treeCheck = require('../tree-check.js')
1111
const { readdirScoped } = require('@npmcli/fs')
12-
const { lstat, readlink } = require('fs/promises')
12+
const { lstat, readlink } = require('node:fs/promises')
1313
const { depth } = require('treeverse')
1414
const { log, time } = require('proc-log')
1515
const { redact } = require('@npmcli/redact')

workspaces/arborist/lib/arborist/reify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const {
1818
mkdir,
1919
rm,
2020
symlink,
21-
} = require('fs/promises')
21+
} = require('node:fs/promises')
2222
const { moveFile } = require('@npmcli/fs')
2323
const PackageJson = require('@npmcli/package-json')
2424
const packageContents = require('@npmcli/installed-package-contents')

workspaces/arborist/lib/realpath.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// built-in fs.realpath, because we only care about symbolic links,
66
// so we can handle many fewer edge cases.
77

8-
const { lstat, readlink } = require('fs/promises')
8+
const { lstat, readlink } = require('node:fs/promises')
99
const { resolve, basename, dirname } = require('path')
1010

1111
const realpathCached = (path, rpcache, stcache, depth) => {

workspaces/arborist/lib/shrinkwrap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const {
4242
rm,
4343
stat,
4444
writeFile,
45-
} = require('fs/promises')
45+
} = require('node:fs/promises')
4646

4747
const { resolve, basename, relative } = require('path')
4848
const specFromLock = require('./spec-from-lock.js')

workspaces/arborist/scripts/benchmark.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ process.env.ARBORIST_DEBUG = '0'
22

33
const { Suite } = require('benchmark')
44
const { relative, resolve } = require('path')
5-
const { mkdir, rm } = require('fs/promises')
5+
const { mkdir, rm } = require('node:fs/promises')
66
const { execSync } = require('child_process')
77
const { linkSync, writeFileSync, readdirSync } = require('fs')
88
const registryServer = require('../test/fixtures/server.js')

workspaces/arborist/scripts/benchmark/load-actual.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const Arborist = require('../..')
22
const { resolve, basename } = require('path')
33
const { writeFileSync } = require('fs')
4-
const { mkdir, rm } = require('fs/promises')
4+
const { mkdir, rm } = require('node:fs/promises')
55

66
const dir = resolve(__dirname, basename(__filename, '.js'))
77

workspaces/arborist/scripts/benchmark/reify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const Arborist = require('../..')
22
const { resolve, basename } = require('path')
33
const { writeFileSync, rmSync } = require('fs')
4-
const { mkdir } = require('fs/promises')
4+
const { mkdir } = require('node:fs/promises')
55
const dir = resolve(__dirname, basename(__filename, '.js'))
66

77
// these are not arbitrary, the empty/full and no-* bits matter

workspaces/arborist/test/arborist/pruner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ t.test('prune with lockfile omit dev', async t => {
8080
})
8181

8282
t.test('prune omit dev with bins', async t => {
83-
const { readdir } = require('fs/promises')
83+
const { readdir } = require('node:fs/promises')
8484
const { statSync, lstatSync } = require('fs')
8585
const path = fixture(t, 'prune-dev-bins')
8686

workspaces/arborist/test/arborist/reify.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const runScript = require('@npmcli/run-script')
44
const localeCompare = require('@isaacs/string-locale-compare')('en')
55
const tnock = require('../fixtures/tnock')
66
const fs = require('fs')
7-
const fsp = require('fs/promises')
7+
const fsp = require('node:fs/promises')
88
const npmFs = require('@npmcli/fs')
99

1010
let failRm = false
@@ -71,10 +71,10 @@ const fspMock = {
7171
},
7272
}
7373
// need this to be injected so that it doesn't pull from main cache
74-
const { moveFile } = t.mock('@npmcli/fs', { 'fs/promises': fspMock })
74+
const { moveFile } = t.mock('@npmcli/fs', { 'node:fs/promises': fspMock })
7575
const mocks = {
7676
fs: fsMock,
77-
'fs/promises': fspMock,
77+
'node:fs/promises': fspMock,
7878
'@npmcli/fs': { ...npmFs, moveFile },
7979
}
8080

0 commit comments

Comments
 (0)