Skip to content

chore: update to Angular 5.1.1 to fix bazel build #8979

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 1 commit into from
Dec 20, 2017
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
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ jobs:
# For some reason, circleci needs the postinstall to be run explicitly.
# This may be unnecessary once ngcontainer uses nodejs 8
- run: bazel run @nodejs//:npm run postinstall
# Disabled until next patch of Angular - broken currently
#- run: bazel build src/cdk/...
- run: bazel build src/cdk/...
- save_cache:
key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
paths:
Expand Down
114 changes: 37 additions & 77 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"node": ">= 5.4.1"
},
"dependencies": {
"@angular/animations": "~5.1.0",
"@angular/common": "~5.1.0",
"@angular/compiler": "~5.1.0",
"@angular/core": "~5.1.0",
"@angular/forms": "~5.1.0",
"@angular/platform-browser": "~5.1.0",
"@angular/animations": "~5.1.1",
"@angular/common": "~5.1.1",
"@angular/compiler": "~5.1.1",
"@angular/core": "~5.1.1",
"@angular/forms": "~5.1.1",
"@angular/platform-browser": "~5.1.1",
"core-js": "^2.4.1",
"rxjs": "^5.5.5",
"systemjs": "0.19.43",
Expand All @@ -40,12 +40,12 @@
"zone.js": "^0.8.12"
},
"devDependencies": {
"@angular/bazel": "~5.1.0",
"@angular/compiler-cli": "~5.1.0",
"@angular/http": "~5.1.0",
"@angular/platform-browser-dynamic": "~5.1.0",
"@angular/platform-server": "~5.1.0",
"@angular/router": "~5.1.0",
"@angular/bazel": "~5.1.1",
"@angular/compiler-cli": "~5.1.1",
"@angular/http": "~5.1.1",
"@angular/platform-browser-dynamic": "~5.1.1",
"@angular/platform-server": "~5.1.1",
"@angular/router": "~5.1.1",
"@angular/upgrade": "^5.0.1",
"@bazel/ibazel": "^0.1.1",
"@google-cloud/storage": "^1.1.1",
Expand Down