Updating to rc1

stephenthedev · May 12, 2016 · cc164e5 · cc164e5
1 parent 938ef06
commit cc164e5
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 42 deletions.
diff --git a/karma-test-shim.js b/karma-test-shim.js
@@ -20,7 +20,7 @@ System.config({
   }
 });
 
-System.import('angular2/testing').then(function (testing) {
+System.import('@angular/core/testing').then(function (testing) {
   return System.import('angular2/platform/testing/browser').then(function (providers) {
     testing.setBaseTestProviders(providers.TEST_BROWSER_PLATFORM_PROVIDERS,
       providers.TEST_BROWSER_APPLICATION_PROVIDERS);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ng2-data",
-    "version": "0.0.28",
+    "version": "0.1.0",
     "description": "Convential HTTP client for Model Data in Angular 2",
     "repository": {
         "type": "git",
@@ -31,12 +31,13 @@
     "typings": "./ng2-data.d.ts",
     "homepage": "https://github.com/raghunat/ng2-data#readme",
     "dependencies": {
-        "angular2": "2.0.0-beta.9",
-        "es6-promise": "^3.0.2",
-        "es6-shim": "^0.33.3",
-        "reflect-metadata": "0.1.2",
-        "rxjs": "5.0.0-beta.2",
-        "zone.js": "0.5.15"
+        "@angular/core": "2.0.0-rc.1",
+        "@angular/http": "2.0.0-rc.1",
+        "es6-shim": "^0.35.0",
+        "reflect-metadata": "0.1.3",
+        "rxjs": "5.0.0-beta.6",
+        "systemjs": "0.19.26",
+        "zone.js": "^0.6.12"
     },
     "devDependencies": {
         "body-parser": "^1.15.0",
@@ -52,6 +53,7 @@
         "karma-mocha-reporter": "^2.0.0",
         "lite-server": "^2.1.0",
         "systemjs": "~0.19.24",
-        "typescript": "~1.7.5"
+        "typescript": "^1.8.10",
+        "typings": "^0.8.1"
     }
 }
diff --git a/src/base.model.js b/src/base.model.js
diff --git a/src/base.model.spec.js b/src/base.model.spec.js
diff --git a/src/base.model.spec.ts b/src/base.model.spec.ts
@@ -6,13 +6,13 @@ ddescribe,
 expect,
 inject,
 injectAsync,
-TestComponentBuilder,
+
 beforeEachProviders
-} from 'angular2/testing';
-import {provide} from 'angular2/core';
-import {HTTP_PROVIDERS, XHRBackend} from 'angular2/http';
-import {MockBackend} from 'angular2/http/testing';
-import {MockConnection} from 'angular2/src/http/backends/mock_backend';
+} from '@angular/core/testing';
+import {provide} from '@angular/core';
+import {HTTP_PROVIDERS, XHRBackend} from '@angular/http';
+import {MockBackend} from '@angular/http/testing';
+import {MockConnection} from '@angular/http/testing';
 
 import {StoreService} from './store.service';
 import {BaseModel} from './base.model';

diff --git a/src/store.config.js b/src/store.config.js
diff --git a/src/store.config.spec.js b/src/store.config.spec.js
diff --git a/src/store.config.spec.ts b/src/store.config.spec.ts
@@ -6,7 +6,7 @@ import {
   it,
   inject,
   injectAsync
-} from 'angular2/testing';
+} from '@angular/core/testing';
 
 import {StoreConfig} from './store.config';
 

diff --git a/src/store.service.js b/src/store.service.js
diff --git a/src/store.service.spec.js b/src/store.service.spec.js
diff --git a/src/store.service.spec.ts b/src/store.service.spec.ts
@@ -6,16 +6,16 @@ ddescribe,
 expect,
 inject,
 injectAsync,
-TestComponentBuilder,
+
 beforeEachProviders
-} from 'angular2/testing';
-import {provide} from 'angular2/core';
+} from '@angular/core/testing';
+import {provide} from '@angular/core';
 import {StoreService} from './store.service';
 import {StoreConfig} from './store.config';
-import {Headers, HTTP_PROVIDERS, BaseRequestOptions, XHRBackend, Response} from 'angular2/http';
-import {MockBackend} from 'angular2/http/testing';
-import {MockConnection} from 'angular2/src/http/backends/mock_backend';
-import {ResponseOptions} from 'angular2/http';
+import {Headers, HTTP_PROVIDERS, BaseRequestOptions, XHRBackend, Response} from '@angular/http';
+import {MockBackend} from '@angular/http/testing';
+import {MockConnection} from '@angular/http/testing';
+import {ResponseOptions} from '@angular/http';
 
 describe('StoreService Service', () => {
 

diff --git a/src/store.service.ts b/src/store.service.ts
@@ -1,5 +1,5 @@
-import {Injectable, Injector} from 'angular2/core';
-import {Http, URLSearchParams, BaseRequestOptions, RequestOptions, Headers} from 'angular2/http';
+import {Injectable} from '@angular/core';
+import {Http, URLSearchParams, RequestOptions, Headers} from '@angular/http';
 import 'rxjs/Rx';
 
 import {StoreConfig} from './store.config';

diff --git a/typings.json b/typings.json
@@ -1,6 +1,6 @@
 {
   "ambientDependencies": {
-    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#d594ef506d1efe2fea15f8f39099d19b39436b71"
+    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
+    "jasmine": "registry:dt/jasmine#2.2.0+20160412134438"
   }
 }