Prepare for adding the Widgets block editor to Core (#32136)

WordPress · May 24, 2021 · c424caf · c424caf
1 parent 3290f61
commit c424caf
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 14 deletions.
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
@@ -148,6 +148,7 @@ export const __experimentalGetCoreBlocks = () => [
 	mediaText,
 	latestComments,
 	latestPosts,
+	legacyWidget,
 	missing,
 	more,
 	nextpage,
@@ -229,15 +230,12 @@ export const registerCoreBlocks = (
  */
 export const __experimentalRegisterExperimentalCoreBlocks =
 	process.env.GUTENBERG_PHASE === 2
-		? ( { enableLegacyWidgetBlock, enableFSEBlocks } = {} ) => {
+		? ( { enableFSEBlocks } = {} ) => {
 				[
 					navigation,
 					navigationLink,
 					homeLink,
 
-					// Register Legacy Widget block.
-					...( enableLegacyWidgetBlock ? [ legacyWidget ] : [] ),
-
 					// Register Full Site Editing Blocks.
 					...( enableFSEBlocks
 						? [

diff --git a/packages/customize-widgets/src/index.js b/packages/customize-widgets/src/index.js
@@ -31,11 +31,7 @@ export function initialize( editorName, blockEditorSettings ) {
 	);
 	registerCoreBlocks( coreBlocks );
 
-	if ( process.env.GUTENBERG_PHASE === 2 ) {
-		__experimentalRegisterExperimentalCoreBlocks( {
-			enableLegacyWidgetBlock: true,
-		} );
-	}
+	__experimentalRegisterExperimentalCoreBlocks();
 
 	registerLegacyWidgetVariations( blockEditorSettings );
 

diff --git a/packages/e2e-tests/fixtures/blocks/core__legacy-widget.html b/packages/e2e-tests/fixtures/blocks/core__legacy-widget.html
@@ -0,0 +1 @@
+<!-- wp:legacy-widget {"idBase":"search","instance":{"encoded":"YTowOnt9","hash":"b9b82f721929717273108125217fbcd9","raw":{}}} /-->
diff --git a/packages/e2e-tests/fixtures/blocks/core__legacy-widget.json b/packages/e2e-tests/fixtures/blocks/core__legacy-widget.json
@@ -0,0 +1,18 @@
+[
+	{
+		"clientId": "_clientId_0",
+		"name": "core/legacy-widget",
+		"isValid": true,
+		"attributes": {
+			"id": null,
+			"idBase": "search",
+			"instance": {
+				"encoded": "YTowOnt9",
+				"hash": "b9b82f721929717273108125217fbcd9",
+				"raw": {}
+			}
+		},
+		"innerBlocks": [],
+		"originalContent": ""
+	}
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__legacy-widget.parsed.json b/packages/e2e-tests/fixtures/blocks/core__legacy-widget.parsed.json
@@ -0,0 +1,16 @@
+[
+	{
+		"blockName": "core/legacy-widget",
+		"attrs": {
+			"idBase": "search",
+			"instance": {
+				"encoded": "YTowOnt9",
+				"hash": "b9b82f721929717273108125217fbcd9",
+				"raw": {}
+			}
+		},
+		"innerBlocks": [],
+		"innerHTML": "",
+		"innerContent": []
+	}
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__legacy-widget.serialized.html b/packages/e2e-tests/fixtures/blocks/core__legacy-widget.serialized.html
@@ -0,0 +1 @@
+<!-- wp:legacy-widget {"idBase":"search","instance":{"encoded":"YTowOnt9","hash":"b9b82f721929717273108125217fbcd9","raw":{}}} /-->
diff --git a/packages/edit-widgets/src/index.js b/packages/edit-widgets/src/index.js
@@ -33,11 +33,7 @@ export function initialize( id, settings ) {
 		( block ) => ! [ 'core/more' ].includes( block.name )
 	);
 	registerCoreBlocks( coreBlocks );
-	if ( process.env.GUTENBERG_PHASE === 2 ) {
-		__experimentalRegisterExperimentalCoreBlocks( {
-			enableLegacyWidgetBlock: true,
-		} );
-	}
+	__experimentalRegisterExperimentalCoreBlocks();
 	registerLegacyWidgetVariations( settings );
 	registerBlock( widgetArea );
 	settings.__experimentalFetchLinkSuggestions = ( search, searchOptions ) =>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!-- wp:legacy-widget {"idBase":"search","instance":{"encoded":"YTowOnt9","hash":"b9b82f721929717273108125217fbcd9","raw":{}}} /-->