Skip to content

Commit

Permalink
Reverting to Angular2/beta until rc 1 is stabilized
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenthedev committed May 15, 2016
1 parent cc164e5 commit 1b0a686
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 78 deletions.
2 changes: 1 addition & 1 deletion karma-test-shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ System.config({
}
});

System.import('@angular/core/testing').then(function (testing) {
System.import('angular2/core').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);
Expand Down
113 changes: 56 additions & 57 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,59 +1,58 @@
{
"name": "ng2-data",
"version": "0.1.0",
"description": "Convential HTTP client for Model Data in Angular 2",
"repository": {
"type": "git",
"url": "git+https://github.com/raghunat/ng2-data.git"
},
"main": "src/store.service",
"scripts": {
"start": "concurrently \"npm run tsc:w\" \"npm run lite\" ",
"tsc": "tsc",
"tsc:w": "tsc -w",
"lite": "lite-server",
"typings": "typings",
"postinstall": "typings install",
"test": "./node_modules/karma/bin/karma start"
},
"keywords": [
"angular",
"angular2",
"data",
"orm",
"http"
],
"author": "raghunat",
"license": "MIT",
"bugs": {
"url": "https://github.com/raghunat/ng2-data/issues"
},
"typings": "./ng2-data.d.ts",
"homepage": "https://github.com/raghunat/ng2-data#readme",
"dependencies": {
"@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",
"concurrently": "^2.0.0",
"cors": "^2.7.1",
"express": "^4.13.4",
"glob": "^7.0.3",
"jasmine-core": "^2.4.1",
"jasmine-spec-reporter": "^2.4.0",
"karma": "^0.13.22",
"karma-chrome-launcher": "^0.2.2",
"karma-jasmine": "^0.3.7",
"karma-mocha-reporter": "^2.0.0",
"lite-server": "^2.1.0",
"systemjs": "~0.19.24",
"typescript": "^1.8.10",
"typings": "^0.8.1"
}
"name": "ng2-data",
"version": "0.1.1",
"description": "Convential HTTP client for Model Data in Angular 2",
"repository": {
"type": "git",
"url": "git+https://github.com/raghunat/ng2-data.git"
},
"main": "src/store.service",
"scripts": {
"start": "concurrently \"npm run tsc:w\" \"npm run lite\" ",
"tsc": "tsc",
"tsc:w": "tsc -w",
"lite": "lite-server",
"typings": "typings",
"postinstall": "typings install",
"test": "./node_modules/karma/bin/karma start"
},
"keywords": [
"angular",
"angular2",
"data",
"orm",
"http"
],
"author": "raghunat",
"license": "MIT",
"bugs": {
"url": "https://github.com/raghunat/ng2-data/issues"
},
"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"
},
"devDependencies": {
"body-parser": "^1.15.0",
"concurrently": "^2.0.0",
"cors": "^2.7.1",
"express": "^4.13.4",
"glob": "^7.0.3",
"jasmine-core": "^2.4.1",
"jasmine-spec-reporter": "^2.4.0",
"karma": "^0.13.22",
"karma-chrome-launcher": "^0.2.2",
"karma-jasmine": "^0.3.7",
"karma-mocha-reporter": "^2.0.0",
"lite-server": "^2.1.0",
"systemjs": "~0.19.24",
"typescript": "^1.8.10",
"typings": "^0.8.1"
}
}
2 changes: 1 addition & 1 deletion src/base.model.spec.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/base.model.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ inject,
injectAsync,

beforeEachProviders
} 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';
} 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/http/testing';

import {StoreService} from './store.service';
import {BaseModel} from './base.model';
Expand Down
2 changes: 1 addition & 1 deletion src/store.config.spec.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/store.config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
expect,
it,
inject,
injectAsync
} from '@angular/core/testing';
injectAsync
} from 'angular2/testing';

import {StoreConfig} from './store.config';

Expand Down
2 changes: 1 addition & 1 deletion src/store.service.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/store.service.spec.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions src/store.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ inject,
injectAsync,

beforeEachProviders
} from '@angular/core/testing';
import {provide} from '@angular/core';
} from 'angular2/testing';
import {provide} from 'angular2/core';
import {StoreService} from './store.service';
import {StoreConfig} from './store.config';
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';
import {Headers, HTTP_PROVIDERS, BaseRequestOptions, XHRBackend, Response} from 'angular2/http';
import {MockBackend} from 'angular2/http/testing';
import {MockConnection} from 'angular2/http/testing';
import {ResponseOptions} from 'angular2/http';

describe('StoreService Service', () => {

Expand Down
6 changes: 3 additions & 3 deletions src/store.service.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Injectable} from '@angular/core';
import {Http, URLSearchParams, RequestOptions, Headers} from '@angular/http';
import {Injectable} from 'angular2/core';
import {Http, URLSearchParams, RequestOptions, Headers} from 'angular2/http';
import 'rxjs/Rx';

import {StoreConfig} from './store.config';
Expand All @@ -9,7 +9,7 @@ let instance = null;

@Injectable()
export class StoreService {
public static config: StoreConfig
public static config: StoreConfig;
public static customGenerateOptions: Function;
public static customGenerateQuery: Function;

Expand Down

0 comments on commit 1b0a686

Please sign in to comment.