Skip to content

Commit

Permalink
wip: angular 5 support
Browse files Browse the repository at this point in the history
This the PR to introduce Angular 5 support. I'll keep it updated and will fix any new issues as beta and RC versions are released. It should be merged once Angular 5 final is released.
  • Loading branch information
crisbeto committed Jul 25, 2017
1 parent 374aaff commit b38a128
Show file tree
Hide file tree
Showing 9 changed files with 176 additions and 130 deletions.
136 changes: 85 additions & 51 deletions package-lock.json

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

29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,29 @@
"version": "2.0.0-beta.8",
"license": "MIT",
"engines": {
"node": ">= 5.4.1 < 7"
"node": ">= 5.4.1 <= 8.2.1"
},
"dependencies": {
"@angular/animations": "~4.1.0",
"@angular/common": "~4.1.0",
"@angular/compiler": "~4.1.0",
"@angular/core": "~4.1.0",
"@angular/forms": "~4.1.0",
"@angular/http": "~4.1.0",
"@angular/platform-browser": "~4.1.0",
"@angular/animations": "~5.0.0-beta.0",
"@angular/common": "~5.0.0-beta.0",
"@angular/compiler": "~5.0.0-beta.0",
"@angular/core": "~5.0.0-beta.0",
"@angular/forms": "~5.0.0-beta.0",
"@angular/http": "~5.0.0-beta.0",
"@angular/platform-browser": "~5.0.0-beta.0",
"core-js": "^2.4.1",
"rxjs": "^5.0.1",
"systemjs": "0.19.43",
"tsickle": "^0.23.4",
"tslib": "^1.7.1",
"zone.js": "^0.8.4"
"zone.js": "^0.8.12"
},
"devDependencies": {
"@angular/compiler-cli": "~4.1.0",
"@angular/platform-browser-dynamic": "~4.1.0",
"@angular/platform-server": "~4.1.0",
"@angular/router": "~4.1.0",
"@angular/tsc-wrapped": "~4.1.0",
"@angular/compiler-cli": "~5.0.0-beta.0",
"@angular/platform-browser-dynamic": "~5.0.0-beta.0",
"@angular/platform-server": "~5.0.0-beta.0",
"@angular/router": "~5.0.0-beta.0",
"@angular/tsc-wrapped": "~5.0.0-beta.0",
"@google-cloud/storage": "^1.1.1",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^3.0.1",
Expand Down
4 changes: 2 additions & 2 deletions src/cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular/core": "^4.0.0",
"@angular/common": "^4.0.0"
"@angular/core": "~5.0.0-beta.0",
"@angular/common": "~5.0.0-beta.0"
},
"dependencies": {
"tslib": "^1.7.1"
Expand Down
4 changes: 2 additions & 2 deletions src/demo-app/autocomplete/autocomplete-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<md-card>

<div>Template-driven value (currentState): {{ currentState }}</div>
<div>Template-driven dirty: {{ modelDir?.dirty }}</div>
<div>Template-driven dirty: {{ modelDir ? modelDir.dirty : false }}</div>

<!-- Added an ngIf below to test that autocomplete works with ngIf -->
<md-input-container *ngIf="true">
Expand Down Expand Up @@ -53,4 +53,4 @@
<md-option *ngFor="let state of tdStates" [value]="state.name">
<span>{{ state.name }}</span>
</md-option>
</md-autocomplete>
</md-autocomplete>
Loading

0 comments on commit b38a128

Please sign in to comment.