Merge pull request #289 from material-components/fix/fse-build

Whitelist block.json in theme bundle
material-components · Feb 1, 2022 · 434b7fe · 434b7fe
2 parents 254475f + 7f21098
commit 434b7fe
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -86,6 +86,7 @@ module.exports = function ( grunt ) {
 					'!theme/assets/js/*.map',
 					'!theme/assets/js/editor*',
 					'!theme/assets/src/**',
+					'theme/assets/src/**/*.json',
 					'!theme/tests/**',
 					'!theme/wp-assets/**',
 					'!theme/composer*',

diff --git a/theme/assets/src/block-editor/blocks/back-to-top/block.json b/theme/assets/src/block-editor/blocks/back-to-top/block.json
@@ -11,7 +11,7 @@
   },
   "description": "Material back to top button",
   "editorStyle": [
-    "material-google-fonts-cdn",
+    "material-google-fonts",
     "material-block-editor-css-theme"
   ],
   "editorScript": "material-block-editor-js-theme"

diff --git a/theme/assets/src/block-editor/blocks/card/block.json b/theme/assets/src/block-editor/blocks/card/block.json
@@ -28,7 +28,7 @@
   "supports": {},
   "apiVersion": 2,
   "description": "Material card for query loop block",
-  "editorStyle": ["material-google-fonts-cdn", "material-block-editor-css-theme"],
+  "editorStyle": ["material-google-fonts", "material-block-editor-css-theme"],
   "editorScript": "material-block-editor-js-theme",
   "usesContext": [ "postId", "postType", "queryId" ],
   "textdomain": "material-design-google"

diff --git a/theme/assets/src/block-editor/blocks/dark-mode-switch/block.json b/theme/assets/src/block-editor/blocks/dark-mode-switch/block.json
@@ -8,7 +8,7 @@
   "title": "Dark Mode Switch",
   "description": "Material dark mode switch",
   "editorStyle": [
-    "material-google-fonts-cdn",
+    "material-google-fonts",
     "material-block-editor-css-theme"
   ],
   "editorScript": "material-block-editor-js-theme"

diff --git a/theme/assets/src/block-editor/blocks/search/block.json b/theme/assets/src/block-editor/blocks/search/block.json
@@ -9,7 +9,7 @@
   "supports": {},
   "description": "Material search bar",
   "editorStyle": [
-    "material-google-fonts-cdn",
+    "material-google-fonts",
     "material-block-editor-css-theme"
   ],
   "editorScript": "material-block-editor-js-theme"

diff --git a/theme/inc/block-editor.php b/theme/inc/block-editor.php
@@ -83,9 +83,11 @@ function enqueue_block_editor_assets() {
 		$version,
 		false
 	);
-	if ( ! wp_style_is( 'material-google-fonts-cdn', 'enqueued' ) ) {
+
+	if ( ! wp_style_is( 'material-google-fonts', 'enqueued' ) ) {
+		// Ideally this should be injected by the plugin if not fallback to default fonts.
 		wp_enqueue_style(
-			'material-google-fonts-cdn',
+			'material-google-fonts',
 			esc_url( '//fonts.googleapis.com/css?family=Roboto|Material+Icons' ),
 			[],
 			$theme_version