Skip to content
This repository was archived by the owner on Oct 1, 2018. It is now read-only.

Commit 03bc259

Browse files
Merge pull request #160 from feloy/ng5
chore(packages) Upgrade to Angular v5
2 parents a72064d + 43d6289 commit 03bc259

File tree

2 files changed

+28
-26
lines changed

2 files changed

+28
-26
lines changed

package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,30 @@
2727
},
2828
"private": true,
2929
"dependencies": {
30-
"@angular/animations": "4.4.4",
31-
"@angular/cdk": "2.0.0-beta.12",
32-
"@angular/common": "4.4.4",
33-
"@angular/compiler": "4.4.4",
34-
"@angular/core": "4.4.4",
35-
"@angular/flex-layout": "2.0.0-beta.9",
36-
"@angular/forms": "4.4.4",
37-
"@angular/http": "4.4.4",
38-
"@angular/material": "2.0.0-beta.12",
39-
"@angular/platform-browser": "4.4.4",
40-
"@angular/platform-browser-dynamic": "4.4.4",
41-
"@angular/router": "4.4.4",
30+
"@angular/animations": "5.0.2",
31+
"@angular/cdk": "5.0.0-rc0",
32+
"@angular/common": "5.0.2",
33+
"@angular/compiler": "5.0.2",
34+
"@angular/core": "5.0.2",
35+
"@angular/flex-layout": "2.0.0-beta.10",
36+
"@angular/forms": "5.0.2",
37+
"@angular/http": "5.0.2",
38+
"@angular/material": "5.0.0-rc0",
39+
"@angular/platform-browser": "5.0.2",
40+
"@angular/platform-browser-dynamic": "5.0.2",
41+
"@angular/router": "5.0.2",
4242
"@types/hammerjs": "2.0.35",
4343
"core-js": "2.4.1",
4444
"hammerjs": "2.0.8",
4545
"ngx-clipboard": "8.1.0",
46-
"rxjs": "5.4.2",
46+
"rxjs": "5.5.2",
47+
"ts-loader": "3.1.1",
4748
"zone.js": "0.8.14"
4849
},
4950
"devDependencies": {
50-
"@angular/cli": "1.4.5",
51-
"@angular/compiler-cli": "4.4.4",
52-
"@angular/language-service": "4.4.4",
51+
"@angular/cli": "1.5.2",
52+
"@angular/compiler-cli": "5.0.2",
53+
"@angular/language-service": "5.0.2",
5354
"@angular/service-worker": "1.0.0-beta.16",
5455
"@types/jasmine": "2.5.53",
5556
"@types/jasminewd2": "2.0.2",
@@ -78,7 +79,7 @@
7879
"ts-node": "3.2.0",
7980
"tslint": "5.3.2",
8081
"tslint-config-prettier": "1.6.0",
81-
"typescript": "2.3.3",
82+
"typescript": "2.4.2",
8283
"validate-commit-msg": "2.14.0",
8384
"wallaby-webpack": "*"
8485
},

src/app/app.component.spec.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { async, ComponentFixture, TestBed } from "@angular/core/testing";
2-
import { RouterTestingModule } from "@angular/router/testing";
3-
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
4-
import { AppComponent } from "./app.component";
5-
import { ToolbarModule } from "./toolbar/toolbar.module";
6-
import { MatSidenavModule } from "@angular/material";
1+
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2+
import { RouterTestingModule } from '@angular/router/testing';
3+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
4+
import { AppComponent } from './app.component';
5+
import { ToolbarModule } from './toolbar/toolbar.module';
6+
import { MatSidenavModule, MatListModule } from '@angular/material';
77

8-
describe("AppComponent", () => {
8+
describe('AppComponent', () => {
99
let component: AppComponent;
1010
let fixture: ComponentFixture<AppComponent>;
1111

@@ -16,7 +16,8 @@ describe("AppComponent", () => {
1616
RouterTestingModule,
1717
BrowserAnimationsModule,
1818
ToolbarModule,
19-
MatSidenavModule
19+
MatSidenavModule,
20+
MatListModule
2021
],
2122
declarations: [AppComponent]
2223
}).compileComponents();
@@ -29,7 +30,7 @@ describe("AppComponent", () => {
2930
fixture.detectChanges();
3031
});
3132

32-
it("should create", () => {
33+
it('should create', () => {
3334
expect(component).toBeTruthy();
3435
});
3536
});

0 commit comments

Comments
 (0)