Skip to content

build: update to latest angular version and fix snapshot CI jobs #24198

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.

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

Merged
merged 2 commits into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@
},
"version": "13.2.0-next.1",
"dependencies": {
"@angular/animations": "^13.1.0",
"@angular/common": "^13.1.0",
"@angular/compiler": "^13.1.0",
"@angular/core": "^13.1.0",
"@angular/forms": "^13.1.0",
"@angular/platform-browser": "^13.1.0",
"@angular/animations": "^13.2.0-next.2",
"@angular/common": "^13.2.0-next.2",
"@angular/compiler": "^13.2.0-next.2",
"@angular/core": "^13.2.0-next.2",
"@angular/forms": "^13.2.0-next.2",
"@angular/platform-browser": "^13.2.0-next.2",
"@types/google.maps": "^3.45.6",
"@types/youtube": "^0.0.42",
"core-js-bundle": "^3.8.2",
Expand All @@ -68,17 +68,17 @@
"zone.js": "~0.11.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "^13.1.0",
"@angular-devkit/core": "^13.1.0",
"@angular-devkit/schematics": "^13.1.0",
"@angular/bazel": "^13.1.0",
"@angular/cli": "^13.1.0",
"@angular/compiler-cli": "^13.1.0",
"@angular-devkit/build-angular": "^13.2.0-next.1",
"@angular-devkit/core": "^13.2.0-next.1",
"@angular-devkit/schematics": "^13.2.0-next.1",
"@angular/bazel": "^13.2.0-next.2",
"@angular/cli": "^13.2.0-next.1",
"@angular/compiler-cli": "^13.2.0-next.2",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#c55a3937d45945489714273bfbbe9b803ceff89e",
"@angular/localize": "^13.1.0",
"@angular/platform-browser-dynamic": "^13.1.0",
"@angular/platform-server": "^13.1.0",
"@angular/router": "^13.1.0",
"@angular/localize": "^13.2.0-next.2",
"@angular/platform-browser-dynamic": "^13.2.0-next.2",
"@angular/platform-server": "^13.2.0-next.2",
"@angular/router": "^13.2.0-next.2",
"@axe-core/webdriverjs": "^4.1.0",
"@babel/core": "^7.16.0",
"@bazel/bazelisk": "1.10.1",
Expand Down Expand Up @@ -143,7 +143,7 @@
"@octokit/rest": "18.3.5",
"@rollup/plugin-commonjs": "^21.0.0",
"@rollup/plugin-node-resolve": "^13.0.5",
"@schematics/angular": "^13.1.0",
"@schematics/angular": "^13.2.0-next.1",
"@types/babel__core": "^7.1.16",
"@types/browser-sync": "^2.26.1",
"@types/fs-extra": "^9.0.5",
Expand Down
14 changes: 8 additions & 6 deletions tools/postinstall/devmode-es2020-bazel.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
diff --git node_modules/@angular/bazel/src/ng_module/ng_module.bzl node_modules/@angular/bazel//src/ng_module/ng_module.bzl
index 3520997..adf46e8 100644
--- node_modules/@angular/bazel//src/ng_module/ng_module.bzl
+++ node_modules/@angular/bazel//src/ng_module/ng_module.bzl
@@ -401,6 +401,9 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
if not is_devmode:
--- node_modules/@angular/bazel/src/ng_module/ng_module.bzl
+++ node_modules/@angular/bazel/src/ng_module/ng_module.bzl
@@ -276,9 +276,8 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
# Note: Keep in sync with the `prodmode_target` for `ts_library` in `tools/defaults.bzl`
tsconfig["compilerOptions"]["target"] = "es2020"
+ else:
else:
- # For devmode output, we use ES2015 to match with what `ts_library` produces by default.
- # https://github.com/bazelbuild/rules_nodejs/blob/9b36274dba34204625579463e3da054a9f42cb47/packages/typescript/internal/build_defs.bzl#L83.
- tsconfig["compilerOptions"]["target"] = "es2015"
+ tsconfig["compilerOptions"]["target"] = "es2020"
+ tsconfig["compilerOptions"]["module"] = "esnext"

return tsconfig

Loading