Merge branch 'trunk' into add/charts-library-grids

.github/files/lint-project-structure.sh

@@ -635,4 +635,15 @@ while IFS= read -r FILE; do
 	done < <( git grep -h --line-number --column -o "$RE" "$FILE" )
 done < <( git -c core.quotepath=off grep -l "$RE" )
 
+# - Check for `random(` in scss files.
+debug "Checking for SCSS random."
+while IFS= read -r FILE; do
+	EXIT=1
+	while IFS=: read -r LINE COL X; do
+		X=${X%(}
+		echo "::error file=$FILE,line=$LINE,col=$COL::Do not use SCSS \`$X()\`. It means that every build will have different CSS, dirtying the diffs (and making for redudant Simple deploys if this gets into a relevant plugin)."
+	done < <( git grep -h --line-number --column -o '\(random\|unique-id\)\s*(' "$FILE" )
+done < <( git -c core.quotepath=off grep -l '\(random\|unique-id\)\s*(' '*.sass' '*.scss' )
+
+
 exit $EXIT

.github/versions.sh

@@ -2,7 +2,7 @@
 PHP_VERSION=8.2
 COMPOSER_VERSION=2.8.3
 NODE_VERSION=22.9.0
-PNPM_VERSION=9.3.0
+PNPM_VERSION=9.15.0
 
 # Other useful version numbers.
 MIN_PHP_VERSION=7.2

.github/workflows/gardening.yml

@@ -37,7 +37,7 @@ jobs:
           composer build-development
         working-directory: ./projects/github-actions/repo-gardening
 
-      - name: Checkout the PR
+      - name: Check out the PR
         if: github.event_name == 'pull_request_target' && github.event.pull_request.state != 'closed'
         uses: actions/checkout@v4
         with:

.husky/post-checkout

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 ./tools/js-tools/git-hooks/post-merge-checkout-hook.sh "$1"

.husky/post-merge

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 ./tools/js-tools/git-hooks/post-merge-checkout-hook.sh ORIG_HEAD

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 node tools/js-tools/git-hooks/pre-commit-hook.js

.husky/pre-push

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 if test -c /dev/tty && sh -c ': < /dev/tty' >/dev/null 2>/dev/null; then
 	exec < /dev/tty
 fi

.phan/stubs/phpunit-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from PHPUnit 9.6.21
+ * Stubs automatically generated from PHPUnit 9.6.22
  * using the definition file `tools/stubs/phpunit-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 9.4.3
+ * Stubs automatically generated from WooCommerce 9.5.1
  * 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.
@@ -50,6 +50,7 @@ class CustomOrdersTableController
      */
     class OrdersTableDataStore extends \Abstract_WC_Order_Data_Store_CPT implements \WC_Object_Data_Store_Interface, \WC_Order_Data_Store_Interface
     {
+        use \Automattic\WooCommerce\Internal\CostOfGoodsSold\CogsAwareTrait;
         /**
          * Get the custom orders table name.
          *

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooPayments 8.6.0
+ * Stubs automatically generated from WooPayments 8.6.1
  * 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.

.pnpmfile.cjs

@@ -223,6 +223,16 @@ function afterAllResolved( lockfile ) {
 		return lockfile;
 	}
 
+	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.optionalDependencies?.[ '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.\n"
+			);
+		}
+	}
+
 	return lockfile;
 }
 

docs/git-workflow.md

@@ -80,7 +80,7 @@ If you're working directly with Jetpack trunk and need to update an external con
 This method assumes you are using the `gh` shorthand from the [Github CLI](https://cli.github.com/):
 
 ```sh
-# Use the Github CLI to checkout the PR with the PR number - for example gh pr checkout 12345.
+# Use the Github CLI to check out the PR with the PR number - for example gh pr checkout 12345.
 gh pr checkout xxxxx
 
 # Run merge-base to check where that branch differed from trunk - example git merge-base update/broken-jetpack-feature trunk.

package.json

@@ -23,21 +23,21 @@
 		"php:autofix": "composer phpcs:fix",
 		"php:compatibility": "composer phpcs:compatibility",
 		"php:lint": "composer phpcs:lint",
-		"prepare": "husky install",
+		"prepare": "husky",
 		"reformat-files": "prettier --ignore-path .eslintignore --write \"**/*.{js,jsx,cjs,mjs,ts,tsx,svelte,json,json5}\"",
 		"version-packages": "bash ./tools/version-packages.sh"
 	},
 	"devDependencies": {
 		"eslint": "9.16.0",
-		"husky": "8.0.3",
+		"husky": "9.1.7",
 		"jetpack-cli": "workspace:*",
 		"jetpack-js-tools": "workspace:*"
 	},
 	"engines": {
 		"node": "^22.9.0",
-		"pnpm": "^9.3.0 <9.12.0"
+		"pnpm": "^9.15.0"
 	},
-	"packageManager": "pnpm@9.3.0",
+	"packageManager": "pnpm@9.15.0",
 	"pnpm": {
 		"patchedDependencies": {
 			"@wordpress/[email protected]": ".pnpm-patches/@[email protected]"