diff --git a/karma-test-shim.js b/karma-test-shim.js index e6449db..414688c 100644 --- 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 index 77467be..cf8d8d5 100644 --- 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 index 53032e8..fb7dc3f 100644 --- a/src/base.model.js +++ b/src/base.model.js @@ -1,4 +1,6 @@ -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { + "use strict"; + var __moduleName = context_1 && context_1.id; var BaseModel; return { setters:[], @@ -36,7 +38,7 @@ System.register([], function(exports_1) { return this.store.destroy(this._model, this.id); }; return BaseModel; - })(); + }()); exports_1("BaseModel", BaseModel); } } diff --git a/src/base.model.spec.js b/src/base.model.spec.js index 8b95ed2..9d87574 100644 --- a/src/base.model.spec.js +++ b/src/base.model.spec.js @@ -1,4 +1,6 @@ -System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2/http/testing', './store.service', './base.model'], function(exports_1) { +System.register(['@angular/core/testing', '@angular/core', '@angular/http', '@angular/http/testing', './store.service', './base.model'], function(exports_1, context_1) { + "use strict"; + var __moduleName = context_1 && context_1.id; var testing_1, core_1, http_1, testing_2, store_service_1, base_model_1; var MockStore; return { @@ -51,7 +53,7 @@ System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2 }; }; return MockStore; - })(); + }()); testing_1.describe('Base Model', function () { testing_1.beforeEachProviders(function () { return [core_1.provide(store_service_1.StoreService, { useClass: MockStore }), http_1.HTTP_PROVIDERS, core_1.provide(http_1.XHRBackend, { useClass: testing_2.MockBackend })]; }); testing_1.it('should delete a user', testing_1.inject([http_1.XHRBackend, store_service_1.StoreService], function (mockBackend, store) { diff --git a/src/base.model.spec.ts b/src/base.model.spec.ts index b057747..79ff04e 100644 --- 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 index 3650786..cfd14bb 100644 --- a/src/store.config.js +++ b/src/store.config.js @@ -1,4 +1,6 @@ -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { + "use strict"; + var __moduleName = context_1 && context_1.id; var StoreConfig; return { setters:[], @@ -16,7 +18,7 @@ System.register([], function(exports_1) { Object.assign(this, config); } return StoreConfig; - })(); + }()); exports_1("StoreConfig", StoreConfig); } } diff --git a/src/store.config.spec.js b/src/store.config.spec.js index 50911be..1c31e76 100644 --- a/src/store.config.spec.js +++ b/src/store.config.spec.js @@ -1,4 +1,6 @@ -System.register(['angular2/testing', './store.config'], function(exports_1) { +System.register(['@angular/core/testing', './store.config'], function(exports_1, context_1) { + "use strict"; + var __moduleName = context_1 && context_1.id; var testing_1, store_config_1; return { setters:[ diff --git a/src/store.config.spec.ts b/src/store.config.spec.ts index 9d90498..be271a2 100644 --- 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 index 861031b..493767d 100644 --- a/src/store.service.js +++ b/src/store.service.js @@ -1,4 +1,6 @@ -System.register(['angular2/core', 'angular2/http', 'rxjs/Rx', './base.model'], function(exports_1) { +System.register(['@angular/core', '@angular/http', 'rxjs/Rx', './base.model'], function(exports_1, context_1) { + "use strict"; + var __moduleName = context_1 && context_1.id; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); @@ -40,12 +42,12 @@ System.register(['angular2/core', 'angular2/http', 'rxjs/Rx', './base.model'], f this.log('Generating headers with', arguments); var options = new http_1.RequestOptions(); if (StoreService.customGenerateOptions) { - var createdHeaders = StoreService.customGenerateOptions(url, method, queryParameters, body); - var newHeaders = new http_1.Headers(); - Object.keys(createdHeaders).forEach(function (k) { - newHeaders.set(k, createdHeaders[k]); + var createdHeaders_1 = StoreService.customGenerateOptions(url, method, queryParameters, body); + var newHeaders_1 = new http_1.Headers(); + Object.keys(createdHeaders_1).forEach(function (k) { + newHeaders_1.set(k, createdHeaders_1[k]); }); - options.headers = newHeaders; + options.headers = newHeaders_1; } this.log('Generated The Following headers', options); return options; @@ -182,7 +184,7 @@ System.register(['angular2/core', 'angular2/http', 'rxjs/Rx', './base.model'], f __metadata('design:paramtypes', [http_1.Http]) ], StoreService); return StoreService; - })(); + }()); exports_1("StoreService", StoreService); } } diff --git a/src/store.service.spec.js b/src/store.service.spec.js index c81457b..cad4372 100644 --- a/src/store.service.spec.js +++ b/src/store.service.spec.js @@ -1,4 +1,6 @@ -System.register(['angular2/testing', 'angular2/core', './store.service', './store.config', 'angular2/http', 'angular2/http/testing'], function(exports_1) { +System.register(['@angular/core/testing', '@angular/core', './store.service', './store.config', '@angular/http', '@angular/http/testing'], function(exports_1, context_1) { + "use strict"; + var __moduleName = context_1 && context_1.id; var testing_1, core_1, store_service_1, store_config_1, http_1, testing_2, http_2; return { setters:[ diff --git a/src/store.service.spec.ts b/src/store.service.spec.ts index 56848c3..0221136 100644 --- 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 index 9e73b03..ff356b3 100644 --- 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 index f5b42e6..9d5c20b 100644 --- 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" } }