Merge branch 'trunk' into add/converge-wpcomsh

Automattic · Jun 11, 2024 · 84ffd16 · 84ffd16
2 parents 5ce21cd + 7983a97
commit 84ffd16
Show file tree

Hide file tree

Showing 652 changed files with 6,937 additions and 3,777 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,6 +3,7 @@ const loadIgnorePatterns = require( './tools/js-tools/load-eslint-ignore.js' );
 /**
  * @type {import("eslint").Linter.Config}
  */
+
 module.exports = {
 	root: true,
 	extends: [ './tools/js-tools/eslintrc/base.js' ],

diff --git a/.github/versions.sh b/.github/versions.sh
@@ -2,7 +2,7 @@
 PHP_VERSION=8.2
 COMPOSER_VERSION=2.7.1
 NODE_VERSION=20.8.1
-PNPM_VERSION=9.2.0
+PNPM_VERSION=9.3.0
 
 # Other useful version numbers.
 MIN_PHP_VERSION=7.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 2d082c6ddeb55ddd1d056684148ba2d5c089ebcf.
+ * Stubs automatically generated from WordPress.com commit 8ea6e9c3894144c290918647a68ffd98cf547fff.
  */
 
 namespace {
@@ -1435,11 +1435,8 @@ public static function site_requires_upgrade($blog_id)
         public static function get_costs()
         {
         }
-        /**
-         * @param int $blog_id
-         * @return string
-         */
-        public static function get_upgrade_url($blog_id){
+        public static function get_upgrade_url($blog_id)
+        {
         }
     }
 }

diff --git a/composer.lock b/composer.lock
diff --git a/docs/rest-api.md b/docs/rest-api.md
@@ -191,7 +191,6 @@ Fetch Jetpack's current connection status.
 ```json
 {
 	"isActive": true,
-	"isStaging": false,
 	"offlineMode": {
 		"isActive":false,
 		"constant":false,

diff --git a/package.json b/package.json
@@ -35,6 +35,6 @@
 	},
 	"engines": {
 		"node": "^20.8.1",
-		"pnpm": "^9.2.0"
+		"pnpm": "^9.3.0"
 	}
 }