Rebase, fix conflicts

.github/files/e2e-tests/e2e-matrix.js

@@ -5,95 +5,95 @@ const projects = [
 	{
 		project: 'Jetpack connection',
 		path: 'projects/plugins/jetpack/tests/e2e',
-		testArgs: [ 'specs/connection', '--retries=1' ],
+		testArgs: [ 'specs/connection' ],
 		targets: [ 'plugins/jetpack' ],
 		suite: '',
 		buildGroup: 'jetpack-core',
 	},
 	{
 		project: 'Jetpack pre-connection',
 		path: 'projects/plugins/jetpack/tests/e2e',
-		testArgs: [ 'specs/pre-connection', '--retries=1' ],
+		testArgs: [ 'specs/pre-connection' ],
 		targets: [ 'plugins/jetpack', 'monorepo' ],
 		suite: '',
 		buildGroup: 'jetpack-core',
 	},
 	{
 		project: 'Jetpack post-connection',
 		path: 'projects/plugins/jetpack/tests/e2e',
-		testArgs: [ 'specs/post-connection', '--retries=1' ],
+		testArgs: [ 'specs/post-connection' ],
 		targets: [ 'plugins/jetpack' ],
 		suite: '',
 		buildGroup: 'jetpack-core',
 	},
 	{
 		project: 'Jetpack post editor',
 		path: 'projects/plugins/jetpack/tests/e2e',
-		testArgs: [ 'specs/editor', '--retries=1' ],
+		testArgs: [ 'specs/editor' ],
 		targets: [ 'plugins/jetpack', 'packages/publicize' ],
 		suite: '',
 		buildGroup: 'jetpack-core',
 	},
 	{
 		project: 'Jetpack sync',
 		path: 'projects/plugins/jetpack/tests/e2e',
-		testArgs: [ 'specs/sync', '--retries=1' ],
+		testArgs: [ 'specs/sync' ],
 		targets: [ 'packages/sync' ],
 		suite: '',
 		buildGroup: 'jetpack-sync',
 	},
 	{
 		project: 'Jetpack Boost - Base',
 		path: 'projects/plugins/boost/tests/e2e',
-		testArgs: [ 'specs/base', '--retries=1' ],
+		testArgs: [ 'specs/base' ],
 		targets: [ 'plugins/boost' ],
 		suite: '',
 		buildGroup: 'jetpack-boost',
 	},
 	{
 		project: 'Jetpack Boost - Modules',
 		path: 'projects/plugins/boost/tests/e2e',
-		testArgs: [ 'specs/modules', '--retries=1' ],
+		testArgs: [ 'specs/modules' ],
 		targets: [ 'plugins/boost' ],
 		suite: '',
 		buildGroup: 'jetpack-boost',
 	},
 	{
 		project: 'Jetpack Boost - Critical CSS',
 		path: 'projects/plugins/boost/tests/e2e',
-		testArgs: [ 'specs/critical-css', '--retries=1' ],
+		testArgs: [ 'specs/critical-css' ],
 		targets: [ 'plugins/boost' ],
 		suite: '',
 		buildGroup: 'jetpack-boost',
 	},
 	{
 		project: 'Jetpack Boost - Page Cache',
 		path: 'projects/plugins/boost/tests/e2e',
-		testArgs: [ 'specs/page-cache', '--retries=1' ],
+		testArgs: [ 'specs/page-cache' ],
 		targets: [ 'plugins/boost' ],
 		suite: '',
 		buildGroup: 'jetpack-boost',
 	},
 	{
 		project: 'Jetpack Boost - Concatenate JS and CSS',
 		path: 'projects/plugins/boost/tests/e2e',
-		testArgs: [ 'specs/concatenate', '--retries=1' ],
+		testArgs: [ 'specs/concatenate' ],
 		targets: [ 'plugins/boost' ],
 		suite: '',
 		buildGroup: 'jetpack-boost',
 	},
 	{
 		project: 'Jetpack Boost - Image CDN',
 		path: 'projects/plugins/boost/tests/e2e',
-		testArgs: [ 'specs/image-cdn', '--retries=1' ],
+		testArgs: [ 'specs/image-cdn' ],
 		targets: [ 'plugins/boost' ],
 		suite: '',
 		buildGroup: 'jetpack-boost',
 	},
 	{
 		project: 'Jetpack Boost - Image Guide',
 		path: 'projects/plugins/boost/tests/e2e',
-		testArgs: [ 'specs/image-guide', '--retries=1' ],
+		testArgs: [ 'specs/image-guide' ],
 		targets: [ 'plugins/boost' ],
 		suite: '',
 		buildGroup: 'jetpack-boost',

.github/workflows/linting.yml

@@ -93,6 +93,8 @@ jobs:
               - '.github/workflows/*.{yml,yaml}'
               - '.github/actions/*/action.{yml,yaml}'
               - 'projects/github-actions/*/action.{yml,yaml}'
+              # If we edit the linting JS files, we need to run it.
+              - 'tools/js-tools/lint-gh-actions.{js,mjs}'
             misc_php:
               # If composer, phpcs config, or the codesniffer package itself changed, there may be a new standard.
               - 'composer.json'
@@ -341,7 +343,7 @@ jobs:
         run: pnpm run lint-changed --git-base=$SHA $(jq -rn --argjson files "$FILES" '$files[]')
 
   ### Lints GitHub Actions yaml files.
-  # Local equivalent: `./tools/js-tools/lint-gh-actions.js <files>`
+  # Local equivalent: `./tools/js-tools/lint-gh-actions.mjs <files>`
   lint_gh_actions:
     name: Lint GitHub Actions yaml files
     runs-on: ubuntu-latest
@@ -358,7 +360,7 @@ jobs:
 
       - run: pnpm install
       - name: Run lint
-        run: ./tools/js-tools/lint-gh-actions.js -v '.github/workflows/*.{yml,yaml}' '.github/actions/*/action.{yml,yaml}' 'projects/github-actions/*/action.{yml,yaml}'
+        run: ./tools/js-tools/lint-gh-actions.mjs -v '.github/workflows/*.{yml,yaml}' '.github/actions/*/action.{yml,yaml}' 'projects/github-actions/*/action.{yml,yaml}'
 
   ### Checks that copied files (e.g. readme, license) are in sync
   # Local equivalent: `./tools/check-copied-files.sh`

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooCommerce 9.5.1
+ * Stubs automatically generated from WooCommerce 9.7.0-dev
  * 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.
@@ -43,7 +43,6 @@ public static function create_simple_product($save = \true, $props = array())
      */
     class CustomOrdersTableController
     {
-        use \Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
     }
     /**
      * This class is the standard data store to be used when the custom orders table is in use.

.phan/stubs/woocommerce-payments-stubs.php

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