Skip to content

Commit 5665657

Browse files
authored
build: update to latest angular version and fix snapshot CI jobs (#24198)
* build: update to latest angular version and fix snapshot CI jobs Updates to the latest Angular next release and fixes the snapshot CI jobs that way, accounting for the Angular Bazel changes that conflicted with our postinstall. * fixup! build: update to latest angular version and fix snapshot CI jobs Omit superfluous slash
1 parent 3ee1c64 commit 5665657

File tree

3 files changed

+958
-634
lines changed

3 files changed

+958
-634
lines changed

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
},
5353
"version": "13.2.0-next.1",
5454
"dependencies": {
55-
"@angular/animations": "^13.1.0",
56-
"@angular/common": "^13.1.0",
57-
"@angular/compiler": "^13.1.0",
58-
"@angular/core": "^13.1.0",
59-
"@angular/forms": "^13.1.0",
60-
"@angular/platform-browser": "^13.1.0",
55+
"@angular/animations": "^13.2.0-next.2",
56+
"@angular/common": "^13.2.0-next.2",
57+
"@angular/compiler": "^13.2.0-next.2",
58+
"@angular/core": "^13.2.0-next.2",
59+
"@angular/forms": "^13.2.0-next.2",
60+
"@angular/platform-browser": "^13.2.0-next.2",
6161
"@types/google.maps": "^3.45.6",
6262
"@types/youtube": "^0.0.42",
6363
"core-js-bundle": "^3.8.2",
@@ -68,17 +68,17 @@
6868
"zone.js": "~0.11.3"
6969
},
7070
"devDependencies": {
71-
"@angular-devkit/build-angular": "^13.1.0",
72-
"@angular-devkit/core": "^13.1.0",
73-
"@angular-devkit/schematics": "^13.1.0",
74-
"@angular/bazel": "^13.1.0",
75-
"@angular/cli": "^13.1.0",
76-
"@angular/compiler-cli": "^13.1.0",
71+
"@angular-devkit/build-angular": "^13.2.0-next.1",
72+
"@angular-devkit/core": "^13.2.0-next.1",
73+
"@angular-devkit/schematics": "^13.2.0-next.1",
74+
"@angular/bazel": "^13.2.0-next.2",
75+
"@angular/cli": "^13.2.0-next.1",
76+
"@angular/compiler-cli": "^13.2.0-next.2",
7777
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#c55a3937d45945489714273bfbbe9b803ceff89e",
78-
"@angular/localize": "^13.1.0",
79-
"@angular/platform-browser-dynamic": "^13.1.0",
80-
"@angular/platform-server": "^13.1.0",
81-
"@angular/router": "^13.1.0",
78+
"@angular/localize": "^13.2.0-next.2",
79+
"@angular/platform-browser-dynamic": "^13.2.0-next.2",
80+
"@angular/platform-server": "^13.2.0-next.2",
81+
"@angular/router": "^13.2.0-next.2",
8282
"@axe-core/webdriverjs": "^4.1.0",
8383
"@babel/core": "^7.16.0",
8484
"@bazel/bazelisk": "1.10.1",
@@ -143,7 +143,7 @@
143143
"@octokit/rest": "18.3.5",
144144
"@rollup/plugin-commonjs": "^21.0.0",
145145
"@rollup/plugin-node-resolve": "^13.0.5",
146-
"@schematics/angular": "^13.1.0",
146+
"@schematics/angular": "^13.2.0-next.1",
147147
"@types/babel__core": "^7.1.16",
148148
"@types/browser-sync": "^2.26.1",
149149
"@types/fs-extra": "^9.0.5",
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
diff --git node_modules/@angular/bazel/src/ng_module/ng_module.bzl node_modules/@angular/bazel//src/ng_module/ng_module.bzl
22
index 3520997..adf46e8 100644
3-
--- node_modules/@angular/bazel//src/ng_module/ng_module.bzl
4-
+++ node_modules/@angular/bazel//src/ng_module/ng_module.bzl
5-
@@ -401,6 +401,9 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
6-
if not is_devmode:
3+
--- node_modules/@angular/bazel/src/ng_module/ng_module.bzl
4+
+++ node_modules/@angular/bazel/src/ng_module/ng_module.bzl
5+
@@ -276,9 +276,8 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
76
# Note: Keep in sync with the `prodmode_target` for `ts_library` in `tools/defaults.bzl`
87
tsconfig["compilerOptions"]["target"] = "es2020"
9-
+ else:
8+
else:
9+
- # For devmode output, we use ES2015 to match with what `ts_library` produces by default.
10+
- # https://github.com/bazelbuild/rules_nodejs/blob/9b36274dba34204625579463e3da054a9f42cb47/packages/typescript/internal/build_defs.bzl#L83.
11+
- tsconfig["compilerOptions"]["target"] = "es2015"
1012
+ tsconfig["compilerOptions"]["target"] = "es2020"
1113
+ tsconfig["compilerOptions"]["module"] = "esnext"
1214

1315
return tsconfig
14-
16+

0 commit comments

Comments
 (0)