@npmcli/arborist 6.2.1 → 6.2.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/lib/arborist/rebuild.js +9 -7
- package/package.json +11 -15
package/lib/arborist/rebuild.js
CHANGED
|
@@ -89,7 +89,6 @@ module.exports = cls => class Builder extends cls {
|
|
|
89
89
|
const {
|
|
90
90
|
depNodes,
|
|
91
91
|
linkNodes,
|
|
92
|
-
storeNodes,
|
|
93
92
|
} = this[_retrieveNodesByType](nodes)
|
|
94
93
|
|
|
95
94
|
// build regular deps
|
|
@@ -100,10 +99,6 @@ module.exports = cls => class Builder extends cls {
|
|
|
100
99
|
this[_resetQueues]()
|
|
101
100
|
await this[_build](linkNodes, { type: 'links' })
|
|
102
101
|
}
|
|
103
|
-
if (storeNodes.size) {
|
|
104
|
-
this[_resetQueues]()
|
|
105
|
-
await this[_build](storeNodes, { type: 'storelinks' })
|
|
106
|
-
}
|
|
107
102
|
|
|
108
103
|
process.emit('timeEnd', 'build')
|
|
109
104
|
}
|
|
@@ -146,6 +141,12 @@ module.exports = cls => class Builder extends cls {
|
|
|
146
141
|
depNodes.add(node)
|
|
147
142
|
}
|
|
148
143
|
}
|
|
144
|
+
// Make sure that store linked nodes are processed last.
|
|
145
|
+
// We can't process store links separately or else lifecycle scripts on
|
|
146
|
+
// standard nodes might not have bin links yet.
|
|
147
|
+
for (const node of storeNodes) {
|
|
148
|
+
depNodes.add(node)
|
|
149
|
+
}
|
|
149
150
|
|
|
150
151
|
// deduplicates link nodes and their targets, avoids
|
|
151
152
|
// calling lifecycle scripts twice when running `npm rebuild`
|
|
@@ -162,7 +163,6 @@ module.exports = cls => class Builder extends cls {
|
|
|
162
163
|
return {
|
|
163
164
|
depNodes,
|
|
164
165
|
linkNodes,
|
|
165
|
-
storeNodes,
|
|
166
166
|
}
|
|
167
167
|
}
|
|
168
168
|
|
|
@@ -330,10 +330,12 @@ module.exports = cls => class Builder extends cls {
|
|
|
330
330
|
devOptional,
|
|
331
331
|
package: pkg,
|
|
332
332
|
location,
|
|
333
|
+
isStoreLink,
|
|
333
334
|
} = node.target
|
|
334
335
|
|
|
335
336
|
// skip any that we know we'll be deleting
|
|
336
|
-
|
|
337
|
+
// or storeLinks
|
|
338
|
+
if (this[_trashList].has(path) || isStoreLink) {
|
|
337
339
|
return
|
|
338
340
|
}
|
|
339
341
|
|
package/package.json
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@npmcli/arborist",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.3",
|
|
4
4
|
"description": "Manage node_modules trees",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@isaacs/string-locale-compare": "^1.1.0",
|
|
7
7
|
"@npmcli/fs": "^3.1.0",
|
|
8
8
|
"@npmcli/installed-package-contents": "^2.0.0",
|
|
9
|
-
"@npmcli/map-workspaces": "^3.0.
|
|
9
|
+
"@npmcli/map-workspaces": "^3.0.2",
|
|
10
10
|
"@npmcli/metavuln-calculator": "^5.0.0",
|
|
11
|
-
"@npmcli/name-from-folder": "^
|
|
11
|
+
"@npmcli/name-from-folder": "^2.0.0",
|
|
12
12
|
"@npmcli/node-gyp": "^3.0.0",
|
|
13
13
|
"@npmcli/package-json": "^3.0.0",
|
|
14
14
|
"@npmcli/query": "^3.0.0",
|
|
15
15
|
"@npmcli/run-script": "^6.0.0",
|
|
16
16
|
"bin-links": "^4.0.1",
|
|
17
|
-
"cacache": "^17.0.
|
|
17
|
+
"cacache": "^17.0.4",
|
|
18
18
|
"common-ancestor-path": "^1.0.1",
|
|
19
19
|
"hosted-git-info": "^6.1.1",
|
|
20
20
|
"json-parse-even-better-errors": "^3.0.0",
|
|
21
21
|
"json-stringify-nice": "^1.1.4",
|
|
22
|
-
"minimatch": "^
|
|
22
|
+
"minimatch": "^6.1.6",
|
|
23
23
|
"nopt": "^7.0.0",
|
|
24
24
|
"npm-install-checks": "^6.0.0",
|
|
25
25
|
"npm-package-arg": "^10.1.0",
|
|
26
26
|
"npm-pick-manifest": "^8.0.1",
|
|
27
27
|
"npm-registry-fetch": "^14.0.3",
|
|
28
28
|
"npmlog": "^7.0.1",
|
|
29
|
-
"pacote": "^15.0.
|
|
29
|
+
"pacote": "^15.0.8",
|
|
30
30
|
"parse-conflict-json": "^3.0.0",
|
|
31
31
|
"proc-log": "^3.0.0",
|
|
32
32
|
"promise-all-reject-late": "^1.0.0",
|
|
33
33
|
"promise-call-limit": "^1.0.1",
|
|
34
|
-
"read-package-json-fast": "^3.0.
|
|
34
|
+
"read-package-json-fast": "^3.0.2",
|
|
35
35
|
"semver": "^7.3.7",
|
|
36
36
|
"ssri": "^10.0.1",
|
|
37
37
|
"treeverse": "^3.0.0",
|
|
@@ -39,28 +39,24 @@
|
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@npmcli/eslint-config": "^4.0.0",
|
|
42
|
-
"@npmcli/template-oss": "4.11.
|
|
42
|
+
"@npmcli/template-oss": "4.11.4",
|
|
43
43
|
"benchmark": "^2.1.4",
|
|
44
44
|
"chalk": "^4.1.0",
|
|
45
45
|
"minify-registry-metadata": "^3.0.0",
|
|
46
|
-
"nock": "^13.
|
|
47
|
-
"tap": "^16.3.
|
|
46
|
+
"nock": "^13.3.0",
|
|
47
|
+
"tap": "^16.3.4",
|
|
48
48
|
"tar-stream": "^3.0.0",
|
|
49
49
|
"tcompare": "^5.0.6"
|
|
50
50
|
},
|
|
51
51
|
"scripts": {
|
|
52
52
|
"test": "tap",
|
|
53
|
-
"test-only": "tap --only",
|
|
54
53
|
"posttest": "node ../.. run lint",
|
|
55
54
|
"snap": "tap",
|
|
56
|
-
"postsnap": "npm run lintfix",
|
|
57
55
|
"test-proxy": "ARBORIST_TEST_PROXY=1 tap --snapshot",
|
|
58
|
-
"eslint": "eslint",
|
|
59
56
|
"lint": "eslint \"**/*.js\"",
|
|
60
57
|
"lintfix": "node ../.. run lint -- --fix",
|
|
61
58
|
"benchmark": "node scripts/benchmark.js",
|
|
62
59
|
"benchclean": "rm -rf scripts/benchmark/*/",
|
|
63
|
-
"npmclilint": "npmcli-lint",
|
|
64
60
|
"postlint": "template-oss-check",
|
|
65
61
|
"template-oss-apply": "template-oss-apply --force"
|
|
66
62
|
},
|
|
@@ -102,7 +98,7 @@
|
|
|
102
98
|
},
|
|
103
99
|
"templateOSS": {
|
|
104
100
|
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
|
|
105
|
-
"version": "4.11.
|
|
101
|
+
"version": "4.11.4",
|
|
106
102
|
"content": "../../scripts/template-oss/index.js"
|
|
107
103
|
}
|
|
108
104
|
}
|