From 778c0ed25445c52c1e268d2acb0dc8dacb7c4b17 Mon Sep 17 00:00:00 2001
From: Tony Arcangelini <33258733+arcangelini@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:04:56 +0200
Subject: [PATCH] Backport wpcomsh 5.1.1 Changes (#38616)

---
 projects/plugins/wpcomsh/CHANGELOG.md                        | 4 ++++
 .../wpcomsh/changelog/fix-eslint-no-empty-catch-blocks       | 5 -----
 .../wpcomsh/changelog/update-wpcom-plugins-remove-old        | 4 ----
 projects/plugins/wpcomsh/composer.json                       | 2 +-
 projects/plugins/wpcomsh/package.json                        | 2 +-
 projects/plugins/wpcomsh/wpcomsh.php                         | 4 ++--
 6 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 projects/plugins/wpcomsh/changelog/fix-eslint-no-empty-catch-blocks
 delete mode 100644 projects/plugins/wpcomsh/changelog/update-wpcom-plugins-remove-old

diff --git a/projects/plugins/wpcomsh/CHANGELOG.md b/projects/plugins/wpcomsh/CHANGELOG.md
index 47920530ef314..17c5b98bcfa17 100644
--- a/projects/plugins/wpcomsh/CHANGELOG.md
+++ b/projects/plugins/wpcomsh/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.1.1 - 2024-07-30
+### Removed
+- Remove the old plugin banner code [#38605]
+
 ## 5.1.0 - 2024-07-29
 ### Changed
 - Hide the plugin banner on non-wpcom-connected users or agency-managed users [#38532]
diff --git a/projects/plugins/wpcomsh/changelog/fix-eslint-no-empty-catch-blocks b/projects/plugins/wpcomsh/changelog/fix-eslint-no-empty-catch-blocks
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/wpcomsh/changelog/fix-eslint-no-empty-catch-blocks
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/wpcomsh/changelog/update-wpcom-plugins-remove-old b/projects/plugins/wpcomsh/changelog/update-wpcom-plugins-remove-old
deleted file mode 100644
index dea50ed90d129..0000000000000
--- a/projects/plugins/wpcomsh/changelog/update-wpcom-plugins-remove-old
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Remove the old plugin banner code
diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json
index 2f905ff13f9a1..2a274920f23ce 100644
--- a/projects/plugins/wpcomsh/composer.json
+++ b/projects/plugins/wpcomsh/composer.json
@@ -128,7 +128,7 @@
 			"composer/installers": true,
 			"roots/wordpress-core-installer": true
 		},
-		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_1_1_alpha"
+		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_1_1"
 	},
 	"extra": {
 		"mirror-repo": "Automattic/wpcom-site-helper",
diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json
index 2c7064c1ad0c4..de9cd4ef2f088 100644
--- a/projects/plugins/wpcomsh/package.json
+++ b/projects/plugins/wpcomsh/package.json
@@ -3,7 +3,7 @@
 	"name": "@automattic/jetpack-wpcomsh",
 	"description": "A helper for connecting WordPress.com sites to external host infrastructure.",
 	"homepage": "https://jetpack.com",
-	"version": "5.1.1-alpha",
+	"version": "5.1.1",
 	"bugs": {
 		"url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh"
 	},
diff --git a/projects/plugins/wpcomsh/wpcomsh.php b/projects/plugins/wpcomsh/wpcomsh.php
index 6f6d12ba4197b..b152dbeed752b 100644
--- a/projects/plugins/wpcomsh/wpcomsh.php
+++ b/projects/plugins/wpcomsh/wpcomsh.php
@@ -2,14 +2,14 @@
 /**
  * Plugin Name: WordPress.com Site Helper
  * Description: A helper for connecting WordPress.com sites to external host infrastructure.
- * Version: 5.1.1-alpha
+ * Version: 5.1.1
  * Author: Automattic
  * Author URI: http://automattic.com/
  *
  * @package wpcomsh
  */
 
-define( 'WPCOMSH_VERSION', '5.1.1-alpha' );
+define( 'WPCOMSH_VERSION', '5.1.1' );
 
 // If true, Typekit fonts will be available in addition to Google fonts
 add_filter( 'jetpack_fonts_enable_typekit', '__return_true' );