Skip to content

Commit e749f57

Browse files
SethDavenporte-schultz
authored andcommitted
Update to angular 2.0.0 final (#224)
1 parent e8591a8 commit e749f57

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

examples/counter/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
},
2424
"homepage": "https://github.com/wbuchwalter/ng2-redux#readme",
2525
"dependencies": {
26-
"@angular/common": "2.0.0-rc.6",
27-
"@angular/compiler": "2.0.0-rc.6",
28-
"@angular/core": "2.0.0-rc.6",
29-
"@angular/http": "2.0.0-rc.6",
30-
"@angular/platform-browser": "2.0.0-rc.6",
31-
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
26+
"@angular/common": "^2.0.0",
27+
"@angular/compiler": "^2.0.0",
28+
"@angular/core": "^2.0.0",
29+
"@angular/http": "^2.0.0",
30+
"@angular/platform-browser": "^2.0.0",
31+
"@angular/platform-browser-dynamic": "^2.0.0",
3232
"core-js": "^2.3.0",
33-
"ng2-redux": "^3.3.9",
33+
"ng2-redux": "^4.0.0-beta.0",
3434
"redux": "^3.5.0",
3535
"redux-logger": "^2.6.1",
3636
"redux-localstorage": "^0.4.0",
3737
"reflect-metadata": "0.1.3",
38-
"rxjs": "5.0.0-beta.11",
39-
"zone.js": "^0.6.15"
38+
"rxjs": "5.0.0-beta.12",
39+
"zone.js": "^0.6.21"
4040
},
4141
"devDependencies": {
4242
"@types/core-js": "^0.9.32",

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"homepage": "https://github.com/angular-redux/ng2-redux#readme",
4949
"devDependencies": {
50-
"@angular/core": "2.0.0-rc.6",
50+
"@angular/core": "^2.0.0",
5151
"@types/chai": "^3.4.31",
5252
"@types/es6-shim": "0.0.30",
5353
"@types/mocha": "^2.2.30",
@@ -60,10 +60,10 @@
6060
"mocha": "^2.4.5",
6161
"nyc": "^8.1.0",
6262
"proxyquire": "^1.7.10",
63-
"redux": "^3.4.0",
63+
"redux": "^3.5.0",
6464
"reflect-metadata": "0.1.3",
6565
"rimraf": "^2.5.2",
66-
"rxjs": "5.0.0-beta.11",
66+
"rxjs": "5.0.0-beta.12",
6767
"sinon": "^1.16.1",
6868
"sinon-chai": "^2.8.0",
6969
"symbol-observable": "^1.0.1",
@@ -73,7 +73,7 @@
7373
"zone.js": "^0.6.17"
7474
},
7575
"peerDependencies": {
76-
"@angular/core": "2.0.0-rc.3 || ^2.0.0-rc.4 || ^2.0.0-rc.5 || ^2.0.0-rc.6",
76+
"@angular/core": "^2.0.0",
7777
"redux": "^3.5.0"
7878
},
7979
"nyc": {

src/components/ng-redux.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ export type PathSelector = (string | number)[];
3636
export type FunctionSelector<RootState, S> = ((s: RootState) => S);
3737
export type Comparator = (x: any, y: any) => boolean;
3838

39+
// Workaround for Redux issue #1935 - remove once Redux 3.6.0 is
40+
// released.
41+
type RetypedCompose = (func: Function, ...funcs: Function[]) => Function;
42+
3943
@Injectable()
4044
export class NgRedux<RootState> {
4145
private _store: Store<RootState> = null;
@@ -80,8 +84,11 @@ export class NgRedux<RootState> {
8084

8185
invariant(!this._store, 'Store already configured!');
8286

87+
// Workaround for Redux issue #1935 - remove once Redux 3.6.0 is
88+
// released.
89+
const reTypedCompose = compose as RetypedCompose;
8390
const finalCreateStore
84-
= <Redux.StoreEnhancerStoreCreator<RootState>>compose(
91+
= <Redux.StoreEnhancerStoreCreator<RootState>>reTypedCompose(
8592
applyMiddleware(...middleware),
8693
...enhancers
8794
)(createStore);

0 commit comments

Comments
 (0)