Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Karrys <luke@lukekarrys.com>2022-11-04 00:32:25 +0300
committerLuke Karrys <luke@lukekarrys.com>2022-11-08 03:03:24 +0300
commit878ddfb5b68c03bdcd7d7da8dae92c4947942801 (patch)
tree669ce4ba1c186ab252e060c9fafbb88ad9a4e4e0 /workspaces/arborist/lib/arborist/load-actual.js
parent1bff0640ccb8414e2d416a5cf9d64e9ff03c6403 (diff)
deps: @npmcli/fs@3.1.0
This also removes `readdir-scoped-modules` and `@npmcli/fs` since those are now a part of `@npmcli/fs`
Diffstat (limited to 'workspaces/arborist/lib/arborist/load-actual.js')
-rw-r--r--workspaces/arborist/lib/arborist/load-actual.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/workspaces/arborist/lib/arborist/load-actual.js b/workspaces/arborist/lib/arborist/load-actual.js
index bb813806e..6c3f917c6 100644
--- a/workspaces/arborist/lib/arborist/load-actual.js
+++ b/workspaces/arborist/lib/arborist/load-actual.js
@@ -3,8 +3,7 @@
const { relative, dirname, resolve, join, normalize } = require('path')
const rpj = require('read-package-json-fast')
-const { promisify } = require('util')
-const readdir = promisify(require('readdir-scoped-modules'))
+const { readdirScoped } = require('@npmcli/fs')
const walkUp = require('walk-up-path')
const ancestorPath = require('common-ancestor-path')
const treeCheck = require('../tree-check.js')
@@ -362,7 +361,7 @@ module.exports = cls => class ActualLoader extends cls {
async [_loadFSChildren] (node) {
const nm = resolve(node.realpath, 'node_modules')
try {
- const kids = await readdir(nm)
+ const kids = await readdirScoped(nm).then(paths => paths.map(p => p.replace(/\\/g, '/')))
return Promise.all(
// ignore . dirs and retired scoped package folders
kids.filter(kid => !/^(@[^/]+\/)?\./.test(kid))
@@ -411,8 +410,8 @@ module.exports = cls => class ActualLoader extends cls {
break
}
- const entries = nmContents.get(p) ||
- await readdir(p + '/node_modules').catch(() => [])
+ const entries = nmContents.get(p) || await readdirScoped(p + '/node_modules')
+ .catch(() => []).then(paths => paths.map(p => p.replace(/\\/g, '/')))
nmContents.set(p, entries)
if (!entries.includes(name)) {
continue