diff --git a/package.json b/package.json index 867633a..76f39f5 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "react-infinite-scroller": "^1.0.4", "react-loading": "^0.0.9", "react-redux": "^4.4.6", - "react-redux-form": "^1.2.4", "react-router": "^3.0.0", "react-router-bootstrap": "^0.23.1", "react-router-redux": "^4.0.7", diff --git a/src/public/js/reducers/index.js b/src/public/js/reducers/index.js index 5874a94..e7cf20d 100644 --- a/src/public/js/reducers/index.js +++ b/src/public/js/reducers/index.js @@ -1,4 +1,4 @@ -import { combineForms } from 'react-redux-form' +import { combineReducers } from 'redux'; import { routerReducer } from 'react-router-redux' import movieStore from './movies' @@ -8,10 +8,7 @@ import userStore from './users' import alerts from './alerts' import torrentStore from './torrents' -// Use combine form form react-redux-form, it's a thin wrapper arround the -// default combinedReducers provided with React. It allows the forms to be -// linked directly to the store. -const rootReducer = combineForms({ +const rootReducer = combineReducers({ routing: routerReducer, movieStore, showsStore, diff --git a/yarn.lock b/yarn.lock index a71f73c..b9812bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1803,10 +1803,6 @@ https-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.0.tgz#b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd" -icepick@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/icepick/-/icepick-1.3.0.tgz#e4942842ed8f9ee778d7dd78f7e36627f49fdaef" - iconv-lite@~0.4.13: version "0.4.13" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" @@ -1872,7 +1868,7 @@ interpret@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" -invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1, invariant@~2.2.1: +invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.1.tgz#b097010547668c7e337028ebe816ebe36c8a8d54" dependencies: @@ -2316,7 +2312,7 @@ lodash.templatesettings@^3.0.0: lodash._reinterpolate "^3.0.0" lodash.escape "^3.0.0" -lodash@^4.10.0, lodash@^4.2.0, lodash@^4.2.1: +lodash@^4.2.0, lodash@^4.2.1: version "4.16.6" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777" @@ -3109,14 +3105,6 @@ react-redux: lodash "^4.2.0" loose-envify "^1.1.0" -react-redux-form: - version "1.2.4" - resolved "https://registry.yarnpkg.com/react-redux-form/-/react-redux-form-1.2.4.tgz#924c5ac06dd52f21efc961df6aed9c10bfe27de9" - dependencies: - icepick "^1.1.0" - invariant "~2.2.1" - lodash "^4.10.0" - react-router: version "3.0.0" resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.0.0.tgz#3f313e4dbaf57048c48dd0a8c3cac24d93667dff"