Skip to content

fix: make sure hoistingLimits are not bypassed #7189

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

Open
Knagis wants to merge 3 commits into
base: master
Choose a base branch
from
+43 −2
Open

fix: make sure hoistingLimits are not bypassed #7189

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
c9cf3e9
fix: make sure hoistingLimits are not bypassed
Knagis Jun 18, 2026
bc03f57
add .yarn/versions file
Knagis Jun 18, 2026
d1185dc
add unit test for hoistingLimits fix
Knagis Jun 18, 2026
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
25 changes: 25 additions & 0 deletions .yarn/versions/3bda9cd7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
releases:
"@yarnpkg/cli": patch
"@yarnpkg/nm": patch
"@yarnpkg/plugin-nm": patch

declined:
- "@yarnpkg/plugin-compat"
- "@yarnpkg/plugin-constraints"
- "@yarnpkg/plugin-dlx"
- "@yarnpkg/plugin-essentials"
- "@yarnpkg/plugin-init"
- "@yarnpkg/plugin-interactive-tools"
- "@yarnpkg/plugin-npm-cli"
- "@yarnpkg/plugin-pack"
- "@yarnpkg/plugin-patch"
- "@yarnpkg/plugin-pnp"
- "@yarnpkg/plugin-pnpm"
- "@yarnpkg/plugin-stage"
- "@yarnpkg/plugin-typescript"
- "@yarnpkg/plugin-version"
- "@yarnpkg/plugin-workspace-tools"
- "@yarnpkg/builder"
- "@yarnpkg/core"
- "@yarnpkg/doctor"
- "@yarnpkg/pnpify"
6 changes: 4 additions & 2 deletions packages/yarnpkg-nm/sources/hoist.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,6 @@ const cloneTree = (tree: HoisterTree, options: InternalHoistOptions): HoisterWor
const isSeen = !!workNode;
if (!workNode) {
const {name, identName, reference, peerNames, hoistPriority, dependencyKind} = node;
const dependenciesNmHoistingLimits = options.hoistingLimits.get(parentNode.locator);
workNode = {
name,
references: new Set([reference]),
Expand All @@ -814,7 +813,7 @@ const cloneTree = (tree: HoisterTree, options: InternalHoistOptions): HoisterWor
peerNames: new Set(peerNames),
reasons: new Map(),
decoupled: true,
isHoistBorder: dependenciesNmHoistingLimits ? dependenciesNmHoistingLimits.has(name) : false,
isHoistBorder: false,
hoistPriority: hoistPriority || 0,
dependencyKind: dependencyKind || HoisterDependencyKind.REGULAR,
hoistedFrom: new Map(),
Expand All @@ -823,6 +822,9 @@ const cloneTree = (tree: HoisterTree, options: InternalHoistOptions): HoisterWor
seenNodes.set(node, workNode);
}

if (!workNode.isHoistBorder && options.hoistingLimits.get(parentNode.locator)?.has(node.name))
workNode.isHoistBorder = true;

parentNode.dependencies.set(node.name, workNode);
parentNode.originalDependencies.set(node.name, workNode);

Expand Down
14 changes: 14 additions & 0 deletions packages/yarnpkg-nm/tests/hoist.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,4 +666,18 @@ describe(`hoist`, () => {
};
expect(getTreeHeight(hoist(toTree(tree), {check: true}))).toEqual(4);
});

it(`should hoistingLimits when top level dependency matches a transitive dependency`, () => {
// . -> A -> B -> C
// -> B -> C
// with hoistingLimits: dependencies, C should not be hoisted to the top
const tree = {
'.': {dependencies: [`A`, `B`]},
A: {dependencies: [`B`]},
B: {dependencies: [`C`]},
};
const hoistedTree = hoist(toTree(tree), {check: true, hoistingLimits: new Map([[`.@`, new Set([`A`, `B`])]])});
const C = Array.from(hoistedTree.dependencies).filter(x => x.name === `C`);
expect(C).toEqual([]);
});
});
Loading