Skip to content

Commit aed4487

Browse files
committed
fix(@angular/cli): expand package groups for newly added peer dependencies in update schematic
Previously, the package group stabilization loop ran completely before the peer dependencies resolution loop. If a peer dependency was newly added during the peer dependencies loop (e.g., @angular/core), its corresponding package group members (e.g., @angular/router) were never expanded, leaving them at outdated versions. Now, wrap the package group and peer dependencies stabilization logic in a single outer loop so that newly added peer dependencies are also stabilized and their package groups are correctly expanded. (cherry picked from commit 4b1b899)
1 parent 287e4e8 commit aed4487

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

  • packages/angular/cli/src/commands/update/schematic

packages/angular/cli/src/commands/update/schematic/index.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -882,14 +882,16 @@ export default function (options: UpdateSchema): Rule {
882882
let lastPackagesSize;
883883
do {
884884
lastPackagesSize = packages.size;
885-
npmPackageJsonMap.forEach((npmPackageJson) => {
886-
_addPackageGroup(tree, packages, npmDeps, npmPackageJson, logger);
887-
});
888-
} while (packages.size > lastPackagesSize);
889885

890-
// This is done in seperate loop to ensure that package groups are added before peer dependencies.
891-
do {
892-
lastPackagesSize = packages.size;
886+
let lastGroupSize;
887+
do {
888+
lastGroupSize = packages.size;
889+
npmPackageJsonMap.forEach((npmPackageJson) => {
890+
_addPackageGroup(tree, packages, npmDeps, npmPackageJson, logger);
891+
});
892+
} while (packages.size > lastGroupSize);
893+
894+
// This is done in seperate loop to ensure that package groups are added before peer dependencies.
893895
npmPackageJsonMap.forEach((npmPackageJson) => {
894896
_addPeerDependencies(tree, packages, npmDeps, npmPackageJson, npmPackageJsonMap, logger);
895897
});

0 commit comments

Comments
 (0)