@wordpress/preferences-persistence 1.40.0 → 1.41.0

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.41.0 (2024-01-10)
+
 ## 1.40.0 (2023-12-13)
 
 ## 1.39.0 (2023-11-29)

package/LICENSE.md

@@ -1,6 +1,6 @@
 ## Gutenberg
 
-    Copyright 2016-2023 by the contributors
+    Copyright 2016-2024 by the contributors
 
 **License for Contributions (on and after April 15, 2021)**
 

package/build/migrations/preferences-package-data/convert-editor-settings.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = convertEditorSettings;
+/**
+ * Internal dependencies
+ */
+
+function convertEditorSettings(data) {
+  var _newData$coreEditPo, _newData$coreEditSi;
+  let newData = data;
+  const settingsToMoveToCore = ['allowRightClickOverrides', 'distractionFree', 'fixedToolbar', 'focusMode', 'inactivePanels', 'keepCaretInsideBlock', 'mostUsedBlocks', 'openPanels', 'showBlockBreadcrumbs', 'showIconLabels', 'showListViewByDefault'];
+  settingsToMoveToCore.forEach(setting => {
+    if (data?.['core/edit-post']?.[setting] !== undefined) {
+      newData = {
+        ...newData,
+        core: {
+          ...newData?.core,
+          [setting]: data['core/edit-post'][setting]
+        }
+      };
+      delete newData['core/edit-post'][setting];
+    }
+    if (data?.['core/edit-site']?.[setting] !== undefined) {
+      delete newData['core/edit-site'][setting];
+    }
+  });
+  if (Object.keys((_newData$coreEditPo = newData?.['core/edit-post']) !== null && _newData$coreEditPo !== void 0 ? _newData$coreEditPo : {})?.length === 0) {
+    delete newData['core/edit-post'];
+  }
+  if (Object.keys((_newData$coreEditSi = newData?.['core/edit-site']) !== null && _newData$coreEditSi !== void 0 ? _newData$coreEditSi : {})?.length === 0) {
+    delete newData['core/edit-site'];
+  }
+  return newData;
+}
+//# sourceMappingURL=convert-editor-settings.js.map

package/build/migrations/preferences-package-data/convert-editor-settings.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["convertEditorSettings","data","_newData$coreEditPo","_newData$coreEditSi","newData","settingsToMoveToCore","forEach","setting","undefined","core","Object","keys","length"],"sources":["@wordpress/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js"],"sourcesContent":["/**\n * Internal dependencies\n */\n\nexport default function convertEditorSettings( data ) {\n\tlet newData = data;\n\tconst settingsToMoveToCore = [\n\t\t'allowRightClickOverrides',\n\t\t'distractionFree',\n\t\t'fixedToolbar',\n\t\t'focusMode',\n\t\t'inactivePanels',\n\t\t'keepCaretInsideBlock',\n\t\t'mostUsedBlocks',\n\t\t'openPanels',\n\t\t'showBlockBreadcrumbs',\n\t\t'showIconLabels',\n\t\t'showListViewByDefault',\n\t];\n\n\tsettingsToMoveToCore.forEach( ( setting ) => {\n\t\tif ( data?.[ 'core/edit-post' ]?.[ setting ] !== undefined ) {\n\t\t\tnewData = {\n\t\t\t\t...newData,\n\t\t\t\tcore: {\n\t\t\t\t\t...newData?.core,\n\t\t\t\t\t[ setting ]: data[ 'core/edit-post' ][ setting ],\n\t\t\t\t},\n\t\t\t};\n\t\t\tdelete newData[ 'core/edit-post' ][ setting ];\n\t\t}\n\n\t\tif ( data?.[ 'core/edit-site' ]?.[ setting ] !== undefined ) {\n\t\t\tdelete newData[ 'core/edit-site' ][ setting ];\n\t\t}\n\t} );\n\n\tif ( Object.keys( newData?.[ 'core/edit-post' ] ?? {} )?.length === 0 ) {\n\t\tdelete newData[ 'core/edit-post' ];\n\t}\n\n\tif ( Object.keys( newData?.[ 'core/edit-site' ] ?? {} )?.length === 0 ) {\n\t\tdelete newData[ 'core/edit-site' ];\n\t}\n\n\treturn newData;\n}\n"],"mappings":";;;;;;AAAA;AACA;AACA;;AAEe,SAASA,qBAAqBA,CAAEC,IAAI,EAAG;EAAA,IAAAC,mBAAA,EAAAC,mBAAA;EACrD,IAAIC,OAAO,GAAGH,IAAI;EAClB,MAAMI,oBAAoB,GAAG,CAC5B,0BAA0B,EAC1B,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,YAAY,EACZ,sBAAsB,EACtB,gBAAgB,EAChB,uBAAuB,CACvB;EAEDA,oBAAoB,CAACC,OAAO,CAAIC,OAAO,IAAM;IAC5C,IAAKN,IAAI,GAAI,gBAAgB,CAAE,GAAIM,OAAO,CAAE,KAAKC,SAAS,EAAG;MAC5DJ,OAAO,GAAG;QACT,GAAGA,OAAO;QACVK,IAAI,EAAE;UACL,GAAGL,OAAO,EAAEK,IAAI;UAChB,CAAEF,OAAO,GAAIN,IAAI,CAAE,gBAAgB,CAAE,CAAEM,OAAO;QAC/C;MACD,CAAC;MACD,OAAOH,OAAO,CAAE,gBAAgB,CAAE,CAAEG,OAAO,CAAE;IAC9C;IAEA,IAAKN,IAAI,GAAI,gBAAgB,CAAE,GAAIM,OAAO,CAAE,KAAKC,SAAS,EAAG;MAC5D,OAAOJ,OAAO,CAAE,gBAAgB,CAAE,CAAEG,OAAO,CAAE;IAC9C;EACD,CAAE,CAAC;EAEH,IAAKG,MAAM,CAACC,IAAI,EAAAT,mBAAA,GAAEE,OAAO,GAAI,gBAAgB,CAAE,cAAAF,mBAAA,cAAAA,mBAAA,GAAI,CAAC,CAAE,CAAC,EAAEU,MAAM,KAAK,CAAC,EAAG;IACvE,OAAOR,OAAO,CAAE,gBAAgB,CAAE;EACnC;EAEA,IAAKM,MAAM,CAACC,IAAI,EAAAR,mBAAA,GAAEC,OAAO,GAAI,gBAAgB,CAAE,cAAAD,mBAAA,cAAAA,mBAAA,GAAI,CAAC,CAAE,CAAC,EAAES,MAAM,KAAK,CAAC,EAAG;IACvE,OAAOR,OAAO,CAAE,gBAAgB,CAAE;EACnC;EAEA,OAAOA,OAAO;AACf"}

package/build/migrations/preferences-package-data/index.js

@@ -6,11 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = convertPreferencesPackageData;
 var _convertComplementaryAreas = _interopRequireDefault(require("./convert-complementary-areas"));
+var _convertEditorSettings = _interopRequireDefault(require("./convert-editor-settings"));
 /**
  * Internal dependencies
  */
 
 function convertPreferencesPackageData(data) {
-  return (0, _convertComplementaryAreas.default)(data);
+  let newData = (0, _convertComplementaryAreas.default)(data);
+  newData = (0, _convertEditorSettings.default)(newData);
+  return newData;
 }
 //# sourceMappingURL=index.js.map

package/build/migrations/preferences-package-data/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_convertComplementaryAreas","_interopRequireDefault","require","convertPreferencesPackageData","data","convertComplementaryAreas"],"sources":["@wordpress/preferences-persistence/src/migrations/preferences-package-data/index.js"],"sourcesContent":["/**\n * Internal dependencies\n */\nimport convertComplementaryAreas from './convert-complementary-areas';\n\nexport default function convertPreferencesPackageData( data ) {\n\treturn convertComplementaryAreas( data );\n}\n"],"mappings":";;;;;;;AAGA,IAAAA,0BAAA,GAAAC,sBAAA,CAAAC,OAAA;AAHA;AACA;AACA;;AAGe,SAASC,6BAA6BA,CAAEC,IAAI,EAAG;EAC7D,OAAO,IAAAC,kCAAyB,EAAED,IAAK,CAAC;AACzC"}
+{"version":3,"names":["_convertComplementaryAreas","_interopRequireDefault","require","_convertEditorSettings","convertPreferencesPackageData","data","newData","convertComplementaryAreas","convertEditorSettings"],"sources":["@wordpress/preferences-persistence/src/migrations/preferences-package-data/index.js"],"sourcesContent":["/**\n * Internal dependencies\n */\nimport convertComplementaryAreas from './convert-complementary-areas';\nimport convertEditorSettings from './convert-editor-settings';\n\nexport default function convertPreferencesPackageData( data ) {\n\tlet newData = convertComplementaryAreas( data );\n\tnewData = convertEditorSettings( newData );\n\treturn newData;\n}\n"],"mappings":";;;;;;;AAGA,IAAAA,0BAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAJA;AACA;AACA;;AAIe,SAASE,6BAA6BA,CAAEC,IAAI,EAAG;EAC7D,IAAIC,OAAO,GAAG,IAAAC,kCAAyB,EAAEF,IAAK,CAAC;EAC/CC,OAAO,GAAG,IAAAE,8BAAqB,EAAEF,OAAQ,CAAC;EAC1C,OAAOA,OAAO;AACf"}

package/build-module/migrations/preferences-package-data/convert-editor-settings.js

@@ -0,0 +1,32 @@
+/**
+ * Internal dependencies
+ */
+
+export default function convertEditorSettings(data) {
+  var _newData$coreEditPo, _newData$coreEditSi;
+  let newData = data;
+  const settingsToMoveToCore = ['allowRightClickOverrides', 'distractionFree', 'fixedToolbar', 'focusMode', 'inactivePanels', 'keepCaretInsideBlock', 'mostUsedBlocks', 'openPanels', 'showBlockBreadcrumbs', 'showIconLabels', 'showListViewByDefault'];
+  settingsToMoveToCore.forEach(setting => {
+    if (data?.['core/edit-post']?.[setting] !== undefined) {
+      newData = {
+        ...newData,
+        core: {
+          ...newData?.core,
+          [setting]: data['core/edit-post'][setting]
+        }
+      };
+      delete newData['core/edit-post'][setting];
+    }
+    if (data?.['core/edit-site']?.[setting] !== undefined) {
+      delete newData['core/edit-site'][setting];
+    }
+  });
+  if (Object.keys((_newData$coreEditPo = newData?.['core/edit-post']) !== null && _newData$coreEditPo !== void 0 ? _newData$coreEditPo : {})?.length === 0) {
+    delete newData['core/edit-post'];
+  }
+  if (Object.keys((_newData$coreEditSi = newData?.['core/edit-site']) !== null && _newData$coreEditSi !== void 0 ? _newData$coreEditSi : {})?.length === 0) {
+    delete newData['core/edit-site'];
+  }
+  return newData;
+}
+//# sourceMappingURL=convert-editor-settings.js.map

package/build-module/migrations/preferences-package-data/convert-editor-settings.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["convertEditorSettings","data","_newData$coreEditPo","_newData$coreEditSi","newData","settingsToMoveToCore","forEach","setting","undefined","core","Object","keys","length"],"sources":["@wordpress/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js"],"sourcesContent":["/**\n * Internal dependencies\n */\n\nexport default function convertEditorSettings( data ) {\n\tlet newData = data;\n\tconst settingsToMoveToCore = [\n\t\t'allowRightClickOverrides',\n\t\t'distractionFree',\n\t\t'fixedToolbar',\n\t\t'focusMode',\n\t\t'inactivePanels',\n\t\t'keepCaretInsideBlock',\n\t\t'mostUsedBlocks',\n\t\t'openPanels',\n\t\t'showBlockBreadcrumbs',\n\t\t'showIconLabels',\n\t\t'showListViewByDefault',\n\t];\n\n\tsettingsToMoveToCore.forEach( ( setting ) => {\n\t\tif ( data?.[ 'core/edit-post' ]?.[ setting ] !== undefined ) {\n\t\t\tnewData = {\n\t\t\t\t...newData,\n\t\t\t\tcore: {\n\t\t\t\t\t...newData?.core,\n\t\t\t\t\t[ setting ]: data[ 'core/edit-post' ][ setting ],\n\t\t\t\t},\n\t\t\t};\n\t\t\tdelete newData[ 'core/edit-post' ][ setting ];\n\t\t}\n\n\t\tif ( data?.[ 'core/edit-site' ]?.[ setting ] !== undefined ) {\n\t\t\tdelete newData[ 'core/edit-site' ][ setting ];\n\t\t}\n\t} );\n\n\tif ( Object.keys( newData?.[ 'core/edit-post' ] ?? {} )?.length === 0 ) {\n\t\tdelete newData[ 'core/edit-post' ];\n\t}\n\n\tif ( Object.keys( newData?.[ 'core/edit-site' ] ?? {} )?.length === 0 ) {\n\t\tdelete newData[ 'core/edit-site' ];\n\t}\n\n\treturn newData;\n}\n"],"mappings":"AAAA;AACA;AACA;;AAEA,eAAe,SAASA,qBAAqBA,CAAEC,IAAI,EAAG;EAAA,IAAAC,mBAAA,EAAAC,mBAAA;EACrD,IAAIC,OAAO,GAAGH,IAAI;EAClB,MAAMI,oBAAoB,GAAG,CAC5B,0BAA0B,EAC1B,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,YAAY,EACZ,sBAAsB,EACtB,gBAAgB,EAChB,uBAAuB,CACvB;EAEDA,oBAAoB,CAACC,OAAO,CAAIC,OAAO,IAAM;IAC5C,IAAKN,IAAI,GAAI,gBAAgB,CAAE,GAAIM,OAAO,CAAE,KAAKC,SAAS,EAAG;MAC5DJ,OAAO,GAAG;QACT,GAAGA,OAAO;QACVK,IAAI,EAAE;UACL,GAAGL,OAAO,EAAEK,IAAI;UAChB,CAAEF,OAAO,GAAIN,IAAI,CAAE,gBAAgB,CAAE,CAAEM,OAAO;QAC/C;MACD,CAAC;MACD,OAAOH,OAAO,CAAE,gBAAgB,CAAE,CAAEG,OAAO,CAAE;IAC9C;IAEA,IAAKN,IAAI,GAAI,gBAAgB,CAAE,GAAIM,OAAO,CAAE,KAAKC,SAAS,EAAG;MAC5D,OAAOJ,OAAO,CAAE,gBAAgB,CAAE,CAAEG,OAAO,CAAE;IAC9C;EACD,CAAE,CAAC;EAEH,IAAKG,MAAM,CAACC,IAAI,EAAAT,mBAAA,GAAEE,OAAO,GAAI,gBAAgB,CAAE,cAAAF,mBAAA,cAAAA,mBAAA,GAAI,CAAC,CAAE,CAAC,EAAEU,MAAM,KAAK,CAAC,EAAG;IACvE,OAAOR,OAAO,CAAE,gBAAgB,CAAE;EACnC;EAEA,IAAKM,MAAM,CAACC,IAAI,EAAAR,mBAAA,GAAEC,OAAO,GAAI,gBAAgB,CAAE,cAAAD,mBAAA,cAAAA,mBAAA,GAAI,CAAC,CAAE,CAAC,EAAES,MAAM,KAAK,CAAC,EAAG;IACvE,OAAOR,OAAO,CAAE,gBAAgB,CAAE;EACnC;EAEA,OAAOA,OAAO;AACf"}

package/build-module/migrations/preferences-package-data/index.js

@@ -2,7 +2,10 @@
  * Internal dependencies
  */
 import convertComplementaryAreas from './convert-complementary-areas';
+import convertEditorSettings from './convert-editor-settings';
 export default function convertPreferencesPackageData(data) {
-  return convertComplementaryAreas(data);
+  let newData = convertComplementaryAreas(data);
+  newData = convertEditorSettings(newData);
+  return newData;
 }
 //# sourceMappingURL=index.js.map

package/build-module/migrations/preferences-package-data/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["convertComplementaryAreas","convertPreferencesPackageData","data"],"sources":["@wordpress/preferences-persistence/src/migrations/preferences-package-data/index.js"],"sourcesContent":["/**\n * Internal dependencies\n */\nimport convertComplementaryAreas from './convert-complementary-areas';\n\nexport default function convertPreferencesPackageData( data ) {\n\treturn convertComplementaryAreas( data );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,OAAOA,yBAAyB,MAAM,+BAA+B;AAErE,eAAe,SAASC,6BAA6BA,CAAEC,IAAI,EAAG;EAC7D,OAAOF,yBAAyB,CAAEE,IAAK,CAAC;AACzC"}
+{"version":3,"names":["convertComplementaryAreas","convertEditorSettings","convertPreferencesPackageData","data","newData"],"sources":["@wordpress/preferences-persistence/src/migrations/preferences-package-data/index.js"],"sourcesContent":["/**\n * Internal dependencies\n */\nimport convertComplementaryAreas from './convert-complementary-areas';\nimport convertEditorSettings from './convert-editor-settings';\n\nexport default function convertPreferencesPackageData( data ) {\n\tlet newData = convertComplementaryAreas( data );\n\tnewData = convertEditorSettings( newData );\n\treturn newData;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,OAAOA,yBAAyB,MAAM,+BAA+B;AACrE,OAAOC,qBAAqB,MAAM,2BAA2B;AAE7D,eAAe,SAASC,6BAA6BA,CAAEC,IAAI,EAAG;EAC7D,IAAIC,OAAO,GAAGJ,yBAAyB,CAAEG,IAAK,CAAC;EAC/CC,OAAO,GAAGH,qBAAqB,CAAEG,OAAQ,CAAC;EAC1C,OAAOA,OAAO;AACf"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences-persistence",
-	"version": "1.40.0",
+	"version": "1.41.0",
 	"description": "Persistence utilities for `wordpress/preferences`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -28,10 +28,10 @@
 	"sideEffects": false,
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "^6.45.0"
+		"@wordpress/api-fetch": "^6.46.0"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "fcf61b4beff747222c2c81d09d757ca1a0abd925"
+	"gitHead": "5e6f9caa205d3bfdbac131952b7bf9c6ec60569b"
 }

package/src/migrations/preferences-package-data/convert-editor-settings.js

@@ -0,0 +1,47 @@
+/**
+ * Internal dependencies
+ */
+
+export default function convertEditorSettings( data ) {
+	let newData = data;
+	const settingsToMoveToCore = [
+		'allowRightClickOverrides',
+		'distractionFree',
+		'fixedToolbar',
+		'focusMode',
+		'inactivePanels',
+		'keepCaretInsideBlock',
+		'mostUsedBlocks',
+		'openPanels',
+		'showBlockBreadcrumbs',
+		'showIconLabels',
+		'showListViewByDefault',
+	];
+
+	settingsToMoveToCore.forEach( ( setting ) => {
+		if ( data?.[ 'core/edit-post' ]?.[ setting ] !== undefined ) {
+			newData = {
+				...newData,
+				core: {
+					...newData?.core,
+					[ setting ]: data[ 'core/edit-post' ][ setting ],
+				},
+			};
+			delete newData[ 'core/edit-post' ][ setting ];
+		}
+
+		if ( data?.[ 'core/edit-site' ]?.[ setting ] !== undefined ) {
+			delete newData[ 'core/edit-site' ][ setting ];
+		}
+	} );
+
+	if ( Object.keys( newData?.[ 'core/edit-post' ] ?? {} )?.length === 0 ) {
+		delete newData[ 'core/edit-post' ];
+	}
+
+	if ( Object.keys( newData?.[ 'core/edit-site' ] ?? {} )?.length === 0 ) {
+		delete newData[ 'core/edit-site' ];
+	}
+
+	return newData;
+}

package/src/migrations/preferences-package-data/index.js

@@ -2,7 +2,10 @@
  * Internal dependencies
  */
 import convertComplementaryAreas from './convert-complementary-areas';
+import convertEditorSettings from './convert-editor-settings';
 
 export default function convertPreferencesPackageData( data ) {
-	return convertComplementaryAreas( data );
+	let newData = convertComplementaryAreas( data );
+	newData = convertEditorSettings( newData );
+	return newData;
 }

package/src/migrations/preferences-package-data/test/convert-editor-settings.js

@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import convertEditorSettings from '../convert-editor-settings';
+
+describe( 'convertEditorSettings', () => {
+	it( 'converts the `allowRightClickOverrides` property', () => {
+		const input = {
+			'core/edit-post': {
+				allowRightClickOverrides: false,
+			},
+		};
+
+		const expectedOutput = {
+			core: {
+				allowRightClickOverrides: false,
+			},
+		};
+
+		expect( convertEditorSettings( input ) ).toEqual( expectedOutput );
+	} );
+} );

package/src/migrations/preferences-package-data/test/index.js

@@ -42,22 +42,24 @@ describe( 'convertPreferencesPackageData', () => {
 		expect( convertPreferencesPackageData( input ) )
 			.toMatchInlineSnapshot( `
 		{
+		  "core": {
+		    "fixedToolbar": true,
+		    "inactivePanels": [],
+		    "openPanels": [
+		      "post-status",
+		    ],
+		  },
 		  "core/customize-widgets": {
 		    "fixedToolbar": true,
 		    "welcomeGuide": false,
 		  },
 		  "core/edit-post": {
 		    "editorMode": "visual",
-		    "fixedToolbar": true,
 		    "fullscreenMode": false,
 		    "hiddenBlockTypes": [
 		      "core/audio",
 		      "core/cover",
 		    ],
-		    "inactivePanels": [],
-		    "openPanels": [
-		      "post-status",
-		    ],
 		    "pinnedItems": {
 		      "my-sidebar-plugin/title-sidebar": false,
 		    },
@@ -67,7 +69,6 @@ describe( 'convertPreferencesPackageData', () => {
 		    "welcomeGuide": false,
 		  },
 		  "core/edit-site": {
-		    "fixedToolbar": true,
 		    "isComplementaryAreaVisible": true,
 		    "welcomeGuide": false,
 		    "welcomeGuideStyles": false,