lightBlockWrapper => apiVersion

WordPress · Sep 25, 2020 · 1375643 · 1375643
1 parent e22a8dc
commit 1375643
Show file tree

Hide file tree

Showing 42 changed files with 59 additions and 71 deletions.
diff --git a/packages/block-editor/src/components/block-edit/edit.js b/packages/block-editor/src/components/block-edit/edit.js
@@ -50,13 +50,8 @@ export const Edit = ( props ) => {
 	// with which a block is displayed. If `blockType` is valid, assign
 	// them preferentially as the render value for the block.
 	const Component = blockType.edit || blockType.save;
-	const lightBlockWrapper = hasBlockSupport(
-		blockType,
-		'lightBlockWrapper',
-		false
-	);
 
-	if ( lightBlockWrapper ) {
+	if ( blockType.apiVersion >= 1 ) {
 		return <Component { ...props } context={ context } />;
 	}
 

diff --git a/packages/block-editor/src/components/block-edit/test/edit.js b/packages/block-editor/src/components/block-edit/test/edit.js
@@ -104,12 +104,10 @@ describe( 'Edit', () => {
 		it( 'should assign context', () => {
 			const edit = ( { context } ) => context.value;
 			registerBlockType( 'core/test-block', {
+				apiVersion: 1,
 				category: 'text',
 				title: 'block title',
 				usesContext: [ 'value' ],
-				supports: {
-					lightBlockWrapper: true,
-				},
 				edit,
 				save: noop,
 			} );

diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
@@ -126,11 +126,7 @@ function BlockListBlock( {
 	const onBlockError = () => setErrorState( true );
 
 	const blockType = getBlockType( name );
-	const lightBlockWrapper = hasBlockSupport(
-		blockType,
-		'lightBlockWrapper',
-		false
-	);
+	const lightBlockWrapper = blockType.apiVersion >= 1;
 	const isUnregisteredBlock = name === getUnregisteredTypeHandlerName();
 
 	// Determine whether the block has props to apply to the wrapper.

diff --git a/packages/block-library/src/audio/block.json b/packages/block-library/src/audio/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/audio",
 	"category": "media",
 	"attributes": {
@@ -37,7 +38,6 @@
 	},
 	"supports": {
 		"anchor": true,
-		"align": true,
-		"lightBlockWrapper": true
+		"align": true
 	}
 }
diff --git a/packages/block-library/src/button/block.json b/packages/block-library/src/button/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/button",
 	"category": "design",
 	"parent": [
@@ -57,7 +58,6 @@
 		"anchor": true,
 		"align": true,
 		"alignWide": false,
-		"reusable": false,
-		"lightBlockWrapper": true
+		"reusable": false
 	}
 }
diff --git a/packages/block-library/src/buttons/block.json b/packages/block-library/src/buttons/block.json
@@ -1,10 +1,10 @@
 {
+	"apiVersion": 1,
 	"name": "core/buttons",
 	"category": "design",
 	"supports": {
 		"anchor": true,
 		"align": true,
-		"alignWide": false,
-		"lightBlockWrapper": true
+		"alignWide": false
 	}
 }
diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/code",
 	"category": "text",
 	"attributes": {
@@ -9,7 +10,6 @@
 		}
 	},
 	"supports": {
-		"anchor": true,
-		"lightBlockWrapper": true
+		"anchor": true
 	}
 }
diff --git a/packages/block-library/src/column/block.json b/packages/block-library/src/column/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/column",
 	"category": "text",
 	"parent": [
@@ -17,7 +18,6 @@
 	"supports": {
 		"anchor": true,
 		"reusable": false,
-		"html": false,
-		"lightBlockWrapper": true
+		"html": false
 	}
 }
diff --git a/packages/block-library/src/columns/block.json b/packages/block-library/src/columns/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/columns",
 	"category": "design",
 	"attributes": {
@@ -13,7 +14,6 @@
 			"full"
 		],
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"gradients": true,
 			"linkColor": true

diff --git a/packages/block-library/src/cover/block.json b/packages/block-library/src/cover/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/cover",
 	"category": "media",
 	"attributes": {
@@ -49,7 +50,6 @@
 		"anchor": true,
 		"align": true,
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalPadding": true
 	}
 }
diff --git a/packages/block-library/src/group/block.json b/packages/block-library/src/group/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/group",
 	"category": "design",
 	"attributes": {
@@ -14,7 +15,6 @@
 		],
 		"anchor": true,
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"gradients": true,
 			"linkColor": true

diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/heading",
 	"category": "text",
 	"attributes": {
@@ -22,7 +23,6 @@
 	"supports": {
 		"anchor": true,
 		"className": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"linkColor": true
 		},

diff --git a/packages/block-library/src/image/block.json b/packages/block-library/src/image/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/image",
 	"category": "media",
 	"attributes": {
@@ -70,7 +71,6 @@
 		}
 	},
 	"supports": {
-		"anchor": true,
-		"lightBlockWrapper": true
+		"anchor": true
 	}
 }
diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/list",
 	"category": "text",
 	"attributes": {
@@ -30,7 +31,6 @@
 		"__experimentalColor": {
 			"gradients": true
 		},
-		"__unstablePasteTextInline": true,
-		"lightBlockWrapper": true
+		"__unstablePasteTextInline": true
 	}
 }
diff --git a/packages/block-library/src/media-text/block.json b/packages/block-library/src/media-text/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/media-text",
 	"category": "media",
 	"attributes": {
@@ -84,7 +85,6 @@
 		"anchor": true,
 		"align": [ "wide", "full" ],
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"gradients": true,
 			"linkColor": true

diff --git a/packages/block-library/src/navigation-link/block.json b/packages/block-library/src/navigation-link/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/navigation-link",
 	"category": "design",
 	"parent": [ "core/navigation" ],
@@ -40,7 +41,6 @@
 	],
 	"supports": {
 		"reusable": false,
-		"html": false,
-		"lightBlockWrapper": true
+		"html": false
 	}
 }
diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/navigation",
 	"category": "design",
 	"attributes": {
@@ -48,7 +49,6 @@
 		"anchor": true,
 		"html": false,
 		"inserter": true,
-		"lightBlockWrapper": true,
 		"__experimentalFontSize": true,
 		"__experimentalColor": {
 			"textColor": true,

diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/paragraph",
 	"category": "text",
 	"attributes": {
@@ -29,7 +30,6 @@
 	"supports": {
 		"anchor": true,
 		"className": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"linkColor": true
 		},

diff --git a/packages/block-library/src/post-author/block.json b/packages/block-library/src/post-author/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-author",
 	"category": "design",
 	"attributes": {
@@ -26,7 +27,6 @@
 	],
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalFontSize": true,
 		"__experimentalColor": {
 			"gradients": true,

diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-comments-count",
 	"category": "design",
 	"attributes": {
@@ -11,7 +12,6 @@
 	],
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"gradients": true
 		},

diff --git a/packages/block-library/src/post-comments-form/block.json b/packages/block-library/src/post-comments-form/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-comments-form",
 	"category": "design",
 	"attributes": {
@@ -12,7 +13,6 @@
 	],
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"gradients": true,
 			"linkColor": true

diff --git a/packages/block-library/src/post-comments/block.json b/packages/block-library/src/post-comments/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-comments",
 	"category": "design",
 	"attributes": {
@@ -12,7 +13,6 @@
 	],
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"align": [
 			"wide",
 			"full"

diff --git a/packages/block-library/src/post-date/block.json b/packages/block-library/src/post-date/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-date",
 	"category": "design",
 	"attributes": {
@@ -15,7 +16,6 @@
 	],
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"gradients": true
 		},

diff --git a/packages/block-library/src/post-excerpt/block.json b/packages/block-library/src/post-excerpt/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-excerpt",
 	"category": "design",
 	"attributes": {
@@ -23,7 +24,6 @@
 	],
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalFontSize": true,
 		"__experimentalColor": {
 			"gradients": true,

diff --git a/packages/block-library/src/post-hierarchical-terms/block.json b/packages/block-library/src/post-hierarchical-terms/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-hierarchical-terms",
 	"category": "design",
 	"attributes": {
@@ -15,7 +16,6 @@
 	],
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalFontSize": true,
 		"__experimentalColor": {
 			"gradients": true,

diff --git a/packages/block-library/src/post-tags/block.json b/packages/block-library/src/post-tags/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-tags",
 	"category": "design",
 	"attributes": {
@@ -9,7 +10,6 @@
 	"usesContext": [ "postId", "postType" ],
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalFontSize": true,
 		"__experimentalColor": {
 			"gradients": true,

diff --git a/packages/block-library/src/post-title/block.json b/packages/block-library/src/post-title/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/post-title",
 	"category": "design",
 	"usesContext": [
@@ -29,7 +30,6 @@
 	},
 	"supports": {
 		"html": false,
-		"lightBlockWrapper": true,
 		"__experimentalColor": {
 			"gradients": true
 		},

diff --git a/packages/block-library/src/preformatted/block.json b/packages/block-library/src/preformatted/block.json
@@ -1,4 +1,5 @@
 {
+	"apiVersion": 1,
 	"name": "core/preformatted",
 	"category": "text",
 	"attributes": {
@@ -11,7 +12,6 @@
 		}
 	},
 	"supports": {
-		"anchor": true,
-		"lightBlockWrapper": true
+		"anchor": true
 	}
 }