Skip to content

Commit afa29cf

Browse files
authored
build: update to latest angular version and cleanup postinstall patch (#20202)
Updates to the latest Angular version and removes postinstall patches which are no longer needed now.
1 parent fbfe4cb commit afa29cf

File tree

5 files changed

+94
-208
lines changed

5 files changed

+94
-208
lines changed

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
},
4949
"version": "10.2.0-next.0",
5050
"dependencies": {
51-
"@angular/animations": "^10.0.0",
52-
"@angular/common": "^10.0.0",
53-
"@angular/compiler": "^10.0.0",
54-
"@angular/core": "^10.0.0",
55-
"@angular/elements": "^10.0.0",
56-
"@angular/forms": "^10.0.0",
57-
"@angular/platform-browser": "^10.0.0",
51+
"@angular/animations": "^10.0.8",
52+
"@angular/common": "^10.0.8",
53+
"@angular/compiler": "^10.0.8",
54+
"@angular/core": "^10.0.8",
55+
"@angular/elements": "^10.0.8",
56+
"@angular/forms": "^10.0.8",
57+
"@angular/platform-browser": "^10.0.8",
5858
"@types/googlemaps": "^3.39.3",
5959
"@types/youtube": "^0.0.38",
6060
"@webcomponents/custom-elements": "^1.1.0",
@@ -67,16 +67,16 @@
6767
"zone.js": "~0.10.3"
6868
},
6969
"devDependencies": {
70-
"@angular-devkit/build-optimizer": "^0.1000.0",
71-
"@angular-devkit/core": "^10.0.0",
72-
"@angular-devkit/schematics": "^10.0.0",
73-
"@angular/bazel": "^10.0.0",
74-
"@angular/benchpress": "^0.2.0",
75-
"@angular/compiler-cli": "^10.0.0",
70+
"@angular-devkit/build-optimizer": "^0.1000.5",
71+
"@angular-devkit/core": "^10.0.5",
72+
"@angular-devkit/schematics": "^10.0.5",
73+
"@angular/bazel": "^10.0.8",
74+
"@angular/benchpress": "^0.2.1",
75+
"@angular/compiler-cli": "^10.0.8",
7676
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#0612a30aaf7a7e7eb2a4a5a9fa0f58622ce59590",
77-
"@angular/platform-browser-dynamic": "^10.0.0",
78-
"@angular/platform-server": "^10.0.0",
79-
"@angular/router": "^10.0.0",
77+
"@angular/platform-browser-dynamic": "^10.0.8",
78+
"@angular/platform-server": "^10.0.8",
79+
"@angular/router": "^10.0.8",
8080
"@bazel/bazelisk": "^1.4.0",
8181
"@bazel/buildifier": "^2.2.1",
8282
"@bazel/ibazel": "^0.13.0",
@@ -88,7 +88,7 @@
8888
"@bazel/typescript": "^1.7.0",
8989
"@firebase/app-types": "^0.3.2",
9090
"@octokit/rest": "16.28.7",
91-
"@schematics/angular": "^10.0.0",
91+
"@schematics/angular": "^10.0.5",
9292
"@types/autoprefixer": "^9.7.2",
9393
"@types/browser-sync": "^2.26.1",
9494
"@types/fs-extra": "^4.0.3",

tools/postinstall/@angular_bazel_ivy_flat_module.patch

Lines changed: 0 additions & 57 deletions
This file was deleted.

tools/postinstall/@angular_bazel_ng_module.patch

Lines changed: 0 additions & 47 deletions
This file was deleted.

tools/postinstall/apply-patches.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,23 +110,6 @@ function applyPatches() {
110110
// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1208.
111111
applyPatch(path.join(__dirname, './manifest_externs_hermeticity.patch'));
112112

113-
try {
114-
// Temporary patch pre-req for https://github.com/angular/angular/pull/36333.
115-
// Can be removed once @angular/bazel is updated here to include this patch.
116-
// try/catch needed for this the material CI tests to work in angular/repo
117-
applyPatch(path.join(__dirname, './@angular_bazel_ng_module.patch'));
118-
} catch {
119-
}
120-
121-
try {
122-
// Temporary patch pre-req for https://github.com/angular/angular/pull/36971.
123-
// Can be removed once @angular/bazel is updated here to include this patch.
124-
// try/catch needed for this as the framework repo has this patch already applied,
125-
// and re-applying again causes an error.
126-
applyPatch(path.join(__dirname, './@angular_bazel_ivy_flat_module.patch'));
127-
} catch {
128-
}
129-
130113
// Workaround for https://github.com/angular/angular/issues/33452:
131114
searchAndReplace(
132115
/angular_compiler_options = {/, `$&

0 commit comments

Comments
 (0)