Skip to content

Commit

Permalink
feat: angular 7+ update (#1910)
Browse files Browse the repository at this point in the history
Closes #1890

BREAKING CHANGES:
Angular 7+ now required.
The following libraries were updated:
- @agm/core
- @ng-bootstrap/ng-bootstrap
- @swimlane/ngx-charts
- ng2-ckeditor
- ngx-echarts
  • Loading branch information
tibing-old-email authored and nnixaa committed Nov 19, 2018
1 parent 3f422db commit aa7579c
Show file tree
Hide file tree
Showing 13 changed files with 4,771 additions and 1,707 deletions.
6,399 changes: 4,733 additions & 1,666 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,27 @@
"release:changelog": "npm run conventional-changelog -- -p angular -i CHANGELOG.md -s"
},
"dependencies": {
"@agm/core": "1.0.0-beta.2",
"@angular/animations": "6.0.0",
"@angular/cdk": "^6.4.7",
"@angular/common": "6.0.0",
"@angular/compiler": "6.0.0",
"@angular/core": "6.0.0",
"@angular/forms": "6.0.0",
"@angular/http": "6.0.0",
"@angular/platform-browser": "6.0.0",
"@angular/platform-browser-dynamic": "6.0.0",
"@angular/router": "6.0.0",
"@agm/core": "^1.0.0-beta.5",
"@angular/animations": "^7.0.3",
"@angular/cdk": "^7.0.3",
"@angular/common": "^7.0.3",
"@angular/compiler": "^7.0.3",
"@angular/core": "^7.0.3",
"@angular/forms": "^7.0.3",
"@angular/http": "^7.0.3",
"@angular/platform-browser": "^7.0.3",
"@angular/platform-browser-dynamic": "^7.0.3",
"@angular/router": "^7.0.3",
"@asymmetrik/ngx-leaflet": "3.0.1",
"@nebular/auth": "2.0.1",
"@nebular/bootstrap": "2.0.1",
"@nebular/security": "2.0.1",
"@nebular/theme": "2.0.1",
"@ng-bootstrap/ng-bootstrap": "1.0.0",
"@swimlane/ngx-charts": "7.0.1",
"@ng-bootstrap/ng-bootstrap": "^4.0.0",
"@swimlane/ngx-charts": "^10.0.0",
"angular-tree-component": "7.2.0",
"angular2-chartjs": "0.4.1",
"angular2-toaster": "6.0.0",
"angular2-toaster": "^6.1.0",
"bootstrap": "4.0.0",
"chart.js": "2.7.1",
"ckeditor": "4.7.3",
Expand All @@ -65,34 +65,35 @@
"ionicons": "2.0.1",
"leaflet": "1.2.0",
"nebular-icons": "1.0.9",
"ng2-ckeditor": "1.1.13",
"ng2-ckeditor": "^1.2.2",
"ng2-completer": "2.0.8",
"ng2-smart-table": "1.3.5",
"ngx-echarts": "2.0.1",
"ngx-echarts": "^4.0.1",
"normalize.css": "6.0.0",
"pace-js": "1.0.2",
"roboto-fontface": "0.8.0",
"rxjs": "^6.1.0",
"rxjs-compat": "^6.1.0",
"rxjs": "6.3.0",
"rxjs-compat": "6.3.0",
"socicon": "3.0.5",
"tinymce": "4.5.7",
"typeface-exo": "0.0.22",
"web-animations-js": "2.2.5",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular/cli": "6.0.0",
"@angular/compiler-cli": "6.0.0",
"@angular/language-service": "6.0.0",
"@angular-devkit/build-angular": "0.10.2",
"@angular/compiler-cli": "^7.0.3",
"@angular/cli": "^7.0.3",
"@angular/language-service": "7.0.0",
"@compodoc/compodoc": "1.0.1",
"@fortawesome/fontawesome-free": "^5.2.0",
"@types/d3-color": "1.0.5",
"@types/googlemaps": "3.30.4",
"@types/googlemaps": "^3.30.4",
"@types/jasmine": "2.5.54",
"@types/jasminewd2": "2.0.3",
"@types/leaflet": "1.2.3",
"@types/node": "6.0.90",
"codelyzer": "4.0.2",
"codelyzer": "^4.5.0",
"conventional-changelog-cli": "1.3.4",
"husky": "0.13.3",
"jasmine-core": "2.6.4",
Expand All @@ -109,8 +110,7 @@
"stylelint": "7.13.0",
"ts-node": "3.2.2",
"tslint": "5.7.0",
"tslint-language-service": "0.9.6",
"typescript": "2.7.2",
"@angular-devkit/build-angular": "~0.6.0"
"tslint-language-service": "^0.9.9",
"typescript": "3.1.3"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, OnDestroy, Input } from '@angular/core';
import { NbLayoutDirectionService, NbLayoutDirection } from '@nebular/theme';
import { takeWhile } from 'rxjs/operators/takeWhile';
import { takeWhile } from 'rxjs/operators';

@Component({
selector: 'ngx-layout-direction-switcher',
Expand Down
2 changes: 1 addition & 1 deletion src/app/@theme/layouts/one-column/one-column.layout.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, OnDestroy } from '@angular/core';
import { NbThemeService } from '@nebular/theme';
import { takeWhile } from 'rxjs/operators/takeWhile';
import { takeWhile } from 'rxjs/operators';

// TODO: move layouts into the framework
@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, OnDestroy } from '@angular/core';
import { NbThemeService } from '@nebular/theme';
import { takeWhile } from 'rxjs/operators/takeWhile';
import { takeWhile } from 'rxjs/operators';

// TODO: move layouts into the framework
@Component({
Expand Down
2 changes: 1 addition & 1 deletion src/app/@theme/layouts/two-columns/two-columns.layout.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, OnDestroy } from '@angular/core';
import { NbThemeService } from '@nebular/theme';
import { takeWhile } from 'rxjs/operators/takeWhile';
import { takeWhile } from 'rxjs/operators';

// TODO: move layouts into the framework
@Component({
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, OnDestroy} from '@angular/core';
import { NbThemeService } from '@nebular/theme';
import { takeWhile } from 'rxjs/operators/takeWhile' ;
import { takeWhile } from 'rxjs/operators' ;

interface CardSettings {
title: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class TemperatureDraggerComponent implements AfterViewInit, OnChanges {
@Input() maxLeap = 0.4;

value = 50;
@Output('valueChange') valueChange = new EventEmitter<Number>();
@Output() valueChange = new EventEmitter<Number>();
@Input('value') set setValue(value) {
this.value = value;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';


@Injectable()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { NbThemeService } from '@nebular/theme';
import { interval } from 'rxjs';
import { interval , Subscription } from 'rxjs';
import { switchMap, takeWhile } from 'rxjs/operators';
import { EarningService, LiveUpdateChart } from '../../../../@core/data/earning.service';
import { Subscription } from 'rxjs/Subscription';

@Component({
selector: 'ngx-earning-card-front',
Expand Down
7 changes: 3 additions & 4 deletions src/app/pages/maps/bubble/bubble-map.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Component, OnDestroy } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { combineLatest } from 'rxjs';
import { takeWhile } from 'rxjs/operators';
import { NgxEchartsService } from 'ngx-echarts';
import { NbThemeService } from '@nebular/theme';
import { registerMap } from 'echarts';

@Component({
selector: 'ngx-bubble-map',
Expand Down Expand Up @@ -31,8 +31,7 @@ export class BubbleMapComponent implements OnDestroy {
private alive = true;

constructor(private theme: NbThemeService,
private http: HttpClient,
private es: NgxEchartsService) {
private http: HttpClient) {

combineLatest([
this.http.get('assets/map/world.json'),
Expand All @@ -41,7 +40,7 @@ export class BubbleMapComponent implements OnDestroy {
.pipe(takeWhile(() => this.alive))
.subscribe(([map, config]: [any, any]) => {

this.es.registerMap('world', map);
registerMap('world', map);

const colors = config.variables;
this.bubbleTheme = config.variables.bubbleMap;
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/maps/search-map/search/search.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, ElementRef, EventEmitter, NgZone, OnInit, Output, ViewChild } from '@angular/core';
import { MapsAPILoader } from '@agm/core';
import { Location } from '../entity/Location';
import {} from 'googlemaps';


@Component({
selector: 'ngx-search',
Expand Down
1 change: 0 additions & 1 deletion src/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"outDir": "../out-tsc/app",
"module": "es2015",
"baseUrl": "./",
"types": [],
"paths": {
"@angular/*": [
"../node_modules/@angular/*"
Expand Down

0 comments on commit aa7579c

Please sign in to comment.