From c6622a1a3fbb2f2a574e456a93deab529dc0180c Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Tue, 30 Oct 2018 13:42:17 -0400
Subject: [PATCH 1/2] Data: Use turbo-combine-reducers in place of Redux

---
 packages/data/CHANGELOG.md | 10 ++++++++--
 packages/data/package.json |  3 ++-
 packages/data/src/index.js |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/data/CHANGELOG.md b/packages/data/CHANGELOG.md
index bc8f8aee7bd42..ce5e89b914db2 100644
--- a/packages/data/CHANGELOG.md
+++ b/packages/data/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.0.1 (Unreleased)
+
+### Internal
+
+- Replace Redux implementation of `combineReducers` with in-place-compatible `turbo-combine-reducers`.
+
 ## 3.0.0 (2018-10-29)
 
 ### Breaking Changes
@@ -10,7 +16,7 @@
 
 ## 2.1.0 (2018-09-30)
 
-## New Features
+### New Features
 
 - Adding support for using controls in resolvers using the controls plugin.
 
@@ -22,7 +28,7 @@
 
 - Writing resolvers as async generators has been deprecated. Use the controls plugin instead.
 
-## Bug Fixes
+### Bug Fixes
 
 - Fix the promise middleware in Firefox.
 
diff --git a/packages/data/package.json b/packages/data/package.json
index 471486a547eb6..abe657181c52a 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -29,7 +29,8 @@
 		"equivalent-key-map": "^0.2.2",
 		"is-promise": "^2.1.0",
 		"lodash": "^4.17.10",
-		"redux": "^4.0.0"
+		"redux": "^4.0.0",
+		"turbo-combine-reducers": "^1.0.2"
 	},
 	"devDependencies": {
 		"deep-freeze": "^0.0.1",
diff --git a/packages/data/src/index.js b/packages/data/src/index.js
index 2e71774abcdbb..122f9c261b760 100644
--- a/packages/data/src/index.js
+++ b/packages/data/src/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { combineReducers } from 'redux';
+import combineReducers from 'turbo-combine-reducers';
 
 /**
  * Internal dependencies

From bb97dd8e984d1bd311f90472fafab51e5eb62b8a Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Tue, 30 Oct 2018 14:52:16 -0400
Subject: [PATCH 2/2] Data: Update package-lock.json for turbo-combine-reducers

---
 package-lock.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index ed71b4aeeb431..5d5dcb1b6c26b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2189,7 +2189,8 @@
 				"equivalent-key-map": "^0.2.2",
 				"is-promise": "^2.1.0",
 				"lodash": "^4.17.10",
-				"redux": "^4.0.0"
+				"redux": "^4.0.0",
+				"turbo-combine-reducers": "^1.0.2"
 			}
 		},
 		"@wordpress/date": {
@@ -19933,6 +19934,11 @@
 				"safe-buffer": "^5.0.1"
 			}
 		},
+		"turbo-combine-reducers": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/turbo-combine-reducers/-/turbo-combine-reducers-1.0.2.tgz",
+			"integrity": "sha512-gHbdMZlA6Ym6Ur5pSH/UWrNQMIM9IqTH6SoL1DbHpqEdQ8i+cFunSmSlFykPt0eGQwZ4d/XTHOl74H0/kFBVWw=="
+		},
 		"tweetnacl": {
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",