@npmcli/arborist 9.1.7 → 9.1.9
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/lib/arborist/reify.js +1 -1
- package/lib/edge.js +1 -1
- package/package.json +5 -5
package/lib/arborist/reify.js
CHANGED
|
@@ -510,7 +510,7 @@ module.exports = cls => class Reifier extends cls {
|
|
|
510
510
|
if (er.code === 'ENOENT') {
|
|
511
511
|
return didMkdirp ? null : mkdir(dirname(to), { recursive: true }).then(() =>
|
|
512
512
|
this[_renamePath](from, to, true))
|
|
513
|
-
} else if (er.code === 'EEXIST') {
|
|
513
|
+
} else if (er.code === 'EEXIST' || er.code === 'ENOTEMPTY') {
|
|
514
514
|
return rm(to, { recursive: true, force: true }).then(() => moveFile(from, to))
|
|
515
515
|
} else {
|
|
516
516
|
throw er
|
package/lib/edge.js
CHANGED
|
@@ -275,7 +275,7 @@ class Edge {
|
|
|
275
275
|
this.#error = 'PEER LOCAL'
|
|
276
276
|
} else if (!this.satisfiedBy(this.#to)) {
|
|
277
277
|
this.#error = 'INVALID'
|
|
278
|
-
} else if (this.overrides && this.#to.edgesOut.size && OverrideSet.doOverrideSetsConflict(this.overrides, this.#to.overrides)) {
|
|
278
|
+
} else if (this.overrides && this.#to.overrides && this.#to.edgesOut.size && OverrideSet.doOverrideSetsConflict(this.overrides, this.#to.overrides)) {
|
|
279
279
|
// Check for conflicts between the edge's override set and the target node's override set.
|
|
280
280
|
// This catches cases where different parts of the tree have genuinely incompatible
|
|
281
281
|
// version requirements for the same package.
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@npmcli/arborist",
|
|
3
|
-
"version": "9.1.
|
|
3
|
+
"version": "9.1.9",
|
|
4
4
|
"description": "Manage node_modules trees",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@isaacs/string-locale-compare": "^1.1.0",
|
|
7
|
-
"@npmcli/fs": "^
|
|
7
|
+
"@npmcli/fs": "^5.0.0",
|
|
8
8
|
"@npmcli/installed-package-contents": "^4.0.0",
|
|
9
9
|
"@npmcli/map-workspaces": "^5.0.0",
|
|
10
10
|
"@npmcli/metavuln-calculator": "^9.0.2",
|
|
11
11
|
"@npmcli/name-from-folder": "^4.0.0",
|
|
12
12
|
"@npmcli/node-gyp": "^5.0.0",
|
|
13
13
|
"@npmcli/package-json": "^7.0.0",
|
|
14
|
-
"@npmcli/query": "^
|
|
14
|
+
"@npmcli/query": "^5.0.0",
|
|
15
15
|
"@npmcli/redact": "^4.0.0",
|
|
16
16
|
"@npmcli/run-script": "^10.0.0",
|
|
17
17
|
"bin-links": "^6.0.0",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"json-stringify-nice": "^1.1.4",
|
|
22
22
|
"lru-cache": "^11.2.1",
|
|
23
23
|
"minimatch": "^10.0.3",
|
|
24
|
-
"nopt": "^
|
|
24
|
+
"nopt": "^9.0.0",
|
|
25
25
|
"npm-install-checks": "^8.0.0",
|
|
26
26
|
"npm-package-arg": "^13.0.0",
|
|
27
27
|
"npm-pick-manifest": "^11.0.1",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"pacote": "^21.0.2",
|
|
30
30
|
"parse-conflict-json": "^5.0.1",
|
|
31
31
|
"proc-log": "^6.0.0",
|
|
32
|
-
"proggy": "^
|
|
32
|
+
"proggy": "^4.0.0",
|
|
33
33
|
"promise-all-reject-late": "^1.0.0",
|
|
34
34
|
"promise-call-limit": "^3.0.1",
|
|
35
35
|
"semver": "^7.3.7",
|