From e0756da7abca27598ad7ef8fd62bb2abb419780b Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Tue, 11 May 2021 08:14:25 +0200
Subject: [PATCH] Fix core-block-patterns support on GB (#31546)

* fix core-block-patterns support on GB

* return early

* do not register any GB patterns

Co-authored-by: ntsekouras <ntsekouras@outlook.com>
---
 lib/block-patterns.php | 450 +++++++++++++++++++++--------------------
 1 file changed, 230 insertions(+), 220 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 8d0c4b025a0ca..4b7cdcc4b209c 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -5,234 +5,244 @@
  * @package gutenberg
  */
 
-// Register categories used for block patterns.
-register_block_pattern_category( 'query', array( 'label' => __( 'Query', 'gutenberg' ) ) );
-
-// Initial Query block patterns.
-register_block_pattern(
-	'query/standard-posts',
-	array(
-		'title'      => __( 'Standard', 'gutenberg' ),
-		'blockTypes' => array( 'core/query' ),
-		'categories' => array( 'query' ),
-		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-						<div class="wp-block-query">
-						<!-- wp:query-loop -->
-						<!-- wp:post-title {"isLink":true} /-->
-						<!-- wp:post-featured-image  {"isLink":true,"align":"wide"} /-->
-						<!-- wp:post-excerpt /-->
-						<!-- wp:separator -->
-						<hr class="wp-block-separator"/>
-						<!-- /wp:separator -->
-						<!-- wp:post-date /-->
-						<!-- /wp:query-loop -->
-						</div>
-						<!-- /wp:query -->',
-	)
-);
-
-register_block_pattern(
-	'query/medium-posts',
-	array(
-		'title'      => __( 'Image at left', 'gutenberg' ),
-		'blockTypes' => array( 'core/query' ),
-		'categories' => array( 'query' ),
-		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-						<div class="wp-block-query">
-						<!-- wp:query-loop -->
-						<!-- wp:columns {"align":"wide"} -->
-						<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} -->
-						<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>
-						<!-- /wp:column -->
-						<!-- wp:column {"width":"33.33%"} -->
-						<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:post-title {"isLink":true} /-->
-						<!-- wp:post-excerpt /--></div>
-						<!-- /wp:column --></div>
-						<!-- /wp:columns -->
-						<!-- /wp:query-loop -->
-						</div>
-						<!-- /wp:query -->',
-	)
-);
-
-register_block_pattern(
-	'query/small-posts',
-	array(
-		'title'      => __( 'Small image and title', 'gutenberg' ),
-		'blockTypes' => array( 'core/query' ),
-		'categories' => array( 'query' ),
-		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-						<div class="wp-block-query">
-						<!-- wp:query-loop -->
-						<!-- wp:columns {"verticalAlignment":"center"} -->
-						<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"25%"} -->
-						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:25%"><!-- wp:post-featured-image {"isLink":true} /--></div>
-						<!-- /wp:column -->
-						<!-- wp:column {"verticalAlignment":"center","width":"75%"} -->
-						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:75%"><!-- wp:post-title {"isLink":true} /--></div>
-						<!-- /wp:column --></div>
-						<!-- /wp:columns -->
-						<!-- /wp:query-loop -->
-						</div>
-						<!-- /wp:query -->',
-	)
-);
-
-register_block_pattern(
-	'query/grid-posts',
-	array(
-		'title'      => __( 'Grid', 'gutenberg' ),
-		'blockTypes' => array( 'core/query' ),
-		'categories' => array( 'query' ),
-		'content'    => '<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"layout":{"type":"flex","columns":3}} -->
-						<div class="wp-block-query">
-						<!-- wp:query-loop -->
-						<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
-						<main class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:post-title {"isLink":true} /-->
-						<!-- wp:post-excerpt {"wordCount":20} /-->
-						<!-- wp:post-date /--></div>
-						<!-- /wp:group -->
-						<!-- /wp:query-loop -->
-						</div>
-						<!-- /wp:query -->',
-	)
-);
+/**
+ * Register Gutenberg bundled patterns.
+ */
+function register_gutenberg_patterns() {
+	// Register categories used for block patterns.
+	register_block_pattern_category( 'query', array( 'label' => __( 'Query', 'gutenberg' ) ) );
+
+	// Initial Query block patterns.
+	register_block_pattern(
+		'query/standard-posts',
+		array(
+			'title'      => __( 'Standard', 'gutenberg' ),
+			'blockTypes' => array( 'core/query' ),
+			'categories' => array( 'query' ),
+			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+							<div class="wp-block-query">
+							<!-- wp:query-loop -->
+							<!-- wp:post-title {"isLink":true} /-->
+							<!-- wp:post-featured-image  {"isLink":true,"align":"wide"} /-->
+							<!-- wp:post-excerpt /-->
+							<!-- wp:separator -->
+							<hr class="wp-block-separator"/>
+							<!-- /wp:separator -->
+							<!-- wp:post-date /-->
+							<!-- /wp:query-loop -->
+							</div>
+							<!-- /wp:query -->',
+		)
+	);
+
+	register_block_pattern(
+		'query/medium-posts',
+		array(
+			'title'      => __( 'Image at left', 'gutenberg' ),
+			'blockTypes' => array( 'core/query' ),
+			'categories' => array( 'query' ),
+			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+							<div class="wp-block-query">
+							<!-- wp:query-loop -->
+							<!-- wp:columns {"align":"wide"} -->
+							<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} -->
+							<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>
+							<!-- /wp:column -->
+							<!-- wp:column {"width":"33.33%"} -->
+							<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:post-title {"isLink":true} /-->
+							<!-- wp:post-excerpt /--></div>
+							<!-- /wp:column --></div>
+							<!-- /wp:columns -->
+							<!-- /wp:query-loop -->
+							</div>
+							<!-- /wp:query -->',
+		)
+	);
+
+	register_block_pattern(
+		'query/small-posts',
+		array(
+			'title'      => __( 'Small image and title', 'gutenberg' ),
+			'blockTypes' => array( 'core/query' ),
+			'categories' => array( 'query' ),
+			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+							<div class="wp-block-query">
+							<!-- wp:query-loop -->
+							<!-- wp:columns {"verticalAlignment":"center"} -->
+							<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"25%"} -->
+							<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:25%"><!-- wp:post-featured-image {"isLink":true} /--></div>
+							<!-- /wp:column -->
+							<!-- wp:column {"verticalAlignment":"center","width":"75%"} -->
+							<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:75%"><!-- wp:post-title {"isLink":true} /--></div>
+							<!-- /wp:column --></div>
+							<!-- /wp:columns -->
+							<!-- /wp:query-loop -->
+							</div>
+							<!-- /wp:query -->',
+		)
+	);
+
+	register_block_pattern(
+		'query/grid-posts',
+		array(
+			'title'      => __( 'Grid', 'gutenberg' ),
+			'blockTypes' => array( 'core/query' ),
+			'categories' => array( 'query' ),
+			'content'    => '<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"layout":{"type":"flex","columns":3}} -->
+							<div class="wp-block-query">
+							<!-- wp:query-loop -->
+							<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
+							<main class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:post-title {"isLink":true} /-->
+							<!-- wp:post-excerpt {"wordCount":20} /-->
+							<!-- wp:post-date /--></div>
+							<!-- /wp:group -->
+							<!-- /wp:query-loop -->
+							</div>
+							<!-- /wp:query -->',
+		)
+	);
+
+	register_block_pattern(
+		'query/large-title-posts',
+		array(
+			'title'      => __( 'Large title', 'gutenberg' ),
+			'blockTypes' => array( 'core/query' ),
+			'categories' => array( 'query' ),
+			'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->
+							<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+							<div class="wp-block-query"><!-- wp:query-loop -->
+							<!-- wp:separator {"customColor":"#ffffff","align":"wide","className":"is-style-wide"} -->
+							<hr class="wp-block-separator alignwide has-text-color has-background is-style-wide" style="background-color:#ffffff;color:#ffffff"/>
+							<!-- /wp:separator -->
+
+							<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
+							<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->
+							<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"style":{"color":{"text":"#ffffff"}},"fontSize":"extra-small"} /--></div>
+							<!-- /wp:column -->
+
+							<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->
+							<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"},"color":{"text":"#ffffff","link":"#ffffff"}}} /--></div>
+							<!-- /wp:column --></div>
+							<!-- /wp:columns -->
+							<!-- /wp:query-loop --></div>
+							<!-- /wp:query --></div>
+							<!-- /wp:group -->',
+		)
+	);
+
+	register_block_pattern(
+		'query/offset-posts',
+		array(
+			'title'      => __( 'Offset', 'gutenberg' ),
+			'blockTypes' => array( 'core/query' ),
+			'categories' => array( 'query' ),
+			'content'    => '<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
+							<main class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->
+							<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->
+							<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
+							<div class="wp-block-query"><!-- wp:query-loop -->
+							<!-- wp:post-featured-image /-->
+							<!-- wp:post-title /-->
+							<!-- wp:post-date /-->
+							<!-- wp:spacer {"height":200} -->
+							<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>
+							<!-- /wp:spacer -->
+							<!-- /wp:query-loop --></div>
+							<!-- /wp:query --></div>
+							<!-- /wp:column -->
+							<!-- wp:column {"width":"50%"} -->
+							<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":2,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
+							<div class="wp-block-query"><!-- wp:query-loop -->
+							<!-- wp:spacer {"height":200} -->
+							<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>
+							<!-- /wp:spacer -->
+							<!-- wp:post-featured-image /-->
+							<!-- wp:post-title /-->
+							<!-- wp:post-date /-->
+							<!-- /wp:query-loop --></div>
+							<!-- /wp:query --></div>
+							<!-- /wp:column --></div>
+							<!-- /wp:columns --></main>
+							<!-- /wp:group -->',
+		)
+	);
+
+	// Initial block pattern to be used with block transformations with patterns.
+	register_block_pattern(
+		'social-links/shared-background-color',
+		array(
+			'title'         => __( 'Social links with a shared background color', 'gutenberg' ),
+			'categories'    => array( 'buttons' ),
+			'blockTypes'    => array( 'core/social-links' ),
+			'viewportWidth' => 500,
+			'content'       => '<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->
+								<ul class="wp-block-social-links has-icon-color has-icon-background-color"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->
+								<!-- wp:social-link {"url":"#","service":"chain"} /-->
+								<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>
+								<!-- /wp:social-links -->',
+		)
+	);
+}
 
-register_block_pattern(
-	'query/large-title-posts',
-	array(
-		'title'      => __( 'Large title', 'gutenberg' ),
-		'blockTypes' => array( 'core/query' ),
-		'categories' => array( 'query' ),
-		'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->
-						<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-						<div class="wp-block-query"><!-- wp:query-loop -->
-						<!-- wp:separator {"customColor":"#ffffff","align":"wide","className":"is-style-wide"} -->
-						<hr class="wp-block-separator alignwide has-text-color has-background is-style-wide" style="background-color:#ffffff;color:#ffffff"/>
-						<!-- /wp:separator -->
-
-						<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
-						<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->
-						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"style":{"color":{"text":"#ffffff"}},"fontSize":"extra-small"} /--></div>
-						<!-- /wp:column -->
-
-						<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->
-						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"},"color":{"text":"#ffffff","link":"#ffffff"}}} /--></div>
-						<!-- /wp:column --></div>
-						<!-- /wp:columns -->
-						<!-- /wp:query-loop --></div>
-						<!-- /wp:query --></div>
-						<!-- /wp:group -->',
-	)
-);
+/**
+ * Deactivate the legacy patterns bundled with WordPress, and add new block patterns for testing.
+ * More details in the trac issue (https://core.trac.wordpress.org/ticket/52846).
+ */
+function update_core_patterns() {
+	$core_block_patterns = array(
+		'text-two-columns',
+		'two-buttons',
+		'two-images',
+		'text-two-columns-with-images',
+		'text-three-columns-buttons',
+		'large-header',
+		'large-header-button',
+		'three-buttons',
+		'heading-paragraph',
+		'quote',
+	);
+
+	$new_core_block_patterns = array(
+		'media-text-nature',
+		'two-images-gallery',
+		'three-columns-media-text',
+		'quote',
+		'large-header-left',
+		'large-header-text-button',
+		'media-text-art',
+		'text-two-columns-title',
+		'three-columns-text',
+		'text-two-columns-title-offset',
+		'heading',
+		'three-images-gallery',
+		'text-two-columns',
+		'media-text-arquitecture',
+		'two-buttons',
+	);
+
+	foreach ( $core_block_patterns as $core_block_pattern ) {
+		$name = 'core/' . $core_block_pattern;
+		if ( WP_Block_Patterns_Registry::get_instance()->is_registered( $name ) ) {
+			unregister_block_pattern( $name );
+		}
+	}
 
-register_block_pattern(
-	'query/offset-posts',
-	array(
-		'title'      => __( 'Offset', 'gutenberg' ),
-		'blockTypes' => array( 'core/query' ),
-		'categories' => array( 'query' ),
-		'content'    => '<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
-						<main class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->
-						<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->
-						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
-						<div class="wp-block-query"><!-- wp:query-loop -->
-						<!-- wp:post-featured-image /-->
-						<!-- wp:post-title /-->
-						<!-- wp:post-date /-->
-						<!-- wp:spacer {"height":200} -->
-						<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>
-						<!-- /wp:spacer -->
-						<!-- /wp:query-loop --></div>
-						<!-- /wp:query --></div>
-						<!-- /wp:column -->
-						<!-- wp:column {"width":"50%"} -->
-						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":2,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
-						<div class="wp-block-query"><!-- wp:query-loop -->
-						<!-- wp:spacer {"height":200} -->
-						<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>
-						<!-- /wp:spacer -->
-						<!-- wp:post-featured-image /-->
-						<!-- wp:post-title /-->
-						<!-- wp:post-date /-->
-						<!-- /wp:query-loop --></div>
-						<!-- /wp:query --></div>
-						<!-- /wp:column --></div>
-						<!-- /wp:columns --></main>
-						<!-- /wp:group -->',
-	)
-);
+	foreach ( $new_core_block_patterns as $core_block_pattern ) {
+		register_block_pattern(
+			'core/' . $core_block_pattern,
+			require __DIR__ . '/block-patterns/' . $core_block_pattern . '.php'
+		);
+	}
+}
 
-// Initial block pattern to be used with block transformations with patterns.
-register_block_pattern(
-	'social-links/shared-background-color',
-	array(
-		'title'         => __( 'Social links with a shared background color', 'gutenberg' ),
-		'categories'    => array( 'buttons' ),
-		'blockTypes'    => array( 'core/social-links' ),
-		'viewportWidth' => 500,
-		'content'       => '<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->
-							<ul class="wp-block-social-links has-icon-color has-icon-background-color"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->
-							<!-- wp:social-link {"url":"#","service":"chain"} /-->
-							<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>
-							<!-- /wp:social-links -->',
-	)
-);
 
-// Deactivate the legacy patterns bundled with WordPress, and add new block patterns for testing.
-// More details in the trac issue (https://core.trac.wordpress.org/ticket/52846).
 add_action(
 	'init',
 	function() {
-
-		$core_block_patterns = array(
-			'text-two-columns',
-			'two-buttons',
-			'two-images',
-			'text-two-columns-with-images',
-			'text-three-columns-buttons',
-			'large-header',
-			'large-header-button',
-			'three-buttons',
-			'heading-paragraph',
-			'quote',
-		);
-
-		$new_core_block_patterns = array(
-			'media-text-nature',
-			'two-images-gallery',
-			'three-columns-media-text',
-			'quote',
-			'large-header-left',
-			'large-header-text-button',
-			'media-text-art',
-			'text-two-columns-title',
-			'three-columns-text',
-			'text-two-columns-title-offset',
-			'heading',
-			'three-images-gallery',
-			'text-two-columns',
-			'media-text-arquitecture',
-			'two-buttons',
-		);
-
-		if ( ! function_exists( 'unregister_block_pattern' ) ) {
+		if ( ! get_theme_support( 'core-block-patterns' ) || ! function_exists( 'unregister_block_pattern' ) ) {
 			return;
 		}
-
-		foreach ( $core_block_patterns as $core_block_pattern ) {
-			$name = 'core/' . $core_block_pattern;
-			if ( WP_Block_Patterns_Registry::get_instance()->is_registered( $name ) ) {
-				unregister_block_pattern( $name );
-			}
-		}
-
-		foreach ( $new_core_block_patterns as $core_block_pattern ) {
-			register_block_pattern(
-				'core/' . $core_block_pattern,
-				require __DIR__ . '/block-patterns/' . $core_block_pattern . '.php'
-			);
-		}
-
+		register_gutenberg_patterns();
+		update_core_patterns();
 	}
 );