From cabca3593920e63d6650993165eefe48e83f60ea Mon Sep 17 00:00:00 2001 From: Michal Piechowiak Date: Tue, 19 Nov 2024 18:53:46 +0100 Subject: [PATCH 1/2] ci: update packages from both angular and angular-cli monorepos in same PR --- renovate.json5 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 44207d26..b6488689 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -17,8 +17,9 @@ { description: 'Stable & unstable Angular bumps in test fixtures', matchFileNames: ['tests/**/fixtures/**/package.json'], - // See https://docs.renovatebot.com/presets-monorepo/#monorepoangular. - matchSourceUrls: ['https://github.com/angular/angular'], + // See https://docs.renovatebot.com/presets-monorepo/#monorepoangular and https://docs.renovatebot.com/presets-monorepo/#monorepoangular-cli. + // packages from both monorepos should be bumped together + matchSourceUrls: ['https://github.com/angular/angular', 'https://github.com/angular/angular-cli'], // Override the schedule to get immediate PRs. schedule: null, // Apply a unique label so we can trigger additional workflows for these PRs. From 287325d0da070d961408a3e09e2ba3fbba38bd1e Mon Sep 17 00:00:00 2001 From: pieh Date: Tue, 19 Nov 2024 19:54:12 +0100 Subject: [PATCH 2/2] chore: pin zone.js in pre-19 fixtures to avoid bumping it by renovate --- tests/fixtures/angular-17/package.json | 2 +- tests/fixtures/application-builder/package.json | 4 ++-- tests/fixtures/browser-builder/package.json | 4 ++-- tests/fixtures/prerender-false/package.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/fixtures/angular-17/package.json b/tests/fixtures/angular-17/package.json index a1a2f927..3f2d3001 100644 --- a/tests/fixtures/angular-17/package.json +++ b/tests/fixtures/angular-17/package.json @@ -24,7 +24,7 @@ "express": "^4.18.2", "rxjs": "~7.8.0", "tslib": "^2.3.0", - "zone.js": "~0.14.3" + "zone.js": "0.14.7" }, "devDependencies": { "@angular-devkit/build-angular": "17.3.8", diff --git a/tests/fixtures/application-builder/package.json b/tests/fixtures/application-builder/package.json index 46aa3589..e2613bf0 100644 --- a/tests/fixtures/application-builder/package.json +++ b/tests/fixtures/application-builder/package.json @@ -21,7 +21,7 @@ "@netlify/angular-runtime": "file:../../..", "rxjs": "~7.8.0", "tslib": "^2.3.0", - "zone.js": "~0.14.2" + "zone.js": "0.14.7" }, "devDependencies": { "@angular-devkit/build-angular": "^18.0.2", @@ -36,4 +36,4 @@ "karma-jasmine-html-reporter": "~2.1.0", "typescript": "~5.4.5" } -} \ No newline at end of file +} diff --git a/tests/fixtures/browser-builder/package.json b/tests/fixtures/browser-builder/package.json index 46aa3589..e2613bf0 100644 --- a/tests/fixtures/browser-builder/package.json +++ b/tests/fixtures/browser-builder/package.json @@ -21,7 +21,7 @@ "@netlify/angular-runtime": "file:../../..", "rxjs": "~7.8.0", "tslib": "^2.3.0", - "zone.js": "~0.14.2" + "zone.js": "0.14.7" }, "devDependencies": { "@angular-devkit/build-angular": "^18.0.2", @@ -36,4 +36,4 @@ "karma-jasmine-html-reporter": "~2.1.0", "typescript": "~5.4.5" } -} \ No newline at end of file +} diff --git a/tests/fixtures/prerender-false/package.json b/tests/fixtures/prerender-false/package.json index 025c9a39..303abd18 100644 --- a/tests/fixtures/prerender-false/package.json +++ b/tests/fixtures/prerender-false/package.json @@ -24,7 +24,7 @@ "express": "^4.18.2", "rxjs": "~7.8.0", "tslib": "^2.3.0", - "zone.js": "~0.14.3" + "zone.js": "0.14.7" }, "devDependencies": { "@angular-devkit/build-angular": "^18.0.2", @@ -42,4 +42,4 @@ "karma-jasmine-html-reporter": "~2.1.0", "typescript": "~5.4.5" } -} \ No newline at end of file +}