Issue 1743 (reduxjs#1770)

* rename createStore param `initialState` to `preloadedState`

* rename configureStore param `initialState` to `preloadedState`

* rename `window.__INITIAL_STATE__` in examples and docs

rename window.__INITIAL_STATE__ to window.__PRELOADED_STATE__

Author: dliv

docs/Glossary.md

@@ -114,10 +114,10 @@ See the complete [store API reference](api/Store.md#dispatch) for more details.
 ## Store creator
 
 ```js
-type StoreCreator = (reducer: Reducer, initialState: ?State) => Store
+type StoreCreator = (reducer: Reducer, preloadedState: ?State) => Store
 ```
 
-A store creator is a function that creates a Redux store. Like with dispatching function, we must distinguish the base store creator, [`createStore(reducer, initialState)`](api/createStore.md) exported from the Redux package, from store creators that are returned from the store enhancers.
+A store creator is a function that creates a Redux store. Like with dispatching function, we must distinguish the base store creator, [`createStore(reducer, preloadedState)`](api/createStore.md) exported from the Redux package, from store creators that are returned from the store enhancers.
 
 ## Store enhancer
 

docs/advanced/ExampleRedditAPI.md

@@ -170,10 +170,10 @@ import rootReducer from './reducers'
 
 const loggerMiddleware = createLogger()
 
-export default function configureStore(initialState) {
+export default function configureStore(preloadedState) {
   return createStore(
     rootReducer,
-    initialState,
+    preloadedState,
     applyMiddleware(
       thunkMiddleware,
       loggerMiddleware

docs/api/README.md

@@ -6,7 +6,7 @@ This section documents the complete Redux API. Keep in mind that Redux is only c
 
 ### Top-Level Exports
 
-* [createStore(reducer, [initialState])](createStore.md)
+* [createStore(reducer, [preloadedState])](createStore.md)
 * [combineReducers(reducers)](combineReducers.md)
 * [applyMiddleware(...middlewares)](applyMiddleware.md)
 * [bindActionCreators(actionCreators, dispatch)](bindActionCreators.md)

docs/api/applyMiddleware.md

@@ -232,7 +232,7 @@ export default connect(
 
   const store = createStore(
     reducer,
-    initialState,
+    preloadedState,
     applyMiddleware(...middleware)
   )
   ```

docs/api/createStore.md

@@ -1,4 +1,4 @@
-# `createStore(reducer, [initialState], [enhancer])`
+# `createStore(reducer, [preloadedState], [enhancer])`
 
 Creates a Redux [store](Store.md) that holds the complete state tree of your app.  
 There should only be a single store in your app.
@@ -7,7 +7,7 @@ There should only be a single store in your app.
 
 1. `reducer` *(Function)*: A [reducing function](../Glossary.md#reducer) that returns the next [state tree](../Glossary.md#state), given the current state tree and an [action](../Glossary.md#action) to handle.
 
-2. [`initialState`] *(any)*: The initial state. You may optionally specify it to hydrate the state from the server in universal apps, or to restore a previously serialized user session. If you produced `reducer` with [`combineReducers`](combineReducers.md), this must be a plain object with the same shape as the keys passed to it. Otherwise, you are free to pass anything that your `reducer` can understand.
+2. [`preloadedState`] *(any)*: The initial state. You may optionally specify it to hydrate the state from the server in universal apps, or to restore a previously serialized user session. If you produced `reducer` with [`combineReducers`](combineReducers.md), this must be a plain object with the same shape as the keys passed to it. Otherwise, you are free to pass anything that your `reducer` can understand.
 
 3. [`enhancer`] *(Function)*: The store enhancer. You may optionally specify it to enhance the store with third-party capabilities such as middleware, time travel, persistence, etc. The only store enhancer that ships with Redux is [`applyMiddleware()`](./applyMiddleware.md).
 

docs/recipes/ServerRendering.md

@@ -53,7 +53,7 @@ app.use(handleRender)
 
 // We are going to fill these out in the sections to follow
 function handleRender(req, res) { /* ... */ }
-function renderFullPage(html, initialState) { /* ... */ }
+function renderFullPage(html, preloadedState) { /* ... */ }
 
 app.listen(port)
 ```
@@ -83,23 +83,23 @@ function handleRender(req, res) {
   )
 
   // Grab the initial state from our Redux store
-  const initialState = store.getState()
+  const preloadedState = store.getState()
 
   // Send the rendered page back to the client
-  res.send(renderFullPage(html, initialState))
+  res.send(renderFullPage(html, preloadedState))
 }
 ```
 
 ### Inject Initial Component HTML and State
 
-The final step on the server side is to inject our initial component HTML and initial state into a template to be rendered on the client side. To pass along the state, we add a `<script>` tag that will attach `initialState` to `window.__INITIAL_STATE__`.
+The final step on the server side is to inject our initial component HTML and initial state into a template to be rendered on the client side. To pass along the state, we add a `<script>` tag that will attach `preloadedState` to `window.__PRELOADED_STATE__`.
 
-The `initialState` will then be available on the client side by accessing `window.__INITIAL_STATE__`.
+The `preloadedState` will then be available on the client side by accessing `window.__PRELOADED_STATE__`.
 
 We also include our bundle file for the client-side application via a script tag. This is whatever output your bundling tool provides for your client entry point. It may be a static file or a URL to a hot reloading development server.
 
 ```js
-function renderFullPage(html, initialState) {
+function renderFullPage(html, preloadedState) {
   return `
     <!doctype html>
     <html>
@@ -109,7 +109,7 @@ function renderFullPage(html, initialState) {
       <body>
         <div id="root">${html}</div>
         <script>
-          window.__INITIAL_STATE__ = ${JSON.stringify(initialState)}
+          window.__PRELOADED_STATE__ = ${JSON.stringify(preloadedState)}
         </script>
         <script src="/static/bundle.js"></script>
       </body>
@@ -124,7 +124,7 @@ function renderFullPage(html, initialState) {
 
 ## The Client Side
 
-The client side is very straightforward. All we need to do is grab the initial state from `window.__INITIAL_STATE__`, and pass it to our [`createStore()`](../api/createStore.md) function as the initial state.
+The client side is very straightforward. All we need to do is grab the initial state from `window.__PRELOADED_STATE__`, and pass it to our [`createStore()`](../api/createStore.md) function as the initial state.
 
 Let’s take a look at our new client file:
 
@@ -139,10 +139,10 @@ import App from './containers/App'
 import counterApp from './reducers'
 
 // Grab the state from a global injected into server-generated HTML
-const initialState = window.__INITIAL_STATE__
+const preloadedState = window.__PRELOADED_STATE__
 
 // Create Redux store with initial state
-const store = createStore(counterApp, initialState)
+const store = createStore(counterApp, preloadedState)
 
 render(
   <Provider store={store}>
@@ -182,10 +182,10 @@ function handleRender(req, res) {
   const counter = parseInt(params.counter, 10) || 0
 
   // Compile an initial state
-  let initialState = { counter }
+  let preloadedState = { counter }
 
   // Create a new Redux store instance
-  const store = createStore(counterApp, initialState)
+  const store = createStore(counterApp, preloadedState)
 
   // Render the component to a string
   const html = renderToString(
@@ -202,7 +202,7 @@ function handleRender(req, res) {
 }
 ```
 
-The code reads from the Express `Request` object passed into our server middleware. The parameter is parsed into a number and then set in the initial state. If you visit [http://localhost:3000/?counter=100](http://localhost:3000/?counter=100) in your browser, you’ll see the counter starts at 100. In the rendered HTML, you’ll see the counter output as 100 and the `__INITIAL_STATE__` variable has the counter set in it.
+The code reads from the Express `Request` object passed into our server middleware. The parameter is parsed into a number and then set in the initial state. If you visit [http://localhost:3000/?counter=100](http://localhost:3000/?counter=100) in your browser, you’ll see the counter starts at 100. In the rendered HTML, you’ll see the counter output as 100 and the `__PRELOADED_STATE__` variable has the counter set in it.
 
 ### Async State Fetching
 
@@ -245,10 +245,10 @@ function handleRender(req, res) {
     const counter = parseInt(params.counter, 10) || apiResult || 0
 
     // Compile an initial state
-    let initialState = { counter }
+    let preloadedState = { counter }
 
     // Create a new Redux store instance
-    const store = createStore(counterApp, initialState)
+    const store = createStore(counterApp, preloadedState)
 
     // Render the component to a string
     const html = renderToString(

examples/async/store/configureStore.js

@@ -3,10 +3,10 @@ import thunkMiddleware from 'redux-thunk'
 import createLogger from 'redux-logger'
 import rootReducer from '../reducers'
 
-export default function configureStore(initialState) {
+export default function configureStore(preloadedState) {
   const store = createStore(
     rootReducer,
-    initialState,
+    preloadedState,
     applyMiddleware(thunkMiddleware, createLogger())
   )
 

examples/real-world/store/configureStore.dev.js

@@ -5,10 +5,10 @@ import api from '../middleware/api'
 import rootReducer from '../reducers'
 import DevTools from '../containers/DevTools'
 
-export default function configureStore(initialState) {
+export default function configureStore(preloadedState) {
   const store = createStore(
     rootReducer,
-    initialState,
+    preloadedState,
     compose(
       applyMiddleware(thunk, api, createLogger()),
       DevTools.instrument()

examples/real-world/store/configureStore.prod.js

@@ -3,10 +3,10 @@ import thunk from 'redux-thunk'
 import api from '../middleware/api'
 import rootReducer from '../reducers'
 
-export default function configureStore(initialState) {
+export default function configureStore(preloadedState) {
   return createStore(
     rootReducer,
-    initialState,
+    preloadedState,
     applyMiddleware(thunk, api)
   )
 }

examples/todomvc/store/configureStore.js

@@ -1,8 +1,8 @@
 import { createStore } from 'redux'
 import rootReducer from '../reducers'
 
-export default function configureStore(initialState) {
-  const store = createStore(rootReducer, initialState)
+export default function configureStore(preloadedState) {
+  const store = createStore(rootReducer, preloadedState)
 
   if (module.hot) {
     // Enable Webpack hot module replacement for reducers