From 5005e7d5ad5eab98e704a8340d2ac3b9d616c304 Mon Sep 17 00:00:00 2001 From: kiswa Date: Thu, 29 Sep 2016 23:35:34 +0000 Subject: [PATCH] Remove typings and update dependencies --- .travis.yml | 2 +- package.json | 9 +++++---- src/app/dashboard/charts/charts.component.ts | 11 ++++++----- system.config.js | 6 +++++- tsconfig.json | 6 +++++- typings.json | 6 ------ 6 files changed, 22 insertions(+), 18 deletions(-) delete mode 100644 typings.json diff --git a/.travis.yml b/.travis.yml index f155cf5..0c67e8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ php: before_script: - nvm install 4 - nvm use 4 - - npm i -g gulp typings + - npm i -g gulp - npm i - touch tests.db - chmod a+w tests.db diff --git a/package.json b/package.json index 8c3bc18..77f531c 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "private": true, "scripts": { "test": "gulp test-api && gulp test-app", - "postinstall": "gulp composer && typings i" + "postinstall": "gulp composer" }, "repository": { "type": "git", @@ -35,6 +35,8 @@ "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", "@angular/router": "3.0.0", + "@types/chartist": "^0.9.33", + "@types/core-js": "^0.9.34", "bourbon": "^4.2.7", "bourbon-neat": "^1.8.0", "chai": "^3.5.0", @@ -66,11 +68,10 @@ "reflect-metadata": "^0.1.8", "rxjs": "5.0.0-beta.12", "scss-base": "^1.1.6", - "systemjs": "0.19.38", - "systemjs-builder": "0.15.31", + "systemjs": "0.19.39", + "systemjs-builder": "0.15.32", "touch": "^1.0.0", "typescript": "^2.0.3", - "typings": "^1.4.0", "zone.js": "^0.6.23" } } diff --git a/src/app/dashboard/charts/charts.component.ts b/src/app/dashboard/charts/charts.component.ts index fd9e7d2..9b71940 100644 --- a/src/app/dashboard/charts/charts.component.ts +++ b/src/app/dashboard/charts/charts.component.ts @@ -1,4 +1,5 @@ import { Component, Input, AfterViewInit } from '@angular/core'; +import * as Chartist from 'chartist'; @Component({ selector: 'tb-charts', @@ -67,11 +68,11 @@ export class Charts implements AfterViewInit { }, low: 0, height: '300px', - plugins: [ Chartist.plugins.tooltip({ - transformTooltipTextFnc: (value) => { - return value + ' points remaining' - } - }) ] + // plugins: [ Chartist.plugins.tooltip({ + // transformTooltipTextFnc: (value) => { + // return value + ' points remaining' + // } + // }) ] }; new Chartist.Line('#' + this.chartName, data, options); diff --git a/system.config.js b/system.config.js index 369e8b3..d7919c6 100644 --- a/system.config.js +++ b/system.config.js @@ -1,10 +1,14 @@ (function(global) { var map = { 'app': 'build', + 'dragula': 'node_modules/dragula/dist/dragula.js', 'ng2-dragula': 'node_modules/ng2-dragula', + 'rxjs': 'node_modules/rxjs', - '@angular': 'node_modules/@angular' + '@angular': 'node_modules/@angular', + + 'chartist': 'node_modules/chartist/dist/chartist.js' }; var packages = { diff --git a/tsconfig.json b/tsconfig.json index f1975e6..9ffa0f3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,6 +6,10 @@ "sourceMap": false, "emitDecoratorMetadata": true, "experimentalDecorators": true, - "removeComments": true + "removeComments": true, + "noImplicitAny": false, + "suppressImplicitAnyIndexErrors": true, + "typeRoots": [ "node_modules/@types" ], + "types": [ "chartist", "core-js" ] } } diff --git a/typings.json b/typings.json deleted file mode 100644 index 86ed2a2..0000000 --- a/typings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "globalDependencies": { - "chartist": "registry:dt/chartist#0.9.5+20160619034222", - "core-js": "registry:dt/core-js#0.0.0+20160914114559" - } -}