Merge pull request reduxjs#4053 from AaronPowell96/master

markerikson · web-flow · commit fe1b1f55c782 · 2021-04-01T13:22:21.000-04:00
Former-commit-id: 2e9a2d4
diff --git a/docs/FAQ.md.REMOVED.git-id b/docs/FAQ.md.REMOVED.git-id
@@ -1 +1 @@
-9535af958b9260218c624e0b9dc86d215d9bb3a1
+20a9916416c3048146df324e1a65b75259b2dc58
diff --git 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
@@ -1 +1 @@
-e5d440a791f50cfc28e9671c4f224fa63463e396
+317255da7b781494f81574efe6869eaab6d0feee
diff --git a/docs/faq/ReactRedux.md.REMOVED.git-id b/docs/faq/ReactRedux.md.REMOVED.git-id
@@ -1 +1 @@
-e9eac838bd0f17ca2feb82650030617ccc7ae47e
+06b05e5eae4377fb2227eaa609d5c60721353821
diff --git a/docs/introduction/Ecosystem.md.REMOVED.git-id b/docs/introduction/Ecosystem.md.REMOVED.git-id
@@ -1 +1 @@
-c7698eaed0f467d4070286da20b766ef88605331
+f051e7a84e711c9d78b2d67b6083591c83a17774
diff --git 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
@@ -1 +1 @@
-3607f5b4607aef55bfefbd78b3b50ec124a21385
+bd57e5a5777b4bf97ae328a266a7694c245b3f92
diff --git a/docs/recipes/UsingImmutableJS.md.REMOVED.git-id b/docs/recipes/UsingImmutableJS.md.REMOVED.git-id
diff --git a/docs/recipes/structuring-reducers/BeyondCombineReducers.md.REMOVED.git-id b/docs/recipes/structuring-reducers/BeyondCombineReducers.md.REMOVED.git-id
@@ -1 +1 @@
-832e2a407ad19f3f89091705f9859f4c4ba712d4
+641adcc7db496e7b7519430e51e3bae9f71856b6
diff --git 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
@@ -1 +1 @@
-59fced569bf3a88c0124e18076da2fbb6fd1efe2
+d78d22877ce644f67b6f2178c2a924b166902ea9
diff --git a/website/_redirects.REMOVED.git-id b/website/_redirects.REMOVED.git-id
@@ -1 +1 @@
-142583e9808b135ebfd31dab6cc0698e0104f5fe
+44dadac6b9caf79ee379dac4009668671fcd90ca
diff --git 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',
       {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-9535af958b9260218c624e0b9dc86d215d9bb3a1`
	`1`	`+20a9916416c3048146df324e1a65b75259b2dc58`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-e5d440a791f50cfc28e9671c4f224fa63463e396`
	`1`	`+317255da7b781494f81574efe6869eaab6d0feee`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-e9eac838bd0f17ca2feb82650030617ccc7ae47e`
	`1`	`+06b05e5eae4377fb2227eaa609d5c60721353821`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-c7698eaed0f467d4070286da20b766ef88605331`
	`1`	`+f051e7a84e711c9d78b2d67b6083591c83a17774`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3607f5b4607aef55bfefbd78b3b50ec124a21385`
	`1`	`+bd57e5a5777b4bf97ae328a266a7694c245b3f92`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-832e2a407ad19f3f89091705f9859f4c4ba712d4`
	`1`	`+641adcc7db496e7b7519430e51e3bae9f71856b6`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-59fced569bf3a88c0124e18076da2fbb6fd1efe2`
	`1`	`+d78d22877ce644f67b6f2178c2a924b166902ea9`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-142583e9808b135ebfd31dab6cc0698e0104f5fe`
	`1`	`+44dadac6b9caf79ee379dac4009668671fcd90ca`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ module.exports = {`
`49`	`49`	`'recipes/computing-derived-data',`
`50`	`50`	`'recipes/implementing-undo-history',`
`51`	`51`	`'recipes/isolating-redux-sub-apps',`
`52`		`- 'recipes/using-immutablejs-with-redux',`
`53`	`52`	`'recipes/code-splitting',`
`54`	`53`	`'recipes/troubleshooting',`
`55`	`54`	`{`