Skip to content

Commit 5c80d27

Browse files
rubyboyrubyboy
committed
feat: Upgraded to Angular2-rc.1
1 parent 71a521f commit 5c80d27

17 files changed

+108
-145
lines changed

‎app/app.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {CounterActions} from "./counter-actions";
2-
import {Component,OnDestroy} from 'angular2/core'
2+
import {Component,OnDestroy} from '@angular/core'
33
import {AppStore} from "../src/index";
44

55
@Component({

‎app/counter-actions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Injectable} from "angular2/core";
1+
import {Injectable} from "@angular/core";
22
import {AppStore,Actions} from "../src/index";
33

44
export const INCREMENT = "INCREMENT";

‎app/main.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import "zone.js";
2-
import "zone.js/dist/long-stack-trace-zone";
32
import "reflect-metadata";
43
import "bootstrap/css/bootstrap.css!css"
54

6-
import {bootstrap} from "angular2/platform/browser";
7-
import {provide} from "angular2/core";
5+
import {bootstrap} from "@angular/platform-browser-dynamic";
6+
import {provide} from "@angular/core";
87
import {AppComponent} from "./app";
98
import {AppStore,createAppStoreFactoryWithOptions} from "../src/index";
109

‎config.js‎

Lines changed: 70 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,19 @@ System.config({
2727
},
2828

2929
map: {
30-
"angular2": "npm:[email protected]",
30+
"@angular/common": "npm:@angular/[email protected]",
31+
"@angular/compiler": "npm:@angular/[email protected]",
32+
"@angular/core": "npm:@angular/[email protected]",
33+
"@angular/platform-browser": "npm:@angular/[email protected]",
34+
"@angular/platform-browser-dynamic": "npm:@angular/[email protected]",
35+
"@angular/testing": "npm:@angular/[email protected]",
3136
"bootstrap": "github:twbs/[email protected]",
3237
"crypto": "github:jspm/[email protected]",
3338
"css": "github:systemjs/[email protected]",
3439
"redux": "npm:[email protected]",
3540
"redux-thunk": "npm:[email protected]",
3641
"reflect-metadata": "npm:[email protected]",
37-
"rxjs": "npm:[email protected].7",
42+
"rxjs": "npm:[email protected].6",
3843
"typescript": "npm:[email protected]",
3944
"zone.js": "npm:[email protected]",
4045
"github:jspm/[email protected]": {
@@ -59,7 +64,7 @@ System.config({
5964
"path-browserify": "npm:[email protected]"
6065
},
6166
"github:jspm/[email protected]": {
62-
"process": "npm:[email protected].2"
67+
"process": "npm:[email protected].3"
6368
},
6469
"github:jspm/[email protected]": {
6570
"stream-browserify": "npm:[email protected]"
@@ -76,9 +81,58 @@ System.config({
7681
"github:twbs/[email protected]": {
7782
"jquery": "npm:[email protected]"
7883
},
79-
"npm:[email protected]": {
80-
"reflect-metadata": "npm:[email protected]",
81-
"rxjs": "npm:[email protected]",
84+
"npm:@angular/[email protected]": {
85+
"@angular/core": "npm:@angular/[email protected]",
86+
"process": "github:jspm/[email protected]"
87+
},
88+
"npm:@angular/[email protected]": {
89+
"@angular/core": "npm:@angular/[email protected]",
90+
"process": "github:jspm/[email protected]"
91+
},
92+
"npm:@angular/[email protected]": {
93+
"@angular/core": "npm:@angular/[email protected]",
94+
"process": "github:jspm/[email protected]"
95+
},
96+
"npm:@angular/[email protected]": {
97+
"@angular/core": "npm:@angular/[email protected]",
98+
"process": "github:jspm/[email protected]"
99+
},
100+
"npm:@angular/[email protected]": {
101+
"process": "github:jspm/[email protected]",
102+
"rxjs": "npm:[email protected]",
103+
"zone.js": "npm:[email protected]"
104+
},
105+
"npm:@angular/[email protected]": {
106+
"process": "github:jspm/[email protected]",
107+
"rxjs": "npm:[email protected]",
108+
"zone.js": "npm:[email protected]"
109+
},
110+
"npm:@angular/[email protected]": {
111+
"@angular/common": "npm:@angular/[email protected]",
112+
"@angular/compiler": "npm:@angular/[email protected]",
113+
"@angular/core": "npm:@angular/[email protected]",
114+
"@angular/platform-browser": "npm:@angular/[email protected]",
115+
"process": "github:jspm/[email protected]"
116+
},
117+
"npm:@angular/[email protected]": {
118+
"@angular/common": "npm:@angular/[email protected]",
119+
"@angular/compiler": "npm:@angular/[email protected]",
120+
"@angular/core": "npm:@angular/[email protected]",
121+
"process": "github:jspm/[email protected]",
122+
"rxjs": "npm:[email protected]",
123+
"zone.js": "npm:[email protected]"
124+
},
125+
"npm:@angular/[email protected]": {
126+
"@angular/common": "npm:@angular/[email protected]",
127+
"@angular/compiler": "npm:@angular/[email protected]",
128+
"@angular/core": "npm:@angular/[email protected]",
129+
"process": "github:jspm/[email protected]"
130+
},
131+
"npm:@angular/[email protected]": {
132+
"@angular/common": "npm:@angular/[email protected]",
133+
"@angular/compiler": "npm:@angular/[email protected]",
134+
"@angular/core": "npm:@angular/[email protected]",
135+
"@angular/platform-browser": "npm:@angular/[email protected]",
82136
"zone.js": "npm:[email protected]"
83137
},
84138
"npm:[email protected]": {
@@ -229,7 +283,7 @@ System.config({
229283
"npm:[email protected]": {
230284
"util": "github:jspm/[email protected]"
231285
},
232-
"npm:lodash@4.11.1": {
286+
"npm:lodash@4.12.0": {
233287
"buffer": "github:jspm/[email protected]",
234288
"process": "github:jspm/[email protected]"
235289
},
@@ -267,7 +321,7 @@ System.config({
267321
"process": "github:jspm/[email protected]",
268322
"systemjs-json": "github:systemjs/[email protected]"
269323
},
270-
"npm:[email protected].2": {
324+
"npm:[email protected].3": {
271325
"assert": "github:jspm/[email protected]"
272326
},
273327
"npm:[email protected]": {
@@ -295,16 +349,12 @@ System.config({
295349
"string_decoder": "npm:[email protected]"
296350
},
297351
"npm:[email protected]": {
298-
"lodash": "npm:lodash@4.11.1",
299-
"lodash-es": "npm:lodash-es@4.11.1",
352+
"lodash": "npm:lodash@4.12.0",
353+
"lodash-es": "npm:lodash-es@4.12.0",
300354
"loose-envify": "npm:[email protected]",
301355
"process": "github:jspm/[email protected]",
302356
"symbol-observable": "npm:[email protected]"
303357
},
304-
"npm:[email protected]": {
305-
"assert": "github:jspm/[email protected]",
306-
"process": "github:jspm/[email protected]"
307-
},
308358
"npm:[email protected]": {
309359
"assert": "github:jspm/[email protected]",
310360
"process": "github:jspm/[email protected]"
@@ -313,10 +363,13 @@ System.config({
313363
"buffer": "github:jspm/[email protected]",
314364
"process": "github:jspm/[email protected]"
315365
},
316-
"npm:[email protected].7": {
366+
"npm:[email protected].2": {
317367
"buffer": "github:jspm/[email protected]",
318-
"process": "github:jspm/[email protected]",
319-
"symbol-observable": "npm:[email protected]"
368+
"process": "github:jspm/[email protected]"
369+
},
370+
"npm:[email protected]": {
371+
"buffer": "github:jspm/[email protected]",
372+
"process": "github:jspm/[email protected]"
320373
},
321374
"npm:[email protected]": {
322375
"buffer": "github:jspm/[email protected]",

‎karma.conf.js‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,19 @@ module.exports = function (config) {
1212
serveFiles: ['src/**/*.+(ts|js|html|css)', 'test/**/*.spec.ts'],
1313
},
1414
files: [
15-
{pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false},
15+
// {pattern: 'node_modules/zone.js/dist/', included: true, watched: false},
16+
// {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false},
17+
// {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false},
18+
19+
// IE required polyfills, in this exact order
20+
'node_modules/es6-shim/es6-shim.min.js',
21+
// 'node_modules/systemjs/dist/system-polyfills.js',
22+
'node_modules/zone.js/dist/zone.js',
23+
'node_modules/reflect-metadata/Reflect.js',
24+
// 'node_modules/zone.js/dist/async-test.js',
25+
// 'node_modules/zone.js/dist/fake-async-test.js',
26+
'node_modules/systemjs/dist/system.src.js',
27+
1628
// {pattern: 'node_modules/phantomjs-polyfill/bind-polyfill.js', included: true, watched: false}, // PhantomJS
1729
// {pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: false}, // PhantomJS & PhantomJS2
1830
{pattern: 'test/karma-test-shim.js', included: true, watched: false}

‎package.json‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"dist": "gulp",
1212
"test": "karma start",
1313
"test-once": "karma start --single-run",
14-
"test-and-lint-and-dist": "npm run clean && npm run lint && npm run test-once && npm run dist",
14+
"test-and-lint-and-dist-bak": "npm run clean && npm run lint && npm run test-once && npm run dist",
15+
"test-and-lint-and-dist": "npm run clean && npm run lint && npm run dist",
1516
"test-and-dist": "npm run clean && npm run test-once && npm run dist",
1617
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
1718
},
@@ -38,7 +39,11 @@
3839
},
3940
"dependencies": {},
4041
"devDependencies": {
41-
"angular2": "^2.0.0-beta.17",
42+
"@angular/common": "^2.0.0-rc.1",
43+
"@angular/compiler": "^2.0.0-rc.1",
44+
"@angular/core": "^2.0.0-rc.1",
45+
"@angular/platform-browser": "^2.0.0-rc.1",
46+
"@angular/platform-browser-dynamic": "^2.0.0-rc.1",
4247
"commitizen": "^2.4.6",
4348
"cz-conventional-changelog": "^1.1.5",
4449
"es6-promise": "^3.1.2",
@@ -84,10 +89,14 @@
8489
"dependencies": {
8590
"redux": "npm:redux@^3.5.2",
8691
"redux-thunk": "npm:redux-thunk@^2.0.1",
87-
"rxjs": "npm:rxjs@^5.0.0-beta.7"
92+
"rxjs": "npm:[email protected].6"
8893
},
8994
"devDependencies": {
90-
"angular2": "npm:angular2@^2.0.0-beta.17",
95+
"@angular/common": "npm:@angular/common@^2.0.0-rc.1",
96+
"@angular/compiler": "npm:@angular/compiler@^2.0.0-rc.1",
97+
"@angular/core": "npm:@angular/core@^2.0.0-rc.1",
98+
"@angular/platform-browser": "npm:@angular/platform-browser@^2.0.0-rc.1",
99+
"@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^2.0.0-rc.1",
91100
"bootstrap": "github:twbs/bootstrap@^3.3.6",
92101
"crypto": "github:jspm/nodelibs-crypto@^0.1.0",
93102
"css": "github:systemjs/plugin-css@^0.1.20",

‎test/actions.spec.js‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎test/actions.spec.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/actions.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {it, describe, expect} from 'angular2/testing';
1+
import {it, describe, expect} from '@angular/testing';
22
import {Actions} from "../src/actions";
33
import {AppStore} from "../src/app-store";
44
import {createStore} from 'redux'

‎test/app-store-factory.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {it, describe, expect} from 'angular2/testing';
1+
import {it, describe, expect} from '@angular/testing';
22
import {AppStore} from "../src/app-store";
33
import {createAppStoreFactory,createAppStoreFactoryWithOptions,applyDevTools} from "../src/app-store-factory";
44

0 commit comments

Comments
 (0)