diff --git a/README.md b/README.md index 4ed3711..15bb48a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # React Redux Epic +[![Greenkeeper badge](https://badges.greenkeeper.io/BerkeleyTrue/react-redux-epic.svg)](https://greenkeeper.io/) + [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) [![Build Status](https://travis-ci.org/BerkeleyTrue/react-redux-epic.svg?branch=master)](https://travis-ci.org/BerkeleyTrue/react-redux-epic) [![Coverage Status](https://coveralls.io/repos/github/BerkeleyTrue/react-redux-epic/badge.svg?branch=master)](https://coveralls.io/github/BerkeleyTrue/react-redux-epic?branch=master) Server Side Rendering made easy with [Redux-Observable](https://github.com/redux-observable/redux-observable) diff --git a/package.json b/package.json index bc4e97a..dba633c 100644 --- a/package.json +++ b/package.json @@ -45,12 +45,12 @@ "author": "Berkeley Martinez (http://www.BerkeleyTrue.com)", "license": "MIT", "devDependencies": { - "ava": "^0.18.2", + "ava": "^0.19.1", "babel": "^6.5.2", "babel-cli": "^6.14.0", - "babel-eslint": "^6.1.2", + "babel-eslint": "^7.2.2", "babel-plugin-dev-expression": "^0.2.1", - "babel-plugin-istanbul": "^2.0.1", + "babel-plugin-istanbul": "^4.1.1", "babel-plugin-transform-function-bind": "^6.8.0", "babel-plugin-transform-runtime": "^6.15.0", "babel-preset-es2015": "^6.14.0", @@ -60,12 +60,12 @@ "cz-conventional-changelog": "^2.0.0", "enzyme": "^2.4.1", "eslint": "^3.5.0", - "eslint-plugin-import": "^1.15.0", + "eslint-plugin-import": "^2.2.0", "eslint-plugin-react": "^6.3.0", "nodemon": "^1.11.0", "nyc": "^10.1.2", "react-addons-test-utils": "^15.3.2", - "sinon": "^1.17.6" + "sinon": "^2.1.0" }, "dependencies": { "babel-runtime": "^6.11.6", @@ -74,7 +74,7 @@ "react": "^15.3.2", "react-dom": "^15.3.2", "redux": "^3.6.0", - "redux-observable": "^0.12.2", + "redux-observable": "^0.14.1", "rxjs": "^5.0.0-rc.5" }, "config": { diff --git a/src/wrap-root-epic.js b/src/wrap-root-epic.js index 0d70923..d619917 100644 --- a/src/wrap-root-epic.js +++ b/src/wrap-root-epic.js @@ -3,8 +3,7 @@ import invariant from 'invariant'; import { EmptyObservable } from 'rxjs/observable/EmptyObservable'; import { Subject } from 'rxjs/Subject'; import { Subscriber } from 'rxjs/Subscriber'; -import { EPIC_END } from 'redux-observable/lib/EPIC_END'; -import { ActionsObservable } from 'redux-observable/lib/ActionsObservable.js'; +import { ActionsObservable, EPIC_END } from 'redux-observable'; import debug from 'debug'; import { diff --git a/test/wrap-root-epic.js b/test/wrap-root-epic.js index 473ebe1..450908e 100644 --- a/test/wrap-root-epic.js +++ b/test/wrap-root-epic.js @@ -55,9 +55,10 @@ test( 'wrappedEpic(actions) => results will emit actions', t => { const wrappedEpic = wrapRootEpic( - () => ActionsObservable.of({ type: 'FOO' }) + actions => actions.mapTo({ type: 'FOO' }) ); - return wrappedEpic(ActionsObservable.of({ type: 'BAR' })) + + return wrappedEpic(ActionsObservable.of({ type: 'BAR' }).delay(1)) .map(action => { t.is(action.type, 'FOO'); });