From 649d08bfa7245f4733705fe6ec630d4a9e35b225 Mon Sep 17 00:00:00 2001 From: Will Soto Date: Sat, 13 Aug 2016 18:53:22 -0400 Subject: [PATCH] feat(angular): upgrade to RC.5 Signed-off-by: Will Soto --- demo/app.module.ts | 14 ++++++++++++++ demo/entry.ts | 7 ++++--- package.json | 14 +++++++------- test/chartist.component.spec.ts | 4 ---- tsconfig.json | 16 +++++++++------- 5 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 demo/app.module.ts diff --git a/demo/app.module.ts b/demo/app.module.ts new file mode 100644 index 00000000..7279aaf2 --- /dev/null +++ b/demo/app.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule } from '@angular/forms'; +import { DemoAppComponent } from './demo'; + +@NgModule({ + declarations: [DemoAppComponent], + imports: [ + BrowserModule, + FormsModule + ], + bootstrap: [DemoAppComponent] +}) +export class AppModule {} diff --git a/demo/entry.ts b/demo/entry.ts index 431dbb78..4d5e12f7 100644 --- a/demo/entry.ts +++ b/demo/entry.ts @@ -1,8 +1,9 @@ import 'reflect-metadata'; import 'zone.js/dist/zone'; import { enableProdMode } from '@angular/core'; -import { bootstrap } from '@angular/platform-browser-dynamic'; -import { DemoAppComponent } from './demo'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; declare var ENV: string; @@ -10,4 +11,4 @@ if (ENV === 'production') { enableProdMode(); } -bootstrap(DemoAppComponent); +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/package.json b/package.json index 02b0a24f..ff79f1bb 100644 --- a/package.json +++ b/package.json @@ -46,13 +46,13 @@ }, "homepage": "https://github.com/paradox41/angular2-chartist#readme", "devDependencies": { - "@angular/common": "2.0.0-rc.4", - "@angular/compiler": "2.0.0-rc.4", - "@angular/core": "2.0.0-rc.4", - "@angular/platform-browser": "2.0.0-rc.4", - "@angular/platform-browser-dynamic": "2.0.0-rc.4", + "@angular/common": "2.0.0-rc.5", + "@angular/compiler": "2.0.0-rc.5", + "@angular/core": "2.0.0-rc.5", + "@angular/forms": "^0.3.0", + "@angular/platform-browser": "2.0.0-rc.5", + "@angular/platform-browser-dynamic": "2.0.0-rc.5", "@types/chartist": "^0.9.30", - "@types/es6-shim": "0.0.28", "@types/jasmine": "^2.2.31", "@types/rx": "^2.5.29", "chartist": "^0.9.7", @@ -88,7 +88,7 @@ "zone.js": "^0.6.12" }, "peerDependencies": { - "@angular/core": "2.0.0-rc.4", + "@angular/core": "2.0.0-rc.5", "chartist": "^0.9.7" } } diff --git a/test/chartist.component.spec.ts b/test/chartist.component.spec.ts index f46b34c7..6e18110c 100644 --- a/test/chartist.component.spec.ts +++ b/test/chartist.component.spec.ts @@ -1,8 +1,4 @@ import { - describe, - it, - expect, - beforeEach, inject, async, TestComponentBuilder, diff --git a/tsconfig.json b/tsconfig.json index 77f7bcb5..b4a0ea45 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ "experimentalDecorators": true, "lib": [ "dom", - "es2015" + "es6" ], "module": "commonjs", "moduleResolution": "node", @@ -14,10 +14,12 @@ "removeComments": false, "sourceMap": true, "strictNullChecks": true, - "target": "ES5" - }, - "compileOnSave": false, - "include": [ - "src/*.ts" - ] + "target": "es5", + "typeRoots": [ + "./node_modules/@types" + ], + "types": [ + "jasmine" + ] + } }