Merge branch 'trunk' into add/wp-data-sync-package

.github/versions.sh

@@ -1,7 +1,7 @@
 # Versions of tools to use in CI.
 PHP_VERSION=8.2
 COMPOSER_VERSION=2.7.7
-NODE_VERSION=20.8.1
+NODE_VERSION=22.9.0
 PNPM_VERSION=9.3.0
 
 # Other useful version numbers.

.nvmrc

@@ -1 +1 @@
-20.8.1
+22.9.0

.phan/stubs/wpcom-stubs.php

@@ -4,7 +4,7 @@
  * `bin/teamcity-builds/jetpack-stubs/stub-defs.php` and regenerate the stubs
  * by triggering the Jetpack Staging → Update WPCOM Stubs job in TeamCity.
  *
- * Stubs automatically generated from WordPress.com commit 2ed424b4493f3450b67bb248706d6e29170e6042.
+ * Stubs automatically generated from WordPress.com commit 4fd96546151f08483e92c0807b89830093fc1aee.
  */
 
 namespace {
@@ -548,7 +548,7 @@ function is_automattic($blog_id = \null)
     {
     }
     /**
-     * @param int|null $blog_id
+     * @param int|string|null $blog_id
      * @return bool
      */
     function wpcom_is_automattic_p2_site($blog_id = \null)
@@ -716,7 +716,7 @@ function is_simple_site_redirect($blog_id = 0)
     }
     class Subscription_Mailer extends \WordPressMailer
     {
-        public function __construct(\Blog_Subscriber $subscriber, $use_wp = \true)
+        public function __construct(\Blog_Subscriber $subscriber, $use_wp = \true, $locale_type = self::USER_LOCALE)
         {
         }
         /**
@@ -1058,7 +1058,7 @@ function wpcom_fetch_subs_counts($include_paid_subscribers = \false)
     function wpcom_is_child_theme()
     {
     }
-    function queue_publish_post($post_id, $post = \null)
+    function queue_publish_post($post_id, $post = \null, $old_post_status = \null)
     {
     }
     /**

package.json

@@ -34,7 +34,7 @@
 		"jetpack-js-tools": "workspace:*"
 	},
 	"engines": {
-		"node": "^20.8.1",
-		"pnpm": "^9.3.0"
+		"node": "^22.9.0",
+		"pnpm": "^9.3.0 <9.12.0"
 	}
 }

projects/js-packages/publicize-components/changelog/fix-social-bsky-profile-name-connection-management

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed Bsky conneciton management profile name

projects/js-packages/publicize-components/changelog/update-social-nuke-has-paid-plan

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Initial state: Removed unused hasPaidPlan flag
+
+

projects/js-packages/publicize-components/src/components/connection-management/connection-name.tsx

@@ -32,7 +32,7 @@ export function ConnectionName( { connection }: ConnectionNameProps ) {
 				</span>
 			) : (
 				<ExternalLink className={ styles[ 'profile-link' ] } href={ connection.profile_link }>
-					{ connection.display_name || connection.external_display }
+					{ connection.display_name || connection.external_display || connection.external_name }
 				</ExternalLink>
 			) }
 			{ isUpdating ? (

projects/js-packages/publicize-components/src/hooks/use-publicize-config/index.js

@@ -80,12 +80,6 @@ export default function usePublicizeConfig() {
 	 */
 	const hidePublicizeFeature = isPostPublished && ! isRePublicizeFeatureAvailable;
 
-	/**
-	 * hasPaidPlan:
-	 * Whether the site has a paid plan. This could be either the Basic or the Advanced plan.
-	 */
-	const hasPaidPlan = !! getJetpackData()?.social?.hasPaidPlan;
-
 	/**\
 	 * Returns true if the post type is a Jetpack Social Note.
 	 */
@@ -102,7 +96,6 @@ export default function usePublicizeConfig() {
 		isRePublicizeUpgradableViaUpsell,
 		hidePublicizeFeature,
 		isPostAlreadyShared,
-		hasPaidPlan,
 		isSocialImageGeneratorAvailable:
 			!! getJetpackData()?.social?.isSocialImageGeneratorAvailable && ! isJetpackSocialNote,
 		isSocialImageGeneratorEnabled: !! getJetpackData()?.social?.isSocialImageGeneratorEnabled,

projects/js-packages/publicize-components/src/social-store/reducer/index.js

@@ -11,7 +11,6 @@ const reducer = combineReducers( {
 	jetpackSettings,
 	socialImageGeneratorSettings,
 	shareStatus,
-	hasPaidPlan: ( state = false ) => state,
 } );
 
 export default reducer;