Don't tree shake in delete_pattern() (#196)

* Don't tree shake on a simple call to delete_pattern() * Fix linting
studiopress · Jun 13, 2023 · bc81bfa · bc81bfa
1 parent da4f307
commit bc81bfa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/wp-modules/api-data/api-data.php b/wp-modules/api-data/api-data.php
@@ -15,6 +15,8 @@
 use WP_REST_Response;
 use function \PatternManager\GetVersionControl\get_dismissed_themes;
 use function \PatternManager\GetVersionControl\get_version_control_meta_key;
+use function \PatternManager\GetWpFilesystem\get_wp_filesystem_api;
+use function PatternManager\PatternDataHandlers\tree_shake_theme_images;
 
 // Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
@@ -108,6 +110,7 @@ function get_pattern_names() {
  */
 function delete_pattern( $request ) {
 	$is_success = \PatternManager\PatternDataHandlers\delete_pattern( $request->get_params()['patternName'] );
+	tree_shake_theme_images( get_wp_filesystem_api(), 'copy_dir' );
 
 	return $is_success
 		? new WP_REST_Response(

diff --git a/wp-modules/app/js/src/components/VersionControlNotice/index.tsx b/wp-modules/app/js/src/components/VersionControlNotice/index.tsx
@@ -29,8 +29,6 @@ export default function VersionControlNotice( {
 					div: <div style={ { marginTop: '1rem' } }></div>,
 					a: (
 						<a
-							target="_blank"
-							rel="noreferrer"
 							href={
 								'https://developer.wpengine.com/knowledge-base/using-git-with-a-wordpress-theme/'
 							}

diff --git a/wp-modules/pattern-data-handlers/pattern-data-handlers.php b/wp-modules/pattern-data-handlers/pattern-data-handlers.php
@@ -323,10 +323,7 @@ function update_pattern( $pattern ) {
 function delete_pattern( string $pattern_name ): bool {
 	$wp_filesystem = \PatternManager\GetWpFilesystem\get_wp_filesystem_api();
 	$pattern_path  = get_pattern_path( $pattern_name );
-	$result        = $wp_filesystem && $wp_filesystem->exists( $pattern_path ) && $wp_filesystem->delete( $pattern_path );
-	tree_shake_theme_images( $wp_filesystem, 'copy_dir' );
-
-	return $result;
+	return $wp_filesystem && $wp_filesystem->exists( $pattern_path ) && $wp_filesystem->delete( $pattern_path );
 }
 
 /**