Skip to content

Commit 368949c

Browse files
leosvelperezleosvelperez
committed
feat(angular): support angular 20.0.0-rc.2
1 parent ae417aa commit 368949c

File tree

11 files changed

+1089
-1590
lines changed

11 files changed

+1089
-1590
lines changed

‎docs/generated/manifests/nx-api.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -444,14 +444,14 @@
444444
}
445445
},
446446
"migrations": {
447-
"/nx-api/angular/migrations/update-angular-cli-version-20-0-0-rc-0": {
448-
"description": "Update the @angular/cli package version to 20.0.0-rc.0.",
449-
"file": "generated/packages/angular/migrations/update-angular-cli-version-20-0-0-rc-0.json",
447+
"/nx-api/angular/migrations/update-angular-cli-version-20-0-0-rc-2": {
448+
"description": "Update the @angular/cli package version to 20.0.0-rc.2.",
449+
"file": "generated/packages/angular/migrations/update-angular-cli-version-20-0-0-rc-2.json",
450450
"hidden": false,
451-
"name": "update-angular-cli-version-20-0-0-rc-0",
451+
"name": "update-angular-cli-version-20-0-0-rc-2",
452452
"version": "21.2.0-beta.0",
453453
"originalFilePath": "/packages/angular",
454-
"path": "/nx-api/angular/migrations/update-angular-cli-version-20-0-0-rc-0",
454+
"path": "/nx-api/angular/migrations/update-angular-cli-version-20-0-0-rc-2",
455455
"type": "migration"
456456
},
457457
"/nx-api/angular/migrations/migrate-provide-server-rendering-import": {

‎docs/generated/packages-metadata.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,13 +440,13 @@
440440
],
441441
"migrations": [
442442
{
443-
"description": "Update the @angular/cli package version to 20.0.0-rc.0.",
444-
"file": "generated/packages/angular/migrations/update-angular-cli-version-20-0-0-rc-0.json",
443+
"description": "Update the @angular/cli package version to 20.0.0-rc.2.",
444+
"file": "generated/packages/angular/migrations/update-angular-cli-version-20-0-0-rc-2.json",
445445
"hidden": false,
446-
"name": "update-angular-cli-version-20-0-0-rc-0",
446+
"name": "update-angular-cli-version-20-0-0-rc-2",
447447
"version": "21.2.0-beta.0",
448448
"originalFilePath": "/packages/angular",
449-
"path": "angular/migrations/update-angular-cli-version-20-0-0-rc-0",
449+
"path": "angular/migrations/update-angular-cli-version-20-0-0-rc-2",
450450
"type": "migration"
451451
},
452452
{

‎docs/generated/packages/angular/migrations/21.2.0-package-updates.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,58 @@
22
"name": "21.2.0-package-updates",
33
"version": "21.2.0-beta.0",
44
"x-prompt": "Do you want to update the Angular version to v20?",
5-
"requires": { "@angular/core": ">=19.2.0 <20.0.0-rc.0" },
5+
"requires": { "@angular/core": ">=19.2.0 <20.0.0-rc.1" },
66
"packages": {
77
"@angular-devkit/build-angular": {
8-
"version": "20.0.0-rc.0",
8+
"version": "20.0.0-rc.2",
99
"alwaysAddToPackageJson": false
1010
},
1111
"@angular-devkit/core": {
12-
"version": "20.0.0-rc.0",
12+
"version": "20.0.0-rc.2",
1313
"alwaysAddToPackageJson": false
1414
},
1515
"@angular-devkit/schematics": {
16-
"version": "20.0.0-rc.0",
16+
"version": "20.0.0-rc.2",
1717
"alwaysAddToPackageJson": false
1818
},
1919
"@angular/build": {
20-
"version": "20.0.0-rc.0",
20+
"version": "20.0.0-rc.2",
2121
"alwaysAddToPackageJson": false
2222
},
2323
"@angular/pwa": {
24-
"version": "20.0.0-rc.0",
24+
"version": "20.0.0-rc.2",
2525
"alwaysAddToPackageJson": false
2626
},
2727
"@angular/ssr": {
28-
"version": "20.0.0-rc.0",
28+
"version": "20.0.0-rc.2",
2929
"alwaysAddToPackageJson": false
3030
},
3131
"@schematics/angular": {
32-
"version": "20.0.0-rc.0",
32+
"version": "20.0.0-rc.2",
3333
"alwaysAddToPackageJson": false
3434
},
3535
"@angular-devkit/architect": {
36-
"version": "0.2000.0-rc.0",
36+
"version": "0.2000.0-rc.2",
3737
"alwaysAddToPackageJson": false
3838
},
3939
"@angular-devkit/build-webpack": {
40-
"version": "0.2000.0-rc.0",
40+
"version": "0.2000.0-rc.2",
4141
"alwaysAddToPackageJson": false
4242
},
4343
"@angular/core": {
44-
"version": "20.0.0-rc.0",
44+
"version": "20.0.0-rc.1",
4545
"alwaysAddToPackageJson": true
4646
},
4747
"@angular/material": {
48-
"version": "20.0.0-rc.0",
48+
"version": "20.0.0-rc.1",
4949
"alwaysAddToPackageJson": false
5050
},
5151
"@angular/cdk": {
52-
"version": "20.0.0-rc.0",
52+
"version": "20.0.0-rc.1",
5353
"alwaysAddToPackageJson": false
5454
},
5555
"@angular/google-maps": {
56-
"version": "20.0.0-rc.0",
56+
"version": "20.0.0-rc.1",
5757
"alwaysAddToPackageJson": false
5858
},
5959
"ng-packagr": { "version": "20.0.0-rc.0", "alwaysAddToPackageJson": false }

‎docs/generated/packages/angular/migrations/update-angular-cli-version-20-0-0-rc-0.json renamed to ‎docs/generated/packages/angular/migrations/update-angular-cli-version-20-0-0-rc-2.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"name": "update-angular-cli-version-20-0-0-rc-0",
2+
"name": "update-angular-cli-version-20-0-0-rc-2",
33
"cli": "nx",
44
"version": "21.2.0-beta.0",
5-
"requires": { "@angular/core": ">=20.0.0-rc.0" },
6-
"description": "Update the @angular/cli package version to 20.0.0-rc.0.",
5+
"requires": { "@angular/core": ">=20.0.0-rc.1" },
6+
"description": "Update the @angular/cli package version to 20.0.0-rc.2.",
77
"factory": "./src/migrations/update-21-2-0/update-angular-cli",
88
"implementation": "/packages/angular/src/migrations/update-21-2-0/update-angular-cli.ts",
99
"aliases": [],

‎package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@
2828
},
2929
"devDependencies": {
3030
"@actions/core": "^1.10.0",
31-
"@angular-devkit/architect": "0.2000.0-rc.0",
32-
"@angular-devkit/build-angular": "20.0.0-rc.0",
33-
"@angular-devkit/core": "20.0.0-rc.0",
34-
"@angular-devkit/schematics": "20.0.0-rc.0",
31+
"@angular-devkit/architect": "0.2000.0-rc.2",
32+
"@angular-devkit/build-angular": "20.0.0-rc.2",
33+
"@angular-devkit/core": "20.0.0-rc.2",
34+
"@angular-devkit/schematics": "20.0.0-rc.2",
3535
"@angular-eslint/eslint-plugin": "19.2.0",
3636
"@angular-eslint/eslint-plugin-template": "19.2.0",
3737
"@angular-eslint/template-parser": "19.2.0",
38-
"@angular/build": "20.0.0-rc.0",
39-
"@angular/cli": "20.0.0-rc.0",
40-
"@angular/common": "20.0.0-rc.0",
41-
"@angular/compiler": "20.0.0-rc.0",
42-
"@angular/compiler-cli": "20.0.0-rc.0",
43-
"@angular/core": "20.0.0-rc.0",
44-
"@angular/platform-browser": "20.0.0-rc.0",
45-
"@angular/router": "20.0.0-rc.0",
38+
"@angular/build": "20.0.0-rc.2",
39+
"@angular/cli": "20.0.0-rc.2",
40+
"@angular/common": "20.0.0-rc.1",
41+
"@angular/compiler": "20.0.0-rc.1",
42+
"@angular/compiler-cli": "20.0.0-rc.1",
43+
"@angular/core": "20.0.0-rc.1",
44+
"@angular/platform-browser": "20.0.0-rc.1",
45+
"@angular/router": "20.0.0-rc.1",
4646
"@astrojs/check": "^0.7.0",
4747
"@astrojs/react": "^3.6.2",
4848
"@babel/core": "^7.23.2",
@@ -116,7 +116,7 @@
116116
"@rspack/dev-server": "1.1.1",
117117
"@rspack/plugin-minify": "^0.7.5",
118118
"@rspack/plugin-react-refresh": "^1.0.0",
119-
"@schematics/angular": "20.0.0-rc.0",
119+
"@schematics/angular": "20.0.0-rc.2",
120120
"@storybook/addon-essentials": "8.4.6",
121121
"@storybook/addon-interactions": "8.4.6",
122122
"@storybook/core-server": "8.4.6",

‎packages/angular/migrations.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -303,13 +303,13 @@
303303
"description": "Change the data persistence operator imports to '@ngrx/router-store/data-persistence'.",
304304
"factory": "./src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence"
305305
},
306-
"update-angular-cli-version-20-0-0-rc-0": {
306+
"update-angular-cli-version-20-0-0-rc-2": {
307307
"cli": "nx",
308308
"version": "21.2.0-beta.0",
309309
"requires": {
310-
"@angular/core": ">=20.0.0-rc.0"
310+
"@angular/core": ">=20.0.0-rc.1"
311311
},
312-
"description": "Update the @angular/cli package version to 20.0.0-rc.0.",
312+
"description": "Update the @angular/cli package version to 20.0.0-rc.2.",
313313
"factory": "./src/migrations/update-21-2-0/update-angular-cli"
314314
},
315315
"migrate-provide-server-rendering-import": {
@@ -1645,59 +1645,59 @@
16451645
"version": "21.2.0-beta.0",
16461646
"x-prompt": "Do you want to update the Angular version to v20?",
16471647
"requires": {
1648-
"@angular/core": ">=19.2.0 <20.0.0-rc.0"
1648+
"@angular/core": ">=19.2.0 <20.0.0-rc.1"
16491649
},
16501650
"packages": {
16511651
"@angular-devkit/build-angular": {
1652-
"version": "20.0.0-rc.0",
1652+
"version": "20.0.0-rc.2",
16531653
"alwaysAddToPackageJson": false
16541654
},
16551655
"@angular-devkit/core": {
1656-
"version": "20.0.0-rc.0",
1656+
"version": "20.0.0-rc.2",
16571657
"alwaysAddToPackageJson": false
16581658
},
16591659
"@angular-devkit/schematics": {
1660-
"version": "20.0.0-rc.0",
1660+
"version": "20.0.0-rc.2",
16611661
"alwaysAddToPackageJson": false
16621662
},
16631663
"@angular/build": {
1664-
"version": "20.0.0-rc.0",
1664+
"version": "20.0.0-rc.2",
16651665
"alwaysAddToPackageJson": false
16661666
},
16671667
"@angular/pwa": {
1668-
"version": "20.0.0-rc.0",
1668+
"version": "20.0.0-rc.2",
16691669
"alwaysAddToPackageJson": false
16701670
},
16711671
"@angular/ssr": {
1672-
"version": "20.0.0-rc.0",
1672+
"version": "20.0.0-rc.2",
16731673
"alwaysAddToPackageJson": false
16741674
},
16751675
"@schematics/angular": {
1676-
"version": "20.0.0-rc.0",
1676+
"version": "20.0.0-rc.2",
16771677
"alwaysAddToPackageJson": false
16781678
},
16791679
"@angular-devkit/architect": {
1680-
"version": "0.2000.0-rc.0",
1680+
"version": "0.2000.0-rc.2",
16811681
"alwaysAddToPackageJson": false
16821682
},
16831683
"@angular-devkit/build-webpack": {
1684-
"version": "0.2000.0-rc.0",
1684+
"version": "0.2000.0-rc.2",
16851685
"alwaysAddToPackageJson": false
16861686
},
16871687
"@angular/core": {
1688-
"version": "20.0.0-rc.0",
1688+
"version": "20.0.0-rc.1",
16891689
"alwaysAddToPackageJson": true
16901690
},
16911691
"@angular/material": {
1692-
"version": "20.0.0-rc.0",
1692+
"version": "20.0.0-rc.1",
16931693
"alwaysAddToPackageJson": false
16941694
},
16951695
"@angular/cdk": {
1696-
"version": "20.0.0-rc.0",
1696+
"version": "20.0.0-rc.1",
16971697
"alwaysAddToPackageJson": false
16981698
},
16991699
"@angular/google-maps": {
1700-
"version": "20.0.0-rc.0",
1700+
"version": "20.0.0-rc.1",
17011701
"alwaysAddToPackageJson": false
17021702
},
17031703
"ng-packagr": {

‎packages/angular/plugins/component-testing.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@ function normalizeBuildTargetOptions(
195195
},
196196
buildContext
197197
);
198-
const buildOptions = withSchemaDefaults(options);
198+
const project =
199+
buildContext.projectsConfigurations.projects[buildContext.projectName];
200+
const buildOptions = withSchemaDefaults(options, project, buildContext.root);
199201

200202
// cypress creates a tsconfig if one isn't preset
201203
// that contains all the support required for angular and component tests
@@ -305,9 +307,18 @@ Note: this may fail, setting the correct 'sourceRoot' for ${buildContext.project
305307
};
306308
}
307309

308-
function withSchemaDefaults(options: any): BrowserBuilderSchema {
310+
function withSchemaDefaults(
311+
options: any,
312+
project: ProjectConfiguration,
313+
workspaceRoot: string
314+
): BrowserBuilderSchema {
309315
if (!options.main && !options.browser) {
310-
throw new Error('Missing executor options "main" and "browser"');
316+
const sourceRoot =
317+
project.sourceRoot ?? joinPathFragments(project.root, 'src');
318+
options.browser = joinPathFragments(sourceRoot, 'main.ts');
319+
if (!existsSync(join(workspaceRoot, options.browser))) {
320+
throw new Error('Missing executor options "main" and "browser"');
321+
}
311322
}
312323
if (!options.index) {
313324
throw new Error('Missing executor options "index"');

‎packages/angular/src/migrations/update-21-2-0/update-angular-cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { formatFiles, Tree, updateJson } from '@nx/devkit';
22

3-
export const angularCliVersion = '20.0.0-rc.0';
3+
export const angularCliVersion = '20.0.0-rc.2';
44

55
export default async function (tree: Tree) {
66
let shouldFormat = false;

‎packages/angular/src/utils/versions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const nxVersion = require('../../package.json').version;
22

3-
export const angularVersion = '20.0.0-rc.0';
4-
export const angularDevkitVersion = '20.0.0-rc.0';
3+
export const angularVersion = '20.0.0-rc.1';
4+
export const angularDevkitVersion = '20.0.0-rc.2';
55
export const ngPackagrVersion = '20.0.0-rc.0';
66
export const angularRspackVersion = '^20.7.0';
77
export const ngrxVersion = '^19.0.0';

‎packages/workspace/src/utils/versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ export const typescriptVersion = '~5.8.2';
44

55
// TODO: remove when preset generation is reworked and
66
// deps are not installed from workspace
7-
export const angularCliVersion = '20.0.0-rc.0';
7+
export const angularCliVersion = '20.0.0-rc.2';

0 commit comments

Comments
 (0)