Merge branch 'trunk' into add/converge-wpcomsh

.github/versions.sh

@@ -2,7 +2,7 @@
 PHP_VERSION=8.2
 COMPOSER_VERSION=2.7.1
 NODE_VERSION=20.8.1
-PNPM_VERSION=8.6.8
+PNPM_VERSION=9.2.0
 
 # Other useful version numbers.
 MIN_PHP_VERSION=7.0

.phan/stubs/amp-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from AMP 2.5.3 and AMP for WP 1.0.94
+ * Stubs automatically generated from AMP 2.5.3 and AMP for WP 1.0.95
  * using the definition file `tools/stubs/amp-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/full-site-editing-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WordPress.com Editing Toolkit 4.20606
+ * Stubs automatically generated from WordPress.com Editing Toolkit 4.25065
  * using the definition file `tools/stubs/full-site-editing-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/woocommerce-internal-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooCommerce 8.8.3
+ * Stubs automatically generated from WooCommerce 8.9.2
  * using the definition file `tools/stubs/woocommerce-internal-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/wpcom-stubs.php

@@ -1435,6 +1435,12 @@ 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){
+        }
     }
 }
 namespace WPForTeams {

.pnpmfile.cjs

@@ -1,7 +1,3 @@
-// Note if you change something here, you'll have to make a package.json mismatch pnpm-lock.yaml to
-// get it re-run. An easy way to do that is to just edit pnpm-lock.yaml to change the version number
-// of husky near the top.
-
 /**
  * Fix package dependencies.
  *
@@ -179,20 +175,13 @@ function afterAllResolved( lockfile ) {
 		return lockfile;
 	}
 
+	// eslint-disable-next-line no-unused-vars -- Don't care.
 	for ( const [ k, v ] of Object.entries( lockfile.packages ) ) {
-		// Forbid installing webpack without webpack-cli. It results in lots of spurious lockfile changes.
-		// https://github.com/pnpm/pnpm/issues/3935
-		if ( k.startsWith( '/webpack/' ) && ! v.dependencies[ 'webpack-cli' ] ) {
-			throw new Error(
-				"Something you've done is trying to add a dependency on webpack without webpack-cli.\nThis is not allowed, as it tends to result in pnpm lockfile flip-flopping.\nSee https://github.com/pnpm/pnpm/issues/3935 for the upstream bug report."
-			);
-		}
-
 		// Forbid `@wordpress/dependency-extraction-webpack-plugin` v6 until WP 6.5 support is dropped.
 		// https://github.com/WordPress/gutenberg/issues/62202
 		if (
-			k.startsWith( '/@wordpress/dependency-extraction-webpack-plugin/' ) &&
-			! k.startsWith( '/@wordpress/dependency-extraction-webpack-plugin/5.' )
+			k.startsWith( '@wordpress/dependency-extraction-webpack-plugin@' ) &&
+			! k.startsWith( '@wordpress/dependency-extraction-webpack-plugin@5.' )
 		) {
 			throw new Error(
 				'@wordpress/dependency-extraction-webpack-plugin >= 6.0.0 is not allowed until we drop WordPress 6.5 support.\nSee https://github.com/WordPress/gutenberg/issues/62202 for details.'

package.json

@@ -35,6 +35,6 @@
 	},
 	"engines": {
 		"node": "^20.8.1",
-		"pnpm": "^8.6.2"
+		"pnpm": "^9.2.0"
 	}
 }