Merge branch 'main' into chore-wpgraphql-logging-snags-sept-2025

Author: colinmurphy

.github/scripts/get_plugin_slug.sh

@@ -29,16 +29,40 @@ done
 # Get unique plugin names
 UNIQUE_PLUGINS=($(printf '%s\n' "${PLUGINS[@]}" | sort -u))
 
-# Find the first plugin that actually exists
-PLUGIN_SLUG=""
+# Find all valid plugins that have changes
+VALID_PLUGINS=()
 for plugin in "${UNIQUE_PLUGINS[@]}"; do
-  if [ -d "plugins/$plugin" ] || [[ " ${CHANGED_FILES[@]} " =~ "plugins/$plugin/" ]]; then
-    PLUGIN_SLUG="$plugin"
-    echo "Found plugin in changes or directory: $PLUGIN_SLUG"
-    break
+  if [ -d "plugins/$plugin" ]; then
+    count=$(printf '%s\n' "${PLUGINS[@]}" | grep -c "^$plugin$")
+    VALID_PLUGINS+=("$plugin")
+    echo "Found plugin with $count changes: $plugin"
   fi
 done
 
+# Output all valid plugins as JSON array for matrix strategy
+if [ ${#VALID_PLUGINS[@]} -gt 0 ]; then
+  # Simple, reliable JSON array generation
+  PLUGINS_JSON="["
+  for i in "${!VALID_PLUGINS[@]}"; do
+    if [ $i -eq 0 ]; then
+      PLUGINS_JSON="$PLUGINS_JSON\"${VALID_PLUGINS[i]}\""
+    else
+      PLUGINS_JSON="$PLUGINS_JSON,\"${VALID_PLUGINS[i]}\""
+    fi
+  done
+  PLUGINS_JSON="$PLUGINS_JSON]"
+  
+  echo "plugins=$PLUGINS_JSON" >> "$GITHUB_OUTPUT"
+  echo "has-plugins=true" >> "$GITHUB_OUTPUT"
+  
+  # For backward compatibility, set slug to first plugin
+  PLUGIN_SLUG="${VALID_PLUGINS[0]}"
+else
+  echo "plugins=[]" >> "$GITHUB_OUTPUT"
+  echo "has-plugins=false" >> "$GITHUB_OUTPUT"
+  PLUGIN_SLUG=""
+fi
+
 if [ -z "$PLUGIN_SLUG" ]; then
   echo "No valid plugin directory found"
   exit 1

.github/scripts/update_composer_package.sh

@@ -18,7 +18,7 @@ usage() {
     echo "  description    - Optional: Package description (uses generic default if not provided)"
     echo ""
     echo "Examples:"
-    echo "  $0 '0.0.2' 'https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.2/wp-graphql-webhooks.zip'"
+    echo "  $0 '0.0.2' 'https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.2/wpgraphql-webhooks.zip'"
     echo ""
     echo "  With custom package name and description:"
     echo "  $0 '0.0.5' 'https://example.com/plugin.zip' 'wpengine/my-plugin' 'My custom plugin description'"

.github/workflows/plugin-artifact-for-pr.yml

@@ -9,41 +9,68 @@ on:
       - 'plugins/*/**.json'
 
 jobs:
-  create-plugin-artifact:
-    name: Create Plugin Artifact
+  detect-plugins:
+    name: Detect Changed Plugins
     runs-on: ubuntu-latest
-
+    outputs:
+      plugins: ${{ steps.plugin.outputs.plugins }}
+      has-plugins: ${{ steps.plugin.outputs.has-plugins }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Get changed plugin directory
+      - name: Get changed plugin directories
         id: plugin
         run: |
           bash .github/scripts/get_plugin_slug.sh \
             ${{ github.event.pull_request.base.sha }} \
             ${{ github.event.pull_request.head.sha }}
 
-      - name: Create plugin artifact
+  create-plugin-artifacts:
+    name: Create Plugin Artifacts
+    runs-on: ubuntu-latest
+    needs: detect-plugins
+    if: needs.detect-plugins.outputs.has-plugins == 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        plugin: ${{ fromJson(needs.detect-plugins.outputs.plugins) }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Create plugin artifact for ${{ matrix.plugin }}
         uses: ./.github/actions/create-plugin-artifact
-        env:
-          PLUGIN_SLUG: ${{ steps.plugin.outputs.slug }}
         with:
-            slug: ${{ env.PLUGIN_SLUG }}
+            slug: ${{ matrix.plugin }}
             composer-options: '--no-progress --optimize-autoloader --no-dev'
 
-      - name: Comment with artifact link
+  comment-on-pr:
+    name: Comment with Artifact Links  
+    runs-on: ubuntu-latest
+    needs: [detect-plugins, create-plugin-artifacts]
+    if: needs.detect-plugins.outputs.has-plugins == 'true'
+    steps:
+      - name: Comment with artifact links
         uses: actions/github-script@v7
         env:
-          PLUGIN_SLUG: ${{ steps.plugin.outputs.slug }}
+          PLUGINS: ${{ needs.detect-plugins.outputs.plugins }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const pr = context.payload.pull_request;
             const runId = context.runId;
             const artifactUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
-            const slug = process.env.PLUGIN_SLUG;
-            const body = `ℹ️ [Download the latest ${slug} plugin zip from this PR](${artifactUrl})\n<em>(See the 'Artifacts' section at the bottom)</em>`;
+            const plugins = JSON.parse(process.env.PLUGINS);
+            
+            let body = '## 📦 Plugin Artifacts Ready!\n\n';
+            body += `[Download from GitHub Actions run](${artifactUrl})\n\n`;
+            body += '**Available plugins:**\n';
+            plugins.forEach(plugin => {
+              body += `- ✅ ${plugin}.zip\n`;
+            });
+            body += '\n<em>See the "Artifacts" section at the bottom of the Actions run page</em>';
 
             // Find existing comment from this bot
             const comments = await github.rest.issues.listComments({
@@ -55,7 +82,7 @@ jobs:
             const botComment = comments.data.find(comment =>
               comment.user.type === 'Bot' &&
               comment.user.login === 'github-actions[bot]' &&
-              comment.body.includes(`ℹ️ [Download the latest ${slug} plugin zip from this PR]`)
+              comment.body.includes('## 📦 Plugin Artifacts Ready!')
             );
 
             if (botComment) {

docs/how-to/install-toolkit-plugins/index.md

@@ -26,7 +26,7 @@ Copy and use this example as your `composer.json` for a typical WordPress projec
   ],
   "require": {
     "wpengine/hwp-previews": "*",
-    "wpengine/wp-graphql-webhooks": "*"
+    "wpengine/wpgraphql-webhooks": "*"
   },
   "config": {
     "allow-plugins": {
@@ -57,7 +57,7 @@ Copy and use this example as your `composer.json` for a typical WordPress projec
 To update to the latest version:
 
 ```bash
-composer update wpengine/hwp-previews wpengine/wp-graphql-webhooks
+composer update wpengine/hwp-previews wpengine/wpgraphql-webhooks
 ```
 
 ---

plugins/README.md

@@ -7,7 +7,7 @@ WordPress plugins for the Headless WordPress Toolkit. Each plugin is paired with
 | Plugin | Description |
 |--------|-------------|
 | [`hwp-previews`](./hwp-previews/README.md) | Headless Previews solution for WordPress: fully configurable preview URLs via the settings page which is framework agnostic. |
-| [`wp-graphql-webhooks`](./wp-graphql-webhooks/README.md) | A WordPress plugin that extends [WPGraphQL](https://www.wpgraphql.com/) to support webhook subscriptions and dispatching for headless WordPress environments. This allows external applications to listen and respond to WordPress content changes through GraphQL-driven webhook events. |
+| [`wpgraphql-webhooks`](./wpgraphql-webhooks/README.md) | A WordPress plugin that extends [WPGraphQL](https://www.wpgraphql.com/) to support webhook subscriptions and dispatching for headless WordPress environments. This allows external applications to listen and respond to WordPress content changes through GraphQL-driven webhook events. |
 
 
 ## Install

plugins/composer-packages.json

@@ -211,6 +211,32 @@
       }
     },
     "wpengine/wpgraphql-debug-extensions": {
+      "0.0.2": {
+        "name": "wpengine/wpgraphql-debug-extensions",
+        "version": "0.0.2",
+        "type": "wordpress-plugin",
+        "description": "Debug extensions for WPGraphQL",
+        "homepage": "https://github.com/wpengine/hwptoolkit",
+        "license": "GPL-2.0",
+        "authors": [
+          {
+            "name": "WP Engine Headless OSS Development Team",
+            "email": "headless-oss@wpengine.com",
+            "homepage": "https://wpengine.com/"
+          }
+        ],
+        "support": {
+          "issues": "https://github.com/wpengine/hwptoolkit/issues",
+          "email": "support@wpengine.com"
+        },
+        "dist": {
+          "url": "https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-debug-extensions-wordpress-plugin-0.0.2/wpgraphql-debug-extensions.zip",
+          "type": "zip"
+        },
+        "require": {
+          "composer/installers": "~1.0 || ~2.0"
+        }
+      },
       "0.0.1": {
         "name": "wpengine/wpgraphql-debug-extensions",
         "version": "0.0.1",
@@ -238,9 +264,35 @@
         }
       }
     },
-    "wpengine/wp-graphql-webhooks": {
+    "wpengine/wpgraphql-webhooks": {
+      "0.0.6": {
+        "name": "wpengine/wpgraphql-webhooks",
+        "version": "0.0.6",
+        "type": "wordpress-plugin",
+        "description": "Headless webhooks for WPGraphQL",
+        "homepage": "https://github.com/wpengine/hwptoolkit",
+        "license": "GPL-2.0",
+        "authors": [
+          {
+            "name": "WP Engine Headless OSS Development Team",
+            "email": "headless-oss@wpengine.com",
+            "homepage": "https://wpengine.com/"
+          }
+        ],
+        "support": {
+          "issues": "https://github.com/wpengine/hwptoolkit/issues",
+          "email": "support@wpengine.com"
+        },
+        "dist": {
+          "url": "https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.6/wpgraphql-webhooks.zip",
+          "type": "zip"
+        },
+        "require": {
+          "composer/installers": "~1.0 || ~2.0"
+        }
+      },
       "0.0.4": {
-        "name": "wpengine/wp-graphql-webhooks",
+        "name": "wpengine/wpgraphql-webhooks",
         "version": "0.0.4",
         "type": "wordpress-plugin",
         "description": "Headless webhooks for WPGraphQL",
@@ -258,15 +310,15 @@
           "email": "support@wpengine.com"
         },
         "dist": {
-          "url": "https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.4/wp-graphql-webhooks.zip",
+          "url": "https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.4/wpgraphql-webhooks.zip",
           "type": "zip"
         },
         "require": {
           "composer/installers": "~1.0 || ~2.0"
         }
       },
       "0.0.3": {
-        "name": "wpengine/wp-graphql-webhooks",
+        "name": "wpengine/wpgraphql-webhooks",
         "version": "0.0.3",
         "type": "wordpress-plugin",
         "description": "Headless webhooks for WPGraphQL",
@@ -284,15 +336,15 @@
           "email": "support@wpengine.com"
         },
         "dist": {
-          "url": "https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.3/wp-graphql-webhooks.zip",
+          "url": "https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.3/wpgraphql-webhooks.zip",
           "type": "zip"
         },
         "require": {
           "composer/installers": "~1.0 || ~2.0"
         }
       },
       "0.0.2": {
-        "name": "wpengine/wp-graphql-webhooks",
+        "name": "wpengine/wpgraphql-webhooks",
         "version": "0.0.2",
         "type": "wordpress-plugin",
         "description": "Headless webhooks for WPGraphQL",
@@ -310,7 +362,7 @@
           "email": "support@wpengine.com"
         },
         "dist": {
-          "url": "https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.2/wp-graphql-webhooks.zip",
+          "url": "https://github.com/wpengine/hwptoolkit/releases/download/%40wpengine%2Fwpgraphql-webhooks-wordpress-plugin-0.0.2/wpgraphql-webhooks.zip",
           "type": "zip"
         },
         "require": {

plugins/wpgraphql-debug-extensions/CHANGELOG.md

@@ -1 +1,7 @@
 # @wpengine/wpgraphql-debug-extensions-plugin
+
+## 0.0.2
+
+### Patch Changes
+
+- [#362](https://github.com/wpengine/hwptoolkit/pull/362) [`730646a`](https://github.com/wpengine/hwptoolkit/commit/730646acfb881344f751cd2f7f2ddc1694f9dd1e) Thanks [@theodesp](https://github.com/theodesp)! - chore: wp-graphql-webhooks -> wpgraphql-webhooks

plugins/wpgraphql-debug-extensions/bin/install-test-env.sh

@@ -149,7 +149,7 @@ setup_plugin() {
 	fi
 
 	# Add this repo as a plugin to the repo
-	if [ ! -d $WORDPRESS_ROOT_DIR/wp-content/plugins/wp-graphql-webhooks ]; then
+	if [ ! -d $WORDPRESS_ROOT_DIR/wp-content/plugins/wpgraphql-webhooks ]; then
 		echo -e "$(status_message "Symlinking the plugin to the WordPress plugins directory...")"
 
 		cd "$ORIGINAL_PATH"

plugins/wpgraphql-debug-extensions/composer.json

@@ -3,7 +3,7 @@
 	"description": "Debug extensions for WPGraphQL",
 	"type": "library",
 	"license": "GPL-2.0",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"authors": [
 		{
 			"name": "WP Engine Headless OSS Development Team",

plugins/wpgraphql-debug-extensions/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wpengine/wpgraphql-debug-extensions-wordpress-plugin",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"private": true,
 	"description": "Debug Extensions for WordPress",
 	"scripts": {