Merge pull request #1 from MikeRyan52/chore/upgrade-angular-rc

chore(deps): Upgrade to Angular 2 RC and add tslint.json

Author: robwormald

example/main.ts

@@ -1,16 +1,16 @@
-import {Component} from 'angular2/core';
-import {bootstrap} from 'angular2/platform/browser';
+import {Component} from '@angular/core';
+import {bootstrap} from '@angular/platform-browser-dynamic';
 import {Database, provideDB, DBSchema} from '../src/index';
 
-const todoAppSchema:DBSchema = {
+const todoAppSchema: DBSchema = {
   version: 1,
   name: 'todo_app',
   stores: {
     'todos': {autoIncrement: true},
     'categories': {autoIncrement: true},
     'friends': {autoIncrement: true}
   }
-}
+};
 
 
 
@@ -21,8 +21,8 @@ const todoAppSchema:DBSchema = {
   `
 })
 class DatabaseDemo {
-  constructor(public db:Database){
-    db.insert('todos', [{name: 'todo1'},{name: 'todo2'},{name: 'todo3'}])
+  constructor(public db: Database) {
+    db.insert('todos', [{name: 'todo1'}, {name: 'todo2'}, {name: 'todo3'}])
     .subscribe(
       rec => console.log(rec),
       err => console.error(err),
@@ -31,4 +31,4 @@ class DatabaseDemo {
   }
 }
 
-bootstrap(DatabaseDemo, [provideDB(todoAppSchema)]);
+bootstrap(DatabaseDemo, [provideDB(todoAppSchema)]);

karma.conf.js

@@ -19,12 +19,11 @@ module.exports = function(config) {
       'node_modules/systemjs/dist/system.js',
       'spec/support/karma-system.js',
       'node_modules/reflect-metadata/Reflect.js',
-      {pattern: 'node_modules/angular2/src/**/*.js', included: false},
-      {pattern: 'node_modules/angular2/*.js', included: false},
+      {pattern: 'node_modules/@angular/**/*.js', included: false},
       {pattern: 'node_modules/rxjs/**/*.js', included: false},
 
       {pattern: 'src/**/*', included: false},
-      {pattern: 'spec/**/*', included: false},
+      {pattern: 'spec/**/*', included: false}
     ],
 
 

package.json

@@ -17,10 +17,12 @@
   "author": "Rob Wormald <[email protected]>",
   "license": "MIT",
   "peerDependencies": {
-    "angular2": "^2.0.0-beta.14",
-    "rxjs": "^5.0.0-beta.2"
+    "@angular/core": "^2.0.0-rc.1",
+    "rxjs": "^5.0.0-beta.6"
   },
   "devDependencies": {
+    "@angular/core": "^2.0.0-rc.1",
+    "@angular/platform-browser-dynamic": "^2.0.0-rc.1",
     "es6-promise": "^3.0.2",
     "es6-shim": "^0.33.13",
     "http-server": "^0.8.5",

spec/db_spec.ts

@@ -1,10 +1,12 @@
 import * as DB from '../src/database';
 
-import {Injector, provide} from 'angular2/core';
+import {ReflectiveInjector, provide} from '@angular/core';
+
+declare var jasmine;
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 2000;
 
-const todoAppSchema:DB.DBSchema = {
+const todoAppSchema: DB.DBSchema = {
   version: 1,
   name: 'todo_app',
   stores: {
@@ -13,10 +15,10 @@ const todoAppSchema:DB.DBSchema = {
     'friends': {autoIncrement: true},
     'users': {autoIncrement: true, primaryKey: 'userID'}
   }
-}
+};
 
 
-//cleanup function
+// cleanup function
 const deleteDatabase = (done) => {
 
   let del = indexedDB.deleteDatabase(todoAppSchema.name);
@@ -25,20 +27,20 @@ const deleteDatabase = (done) => {
     del.onblocked = undefined;
     console.error(err);
     throw err;
-  }
+  };
   del.onsuccess = () => {
     done();
-  }
-}
+  };
+};
 
 describe('database functionality', () => {
 
-  let idb:DB.Database;
+  let idb: DB.Database;
   let dbBackend;
-  let injector:Injector;
+  let injector: ReflectiveInjector;
 
   beforeEach(() => {
-    injector = Injector.resolveAndCreate([
+    injector = ReflectiveInjector.resolveAndCreate([
       DB.DB_PROVIDERS,
       DB.provideDB(todoAppSchema)
     ]);
@@ -65,51 +67,51 @@ describe('database functionality', () => {
   });
 
   it('should insert some data', (done) => {
-    idb.insert('todos',[{name: 'todo1'}, {name: 'todo2'}])
+    idb.insert('todos', [{name: 'todo1'}, {name: 'todo2'}])
       .toArray()
       .subscribe(results => {
         expect(results[0]).toEqual({$key: 1, name: 'todo1'});
         expect(results[1]).toEqual({$key: 2, name: 'todo2'});
-        done()
+        done();
       }, err => {
         console.error(err);
         done(err);
       });
   });
 
   it('should insert some more data', (done) => {
-    idb.insert('todos',[{name: 'todo3'}, {name: 'todo4'}])
+    idb.insert('todos', [{name: 'todo3'}, {name: 'todo4'}])
       .toArray()
       .subscribe(results => {
         expect(results[0]).toEqual({$key: 3, name: 'todo3'});
         expect(results[1]).toEqual({$key: 4, name: 'todo4'});
-        done()
+        done();
       }, err => {
         console.error(err);
         done(err);
       });
   });
 
   it('should update existing data', (done) => {
-    idb.insert('todos',[{$key: 3, name: 'todo3++'}, {$key: 4, name: 'todo4++'}])
+    idb.insert('todos', [{$key: 3, name: 'todo3++'}, {$key: 4, name: 'todo4++'}])
       .toArray()
       .subscribe(results => {
         expect(results[0]).toEqual({$key: 3, name: 'todo3++'});
         expect(results[1]).toEqual({$key: 4, name: 'todo4++'});
-        done()
+        done();
       }, err => {
         console.error(err);
         done(err);
       });
   });
 
   it('should insert some more data with a primary key', (done) => {
-    idb.insert('users',[{userID: 'user1'}, {userID: 'user2'}])
+    idb.insert('users', [{userID: 'user1'}, {userID: 'user2'}])
       .toArray()
       .subscribe(results => {
         expect(results[0]).toEqual({userID: 'user1'});
         expect(results[1]).toEqual({userID: 'user2'});
-        done()
+        done();
       }, err => {
         console.error(err);
         done(err);
@@ -123,7 +125,7 @@ describe('database functionality', () => {
     idb.changes.subscribe(notif => {
       notificationCount++;
     });
-    idb.insert('todos',[{name: 'todo5'}, {name: 'todo6'}])
+    idb.insert('todos', [{name: 'todo5'}, {name: 'todo6'}])
       .toArray()
       .subscribe(() => {}, (err) => {}, () => {
         expect(notificationCount).toBe(2);
@@ -141,7 +143,7 @@ describe('database functionality', () => {
         done(err);
       }, () => {
         expect(found).toEqual({name: 'todo2'});
-        done()
+        done();
       });
   });
 
@@ -155,7 +157,7 @@ describe('database functionality', () => {
         done(err);
       }, () => {
         expect(found).toEqual({userID: 'user1'});
-        done()
+        done();
       });
   });
 
@@ -169,7 +171,7 @@ describe('database functionality', () => {
         done(err);
       }, () => {
         expect(found.length).toEqual(6);
-        done()
+        done();
       });
   });
 
@@ -183,9 +185,8 @@ describe('database functionality', () => {
         done(err);
       }, () => {
         expect(found.length).toEqual(1);
-        done()
+        done();
       });
   });
 
 });
-