Merge branch 'trunk' into publish/auto-sizes-1-6-0

Author: mukeshpanchal27

bin/test-php-watch.sh

@@ -1,13 +1,29 @@
 #!/bin/bash
-if ! which inotifywait >/dev/null 2>&1; then
-  echo "Error: the inotifywait command is not available. Make sure you have inotify-tools installed."
-  exit 1
+
+# Check for the fswatch command
+if ! command -v fswatch >/dev/null 2>&1; then
+	echo "Error: The fswatch command is not available."
+	echo "On macOS, you can install it with Homebrew: brew install fswatch"
+	exit 1
 fi
 
+cd "$(git rev-parse --show-toplevel)"
+
 while true; do
 	echo "Waiting for a change in the plugins directory..."
-	output=$(inotifywait -e modify,create,delete -r ./plugins  --include '.*(\.php$|/tests/.*)' 2> /dev/null)
-	plugin_slug=$(echo "$output" | awk -F/ '{print $3}')
+
+	file=$(fswatch -1 -r \
+		--event Created \
+		--event Updated \
+		--event Removed \
+		--include '\.php$' \
+		--include '/tests/' \
+		./plugins 2>/dev/null | head -n 1)
+
+	# Make the file path relative.
+	file="${file#"$PWD/"}"
+
+	plugin_slug=$(echo "$file" | awk -F/ '{print $2}')
 	sleep 1 # Give the user a chance to copy text from terminal before IDE auto-saves.
 	clear
 	echo "Running phpunit tests for $(tput bold)$plugin_slug$(tput sgr0):"

bin/update-test-case-snapshots.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Updates snapshots used for testing Optimization Detective
+# Move actual.html files on top of an expected.html file in directories that also contain buffer.html files.
+
+set -e
+
+cd "$(git rev-parse --show-toplevel)"
+
+count=0
+
+while IFS= read -r -d '' actual_file; do
+	dir_path=$(dirname "$actual_file")
+	buffer_file="$dir_path/buffer.html"
+	if [ ! -e "$buffer_file" ]; then
+		continue
+	fi
+	expected_file="$dir_path/expected.html"
+
+	count=$((count + 1))
+
+	mv "$actual_file" "$expected_file"
+	echo "Updated $expected_file"
+done < <(find plugins -name 'actual.html' -path '*/test-cases/*' -print0)
+
+echo "Performed $count snapshot update(s)"

composer.lock

@@ -8,12 +8,12 @@
   },
   "dependencies": {
     "@builder.io/partytown": "github:westonruter/partytown#add/wp-i18n-workaround",
-    "web-vitals": "5.0.3"
+    "web-vitals": "5.1.0"
   },
   "devDependencies": {
     "@octokit/rest": "^22.0.0",
-    "@playwright/test": "^1.54.1",
-    "@types/node": "^24.1.0",
+    "@playwright/test": "^1.54.2",
+    "@types/node": "^24.2.0",
     "@wordpress/e2e-test-utils-playwright": "^1.27.0",
     "@wordpress/env": "^10.27.0",
     "@wordpress/prettier-config": "^4.25.0",
@@ -24,10 +24,10 @@
     "fast-glob": "^3.3.3",
     "fs-extra": "^11.3.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.1.2",
+    "lint-staged": "^16.1.4",
     "lodash": "4.17.21",
     "npm-run-all": "^4.1.5",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "webpackbar": "^7.0.0"
   },
   "scripts": {
@@ -81,6 +81,7 @@
     "test-php-multisite:view-transitions": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/performance composer test-multisite:view-transitions",
     "test-php-multisite:web-worker-offloading": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/performance composer test-multisite:web-worker-offloading",
     "test-php-multisite:webp-uploads": "wp-env run tests-cli --env-cwd=/var/www/html/wp-content/plugins/performance composer test-multisite:webp-uploads",
+    "update-test-case-snapshots": "bin/update-test-case-snapshots.sh",
     "wp-env": "wp-env",
     "prepare": "husky"
   }