Use a filter instead of modifying each block.json file.

WordPress · Jun 7, 2021 · 3a39cea · 3a39cea
1 parent c015795
commit 3a39cea
Show file tree

Hide file tree

Showing 40 changed files with 56 additions and 89 deletions.
diff --git a/lib/blocks.php b/lib/blocks.php
@@ -470,5 +470,26 @@ function gutenberg_migrate_old_typography_shape( $metadata ) {
 	return $metadata;
 }
 
-
 add_filter( 'block_type_metadata', 'gutenberg_migrate_old_typography_shape' );
+
+/**
+ * Filters the content of a single block.
+ *
+ * @param array $metadata Metadata for registering a block type.
+ *
+ * @return array Returns the $metadata with any missing `style` and `editorStyle` added.
+ */
+function gutenberg_add_missing_styles_to_core_block_json( $metadata ) {
+	if ( ! empty( $metadata['name'] ) && 0 === strpos( $metadata['name'], 'core/' ) ) {
+		$block_name = str_replace( 'core/', '', $metadata['name'] );
+
+		if ( ! isset( $metadata['style'] ) ) {
+			$metadata['style'] = "wp-block-$block_name";
+		}
+		if ( ! isset( $metadata['editorStyle'] ) ) {
+			$metadata['editorStyle'] = "wp-block-$block_name-editor";
+		}
+	}
+	return $metadata;
+}
+add_filter( 'block_type_metadata', 'gutenberg_add_missing_styles_to_core_block_json' );
diff --git a/packages/block-library/src/archives/block.json b/packages/block-library/src/archives/block.json
@@ -19,6 +19,5 @@
 		"align": true,
 		"html": false
 	},
-	"editorStyle": "wp-block-archives-editor",
-	"style": "wp-block-archives"
+	"editorStyle": "wp-block-archives-editor"
 }
diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json
@@ -15,6 +15,5 @@
 		"html": false,
 		"inserter": false
 	},
-	"editorStyle": "wp-block-editor",
-	"style": "wp-block"
+	"editorStyle": "wp-block-editor"
 }
diff --git a/packages/block-library/src/calendar/block.json b/packages/block-library/src/calendar/block.json
@@ -17,6 +17,5 @@
 	"supports": {
 		"align": true
 	},
-	"editorStyle": "wp-block-calendar-editor",
 	"style": "wp-block-calendar"
 }
diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json
@@ -18,6 +18,5 @@
 			"fontSize": true
 		}
 	},
-	"editorStyle": "wp-block-code-editor",
 	"style": "wp-block-code"
 }
diff --git a/packages/block-library/src/column/block.json b/packages/block-library/src/column/block.json
@@ -28,7 +28,5 @@
 		"spacing": {
 			"padding": true
 		}
-	},
-	"editorStyle": "wp-block-column-editor",
-	"style": "wp-block-column"
+	}
 }
diff --git a/packages/block-library/src/freeform/block.json b/packages/block-library/src/freeform/block.json
@@ -16,6 +16,5 @@
 		"customClassName": false,
 		"reusable": false
 	},
-	"editorStyle": "wp-block-freeform-editor",
-	"style": "wp-block-freeform"
+	"editorStyle": "wp-block-freeform-editor"
 }
diff --git a/packages/block-library/src/html/block.json b/packages/block-library/src/html/block.json
@@ -17,6 +17,5 @@
 		"className": false,
 		"html": false
 	},
-	"editorStyle": "wp-block-html-editor",
-	"style": "wp-block-html"
+	"editorStyle": "wp-block-html-editor"
 }
diff --git a/packages/block-library/src/legacy-widget/block.json b/packages/block-library/src/legacy-widget/block.json
@@ -24,6 +24,5 @@
 		"customClassName": false,
 		"reusable": false
 	},
-	"editorStyle": "wp-block-legacy-widget-editor",
-	"style": "wp-block-legacy-widget"
+	"editorStyle": "wp-block-legacy-widget-editor"
 }
diff --git a/packages/block-library/src/loginout/block.json b/packages/block-library/src/loginout/block.json
@@ -21,7 +21,5 @@
 		"typography": {
 			"fontSize": false
 		}
-	},
-	"editorStyle": "wp-block-loginout-editor",
-	"style": "wp-block-loginout"
+	}
 }
diff --git a/packages/block-library/src/more/block.json b/packages/block-library/src/more/block.json
@@ -21,6 +21,5 @@
 		"html": false,
 		"multiple": false
 	},
-	"editorStyle": "wp-block-more-editor",
-	"style": "wp-block-more"
+	"editorStyle": "wp-block-more-editor"
 }
diff --git a/packages/block-library/src/nextpage/block.json b/packages/block-library/src/nextpage/block.json
@@ -12,6 +12,5 @@
 		"className": false,
 		"html": false
 	},
-	"editorStyle": "wp-block-nextpage-editor",
-	"style": "wp-block-nextpage"
+	"editorStyle": "wp-block-nextpage-editor"
 }
diff --git a/packages/block-library/src/post-comment-author/block.json b/packages/block-library/src/post-comment-author/block.json
@@ -9,7 +9,5 @@
 	"usesContext": [ "commentId" ],
 	"supports": {
 		"html": false
-	},
-	"editorStyle": "wp-block-post-comment-author-editor",
-	"style": "wp-block-post-comment-author"
+	}
 }
diff --git a/packages/block-library/src/post-comment-content/block.json b/packages/block-library/src/post-comment-content/block.json
@@ -9,7 +9,5 @@
 	"usesContext": [ "commentId" ],
 	"supports": {
 		"html": false
-	},
-	"editorStyle": "wp-block-post-comment-content-editor",
-	"style": "wp-block-post-comment-content"
+	}
 }
diff --git a/packages/block-library/src/post-comment-date/block.json b/packages/block-library/src/post-comment-date/block.json
@@ -14,7 +14,5 @@
 	"usesContext": [ "commentId" ],
 	"supports": {
 		"html": false
-	},
-	"editorStyle": "wp-block-post-comment-date-editor",
-	"style": "wp-block-post-comment-date"
+	}
 }
diff --git a/packages/block-library/src/post-comment/block.json b/packages/block-library/src/post-comment/block.json
@@ -15,7 +15,5 @@
 	},
 	"supports": {
 		"html": false
-	},
-	"editorStyle": "wp-block-post-comment-editor",
-	"style": "wp-block-post-comment"
+	}
 }
diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json
@@ -20,7 +20,5 @@
 			"fontSize": true,
 			"lineHeight": true
 		}
-	},
-	"editorStyle": "wp-block-post-comments-count-editor",
-	"style": "wp-block-post-comments-count"
+	}
 }
diff --git a/packages/block-library/src/post-comments-form/block.json b/packages/block-library/src/post-comments-form/block.json
@@ -22,6 +22,5 @@
 			"lineHeight": true
 		}
 	},
-	"editorStyle": "wp-block-post-comments-form-editor",
 	"style": "wp-block-post-comments-form"
 }
diff --git a/packages/block-library/src/post-comments-link/block.json b/packages/block-library/src/post-comments-link/block.json
@@ -21,7 +21,5 @@
 			"fontSize": true,
 			"lineHeight": true
 		}
-	},
-	"editorStyle": "wp-block-post-comments-link-editor",
-	"style": "wp-block-post-comments-link"
+	}
 }
diff --git a/packages/block-library/src/post-comments/block.json b/packages/block-library/src/post-comments/block.json
@@ -23,6 +23,5 @@
 			"link": true
 		}
 	},
-	"editorStyle": "wp-block-post-comments-editor",
 	"style": "wp-block-post-comments"
 }
diff --git a/packages/block-library/src/post-content/block.json b/packages/block-library/src/post-content/block.json
@@ -11,6 +11,5 @@
 		"html": false,
 		"__experimentalLayout": true
 	},
-	"editorStyle": "wp-block-post-content-editor",
-	"style": "wp-block-post-content"
+	"editorStyle": "wp-block-post-content-editor"
 }
diff --git a/packages/block-library/src/post-date/block.json b/packages/block-library/src/post-date/block.json
@@ -28,7 +28,5 @@
 			"fontSize": true,
 			"lineHeight": true
 		}
-	},
-	"editorStyle": "wp-block-post-date-editor",
-	"style": "wp-block-post-date"
+	}
 }
diff --git a/packages/block-library/src/post-navigation-link/block.json b/packages/block-library/src/post-navigation-link/block.json
@@ -24,7 +24,5 @@
 	"supports": {
 		"reusable": false,
 		"html": false
-	},
-	"editorStyle": "wp-block-post-navigation-link-editor",
-	"style": "wp-block-post-navigation-link"
+	}
 }
diff --git a/packages/block-library/src/post-terms/block.json b/packages/block-library/src/post-terms/block.json
@@ -24,7 +24,5 @@
 			"lineHeight": true,
 			"fontSize": true
 		}
-	},
-	"editorStyle": "wp-block-post-terms-editor",
-	"style": "wp-block-post-terms"
+	}
 }
diff --git a/packages/block-library/src/post-title/block.json b/packages/block-library/src/post-title/block.json
@@ -41,6 +41,5 @@
 			"__experimentalFontFamily": true
 		}
 	},
-	"editorStyle": "wp-block-post-title-editor",
 	"style": "wp-block-post-title"
 }
diff --git a/packages/block-library/src/preformatted/block.json b/packages/block-library/src/preformatted/block.json
@@ -24,6 +24,5 @@
 			"fontSize": true
 		}
 	},
-	"editorStyle": "wp-block-preformatted-editor",
 	"style": "wp-block-preformatted"
 }
diff --git a/packages/block-library/src/query-pagination-next/block.json b/packages/block-library/src/query-pagination-next/block.json
@@ -23,7 +23,5 @@
 			"fontSize": true,
 			"lineHeight": true
 		}
-	},
-	"editorStyle": "wp-block-query-pagination-next-editor",
-	"style": "wp-block-query-pagination-next"
+	}
 }
diff --git a/packages/block-library/src/query-pagination-numbers/block.json b/packages/block-library/src/query-pagination-numbers/block.json
@@ -11,6 +11,5 @@
 		"reusable": false,
 		"html": false
 	},
-	"editorStyle": "wp-block-query-pagination-numbers-editor",
-	"style": "wp-block-query-pagination-numbers"
+	"editorStyle": "query-pagination-numbers-editor"
 }
diff --git a/packages/block-library/src/query-pagination-previous/block.json b/packages/block-library/src/query-pagination-previous/block.json
@@ -23,7 +23,5 @@
 			"fontSize": true,
 			"lineHeight": true
 		}
-	},
-	"editorStyle": "wp-block-query-pagination-previous-editor",
-	"style": "wp-block-query-pagination-previous"
+	}
 }
diff --git a/packages/block-library/src/query-title/block.json b/packages/block-library/src/query-title/block.json
@@ -29,6 +29,5 @@
 			"__experimentalFontFamily": true
 		}
 	},
-	"editorStyle": "wp-block-query-title-editor",
-	"style": "wp-block-query-title"
+	"editorStyle": "wp-block-query-title-editor"
 }
diff --git a/packages/block-library/src/query/block.json b/packages/block-library/src/query/block.json
@@ -52,6 +52,5 @@
 		},
 		"__experimentalLayout": true
 	},
-	"editorStyle": "wp-block-query-editor",
-	"style": "wp-block-query"
+	"editorStyle": "wp-block-query-editor"
 }
diff --git a/packages/block-library/src/shortcode/block.json b/packages/block-library/src/shortcode/block.json
@@ -16,6 +16,5 @@
 		"customClassName": false,
 		"html": false
 	},
-	"editorStyle": "wp-block-shortcode-editor",
-	"style": "wp-block-shortcode"
+	"editorStyle": "wp-block-shortcode-editor"
 }
diff --git a/packages/block-library/src/site-tagline/block.json b/packages/block-library/src/site-tagline/block.json
@@ -27,7 +27,5 @@
 			"__experimentalTextTransform": true,
 			"__experimentalLetterSpacing": true
 		}
-	},
-	"editorStyle": "wp-block-site-tagline-editor",
-	"style": "wp-block-site-tagline"
+	}
 }
diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json
@@ -35,7 +35,5 @@
 			"__experimentalFontWeight": true,
 			"__experimentalLetterSpacing": true
 		}
-	},
-	"editorStyle": "wp-block-site-title-editor",
-	"style": "wp-block-site-title"
+	}
 }
diff --git a/packages/block-library/src/social-link/block.json b/packages/block-library/src/social-link/block.json
@@ -26,6 +26,5 @@
 		"reusable": false,
 		"html": false
 	},
-	"editorStyle": "wp-block-social-link-editor",
-	"style": "wp-block-social-link"
+	"editorStyle": "wp-block-social-link-editor"
 }
diff --git a/packages/block-library/src/table-of-contents/block.json b/packages/block-library/src/table-of-contents/block.json
@@ -15,7 +15,5 @@
 	"usesContext": [ "postId" ],
 	"supports": {
 		"html": false
-	},
-	"editorStyle": "wp-block-table-of-contents-editor",
-	"style": "wp-block-table-of-contents"
+	}
 }
diff --git a/packages/block-library/src/tag-cloud/block.json b/packages/block-library/src/tag-cloud/block.json
@@ -19,6 +19,5 @@
 		"html": false,
 		"align": true
 	},
-	"editorStyle": "wp-block-tag-cloud-editor",
-	"style": "wp-block-tag-cloud"
+	"editorStyle": "wp-block-tag-cloud-editor"
 }
diff --git a/packages/block-library/src/template-part/block.json b/packages/block-library/src/template-part/block.json
@@ -31,6 +31,5 @@
 		},
 		"__experimentalLayout": true
 	},
-	"editorStyle": "wp-block-template-part-editor",
-	"style": "wp-block-template-part"
+	"editorStyle": "wp-block-template-part-editor"
 }
diff --git a/packages/block-library/src/term-description/block.json b/packages/block-library/src/term-description/block.json
@@ -21,6 +21,5 @@
 			"lineHeight": true
 		}
 	},
-	"editorStyle": "wp-block-term-description-editor",
-	"style": "wp-block-term-description"
+	"editorStyle": "wp-block-term-description-editor"
 }
diff --git a/packages/block-library/src/verse/block.json b/packages/block-library/src/verse/block.json
@@ -33,6 +33,6 @@
 			"padding": true
 		}
 	},
-	"editorStyle": "wp-block-verse-editor",
-	"style": "wp-block-verse"
+	"style": "wp-block-verse",
+	"editorStyle": "wp-block-verse-editor"
 }