Breaking API changes for 1.0

examples/counter/containers/App.js

@@ -1,15 +1,15 @@
 import React from 'react';
 import CounterApp from './CounterApp';
-import { createRedux } from 'redux';
+import { createStore } from 'redux';
 import { Provider } from 'redux/react';
-import * as stores from '../stores';
+import * as reducers from '../reducers';
 
-const redux = createRedux(stores);
+const store = createStore(reducers);
 
 export default class App {
   render() {
     return (
-      <Provider redux={redux}>
+      <Provider store={store}>
         {() => <CounterApp />}
       </Provider>
     );

examples/counter/webpack.config.js

@@ -18,6 +18,9 @@ module.exports = {
     new webpack.NoErrorsPlugin()
   ],
   resolve: {
+    alias: {
+      'redux': path.join(__dirname, '../../src')
+    },
     extensions: ['', '.js']
   },
   module: {

examples/todomvc/containers/App.js

@@ -1,16 +1,16 @@
 import React from 'react';
 import TodoApp from './TodoApp';
-import { createRedux } from 'redux';
+import { createStore } from 'redux';
 import { Provider } from 'redux/react';
-import * as stores from '../stores';
+import * as reducers from '../reducers';
 
-const redux = createRedux(stores);
+const store = createStore(reducers);
 
 export default class App {
   render() {
     return (
-      <Provider redux={redux}>
-        {() => <TodoApp />}
+      <Provider store={store}>
+        {() => <TodoApp /> }
       </Provider>
     );
   }

examples/todomvc/webpack.config.js

@@ -18,6 +18,9 @@ module.exports = {
     new webpack.NoErrorsPlugin()
   ],
   resolve: {
+    alias: {
+      'redux': path.join(__dirname, '../../src')
+    },
     extensions: ['', '.js']
   },
   module: {

src/Store.js

@@ -0,0 +1,50 @@
+import invariant from 'invariant';
+import isPlainObject from './utils/isPlainObject';
+
+export default class Store {
+  constructor(reducer, initialState) {
+    invariant(
+      typeof reducer === 'function',
+      'Expected the reducer to be a function.'
+    );
+
+    this.state = initialState;
+    this.listeners = [];
+    this.replaceReducer(reducer);
+  }
+
+  getReducer() {
+    return this.reducer;
+  }
+
+  replaceReducer(nextReducer) {
+    this.reducer = nextReducer;
+    this.dispatch({ type: '@@INIT' });
+  }
+
+  dispatch(action) {
+    invariant(
+      isPlainObject(action),
+      'Actions must be plain objects. Use custom middleware for async actions.'
+    );
+
+    const { reducer } = this;
+    this.state = reducer(this.state, action);
+    this.listeners.forEach(listener => listener());
+    return action;
+  }
+
+  getState() {
+    return this.state;
+  }
+
+  subscribe(listener) {
+    const { listeners } = this;
+    listeners.push(listener);
+
+    return function unsubscribe() {
+      const index = listeners.indexOf(listener);
+      listeners.splice(index, 1);
+    };
+  }
+}

src/components/createConnector.js

@@ -1,15 +1,16 @@
-import createReduxShape from '../utils/createReduxShape';
+import createStoreShape from '../utils/createStoreShape';
 import identity from '../utils/identity';
 import shallowEqual from '../utils/shallowEqual';
 import isPlainObject from '../utils/isPlainObject';
 import invariant from 'invariant';
 
 export default function createConnector(React) {
   const { Component, PropTypes } = React;
+  const storeShape = createStoreShape(PropTypes);
 
   return class Connector extends Component {
     static contextTypes = {
-      redux: createReduxShape(PropTypes).isRequired
+      store: storeShape.isRequired
     };
 
     static propTypes = {
@@ -38,12 +39,11 @@ export default function createConnector(React) {
 
     constructor(props, context) {
       super(props, context);
-
       this.state = this.selectState(props, context);
     }
 
     componentDidMount() {
-      this.unsubscribe = this.context.redux.subscribe(::this.handleChange);
+      this.unsubscribe = this.context.store.subscribe(::this.handleChange);
     }
 
     componentWillReceiveProps(nextProps) {
@@ -63,7 +63,7 @@ export default function createConnector(React) {
     }
 
     selectState(props, context) {
-      const state = context.redux.getState();
+      const state = context.store.getState();
       const slice = props.select(state);
 
       invariant(
@@ -78,7 +78,7 @@ export default function createConnector(React) {
     render() {
       const { children } = this.props;
       const { slice } = this.state;
-      const { redux: { dispatch } } = this.context;
+      const { store: { dispatch } } = this.context;
 
       return children({ dispatch, ...slice });
     }

src/components/createProvideDecorator.js

@@ -3,14 +3,14 @@ import getDisplayName from '../utils/getDisplayName';
 export default function createProvideDecorator(React, Provider) {
   const { Component } = React;
 
-  return function provide(redux) {
+  return function provide(store) {
     return DecoratedComponent => class ProviderDecorator extends Component {
       static displayName = `Provider(${getDisplayName(DecoratedComponent)})`;
       static DecoratedComponent = DecoratedComponent;
 
       render() {
         return (
-          <Provider redux={redux}>
+          <Provider store={store}>
             {() => <DecoratedComponent {...this.props} />}
           </Provider>
         );

src/components/createProvider.js

@@ -1,36 +1,34 @@
-import createReduxShape from '../utils/createReduxShape';
+import createStoreShape from '../utils/createStoreShape';
 
 export default function createProvider(React) {
   const { Component, PropTypes } = React;
-
-  const reduxShapeIsRequired = createReduxShape(PropTypes).isRequired;
+  const storeShape = createStoreShape(PropTypes);
 
   return class Provider extends Component {
-    static propTypes = {
-      redux: reduxShapeIsRequired,
-      children: PropTypes.func.isRequired
+    static childContextTypes = {
+      store: storeShape.isRequired
     };
 
-    static childContextTypes = {
-      redux: reduxShapeIsRequired
+    static propTypes = {
+      children: PropTypes.func.isRequired
     };
 
     getChildContext() {
-      return { redux: this.state.redux };
+      return { store: this.state.store };
     }
 
     constructor(props, context) {
       super(props, context);
-      this.state = { redux: props.redux };
+      this.state = { store: props.store };
     }
 
     componentWillReceiveProps(nextProps) {
-      const { redux } = this.state;
-      const { redux: nextRedux } = nextProps;
+      const { store } = this.state;
+      const { store: nextStore } = nextProps;
 
-      if (redux !== nextRedux) {
-        const nextDispatcher = nextRedux.getDispatcher();
-        redux.replaceDispatcher(nextDispatcher);
+      if (store !== nextStore) {
+        const nextReducer = nextStore.getReducer();
+        store.replaceReducer(nextReducer);
       }
     }
 

src/createStore.js

@@ -0,0 +1,45 @@
+import Store from './Store';
+import composeReducers from './utils/composeReducers';
+import composeMiddleware from './utils/composeMiddleware';
+import thunkMiddleware from './middleware/thunk';
+
+const defaultMiddlewares = ({ dispatch, getState }) => [
+  thunkMiddleware({ dispatch, getState })
+];
+
+export default function createStore(
+  reducer,
+  initialState,
+  middlewares = defaultMiddlewares
+) {
+  const finalReducer = typeof reducer === 'function' ?
+    reducer :
+    composeReducers(reducer);
+
+  const store = new Store(finalReducer, initialState);
+  const getState = ::store.getState;
+
+  const rawDispatch = ::store.dispatch;
+  let cookedDispatch = null;
+
+  function dispatch(action) {
+    return cookedDispatch(action);
+  }
+
+  const finalMiddlewares = typeof middlewares === 'function' ?
+    middlewares({ dispatch, getState }) :
+    middlewares;
+
+  cookedDispatch = composeMiddleware(
+    ...finalMiddlewares,
+    rawDispatch
+  );
+
+  return {
+    dispatch: cookedDispatch,
+    subscribe: ::store.subscribe,
+    getState: ::store.getState,
+    getReducer: ::store.getReducer,
+    replaceReducer: ::store.replaceReducer
+  };
+}

src/index.js

@@ -1,16 +1,14 @@
 // Core
-import createRedux from './createRedux';
-import createDispatcher from './createDispatcher';
+import createStore from './createStore';
 
 // Utilities
 import composeMiddleware from './utils/composeMiddleware';
-import composeStores from './utils/composeStores';
+import composeReducers from './utils/composeReducers';
 import bindActionCreators from './utils/bindActionCreators';
 
 export {
-  createRedux,
-  createDispatcher,
+  createStore,
   composeMiddleware,
-  composeStores,
+  composeReducers,
   bindActionCreators
 };