Rebase

Automattic · Oct 25, 2024 · 3857b01 · 3857b01
2 parents 7525d3d + cec6f1e
commit 3857b01
Show file tree

Hide file tree

Showing 215 changed files with 2,326 additions and 494 deletions.
diff --git a/.github/versions.sh b/.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.

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.8.1
+22.9.0
diff --git a/.phan/stubs/wpcom-stubs.php b/.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)
     {
     }
     /**

diff --git a/package.json b/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"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/js-packages/ai-client/CHANGELOG.md b/projects/js-packages/ai-client/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.22.0] - 2024-10-21
+### Changed
+- AI Client: Add types for AI assistant feature payload data branch featuresControl. [#39826]
+
 ## [0.21.0] - 2024-10-14
 ### Added
 - AI Client: Add image styles 'auto' and 'none' to the logo generator. Order styles so those are on top in the dropdown selector. [#39689]
@@ -435,6 +439,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies. [#31659]
 - Updated package dependencies. [#31785]
 
+[0.22.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.21.0...v0.22.0
 [0.21.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.20.1...v0.21.0
 [0.20.1]: https://github.com/Automattic/jetpack-ai-client/compare/v0.20.0...v0.20.1
 [0.20.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.19.0...v0.20.0

diff --git a/projects/js-packages/ai-client/changelog/add-jetpack-ai-features-control-types b/projects/js-packages/ai-client/changelog/add-jetpack-ai-features-control-types
diff --git a/projects/js-packages/ai-client/package.json b/projects/js-packages/ai-client/package.json
@@ -1,7 +1,7 @@
 {
 	"private": false,
 	"name": "@automattic/jetpack-ai-client",
-	"version": "0.21.0",
+	"version": "0.22.0",
 	"description": "A JS client for consuming Jetpack AI services",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme",
 	"bugs": {