upgrading to redux 1.0.0-rc

pjago · Jul 25, 2015 · 057f216 · 057f216
1 parent 39f6cb5
commit 057f216
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/containers/App.js b/containers/App.js
@@ -1,15 +1,16 @@
 import React, { Component } from 'react';
 import PokedexApp from './PokedexApp';
-import { createRedux } from 'redux';
-import { Provider } from 'redux/react';
-import * as stores from '../stores';
+import { createStore, combineReducers } from 'redux';
+import { Provider } from 'react-redux';
+import * as reducers from '../reducers';
 
-const redux = createRedux(stores);
+const reducer = combineReducers(reducers);
+const store = createStore(reducer);
 
 export default class App extends Component {
   render() {
     return (
-      <Provider redux={redux}>
+      <Provider store={store}>
         {() => <PokedexApp />}
       </Provider>
     );

diff --git a/containers/PokedexApp.js b/containers/PokedexApp.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { bindActionCreators } from 'redux';
-import { Connector } from 'redux/react';
+import { Connector } from 'react-redux';
 import MainSection from '../components/MainSection';
 import * as PokemonActions from '../actions/PokemonActions';
 

diff --git a/index.html b/index.html
@@ -3,8 +3,7 @@
     <title>Pokedex in Redux</title>
   </head>
   <body>
-    <div class="todoapp" id="root">
-    </div>
+    <div id="root"></div>
   </body>
   <script src="/browser-polyfill.min.js"></script>
   <script src="/static/bundle.js"></script>

diff --git a/package.json b/package.json
@@ -29,7 +29,8 @@
   "dependencies": {
     "classnames": "^2.1.2",
     "react": "^0.13.3",
-    "redux": "^0.12.0"
+    "react-redux": "^0.2.2",
+    "redux": "^1.0.0-rc"
   },
   "devDependencies": {
     "babel-core": "^5.5.8",

diff --git a/stores/index.js → reducers/index.js b/stores/index.js → reducers/index.js
diff --git a/stores/pokemon.js → reducers/pokemon.js b/stores/pokemon.js → reducers/pokemon.js