Lodash: Refactor persistence plugin away from _.merge() (#47790)

* Lodash: Refactor persistence plugin away from _.merge() * Merge only plain objects
WordPress · Feb 7, 2023 · 53fab10 · 53fab10 · github-actions · Feb 7, 2023
1 parent bc6f111
commit 53fab10
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/data/package.json b/packages/data/package.json
@@ -36,6 +36,7 @@
 		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
 		"@wordpress/priority-queue": "file:../priority-queue",
 		"@wordpress/redux-routine": "file:../redux-routine",
+		"deepmerge": "^4.3.0",
 		"equivalent-key-map": "^0.2.2",
 		"is-plain-object": "^5.0.0",
 		"is-promise": "^4.0.0",

diff --git a/packages/data/src/plugins/persistence/index.js b/packages/data/src/plugins/persistence/index.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { isPlainObject } from 'is-plain-object';
-import { merge } from 'lodash';
+import deepmerge from 'deepmerge';
 
 /**
  * Internal dependencies
@@ -193,7 +193,9 @@ function persistencePlugin( registry, pluginOptions ) {
 					//   subset of keys.
 					// - New keys in what would otherwise be used as initial
 					//   state are deeply merged as base for persisted value.
-					initialState = merge( {}, initialState, persistedState );
+					initialState = deepmerge( initialState, persistedState, {
+						isMergeableObject: isPlainObject,
+					} );
 				} else {
 					// If there is a mismatch in object-likeness of default
 					// initial or persisted state, defer to persisted value.