Skip to content

Commit

Permalink
fix(core): upgrade to angular 5 and typescript 2.6.x (#218)
Browse files Browse the repository at this point in the history
* upgrade to angular 5 and typescript 2.6.x

BREAKING CHANGES: raises minimum angular version to Angular 5

* bump dep

* newer angular-cli

* reorder improts

* minor version
  • Loading branch information
scttcper authored Jan 23, 2018
1 parent 3405e1a commit 623d613
Show file tree
Hide file tree
Showing 5 changed files with 747 additions and 318 deletions.
45 changes: 22 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,42 +20,41 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^4.4.6",
"@angular/cdk": "2.0.0-beta.12",
"@angular/common": "^4.4.6",
"@angular/compiler": "^4.4.6",
"@angular/core": "^4.4.6",
"@angular/forms": "^4.4.6",
"@angular/http": "^4.4.6",
"@angular/material": "2.0.0-beta.12",
"@angular/platform-browser": "^4.4.6",
"@angular/platform-browser-dynamic": "^4.4.6",
"@angular/router": "^4.4.6",
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.6",
"@angular/animations": "^5.2.1",
"@angular/cdk": "5.1.0",
"@angular/common": "^5.2.1",
"@angular/compiler": "^5.2.1",
"@angular/core": "^5.2.1",
"@angular/forms": "^5.2.1",
"@angular/material": "5.1.0",
"@angular/platform-browser": "^5.2.1",
"@angular/platform-browser-dynamic": "^5.2.1",
"@angular/router": "^5.2.1",
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.9",
"@uirouter/angular": "1.0.0-rc.3",
"bootstrap": "4.0.0-beta.3",
"bootstrap": "4.0.0",
"core-js": "^2.5.3",
"rxjs": "5.5.6",
"zone.js": "^0.8.20"
},
"devDependencies": {
"@angular/cli": "1.6.3",
"@angular/compiler-cli": "^4.4.6",
"@angular/language-service": "^4.4.6",
"@angular/cli": "1.6.5",
"@angular/compiler-cli": "^5.2.1",
"@angular/language-service": "^5.2.1",
"@types/applicationinsights-js": "^1.0.5",
"@types/facebook-pixel": "^0.0.19",
"@types/fs-extra": "^5.0.0",
"@types/google.analytics": "^0.0.36",
"@types/jasmine": "^2.8.4",
"@types/jasmine": "^2.8.5",
"@types/jasminewd2": "^2.0.3",
"@types/node": "^9.3.0",
"@types/segment-analytics": "^0.0.28",
"codelyzer": "^4.0.2",
"codelyzer": "^4.1.0",
"commitizen": "^2.9.6",
"copy": "^0.3.1",
"cz-conventional-changelog": "^2.1.0",
"fs-extra": "^5.0.0",
"jasmine-core": "^2.8.0",
"jasmine-core": "^2.9.1",
"jasmine-spec-reporter": "^4.2.1",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
Expand All @@ -65,14 +64,14 @@
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "^5.2.2",
"rimraf": "^2.6.2",
"rollup": "^0.54.0",
"rollup": "^0.54.1",
"rollup-plugin-filesize": "^1.5.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"semantic-release": "^12.2.2",
"travis-deploy-once": "^4.3.1",
"semantic-release": "^12.2.4",
"travis-deploy-once": "^4.3.2",
"ts-node": "^4.1.0",
"tslint": "^5.9.1",
"typescript": "2.4.x"
"typescript": "2.6.x"
},
"release": {
"branch": "master"
Expand Down
6 changes: 2 additions & 4 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// import { HttpClientModule } from '@angular/common/http';
import { HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { HttpModule } from '@angular/http';
import { BrowserModule } from '@angular/platform-browser';

import { MatIconModule } from '@angular/material/icon';
Expand All @@ -19,8 +18,7 @@ import { ProvidersComponent } from './providers/providers.component';
],
imports: [
BrowserModule,
// HttpClientModule,
HttpModule,
HttpClientModule,

NgbCollapseModule.forRoot(),
MatIconModule,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"inspectlet"
],
"peerDependencies": {
"@angular/common": ">= 4.4.0 <=6.0.0",
"@angular/core": ">= 4.4.0 <=6.0.0",
"@angular/router": ">= 4.4.0 <=6.0.0",
"@angular/common": ">= 5.0.0 <=6.0.0",
"@angular/core": ">= 5.0.0 <=6.0.0",
"@angular/router": ">= 5.0.0 <=6.0.0",
"rxjs": "^5.5.0"
}
}
2 changes: 1 addition & 1 deletion src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import '~bootstrap/scss/variables';
@import '~bootstrap/scss/mixins';
@import '~bootstrap/scss/root';
@import '~bootstrap/scss/print';
@import '~bootstrap/scss/reboot';
@import '~bootstrap/scss/type';
// @import '~bootstrap/scss/images';
Expand Down Expand Up @@ -33,6 +32,7 @@
// @import '~bootstrap/scss/popover';
// @import '~bootstrap/scss/carousel';
@import '~bootstrap/scss/utilities';
@import '~bootstrap/scss/print';


.bg-blue {
Expand Down
Loading

0 comments on commit 623d613

Please sign in to comment.