Skip to content

fix(arborist): inherit overrides from fsParent #8108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix(arborist): inherit overrides from fsParent #8108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b821eb0
chore(arborist): run tests to update snapshots
TrevorBurnham Feb 18, 2025
e8bd8bc
test(arborist): add load-virtual and reify tests to demonstrate #4205
TrevorBurnham Feb 18, 2025
7e510a1
fix(arborist): inherit overrides from fsParent
TrevorBurnham Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions workspaces/arborist/lib/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,8 +822,12 @@ class Node {
target.root = root
}

if (!this.overrides && this.parent && this.parent.overrides) {
this.overrides = this.parent.overrides.getNodeRule(this)
if (!this.overrides) {
if (this.parent && this.parent.overrides) {
this.overrides = this.parent.overrides.getNodeRule(this)
} else if (this.fsParent && this.fsParent.overrides) {
this.overrides = this.fsParent.overrides.getNodeRule(this)
}
}
// tree should always be valid upon root setter completion.
treeCheck(this)
Expand Down
231 changes: 0 additions & 231 deletions workspaces/arborist/tap-snapshots/test/arborist/load-actual.js.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6161,237 +6161,6 @@ ArboristNode {
}
`

exports[`test/arborist/load-actual.js TAP selflink > loaded tree 1`] = `
ArboristNode {
"children": Map {
"@scope/y" => ArboristNode {
"edgesIn": Set {
EdgeIn {
"from": "",
"name": "@scope/y",
"spec": "*",
"type": "prod",
},
},
"edgesOut": Map {
"foo" => EdgeOut {
"name": "foo",
"spec": "*",
"to": "node_modules/foo",
"type": "prod",
},
},
"location": "node_modules/@scope/y",
"name": "@scope/y",
"path": "selflink/node_modules/@scope/y",
"version": "1.2.3",
},
"@scope/z" => ArboristNode {
"children": Map {
"glob" => ArboristLink {
"dev": true,
"edgesIn": Set {
EdgeIn {
"from": "node_modules/@scope/z",
"name": "glob",
"spec": "4",
"type": "prod",
},
},
"extraneous": true,
"location": "node_modules/@scope/z/node_modules/glob",
"name": "glob",
"optional": true,
"path": "selflink/node_modules/@scope/z/node_modules/glob",
"peer": true,
"realpath": "selflink/node_modules/foo/node_modules/glob",
"resolved": "file:../../../foo/node_modules/glob",
"target": ArboristNode {
"children": Map {
"graceful-fs" => ArboristNode {
"dev": true,
"extraneous": true,
"location": "node_modules/foo/node_modules/glob/node_modules/graceful-fs",
"name": "graceful-fs",
"optional": true,
"path": "selflink/node_modules/foo/node_modules/glob/node_modules/graceful-fs",
"peer": true,
"version": "3.0.2",
},
"inherits" => ArboristNode {
"dev": true,
"extraneous": true,
"location": "node_modules/foo/node_modules/glob/node_modules/inherits",
"name": "inherits",
"optional": true,
"path": "selflink/node_modules/foo/node_modules/glob/node_modules/inherits",
"peer": true,
"version": "2.0.1",
},
"minimatch" => ArboristNode {
"children": Map {
"lru-cache" => ArboristNode {
"dev": true,
"extraneous": true,
"location": "node_modules/foo/node_modules/glob/node_modules/minimatch/node_modules/lru-cache",
"name": "lru-cache",
"optional": true,
"path": "selflink/node_modules/foo/node_modules/glob/node_modules/minimatch/node_modules/lru-cache",
"peer": true,
"version": "2.5.0",
},
"sigmund" => ArboristNode {
"dev": true,
"extraneous": true,
"location": "node_modules/foo/node_modules/glob/node_modules/minimatch/node_modules/sigmund",
"name": "sigmund",
"optional": true,
"path": "selflink/node_modules/foo/node_modules/glob/node_modules/minimatch/node_modules/sigmund",
"peer": true,
"version": "1.0.0",
},
},
"dev": true,
"extraneous": true,
"location": "node_modules/foo/node_modules/glob/node_modules/minimatch",
"name": "minimatch",
"optional": true,
"path": "selflink/node_modules/foo/node_modules/glob/node_modules/minimatch",
"peer": true,
"version": "1.0.0",
},
"once" => ArboristNode {
"dev": true,
"extraneous": true,
"location": "node_modules/foo/node_modules/glob/node_modules/once",
"name": "once",
"optional": true,
"path": "selflink/node_modules/foo/node_modules/glob/node_modules/once",
"peer": true,
"version": "1.3.0",
},
},
"edgesIn": Set {
EdgeIn {
"from": "node_modules/foo",
"name": "glob",
"spec": "4",
"type": "prod",
},
},
"location": "node_modules/foo/node_modules/glob",
"name": "glob",
"path": "selflink/node_modules/foo/node_modules/glob",
"version": "4.0.5",
},
"version": "4.0.5",
},
},
"dev": true,
"edgesOut": Map {
"glob" => EdgeOut {
"name": "glob",
"spec": "4",
"to": "node_modules/@scope/z/node_modules/glob",
"type": "prod",
},
},
"extraneous": true,
"location": "node_modules/@scope/z",
"name": "@scope/z",
"optional": true,
"path": "selflink/node_modules/@scope/z",
"peer": true,
"version": "1.2.3",
},
"foo" => ArboristNode {
"children": Map {
"glob" => ArboristNode {
"location": "node_modules/foo/node_modules/glob",
},
"selflink" => ArboristLink {
"edgesIn": Set {
EdgeIn {
"from": "node_modules/foo",
"name": "selflink",
"spec": "*",
"type": "prod",
},
},
"location": "node_modules/foo/node_modules/selflink",
"name": "selflink",
"path": "selflink/node_modules/foo/node_modules/selflink",
"realpath": "selflink",
"resolved": "file:../../..",
"target": ArboristNode {
"location": "",
},
"version": "1.2.3",
},
},
"edgesIn": Set {
EdgeIn {
"from": "",
"name": "foo",
"spec": "*",
"type": "prod",
},
EdgeIn {
"from": "node_modules/@scope/y",
"name": "foo",
"spec": "*",
"type": "prod",
},
},
"edgesOut": Map {
"glob" => EdgeOut {
"name": "glob",
"spec": "4",
"to": "node_modules/foo/node_modules/glob",
"type": "prod",
},
"selflink" => EdgeOut {
"name": "selflink",
"spec": "*",
"to": "node_modules/foo/node_modules/selflink",
"type": "prod",
},
},
"location": "node_modules/foo",
"name": "foo",
"path": "selflink/node_modules/foo",
"version": "1.2.3",
},
},
"edgesOut": Map {
"@scope/x" => EdgeOut {
"error": "MISSING",
"name": "@scope/x",
"spec": "*",
"to": null,
"type": "prod",
},
"@scope/y" => EdgeOut {
"name": "@scope/y",
"spec": "*",
"to": "node_modules/@scope/y",
"type": "prod",
},
"foo" => EdgeOut {
"name": "foo",
"spec": "*",
"to": "node_modules/foo",
"type": "prod",
},
},
"isProjectRoot": true,
"location": "",
"name": "selflink",
"path": "selflink",
"version": "1.2.3",
}
`

exports[`test/arborist/load-actual.js TAP shake out Link target timing issue > loaded tree 1`] = `
ArboristNode {
"children": Map {
Expand Down
89 changes: 89 additions & 0 deletions workspaces/arborist/tap-snapshots/test/arborist/load-virtual.js.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16375,6 +16375,95 @@ ArboristNode {
}
`

exports[`test/arborist/load-virtual.js TAP workspaces load installed workspace with dependency overrides > virtual tree with overrides 1`] = `
ArboristNode {
"children": Map {
"arg" => ArboristNode {
"edgesIn": Set {
EdgeIn {
"from": "ws",
"name": "arg",
"override": "4.1.3",
"spec": "4.1.2",
"type": "prod",
},
},
"location": "node_modules/arg",
"name": "arg",
"overrides": Map {
"arg" => "4.1.3",
},
"path": "{CWD}/test/fixtures/workspaces-with-overrides/node_modules/arg",
"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
"version": "4.1.3",
},
"ws" => ArboristLink {
"edgesIn": Set {
EdgeIn {
"from": "",
"name": "ws",
"spec": "file:{CWD}/test/fixtures/workspaces-with-overrides/ws",
"type": "workspace",
},
},
"isWorkspace": true,
"location": "node_modules/ws",
"name": "ws",
"overrides": Map {
"arg" => "4.1.3",
},
"path": "{CWD}/test/fixtures/workspaces-with-overrides/node_modules/ws",
"realpath": "{CWD}/test/fixtures/workspaces-with-overrides/ws",
"resolved": "file:../ws",
"target": ArboristNode {
"location": "ws",
},
"version": "1.0.0",
},
},
"edgesOut": Map {
"ws" => EdgeOut {
"name": "ws",
"spec": "file:{CWD}/test/fixtures/workspaces-with-overrides/ws",
"to": "node_modules/ws",
"type": "workspace",
},
},
"fsChildren": Set {
ArboristNode {
"edgesOut": Map {
"arg" => EdgeOut {
"name": "arg",
"override": "4.1.3",
"spec": "4.1.2",
"to": "node_modules/arg",
"type": "prod",
},
},
"isWorkspace": true,
"location": "ws",
"name": "ws",
"overrides": Map {
"arg" => "4.1.3",
},
"path": "{CWD}/test/fixtures/workspaces-with-overrides/ws",
"version": "1.0.0",
},
},
"isProjectRoot": true,
"location": "",
"name": "workspaces-with-overrides",
"overrides": Map {
"arg" => "4.1.3",
},
"packageName": "workspace-with-overrides",
"path": "{CWD}/test/fixtures/workspaces-with-overrides",
"workspaces": Map {
"ws" => "ws",
},
}
`

exports[`test/arborist/load-virtual.js TAP workspaces load installed workspace with transitive dependencies > virtual tree with transitive deps 1`] = `
ArboristNode {
"children": Map {
Expand Down
33 changes: 33 additions & 0 deletions workspaces/arborist/tap-snapshots/test/arborist/reify.js.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53497,6 +53497,39 @@ Object {
}
`

exports[`test/arborist/reify.js TAP workspaces reify workspaces with overrides > should retain override version (4.1.3) 1`] = `
Object {
"lockfileVersion": 3,
"name": "workspace-with-overrides",
"packages": Object {
"": Object {
"name": "workspace-with-overrides",
"workspaces": Array [
"ws",
],
},
"node_modules/a": Object {
"link": true,
"resolved": "ws",
},
"node_modules/arg": Object {
"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
"license": "MIT",
"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
"version": "4.1.3",
},
"ws": Object {
"dependencies": Object {
"arg": "4.1.2",
},
"name": "a",
"version": "1.0.0",
},
},
"requires": true,
}
`

exports[`test/arborist/reify.js TAP workspaces root as-a-workspace > should produce expected package-lock file 1`] = `
Object {
"lockfileVersion": 3,
Expand Down
Loading
Loading