Skip to content

Commit

Permalink
chore: update angular to 4.4.4 and switch (#7431)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmalerba authored and kara committed Oct 3, 2017
1 parent ed338a3 commit 38bec5c
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"node": ">= 5.4.1"
},
"dependencies": {
"@angular/animations": "~4.4.3",
"@angular/common": "~4.4.3",
"@angular/compiler": "~4.4.3",
"@angular/core": "~4.4.3",
"@angular/forms": "~4.4.3",
"@angular/http": "~4.4.3",
"@angular/platform-browser": "~4.4.3",
"@angular/animations": "~4.4.4",
"@angular/common": "~4.4.4",
"@angular/compiler": "~4.4.4",
"@angular/core": "~4.4.4",
"@angular/forms": "~4.4.4",
"@angular/http": "~4.4.4",
"@angular/platform-browser": "~4.4.4",
"core-js": "^2.4.1",
"rxjs": "^5.0.1",
"systemjs": "0.19.43",
Expand All @@ -40,11 +40,11 @@
"zone.js": "^0.8.12"
},
"devDependencies": {
"@angular/compiler-cli": "~4.4.3",
"@angular/platform-browser-dynamic": "~4.4.3",
"@angular/platform-server": "~4.4.3",
"@angular/router": "~4.4.3",
"@angular/tsc-wrapped": "~4.4.3",
"@angular/compiler-cli": "~4.4.4",
"@angular/platform-browser-dynamic": "~4.4.4",
"@angular/platform-server": "~4.4.4",
"@angular/router": "~4.4.4",
"@angular/tsc-wrapped": "~4.4.4",
"@google-cloud/storage": "^1.1.1",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/lib/select/select.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
TODO(mmalerba):   is currently broken in components with preserveWhitespace: false, so we
evaluate it as a JS string binding instead. Change back to   once it works again.
-->
<ng-container *ngIf="empty">{{'\u00A0'}}</ng-container>
<ng-container *ngIf="empty">&nbsp;</ng-container>
<span class="mat-select-value-text" *ngIf="!empty" [ngSwitch]="!!customTrigger">
<span *ngSwitchDefault>{{ triggerValue }}</span>
<ng-content select="mat-select-trigger" *ngSwitchCase="true"></ng-content>
Expand Down
2 changes: 2 additions & 0 deletions src/material-moment-adapter/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
// Needed for Moment.js since it doesn't have a default export.
"allowSyntheticDefaultImports": true,
"rootDir": "..",
"baseUrl": ".",
"paths": {
Expand Down
22 changes: 11 additions & 11 deletions tools/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^4.4.3",
"@angular/animations": "^4.4.4",
"@angular/cdk": "github:angular/cdk-builds",
"@angular/common": "^4.4.3",
"@angular/compiler": "^4.4.3",
"@angular/core": "^4.4.3",
"@angular/forms": "^4.4.3",
"@angular/http": "^4.4.3",
"@angular/common": "^4.4.4",
"@angular/compiler": "^4.4.4",
"@angular/core": "^4.4.4",
"@angular/forms": "^4.4.4",
"@angular/http": "^4.4.4",
"@angular/material": "github:angular/material2-builds",
"@angular/platform-browser": "^4.4.3",
"@angular/platform-browser-dynamic": "^4.4.3",
"@angular/router": "^4.4.3",
"@angular/platform-browser": "^4.4.4",
"@angular/platform-browser-dynamic": "^4.4.4",
"@angular/router": "^4.4.4",
"@swimlane/ngx-charts": "^6.0.0",
"angularfire2": "^4.0.0-rc.1",
"core-js": "^2.4.1",
Expand All @@ -31,8 +31,8 @@
},
"devDependencies": {
"@angular/cli": "^1.2.0",
"@angular/compiler-cli": "^4.4.3",
"@angular/language-service": "^4.4.3",
"@angular/compiler-cli": "^4.4.4",
"@angular/language-service": "^4.4.4",
"@types/jasmine": "2.5.45",
"@types/node": "~6.0.60",
"ts-node": "~3.0.4",
Expand Down
20 changes: 10 additions & 10 deletions tools/screenshot-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"dependencies": {
"@angular/animations": "^4.0.2",
"@angular/cdk": "angular/cdk-builds",
"@angular/common": "^4.4.3",
"@angular/compiler": "^4.4.3",
"@angular/compiler-cli": "^4.4.3",
"@angular/core": "^4.4.3",
"@angular/forms": "^4.4.3",
"@angular/http": "^4.4.3",
"@angular/common": "^4.4.4",
"@angular/compiler": "^4.4.4",
"@angular/compiler-cli": "^4.4.4",
"@angular/core": "^4.4.4",
"@angular/forms": "^4.4.4",
"@angular/http": "^4.4.4",
"@angular/material": "angular/material2-builds",
"@angular/platform-browser": "^4.4.3",
"@angular/platform-browser-dynamic": "^4.4.3",
"@angular/router": "^4.4.3",
"@angular/platform-browser": "^4.4.4",
"@angular/platform-browser-dynamic": "^4.4.4",
"@angular/router": "^4.4.4",
"core-js": "^2.4.1",
"firebase": "^3.7.6",
"rxjs": "^5.0.1",
Expand All @@ -29,7 +29,7 @@
},
"devDependencies": {
"@angular/cli": "^1.0.0",
"@angular/compiler-cli": "^4.4.3",
"@angular/compiler-cli": "^4.4.4",
"@types/node": "^6.0.42",
"ts-node": "1.2.1",
"typescript": "~2.2.1"
Expand Down
2 changes: 0 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
{
"compilerOptions": {
"outDir": "./dist/packages/all",
// Needed for Moment.js since it doesn't have a default export.
"allowSyntheticDefaultImports": true,
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
Expand Down

0 comments on commit 38bec5c

Please sign in to comment.