Data: Fix deprecation key to persist

1. Wrong property accessed used 2. Reducer is already wrapped at point registerStore is called. Detect from plugin instead.
WordPress · Aug 3, 2018 · 8f8c544 · 8f8c544
1 parent 94a1f4c
commit 8f8c544
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/data/src/plugins/persistence/index.js b/packages/data/src/plugins/persistence/index.js
@@ -144,6 +144,15 @@ export default function( registry, pluginOptions ) {
 
 	return {
 		registerStore( reducerKey, options ) {
+			// REMOVEME: Deprecation: v3.7
+			if ( options.reducer.__deprecatedKeyToPersist ) {
+				options = {
+					...options,
+					persist: [ options.reducer.__deprecatedKeyToPersist ],
+				};
+				delete options.reducer.__deprecatedKeyToPersist;
+			}
+
 			if ( ! options.persist ) {
 				return registry.registerStore( reducerKey, options );
 			}

diff --git a/packages/data/src/registry.js b/packages/data/src/registry.js
@@ -286,11 +286,6 @@ export function createRegistry( storeConfigs = {} ) {
 			throw new TypeError( 'Must specify store reducer' );
 		}
 
-		// REMOVEME: Deprecation: v3.7
-		if ( options.reducer.__keyToPersist ) {
-			options.persist = [ options.reducer.__keyToPersist ];
-		}
-
 		const store = registerReducer( reducerKey, options.reducer );
 
 		if ( options.actions ) {