diff --git a/docs/FAQ.md.REMOVED.git-id b/docs/FAQ.md.REMOVED.git-id index 82a2039536e..03447e356d8 100644 --- a/docs/FAQ.md.REMOVED.git-id +++ b/docs/FAQ.md.REMOVED.git-id @@ -1 +1 @@ -9535af958b9260218c624e0b9dc86d215d9bb3a1 \ No newline at end of file +20a9916416c3048146df324e1a65b75259b2dc58 \ No newline at end of file diff --git a/docs/api/createStore.md b/docs/api/createStore.md index 965bf32d3de..8b22c38b671 100644 --- a/docs/api/createStore.md +++ b/docs/api/createStore.md @@ -50,7 +50,7 @@ console.log(store.getState()) - Don't create more than one store in an application! Instead, use [`combineReducers`](combineReducers.md) to create a single root reducer out of many. -- It is up to you to choose the state format. You can use plain objects or something like [Immutable](https://facebook.github.io/immutable-js/). If you're not sure, start with plain objects. +- Redux state is normally plain JS objects and arrays. - If your state is a plain object, make sure you never mutate it! For example, instead of returning something like `Object.assign(state, newData)` from your reducers, return `Object.assign({}, state, newData)`. This way you don't override the previous `state`. You can also write `return { ...state, ...newData }` if you enable the [object spread operator proposal](../recipes/UsingObjectSpreadOperator.md). diff --git a/docs/faq/ImmutableData.md.REMOVED.git-id b/docs/faq/ImmutableData.md.REMOVED.git-id index 38039fb3683..9f442179a38 100644 --- a/docs/faq/ImmutableData.md.REMOVED.git-id +++ b/docs/faq/ImmutableData.md.REMOVED.git-id @@ -1 +1 @@ -e5d440a791f50cfc28e9671c4f224fa63463e396 \ No newline at end of file +317255da7b781494f81574efe6869eaab6d0feee \ No newline at end of file diff --git a/docs/faq/ReactRedux.md.REMOVED.git-id b/docs/faq/ReactRedux.md.REMOVED.git-id index b82e09fc952..dcc13404521 100644 --- a/docs/faq/ReactRedux.md.REMOVED.git-id +++ b/docs/faq/ReactRedux.md.REMOVED.git-id @@ -1 +1 @@ -e9eac838bd0f17ca2feb82650030617ccc7ae47e \ No newline at end of file +06b05e5eae4377fb2227eaa609d5c60721353821 \ No newline at end of file diff --git a/docs/introduction/Ecosystem.md.REMOVED.git-id b/docs/introduction/Ecosystem.md.REMOVED.git-id index 113d72d35ec..ba680a90af9 100644 --- a/docs/introduction/Ecosystem.md.REMOVED.git-id +++ b/docs/introduction/Ecosystem.md.REMOVED.git-id @@ -1 +1 @@ -c7698eaed0f467d4070286da20b766ef88605331 \ No newline at end of file +f051e7a84e711c9d78b2d67b6083591c83a17774 \ No newline at end of file diff --git a/docs/recipes/README.md b/docs/recipes/README.md index 281f8e8a90a..329015a94a9 100644 --- a/docs/recipes/README.md +++ b/docs/recipes/README.md @@ -18,7 +18,6 @@ These are some use cases and code snippets to get you started with Redux in a re - [Computing Derived Data](ComputingDerivedData.md) - [Implementing Undo History](ImplementingUndoHistory.md) - [Isolating Redux Sub-Apps](IsolatingSubapps.md) -- [Using Immutable.JS with Redux](UsingImmutableJS.md) - [Code Splitting](CodeSplitting.md) - [Troubleshooting](Troubleshooting.md) - [Structuring Reducers](structuring-reducers/StructuringReducers.md) diff --git a/docs/recipes/Troubleshooting.md.REMOVED.git-id b/docs/recipes/Troubleshooting.md.REMOVED.git-id index c295dfc789e..db249693b7a 100644 --- a/docs/recipes/Troubleshooting.md.REMOVED.git-id +++ b/docs/recipes/Troubleshooting.md.REMOVED.git-id @@ -1 +1 @@ -3607f5b4607aef55bfefbd78b3b50ec124a21385 \ No newline at end of file +bd57e5a5777b4bf97ae328a266a7694c245b3f92 \ No newline at end of file diff --git a/docs/recipes/UsingImmutableJS.md.REMOVED.git-id b/docs/recipes/UsingImmutableJS.md.REMOVED.git-id deleted file mode 100644 index 0c45b35d45d..00000000000 --- a/docs/recipes/UsingImmutableJS.md.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -0bc3b7abedae7a9a234e98f9eb3a6440eb68d5de \ No newline at end of file diff --git a/docs/recipes/structuring-reducers/BeyondCombineReducers.md.REMOVED.git-id b/docs/recipes/structuring-reducers/BeyondCombineReducers.md.REMOVED.git-id index 6269d0a97eb..83183a5ba3c 100644 --- a/docs/recipes/structuring-reducers/BeyondCombineReducers.md.REMOVED.git-id +++ b/docs/recipes/structuring-reducers/BeyondCombineReducers.md.REMOVED.git-id @@ -1 +1 @@ -832e2a407ad19f3f89091705f9859f4c4ba712d4 \ No newline at end of file +641adcc7db496e7b7519430e51e3bae9f71856b6 \ No newline at end of file diff --git a/docs/recipes/structuring-reducers/StructuringReducers.md b/docs/recipes/structuring-reducers/StructuringReducers.md index 033524102fc..c02e477247f 100644 --- a/docs/recipes/structuring-reducers/StructuringReducers.md +++ b/docs/recipes/structuring-reducers/StructuringReducers.md @@ -21,7 +21,7 @@ It is vital that these Prerequisite Concepts are **thoroughly understood** befor #### [Prerequisite Concepts](PrerequisiteConcepts.md) -It's also important to note that some of these suggestions may or may not be directly applicable based on architectural decisions in a specific application. For example, an application using Immutable.js Maps to store data would likely have its reducer logic structured at least somewhat differently than an application using plain Javascript objects. This documentation primarily assumes use of plain Javascript objects, but many of the principles would still apply if using other tools. +Standard Redux architecture relies on using plain JS objects and arrays for your state. If you're using an alternate approach for some reason, the details may differ based on your approach, but many of the principles will still apply. ### Reducer Concepts and Techniques diff --git a/docs/understanding/history-and-design/PriorArt.md.REMOVED.git-id b/docs/understanding/history-and-design/PriorArt.md.REMOVED.git-id index 6f0a9f1fa62..a8932977849 100644 --- a/docs/understanding/history-and-design/PriorArt.md.REMOVED.git-id +++ b/docs/understanding/history-and-design/PriorArt.md.REMOVED.git-id @@ -1 +1 @@ -59fced569bf3a88c0124e18076da2fbb6fd1efe2 \ No newline at end of file +d78d22877ce644f67b6f2178c2a924b166902ea9 \ No newline at end of file diff --git a/website/_redirects.REMOVED.git-id b/website/_redirects.REMOVED.git-id index 2fd3a588242..143cba66e0c 100644 --- a/website/_redirects.REMOVED.git-id +++ b/website/_redirects.REMOVED.git-id @@ -1 +1 @@ -142583e9808b135ebfd31dab6cc0698e0104f5fe \ No newline at end of file +44dadac6b9caf79ee379dac4009668671fcd90ca \ No newline at end of file diff --git a/website/sidebars.js b/website/sidebars.js index c9710e91894..993065fc382 100755 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -49,7 +49,6 @@ module.exports = { 'recipes/computing-derived-data', 'recipes/implementing-undo-history', 'recipes/isolating-redux-sub-apps', - 'recipes/using-immutablejs-with-redux', 'recipes/code-splitting', 'recipes/troubleshooting', {