Skip to content

build: update to latest angular version and cleanup postinstall patch #20202

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.

Sign up for GitHub

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 1 commit into from
Aug 5, 2020
Merged

build: update to latest angular version and cleanup postinstall patch #20202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
},
"version": "10.2.0-next.0",
"dependencies": {
"@angular/animations": "^10.0.0",
"@angular/common": "^10.0.0",
"@angular/compiler": "^10.0.0",
"@angular/core": "^10.0.0",
"@angular/elements": "^10.0.0",
"@angular/forms": "^10.0.0",
"@angular/platform-browser": "^10.0.0",
"@angular/animations": "^10.0.8",
"@angular/common": "^10.0.8",
"@angular/compiler": "^10.0.8",
"@angular/core": "^10.0.8",
"@angular/elements": "^10.0.8",
"@angular/forms": "^10.0.8",
"@angular/platform-browser": "^10.0.8",
"@types/googlemaps": "^3.39.3",
"@types/youtube": "^0.0.38",
"@webcomponents/custom-elements": "^1.1.0",
Expand All @@ -67,16 +67,16 @@
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-optimizer": "^0.1000.0",
"@angular-devkit/core": "^10.0.0",
"@angular-devkit/schematics": "^10.0.0",
"@angular/bazel": "^10.0.0",
"@angular/benchpress": "^0.2.0",
"@angular/compiler-cli": "^10.0.0",
"@angular-devkit/build-optimizer": "^0.1000.5",
"@angular-devkit/core": "^10.0.5",
"@angular-devkit/schematics": "^10.0.5",
"@angular/bazel": "^10.0.8",
"@angular/benchpress": "^0.2.1",
"@angular/compiler-cli": "^10.0.8",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#0612a30aaf7a7e7eb2a4a5a9fa0f58622ce59590",
"@angular/platform-browser-dynamic": "^10.0.0",
"@angular/platform-server": "^10.0.0",
"@angular/router": "^10.0.0",
"@angular/platform-browser-dynamic": "^10.0.8",
"@angular/platform-server": "^10.0.8",
"@angular/router": "^10.0.8",
"@bazel/bazelisk": "^1.4.0",
"@bazel/buildifier": "^2.2.1",
"@bazel/ibazel": "^0.13.0",
Expand All @@ -88,7 +88,7 @@
"@bazel/typescript": "^1.7.0",
"@firebase/app-types": "^0.3.2",
"@octokit/rest": "16.28.7",
"@schematics/angular": "^10.0.0",
"@schematics/angular": "^10.0.5",
"@types/autoprefixer": "^9.7.2",
"@types/browser-sync": "^2.26.1",
"@types/fs-extra": "^4.0.3",
Expand Down
57 changes: 0 additions & 57 deletions tools/postinstall/@angular_bazel_ivy_flat_module.patch
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions tools/postinstall/@angular_bazel_ng_module.patch
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions tools/postinstall/apply-patches.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,23 +110,6 @@ function applyPatches() {
// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1208.
applyPatch(path.join(__dirname, './manifest_externs_hermeticity.patch'));

try {
// Temporary patch pre-req for https://github.com/angular/angular/pull/36333.
// Can be removed once @angular/bazel is updated here to include this patch.
// try/catch needed for this the material CI tests to work in angular/repo
applyPatch(path.join(__dirname, './@angular_bazel_ng_module.patch'));
} catch {
}

try {
// Temporary patch pre-req for https://github.com/angular/angular/pull/36971.
// Can be removed once @angular/bazel is updated here to include this patch.
// try/catch needed for this as the framework repo has this patch already applied,
// and re-applying again causes an error.
applyPatch(path.join(__dirname, './@angular_bazel_ivy_flat_module.patch'));
} catch {
}

// Workaround for https://github.com/angular/angular/issues/33452:
searchAndReplace(
/angular_compiler_options = {/, `$&
Expand Down
Loading