@npmcli/arborist 7.5.2 → 7.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/index.js +2 -2
- package/bin/lib/logging.js +4 -4
- package/bin/lib/options.js +1 -1
- package/bin/lib/print-tree.js +1 -1
- package/lib/arborist/build-ideal-tree.js +2 -2
- package/lib/arborist/index.js +3 -3
- package/lib/arborist/isolated-reifier.js +3 -3
- package/lib/arborist/load-actual.js +1 -1
- package/lib/arborist/load-virtual.js +1 -1
- package/lib/arborist/rebuild.js +1 -1
- package/lib/arborist/reify.js +2 -2
- package/lib/debug.js +3 -2
- package/lib/dep-valid.js +1 -1
- package/lib/diff.js +1 -1
- package/lib/edge.js +1 -1
- package/lib/from-path.js +1 -1
- package/lib/link.js +1 -1
- package/lib/node.js +2 -2
- package/lib/printable.js +1 -1
- package/lib/query-selector-all.js +1 -1
- package/lib/realpath.js +2 -2
- package/lib/relpath.js +1 -1
- package/lib/retire-path.js +2 -2
- package/lib/shrinkwrap.js +2 -2
- package/lib/version-from-tgz.js +2 -2
- package/lib/yarn-lock.js +1 -1
- package/package.json +1 -1
package/bin/index.js
CHANGED
package/bin/lib/logging.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
const { log } = require('proc-log')
|
|
2
|
-
const fs = require('fs')
|
|
3
|
-
const { dirname } = require('path')
|
|
4
|
-
const os = require('os')
|
|
5
|
-
const { inspect, format } = require('util')
|
|
2
|
+
const fs = require('node:fs')
|
|
3
|
+
const { dirname } = require('node:path')
|
|
4
|
+
const os = require('node:os')
|
|
5
|
+
const { inspect, format } = require('node:util')
|
|
6
6
|
|
|
7
7
|
const { bin: options } = require('./options.js')
|
|
8
8
|
|
package/bin/lib/options.js
CHANGED
package/bin/lib/print-tree.js
CHANGED
|
@@ -6,10 +6,10 @@ const pacote = require('pacote')
|
|
|
6
6
|
const cacache = require('cacache')
|
|
7
7
|
const { callLimit: promiseCallLimit } = require('promise-call-limit')
|
|
8
8
|
const realpath = require('../../lib/realpath.js')
|
|
9
|
-
const { resolve, dirname } = require('path')
|
|
9
|
+
const { resolve, dirname } = require('node:path')
|
|
10
10
|
const treeCheck = require('../tree-check.js')
|
|
11
11
|
const { readdirScoped } = require('@npmcli/fs')
|
|
12
|
-
const { lstat, readlink } = require('fs/promises')
|
|
12
|
+
const { lstat, readlink } = require('node:fs/promises')
|
|
13
13
|
const { depth } = require('treeverse')
|
|
14
14
|
const { log, time } = require('proc-log')
|
|
15
15
|
const { redact } = require('@npmcli/redact')
|
package/lib/arborist/index.js
CHANGED
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
// the base class, so that the overall voltron class is easier to test and
|
|
27
27
|
// cover, and separation of concerns can be maintained.
|
|
28
28
|
|
|
29
|
-
const { resolve } = require('path')
|
|
30
|
-
const { homedir } = require('os')
|
|
29
|
+
const { resolve } = require('node:path')
|
|
30
|
+
const { homedir } = require('node:os')
|
|
31
31
|
const { depth } = require('treeverse')
|
|
32
32
|
const mapWorkspaces = require('@npmcli/map-workspaces')
|
|
33
33
|
const { log, time } = require('proc-log')
|
|
@@ -47,7 +47,7 @@ const mixins = [
|
|
|
47
47
|
]
|
|
48
48
|
|
|
49
49
|
const _setWorkspaces = Symbol.for('setWorkspaces')
|
|
50
|
-
const Base = mixins.reduce((a, b) => b(a), require('events'))
|
|
50
|
+
const Base = mixins.reduce((a, b) => b(a), require('node:events'))
|
|
51
51
|
|
|
52
52
|
// if it's 1, 2, or 3, set it explicitly that.
|
|
53
53
|
// if undefined or null, set it null
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
const _makeIdealGraph = Symbol('makeIdealGraph')
|
|
2
2
|
const _createIsolatedTree = Symbol.for('createIsolatedTree')
|
|
3
3
|
const _createBundledTree = Symbol('createBundledTree')
|
|
4
|
-
const { mkdirSync } = require('fs')
|
|
4
|
+
const { mkdirSync } = require('node:fs')
|
|
5
5
|
const pacote = require('pacote')
|
|
6
|
-
const { join } = require('path')
|
|
6
|
+
const { join } = require('node:path')
|
|
7
7
|
const { depth } = require('treeverse')
|
|
8
|
-
const crypto = require('crypto')
|
|
8
|
+
const crypto = require('node:crypto')
|
|
9
9
|
|
|
10
10
|
// cache complicated function results
|
|
11
11
|
const memoize = (fn) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// mix-in implementing the loadActual method
|
|
2
2
|
|
|
3
|
-
const { relative, dirname, resolve, join, normalize } = require('path')
|
|
3
|
+
const { relative, dirname, resolve, join, normalize } = require('node:path')
|
|
4
4
|
|
|
5
5
|
const rpj = require('read-package-json-fast')
|
|
6
6
|
const { readdirScoped } = require('@npmcli/fs')
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// mixin providing the loadVirtual method
|
|
2
2
|
const mapWorkspaces = require('@npmcli/map-workspaces')
|
|
3
3
|
|
|
4
|
-
const { resolve } = require('path')
|
|
4
|
+
const { resolve } = require('node:path')
|
|
5
5
|
|
|
6
6
|
const nameFromFolder = require('@npmcli/name-from-folder')
|
|
7
7
|
const consistentResolve = require('../consistent-resolve.js')
|
package/lib/arborist/rebuild.js
CHANGED
|
@@ -8,7 +8,7 @@ const rpj = require('read-package-json-fast')
|
|
|
8
8
|
const binLinks = require('bin-links')
|
|
9
9
|
const runScript = require('@npmcli/run-script')
|
|
10
10
|
const { callLimit: promiseCallLimit } = require('promise-call-limit')
|
|
11
|
-
const { resolve } = require('path')
|
|
11
|
+
const { resolve } = require('node:path')
|
|
12
12
|
const { isNodeGypPackage, defaultGypInstallScript } = require('@npmcli/node-gyp')
|
|
13
13
|
const { log, time } = require('proc-log')
|
|
14
14
|
|
package/lib/arborist/reify.js
CHANGED
|
@@ -11,14 +11,14 @@ const { log, time } = require('proc-log')
|
|
|
11
11
|
const hgi = require('hosted-git-info')
|
|
12
12
|
const rpj = require('read-package-json-fast')
|
|
13
13
|
|
|
14
|
-
const { dirname, resolve, relative, join } = require('path')
|
|
14
|
+
const { dirname, resolve, relative, join } = require('node:path')
|
|
15
15
|
const { depth: dfwalk } = require('treeverse')
|
|
16
16
|
const {
|
|
17
17
|
lstat,
|
|
18
18
|
mkdir,
|
|
19
19
|
rm,
|
|
20
20
|
symlink,
|
|
21
|
-
} = require('fs/promises')
|
|
21
|
+
} = require('node:fs/promises')
|
|
22
22
|
const { moveFile } = require('@npmcli/fs')
|
|
23
23
|
const PackageJson = require('@npmcli/package-json')
|
|
24
24
|
const packageContents = require('@npmcli/installed-package-contents')
|
package/lib/debug.js
CHANGED
|
@@ -18,14 +18,15 @@ const debug = process.env.ARBORIST_DEBUG !== '0' && (
|
|
|
18
18
|
/\barborist\b/.test(process.env.NODE_DEBUG || '') ||
|
|
19
19
|
process.env.npm_package_name === '@npmcli/arborist' &&
|
|
20
20
|
['test', 'snap'].includes(process.env.npm_lifecycle_event) ||
|
|
21
|
-
process.cwd() === require('path').resolve(__dirname, '..')
|
|
21
|
+
process.cwd() === require('node:path').resolve(__dirname, '..')
|
|
22
22
|
)
|
|
23
23
|
|
|
24
24
|
module.exports = debug ? fn => fn() : () => {}
|
|
25
25
|
const red = process.stderr.isTTY ? msg => `\x1B[31m${msg}\x1B[39m` : m => m
|
|
26
26
|
module.exports.log = (...msg) => module.exports(() => {
|
|
27
|
-
const { format } = require('util')
|
|
27
|
+
const { format } = require('node:util')
|
|
28
28
|
const prefix = `\n${process.pid} ${red(format(msg.shift()))} `
|
|
29
29
|
msg = (prefix + format(...msg).trim().split('\n').join(prefix)).trim()
|
|
30
|
+
/* eslint-disable-next-line no-console */
|
|
30
31
|
console.error(msg)
|
|
31
32
|
})
|
package/lib/dep-valid.js
CHANGED
package/lib/diff.js
CHANGED
package/lib/edge.js
CHANGED
package/lib/from-path.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// installed. directory (ie, symlink) deps also need to be resolved based on
|
|
4
4
|
// their targets, but that's what realpath is
|
|
5
5
|
|
|
6
|
-
const { dirname } = require('path')
|
|
6
|
+
const { dirname } = require('node:path')
|
|
7
7
|
const npa = require('npm-package-arg')
|
|
8
8
|
|
|
9
9
|
const fromPath = (node, edge) => {
|
package/lib/link.js
CHANGED
|
@@ -2,7 +2,7 @@ const relpath = require('./relpath.js')
|
|
|
2
2
|
const Node = require('./node.js')
|
|
3
3
|
const _loadDeps = Symbol.for('Arborist.Node._loadDeps')
|
|
4
4
|
const _target = Symbol.for('_target')
|
|
5
|
-
const { dirname } = require('path')
|
|
5
|
+
const { dirname } = require('node:path')
|
|
6
6
|
// defined by Node class
|
|
7
7
|
const _delistFromMeta = Symbol.for('_delistFromMeta')
|
|
8
8
|
const _refreshLocation = Symbol.for('_refreshLocation')
|
package/lib/node.js
CHANGED
|
@@ -41,8 +41,8 @@ const gatherDepSet = require('./gather-dep-set.js')
|
|
|
41
41
|
const treeCheck = require('./tree-check.js')
|
|
42
42
|
const { walkUp } = require('walk-up-path')
|
|
43
43
|
|
|
44
|
-
const { resolve, relative, dirname, basename } = require('path')
|
|
45
|
-
const util = require('util')
|
|
44
|
+
const { resolve, relative, dirname, basename } = require('node:path')
|
|
45
|
+
const util = require('node:util')
|
|
46
46
|
const _package = Symbol('_package')
|
|
47
47
|
const _parent = Symbol('_parent')
|
|
48
48
|
const _target = Symbol.for('_target')
|
package/lib/printable.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// helper function to output a clearer visualization
|
|
2
2
|
// of the current node and its descendents
|
|
3
3
|
const localeCompare = require('@isaacs/string-locale-compare')('en')
|
|
4
|
-
const util = require('util')
|
|
4
|
+
const util = require('node:util')
|
|
5
5
|
const relpath = require('./relpath.js')
|
|
6
6
|
|
|
7
7
|
class ArboristNode {
|
package/lib/realpath.js
CHANGED
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
// built-in fs.realpath, because we only care about symbolic links,
|
|
6
6
|
// so we can handle many fewer edge cases.
|
|
7
7
|
|
|
8
|
-
const { lstat, readlink } = require('fs/promises')
|
|
9
|
-
const { resolve, basename, dirname } = require('path')
|
|
8
|
+
const { lstat, readlink } = require('node:fs/promises')
|
|
9
|
+
const { resolve, basename, dirname } = require('node:path')
|
|
10
10
|
|
|
11
11
|
const realpathCached = (path, rpcache, stcache, depth) => {
|
|
12
12
|
// just a safety against extremely deep eloops
|
package/lib/relpath.js
CHANGED
package/lib/retire-path.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const crypto = require('crypto')
|
|
2
|
-
const { dirname, basename, resolve } = require('path')
|
|
1
|
+
const crypto = require('node:crypto')
|
|
2
|
+
const { dirname, basename, resolve } = require('node:path')
|
|
3
3
|
|
|
4
4
|
// use sha1 because it's faster, and collisions extremely unlikely anyway
|
|
5
5
|
const pathSafeHash = s =>
|
package/lib/shrinkwrap.js
CHANGED
|
@@ -42,9 +42,9 @@ const {
|
|
|
42
42
|
rm,
|
|
43
43
|
stat,
|
|
44
44
|
writeFile,
|
|
45
|
-
} = require('fs/promises')
|
|
45
|
+
} = require('node:fs/promises')
|
|
46
46
|
|
|
47
|
-
const { resolve, basename, relative } = require('path')
|
|
47
|
+
const { resolve, basename, relative } = require('node:path')
|
|
48
48
|
const specFromLock = require('./spec-from-lock.js')
|
|
49
49
|
const versionFromTgz = require('./version-from-tgz.js')
|
|
50
50
|
const npa = require('npm-package-arg')
|
package/lib/version-from-tgz.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const semver = require('semver')
|
|
2
|
-
const { basename } = require('path')
|
|
3
|
-
const { URL } = require('url')
|
|
2
|
+
const { basename } = require('node:path')
|
|
3
|
+
const { URL } = require('node:url')
|
|
4
4
|
module.exports = (name, tgz) => {
|
|
5
5
|
const base = basename(tgz)
|
|
6
6
|
if (!base.endsWith('.tgz')) {
|
package/lib/yarn-lock.js
CHANGED
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
|
|
30
30
|
const localeCompare = require('@isaacs/string-locale-compare')('en')
|
|
31
31
|
const consistentResolve = require('./consistent-resolve.js')
|
|
32
|
-
const { dirname } = require('path')
|
|
32
|
+
const { dirname } = require('node:path')
|
|
33
33
|
const { breadth } = require('treeverse')
|
|
34
34
|
|
|
35
35
|
// Sort Yarn entries respecting the yarn.lock sort order
|