File tree 3 files changed +17
-10
lines changed
tap-snapshots/test/arborist
3 files changed +17
-10
lines changed Original file line number Diff line number Diff line change @@ -822,8 +822,12 @@ class Node {
822
822
target . root = root
823
823
}
824
824
825
- if ( ! this . overrides && this . parent && this . parent . overrides ) {
826
- this . overrides = this . parent . overrides . getNodeRule ( this )
825
+ if ( ! this . overrides ) {
826
+ if ( this . parent && this . parent . overrides ) {
827
+ this . overrides = this . parent . overrides . getNodeRule ( this )
828
+ } else if ( this . fsParent && this . fsParent . overrides ) {
829
+ this . overrides = this . fsParent . overrides . getNodeRule ( this )
830
+ }
827
831
}
828
832
// tree should always be valid upon root setter completion.
829
833
treeCheck ( this )
Original file line number Diff line number Diff line change @@ -16381,9 +16381,9 @@ ArboristNode {
16381
16381
"arg" => ArboristNode {
16382
16382
"edgesIn": Set {
16383
16383
EdgeIn {
16384
- "error": "INVALID",
16385
16384
"from": "ws",
16386
16385
"name": "arg",
16386
+ "override": "4.1.3",
16387
16387
"spec": "4.1.2",
16388
16388
"type": "prod",
16389
16389
},
@@ -16433,8 +16433,8 @@ ArboristNode {
16433
16433
ArboristNode {
16434
16434
"edgesOut": Map {
16435
16435
"arg" => EdgeOut {
16436
- "error": "INVALID",
16437
16436
"name": "arg",
16437
+ "override": "4.1.3",
16438
16438
"spec": "4.1.2",
16439
16439
"to": "node_modules/arg",
16440
16440
"type": "prod",
@@ -16443,6 +16443,9 @@ ArboristNode {
16443
16443
"isWorkspace": true,
16444
16444
"location": "ws",
16445
16445
"name": "ws",
16446
+ "overrides": Map {
16447
+ "arg" => "4.1.3",
16448
+ },
16446
16449
"path": "{CWD}/test/fixtures/workspaces-with-overrides/ws",
16447
16450
"version": "1.0.0",
16448
16451
},
Original file line number Diff line number Diff line change @@ -53512,19 +53512,19 @@ Object {
53512
53512
"link": true,
53513
53513
"resolved": "ws",
53514
53514
},
53515
+ "node_modules/arg": Object {
53516
+ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
53517
+ "license": "MIT",
53518
+ "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
53519
+ "version": "4.1.3",
53520
+ },
53515
53521
"ws": Object {
53516
53522
"dependencies": Object {
53517
53523
"arg": "4.1.2",
53518
53524
},
53519
53525
"name": "a",
53520
53526
"version": "1.0.0",
53521
53527
},
53522
- "ws/node_modules/arg": Object {
53523
- "integrity": "sha512-+ytCkGcBtHZ3V2r2Z06AncYO8jz46UEamcspGoU8lHcEbpn6J77QK0vdWvChsclg/tM5XIJC5tnjmPp7Eq6Obg==",
53524
- "license": "MIT",
53525
- "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.2.tgz",
53526
- "version": "4.1.2",
53527
- },
53528
53528
},
53529
53529
"requires": true,
53530
53530
}
You can’t perform that action at this time.
0 commit comments