@ideasonpurpose/build-tools-wordpress 2.7.0 → 2.8.1

package/.github/workflows/release-from-version-tag.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       # https://github.com/marketplace/actions/checkout
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Set TAG environment variable
         run: |

package/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### v2.8.0
+
+> 3 June 2026
+
+- bump deps
+- refactor format functions and improve tests
+- boilerplate and README SVGo info
+
+#### v2.7.0
+
+> 6 May 2026
+
+- bump deps, migrate some tooling
+- feat: add AI Coding Assistant guidelines documentation
+
 #### v2.6.6
 
 > 27 April 2026

package/README.md

@@ -1,6 +1,6 @@
 # @ideasonpurpose/build-tools-wordpress
 
-#### Version 2.7.0
+#### Version 2.8.1
 
 [![NPM Version](https://img.shields.io/npm/v/%40ideasonpurpose%2Fbuild-tools-wordpress?logo=npm)](https://www.npmjs.com/package/@ideasonpurpose/build-tools-wordpress)
 [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/ideasonpurpose/build-tools-wordpress/npm-publish.yml?logo=github&logoColor=white)](https://github.com/ideasonpurpose/build-tools-wordpress#readme)
@@ -41,6 +41,10 @@ Webpack handles SVG files differently based on import context:
 
 Data URIs are generated as `data:image/svg+xml,<url-encoded-content>` using more efficient URL-encoding, not base64.
 
+### SVG Optimization
+
+SVGO is included along with our preferred [svgo.config.mjs][]. Run this with `npx svgo <file-to-optimize.svg>`
+
 ## Experimental formatting helpers
 
 This package includes two experimental formatting scripts:
@@ -94,6 +98,7 @@ A GitHub action will auto-publish version-tagged releases to npm. In order to pu
 
 #### Brought to you by IOP
 
-<a href="https://www.ideasonpurpose.com"><img src="https://raw.githubusercontent.com/ideasonpurpose/ideasonpurpose/master/iop-logo-white-on-black-88px.png" height="44" align="top" alt="IOP Logo"></a><img src="https://raw.githubusercontent.com/ideasonpurpose/ideasonpurpose/master/spacer.png" align="middle" width="4" height="54"> This project is actively developed and used in production at <a href="https://www.ideasonpurpose.com">Ideas On Purpose</a>.
+| <a href="https://www.ideasonpurpose.com"><img src="https://raw.githubusercontent.com/ideasonpurpose/ideasonpurpose/master/iop-logo-white-on-black-88px.png" height="44" align="top" alt="IOP Logo"></a> | This project is actively developed and used in production at <a href="https://www.ideasonpurpose.com">Ideas On Purpose</a>. |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
 
 <!-- END IOP CREDIT BLURB -->

package/bin/format-php-prettier.js

@@ -141,7 +141,7 @@ export function unTokenizeHTML(tokenizedHTML, phpCodeBlocks) {
  *
  * @param {string} filepath - The path to the file to format (must be a valid file path).
  */
-async function formatHTMLThenPHP(filepath) {
+export async function formatHTMLThenPHP(filepath) {
   try {
     const startTime = process.hrtime.bigint();
     const rawFile = await readFile(filepath, "utf8");
@@ -175,9 +175,11 @@ async function formatHTMLThenPHP(filepath) {
   }
 }
 
-if (process.argv[2]) {
-  const fullPath = resolve(process.argv[2]);
-  formatHTMLThenPHP(fullPath);
-} else {
-  console.error("Error: A filepath is required.");
+export async function main(filepath = process.argv[2]) {
+  if (!filepath) {
+    console.error("Error: A filepath is required.");
+    return;
+  }
+  await formatHTMLThenPHP(resolve(filepath));
 }
+if (import.meta.url === `file://${process.argv[1]}`) main();

package/bin/format-wp-block-pattern.js

@@ -108,6 +108,16 @@ export function normalizeCommentTagSpacing(content) {
       /** @param {string} match @param {string} p1 */ (match, p1) =>
         `>\n${p1}\n`,
     );
+
+    if (block === "wp:paragraph") {
+      newContent = newContent
+        .replace(/\n\s*<p>\s*/g, "\n<p>")
+        .replace(/\s*<\/p>/g, "</p>")
+        .replace(/<p>[\s\S]*?<\/p>/g, (match) =>
+          match.replace(/\s+/g, " ").trim(),
+        );
+      newContent = newContent.replace(/\n{3,}/g, "\n\n").replace(/\s+$/, "\n");
+    }
   });
   return newContent;
 }
@@ -169,38 +179,36 @@ export function formatWithPrettier(content) {
 /**
  * @param {String} filepath
  */
-async function formatWPBlockPattern(filepath) {
-  try {
-    const startTime = process.hrtime.bigint();
-    const rawFile = await readFile(filepath, "utf8");
-
-    const formatters = [
-      formatWithPrettier,
-      normalizeCommentTagSpacing,
-      formatAllWpComments,
-      trimInsideListElements,
-      trimInsideHeadings,
-      normalizeNewlines,
-    ];
-
-    const outputHtml = await formatters.reduce(
-      async (acc, fn) => fn(await acc),
-      Promise.resolve(rawFile),
-    );
+export async function formatWPBlockPattern(filepath) {
+  const startTime = process.hrtime.bigint();
+  const rawFile = await readFile(filepath, "utf8");
+
+  const formatters = [
+    formatWithPrettier,
+    normalizeCommentTagSpacing,
+    formatAllWpComments,
+    trimInsideListElements,
+    trimInsideHeadings,
+    normalizeNewlines,
+  ];
 
-    await writeFile(filepath, outputHtml, "utf8");
-    const endTime = process.hrtime.bigint();
-    const duration = Number(endTime - startTime);
+  const outputHtml = await formatters.reduce(
+    async (acc, fn) => fn(await acc),
+    Promise.resolve(rawFile),
+  );
 
-    console.log(`${basename(filepath)} ${(duration / 1e6).toFixed(2)}ms`);
-  } catch (error) {
-    console.error("Error:", error);
-  }
+  await writeFile(filepath, outputHtml, "utf8");
+  const endTime = process.hrtime.bigint();
+  const duration = Number(endTime - startTime);
+
+  console.log(`${basename(filepath)} ${(duration / 1e6).toFixed(2)}ms`);
 }
 
-if (process.argv[2]) {
-  const fullPath = resolve(process.argv[2]);
-  formatWPBlockPattern(fullPath);
-} else {
-  console.error("Error: A filepath is required.");
+export async function main(filepath = process.argv[2]) {
+  if (!filepath) {
+    console.error("Error: A filepath is required.");
+    return;
+  }
+  await formatWPBlockPattern(resolve(filepath));
 }
+if (import.meta.url === `file://${process.argv[1]}`) main();

package/boilerplate/composer.json

@@ -0,0 +1,42 @@
+{
+  "name": "ideasonpurpose/iop-theme",
+  "description": "Block-based hybrid theme for the Stone Rabbit NYC website.",
+  "authors": [
+    {
+      "name": "Ideas On Purpose",
+      "homepage": "https://www.ideasonpurpose.com"
+    }
+  ],
+  "config": {
+    "optimize-autoloader": true,
+    "sort-packages": true,
+    "vendor-dir": "wp-content/themes/iop-theme/vendor",
+    "platform": {
+      "php": "8.4",
+      "ext-intl": "0"
+    }
+  },
+  "autoload": {
+    "psr-4": {
+      "IdeasOnPurpose\\": [
+        "wp-content/themes/iop-theme/lib"
+      ]
+    }
+  },
+  "require": {
+    "ideasonpurpose/wp-admin-separators": "1.0.8",
+    "ideasonpurpose/wp-google-analytics": "^1.1.0",
+    "ideasonpurpose/wp-svg-lib": "^3.2.0",
+    "ideasonpurpose/wp-theme-i18n": "dev-main",
+    "ideasonpurpose/wp-theme-init": "^2.20.5"
+  },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/ideasonpurpose/wp-theme-i18n"
+    }
+  ],
+  "require-dev": {
+    "php-stubs/acf-pro-stubs": "^6.5"
+  }
+}

package/boilerplate/package.json

@@ -0,0 +1,74 @@
+{
+  "name": "iop-theme",
+  "version": "0.1.10",
+  "private": true,
+  "description": "Theme for the CLIENT_NAME website",
+  "license": "UNLICENSED",
+  "author": "Ideas On Purpose (https://www.ideasonpurpose.com/)",
+  "contributors": [
+    "Joe Maller <joe@ideasonpurpose.com>",
+    "Codrin Pavel <codrin@ideasonpurpose.com>"
+  ],
+  "type": "module",
+  "main": "index.js",
+  "scripts": {
+    "_bootstrap:composer": "npm run composer:install",
+    "_bootstrap:npm": "npm ci",
+    "prebootstrap": "npm run permissions:repair",
+    "bootstrap": "npm run _bootstrap:npm && npm run _bootstrap:composer && npm run theme:activate",
+    "postbootstrap": "echo && echo '  🚀' && echo '     ✨ All set!' && echo '🌏      Run this to get started:' && chalk bold yellow  '        npm run start' && echo",
+    "prebuild": "npm run clean",
+    "build": "NODE_ENV=production webpack",
+    "postbuild": "npm run zip",
+    "clean": "npx rimraf -g 'wp-content/themes/iop*/dist'",
+    "composer": "npm run composer:install",
+    "composer:install": "docker compose run --rm composer",
+    "composer:require": "docker compose run --rm composer require",
+    "composer:update": "docker compose run --rm composer update",
+    "db:admin": "docker compose run --rm --service-ports phpmyadmin",
+    "db:dump": "docker compose run --rm db-dump",
+    "db:pull": "npm run pull:db",
+    "db:reload": "docker compose run --rm db-reload",
+    "postdb:reload": "npm run theme:activate",
+    "dev": "npm run start",
+    "log:wordpress": "npm run logs:wordpress",
+    "logs:wordpress": "docker compose exec wordpress tail -f /var/log/wordpress/debug.log",
+    "mysqldump": "npm run db:dump",
+    "permissions:repair": "docker compose run --rm repair-permissions",
+    "phpmyadmin": "npm run db:admin",
+    "preproject:refresh": "docker compose pull refresh",
+    "project:refresh": "docker compose run --rm refresh",
+    "postproject:refresh": "docker compose pull wordpress",
+    "pull": "npm run pull:db && npm run pull:plugins && npm run pull:uploads",
+    "prepull:db": "npm run db:dump",
+    "pull:db": "docker compose run --rm pull database",
+    "postpull:db": "npm run db:reload",
+    "pull:plugins": "docker compose run --rm pull plugins",
+    "pull:uploads": "docker compose run --rm pull uploads",
+    "pull:uploads-all": "docker compose run --rm pull uploads all",
+    "prestart": "npm run clean && docker compose run --rm --service-ports -d wordpress && iop-build-port-reporter",
+    "start": "webpack serve",
+    "poststart": "npm run stop",
+    "stop": "docker compose down --remove-orphans",
+    "test": "playwright test --ui",
+    "theme:activate": "docker compose run --rm theme-activate",
+    "version": "version-everything && git add -u",
+    "postversion": "npm run build",
+    "webgrind": "docker compose run --rm --service-ports webgrind",
+    "wp-cli": "docker compose exec -u wp wordpress",
+    "zip": "iop-build-zip-archive"
+  },
+  "prettier": "@ideasonpurpose/prettier-config",
+  "stylelint": {
+    "extends": "@ideasonpurpose/stylelint-config"
+  },
+  "devDependencies": {
+    "@ideasonpurpose/build-tools-wordpress": "^2.5.1"
+  },
+  "version-everything": {
+    "files": [
+      "README.md",
+      "wp-content/themes/iop-theme/style.css"
+    ]
+  }
+}

package/boilerplate/svgo.config.mjs

@@ -0,0 +1,32 @@
+/**
+ * This is primarily intended to work with the SVGO VS Code Plugin, and to
+ * save trips out to SVGOMG.
+ *
+ * This config allows for immediate optimization of SVGs in the editor
+ *
+ *
+ * @links
+ * - SVGO: https://github.com/svg/svgo
+ * - SVGO preset-default docs: https://svgo.dev/docs/preset-default
+ * - VS Code Plugin: https://marketplace.visualstudio.com/items?itemName=1000ch.svgo
+ * - SVGOMG: https://jakearchibald.github.io/svgomg/
+ */
+
+export default {
+  js2svg: {
+    indent: 4, // number
+    pretty: true, // boolean
+  },
+
+  plugins: [
+    {
+      name: "preset-default",
+      params: {
+        overrides: {
+          cleanupIds: false,
+        },
+      },
+    },
+    "removeDimensions",
+  ],
+};

package/example/docker-compose.yml

@@ -0,0 +1,7 @@
+include:
+  - path: ./node_modules/@ideasonpurpose/build-tools-wordpress/tooling/docker-compose.yml
+    # Set project_directory to force volumes to use this file as the relative root for included docker-compose files
+    project_directory: .
+
+# Uncomment this line to use a local dev build of the WordPress Docker image.
+# services: { wordpress: { image: "ideasonpurpose/wordpress:dev" } }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ideasonpurpose/build-tools-wordpress",
-  "version": "2.7.0",
+  "version": "2.8.1",
   "description": "Build scripts and dependencies for IOP's WordPress development environments.",
   "homepage": "https://github.com/ideasonpurpose/build-tools-wordpress#readme",
   "bugs": {
@@ -21,9 +21,9 @@
   "bin": {
     "iop-build-port-reporter": "./bin/port-reporter.js",
     "iop-build-zip-archive": "./bin/zip.js",
-    "iop-project-init": "./bin/project-init.js",
     "iop-html-php-prettier": "./bin/format-php-prettier.js",
-    "iop-format-wp-block-pattern": "./bin/format-wp-block-pattern.js"
+    "iop-format-wp-block-pattern": "./bin/format-wp-block-pattern.js",
+    "iop-project-refresh": "./bin/refresh.js"
   },
   "directories": {
     "lib": "lib"
@@ -35,18 +35,18 @@
   "prettier": "@ideasonpurpose/prettier-config",
   "dependencies": {
     "@ideasonpurpose/prettier-config": "^1.0.1",
-    "@ideasonpurpose/stylelint-config": "^1.1.4",
+    "@ideasonpurpose/stylelint-config": "^1.1.6",
     "@prettier/plugin-php": "^0.25.0",
-    "@rollup/plugin-commonjs": "^29.0.2",
+    "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@svgr/webpack": "^8.1.0",
-    "@wordpress/dependency-extraction-webpack-plugin": "^6.45.0",
+    "@wordpress/dependency-extraction-webpack-plugin": "^6.47.0",
     "ansi-html": "^0.0.9",
-    "archiver": "^7.0.1",
+    "archiver": "^8.0.0",
     "autoprefixer": "^10.5.0",
     "babel-loader": "^10.1.1",
-    "caniuse-lite": "^1.0.30001792",
+    "caniuse-lite": "^1.0.30001793",
     "chalk": "^5.6.2",
     "chalk-cli": "^6.0.0",
     "classnames": "^2.5.1",
@@ -54,10 +54,10 @@
     "copy-webpack-plugin": "^14.0.0",
     "cosmiconfig": "^9.0.1",
     "css-loader": "^7.1.4",
-    "cssnano": "^8.0.0",
+    "cssnano": "^8.0.1",
     "dotenv": "^17.4.2",
     "esbuild-loader": "^4.4.3",
-    "eslint": "^10.3.0",
+    "eslint": "^10.4.1",
     "filesize": "^11.0.17",
     "fs-extra": "^11.3.5",
     "globby": "^16.2.0",
@@ -69,7 +69,7 @@
     "lodash": "^4.18.1",
     "mini-css-extract-plugin": "^2.10.2",
     "ora": "^9.4.0",
-    "postcss": "^8.5.14",
+    "postcss": "^8.5.15",
     "postcss-loader": "^8.2.1",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.8.3",
@@ -77,28 +77,28 @@
     "read-package-up": "^12.0.0",
     "replacestream": "^4.0.3",
     "rimraf": "^6.1.3",
-    "sass-embedded": "^1.99.0",
-    "sass-loader": "^16.0.7",
-    "semver": "^7.7.4",
+    "sass-embedded": "^1.100.0",
+    "sass-loader": "^17.0.0",
+    "semver": "^7.8.1",
     "sharp": "^0.34.5",
-    "sort-package-json": "^3.6.1",
+    "sort-package-json": "^3.7.0",
     "string-length": "^7.0.1",
     "style-loader": "^4.0.0",
     "svgo": "^4.0.1",
     "svgo-loader": "^5.0.0",
     "version-everything": "^0.12.2",
-    "webpack": "^5.106.2",
+    "webpack": "^5.107.2",
     "webpack-bundle-analyzer": "^5.3.0",
     "webpack-dev-middleware": "^8.0.3",
-    "webpack-dev-server": "^5.2.3",
+    "webpack-dev-server": "^5.2.4",
     "webpack-manifest-plugin": "^6.0.1"
   },
   "peerDependencies": {
     "webpack-cli": "^6.0.1"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^4.1.5",
-    "vitest": "^4.1.5"
+    "@vitest/coverage-v8": "^4.1.8",
+    "vitest": "^4.1.8"
   },
   "version-everything": {
     "files": [

package/test/devserver-proxy.test.js

@@ -1,23 +1,19 @@
 //@ts-check
 
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-
-import fs from "fs";
-import dns from "dns";
+import { afterEach, beforeEach, expect, test, vi } from "vitest";
 
 import { EventEmitter } from "events";
 
 import { devserverProxy } from "../lib/devserver-proxy.js";
 import { findLocalPort } from "../lib/find-local-docker-port.js";
 
-const expected = "11.22.33.44";
-
 const expectedPort = 56789;
 const expectedHostName = "stella.dog";
 const expectedTarget = `http://${expectedHostName}:${expectedPort}`;
 
 vi.mock("../lib/find-local-docker-port.js");
 
+/** @type {Promise<{port:number,hostname:string}>} */
 let localPort;
 
 beforeEach(() => {
@@ -33,80 +29,6 @@ beforeEach(() => {
 afterEach(() => {
   vi.restoreAllMocks();
 });
-// beforeEach(() => {
-//   jest.spyOn(dns, "promises", "get").mockImplementation(() => {
-//     return { resolve: async () => [expected] };
-//   });
-
-//   console.log = jest.fn();
-// });
-
-// afterEach(() => {
-//   jest.clearAllMocks();
-//   jest.resetAllMocks();
-//   // mockResolve.mockResolvedValue(["11.22.33.44"]);
-// });
-
-// disabled because we're now mocking the library
-// test.skip("dns works normally", async () => {
-//   const actual = await dns.promises.resolve("apple.com");
-//   expect(actual[0]).toMatch(/^17\.253/);
-// });
-
-// test("mock dns.promises.resolve", async () => {
-//   const actual = await dns.promises.resolve("hello");
-//   expect(actual).toBe(expected);
-// });
-
-// test("resolve from file", async () => {
-//   const actual = await resolveFromFile("wordpress");
-//   expect(actual).toBe(expected);
-// });
-
-// test("Send legacy token where there's no wordpress service", async () => {
-//   jest.spyOn(dns, "promises", "get").mockImplementation(() => {
-//     // console.log("ONLY ONCE");
-//     return { resolve: () => new Promise((resolve, reject) => reject()) };
-//   });
-
-//   let proxy =
-//     "http://devserver-proxy-token--d939bef2a41c4aa154ddb8db903ce19fff338b61";
-
-//   const logSpy = jest.spyOn(console, "log");
-//   const actual = await devserverProxy({ proxy });
-
-//   expect(actual).toStrictEqual({});
-//   // expect(logSpy).toHaveBeenCalledWith(expect.stringContaining("ONCE"));
-//   expect(logSpy).toHaveBeenCalledWith(
-//     expect.any(String),
-//     expect.stringContaining("devserver-proxy-token"),
-//     expect.any(String)
-//   );
-// });
-
-// test("prefix http onto string", async () => {
-//   jest.spyOn(dns, "promises", "get").mockImplementation(() => {
-//     return {
-//       resolve: () => new Promise((resolve, reject) => resolve(["fake-url"])),
-//     };
-//   });
-
-//   let proxy = "placeholder string";
-//   const actual = await devserverProxy({ proxy });
-//   expect(actual).toHaveProperty("proxy.**.target", "http://fake-url");
-// });
-
-// test("fail to prefix http onto string", async () => {
-//   jest.spyOn(dns, "promises", "get").mockImplementation(() => {
-//     return {
-//       resolve: () => new Promise((resolve, reject) => reject()),
-//     };
-//   });
-
-//   let proxy = "placeholder string";
-//   const actual = await devserverProxy({ proxy });
-//   expect(actual).toStrictEqual({});
-// });
 
 test("Test proxy settings", async () => {
   let proxy = true;
@@ -134,6 +56,13 @@ test("proxy is a plain string", async () => {
   expect(findLocalPort).toHaveBeenCalledWith(proxy);
 });
 
+test("plain string proxy with no local port", async () => {
+  vi.mocked(findLocalPort).mockReturnValue(Promise.resolve(null));
+  const result = await devserverProxy({ proxy: "sandwich" });
+  expect(result.proxy).toHaveLength(1);
+  expect(result.proxy[0].target).toBeUndefined();
+});
+
 test("Proxy boolean true", async () => {
   vi.mocked(findLocalPort).mockReturnValue(localPort);
   const proxy = true;
@@ -141,6 +70,13 @@ test("Proxy boolean true", async () => {
   expect(actual).toHaveProperty("target", expectedTarget);
 });
 
+test("Proxy boolean true with no local port", async () => {
+  vi.mocked(findLocalPort).mockReturnValue(Promise.resolve(null));
+  const result = await devserverProxy({ proxy: true });
+  expect(result.proxy).toHaveLength(1);
+  expect(result.proxy[0].target).toBeUndefined();
+});
+
 test("Proxy boolean false", async () => {
   const proxy = false;
   expect(await devserverProxy({ proxy })).toStrictEqual({ proxy: [] });
@@ -216,7 +152,6 @@ test("onProxyRes Handler", async () => {
   );
 });
 
-
 test("onProxyRes Handler passthrough", async () => {
   const config = { proxy: "http://localhost:3000" };
   const result = await devserverProxy(config);
@@ -224,9 +159,9 @@ test("onProxyRes Handler passthrough", async () => {
 
   const mockProxyRes = new EventEmitter();
   mockProxyRes.statusCode = 200;
-  mockProxyRes.statusMessage = "OK";
   mockProxyRes.headers = {
     "content-type": "nope/nope",
+    "x-num": 42,
   };
   const mockReq = {
     headers: { host: "example.com" },
@@ -255,124 +190,19 @@ test("onProxyRes Handler passthrough", async () => {
   );
 });
 
+test("onProxyReqWs handler", async () => {
+  const result = await devserverProxy({ proxy: "http://example.com" });
+  const onProxyReqWs = result.proxy[0].onProxyReqWs;
+
+  const socket = new EventEmitter();
+  const errSpy = vi.spyOn(console, "error");
 
+  onProxyReqWs(null, null, socket, null, null);
+  socket.emit("error", { code: "EPIPE" });
+  expect(errSpy).not.toHaveBeenCalled();
 
-// test("test proxy's onProxyRes handler", async () => {
-//   let proxy = "https://example.com";
-//   const logSpy = jest.spyOn(console, "log");
-//   const actual = await devserverProxy({ proxy });
-
-//   const route = actual.proxy["**"];
-//   const mockProxyRes = fs.createReadStream(new URL(import.meta.url));
-
-//   mockProxyRes.headers = {
-//     headerKey: "value",
-//     host: "example.com",
-//     "content-type": "text/html; charset=utf-8",
-//   };
-//   mockProxyRes.statusCode = "statusCode";
-//   mockProxyRes.statusMessage = "statusMessage";
-
-//   const events = {};
-//   jest.spyOn(mockProxyRes, "on").mockImplementation((event, handler) => {
-//     events[event] = handler;
-//     return mockProxyRes;
-//   });
-
-//   const setHeader = jest.fn();
-//   const end = jest.fn();
-
-//   const res = { setHeader, end };
-//   const req = {
-//     headers: { host: "req.headers.host" },
-//     path: "path",
-//   };
-
-//   route.onProxyRes(mockProxyRes, req, res);
-//   events.data(Buffer.from("A string with 28 characters."));
-//   events.end();
-
-//   expect(res.statusCode).toBe(mockProxyRes.statusCode);
-//   expect(res.statusMessage).toBe(mockProxyRes.statusMessage);
-//   expect(req.headers.host).toBe("req.headers.host");
-//   expect(setHeader).toHaveBeenLastCalledWith("Content-Length", 28);
-// });
-
-// test("test proxy's onProxyRes handler onEnd passthrough", async () => {
-//   let proxy = "https://example.com";
-//   // const logSpy = jest.spyOn(console, "log");
-//   const actual = await devserverProxy({ proxy });
-
-//   const route = actual.proxy["**"];
-//   const mockProxyRes = fs.createReadStream(new URL(import.meta.url));
-
-//   console.log("hello");
-//   mockProxyRes.headers = {
-//     headerKey: "value",
-//     host: "example.com",
-//     "Content-Length": 123,
-//   };
-
-//   const events = {};
-//   jest.spyOn(mockProxyRes, "on").mockImplementation((event, handler) => {
-//     events[event] = handler;
-//     return mockProxyRes;
-//   });
-
-//   const setHeader = jest.fn();
-//   const end = jest.fn();
-
-//   const res = { setHeader, end };
-//   const req = {
-//     headers: { host: "req.headers.host" },
-//     path: "/wp-admin/fake.css",
-//   };
-
-//   route.onProxyRes(mockProxyRes, req, res);
-//   events.end();
-
-//   expect(end).toHaveBeenCalled();
-// });
-
-// test("proxy should rewrite http:// and http:\\/\\/", async () => {
-//   let proxy = "wordpress";
-
-//   const logSpy = jest.spyOn(console, "log");
-//   const actual = await devserverProxy({ proxy });
-//   const route = actual.proxy["**"];
-//   const mockProxyRes = fs.createReadStream(new URL(import.meta.url));
-
-//   mockProxyRes.headers = {
-//     headerKey: "value",
-//     host: "example.com",
-//     "content-type": "text/html; charset=utf-8",
-//   };
-
-//   const events = {};
-//   jest.spyOn(mockProxyRes, "on").mockImplementation((event, handler) => {
-//     events[event] = handler;
-//     return mockProxyRes;
-//   });
-
-//   const setHeader = jest.fn();
-//   const end = jest.fn();
-
-//   const res = { setHeader, end };
-//   const req = {
-//     headers: { host: "req.headers.host" },
-//     path: "path",
-//   };
-
-//   route.onProxyRes(mockProxyRes, req, res);
-//   events.data(Buffer.from("http://11.22.33.44\n"));
-//   events.data(Buffer.from("http:\\/\\/11.22.33.44\n"));
-//   events.end();
-
-//   expect(end.mock.calls[0][0].toString("utf8")).toMatch(
-//     /http:\/\/req.headers.host/
-//   );
-
-//   expect(end.mock.calls[0][0].toString("utf8")).toMatch(
-//     /http:\\\/\\\/req.headers.host/
-//   );
-// });
+  socket.emit("error", { code: "OTHER" });
+  expect(errSpy).toHaveBeenCalledWith("WebSocket proxy error:", {
+    code: "OTHER",
+  });
+});

package/test/fixtures/format-wp-block-pattern/nested-list.php

@@ -1,3 +1,9 @@
+<?php
+/**
+ * Title: Nested List Test
+ */
+?>
+
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
 <li>   UL Item 1  </li>

package/test/fixtures/format-wp-block-pattern/nested-list__formatted.php

@@ -1,3 +1,9 @@
+<?php
+/**
+ * Title: Nested List Test
+ */
+?>
+
 <!-- wp:list -->
 <ul class="wp-block-list">
 

package/test/fixtures/format-wp-block-pattern/paragraph-whitespace.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Title: Paragraph Whitespace Test
+ */
+?>
+
+<!-- wp:paragraph -->
+  <p>
+    There are four button styles. Default, Primary, Secondary and Text. Each
+    style can include an icon which can be positioned on either side by changing
+    the button's text-alignment. Button colors can be customized by selecting
+    different Text and Background colors.
+  </p>
+<!-- /wp:paragraph -->

package/test/fixtures/format-wp-block-pattern/paragraph-whitespace__formatted.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * Title: Paragraph Whitespace Test
+ */
+?>
+
+<!-- wp:paragraph -->
+<p>There are four button styles. Default, Primary, Secondary and Text. Each style can include an icon which can be positioned on either side by changing the button's text-alignment. Button colors can be customized by selecting different Text and Background colors.</p>
+<!-- /wp:paragraph -->

package/test/format-wp-block-pattern.test.js

@@ -1,6 +1,13 @@
 //@ts-check
 
-import { describe, expect, test } from "vitest";
+import { describe, expect, test, vi } from "vitest";
+import prettier from "prettier";
+
+vi.mock("prettier", () => ({
+  default: {
+    format: vi.fn().mockResolvedValue("<formatted/>"),
+  },
+}));
 
 import { readFile } from "node:fs/promises";
 
@@ -9,6 +16,11 @@ import {
   formatAllWpComments,
   normalizeCommentTagSpacing,
   trimInsideListElements,
+  normalizeNewlines,
+  trimInsideHeadings,
+  formatWithPrettier,
+  formatWPBlockPattern,
+  main,
 } from "../bin/format-wp-block-pattern.js";
 
 describe("Format JSON in WP Block comments", () => {
@@ -106,15 +118,62 @@ describe("Normalize whitespace", () => {
       await readFile("./test/fixtures/format-wp-block-pattern/nested-list.php")
     ).toString();
 
-        const expected = (
-      await readFile("./test/fixtures/format-wp-block-pattern/nested-list__formatted.php")
+    const expected = (
+      await readFile(
+        "./test/fixtures/format-wp-block-pattern/nested-list__formatted.php",
+      )
     ).toString();
 
     const actual = trimInsideListElements(input);
-        expect(actual).toMatch(/<li>UL/);
+    expect(actual).toMatch(/<li>UL/);
+
+    expect(actual).toBe(expected);
+  });
+
+  test("Whitespace handling in paragraphs", async () => {
+    const input = (
+      await readFile(
+        "./test/fixtures/format-wp-block-pattern/paragraph-whitespace.php",
+      )
+    ).toString();
+
+    const expected = (
+      await readFile(
+        "./test/fixtures/format-wp-block-pattern/paragraph-whitespace__formatted.php",
+      )
+    ).toString();
+
+    const actual = normalizeCommentTagSpacing(input);
+    expect(actual).toBe(expected);
+  });
+
+  test("normalizeNewlines for coverage", async () => {
+    const input = "Line 1\nLine 2\n \n \n\n\n\nLine 3\nLine 4";
+    const expected = "Line 1\nLine 2\n\nLine 3\nLine 4\n";
+
+    const actual = normalizeNewlines(input);
+    expect(actual).toBe(expected);
+  });
 
+  test("trimInsideHeadings for coverage", async () => {
+    const input = "<h2>   Heading with extra spaces   </h2>";
+    const expected = "<h2>Heading with extra spaces</h2>";
+
+    const actual = trimInsideHeadings(input);
     expect(actual).toBe(expected);
   });
+
+  test("formatWithPrettier for coverage", async () => {
+    const input = "<div>foo</div>";
+    await formatWithPrettier(input);
+    expect(prettier.format).toHaveBeenCalled();
+  });
+
+  test("main requires filepath", async () => {
+    const spy = vi.spyOn(console, "error").mockImplementation(() => {});
+    await main();
+    expect(spy).toHaveBeenCalled();
+    spy.mockRestore();
+  });
 });
 
-// {"align":"full","className":"group-name"}

package/tooling/docker-compose.yml

@@ -2,7 +2,7 @@ services:
   # Primary database for the local WordPress development environment.
   # Image from: https://hub.docker.com/_/mysql
   db:
-    image: &db_img mysql:8.4
+    image: &db_img mysql:9.7
     restart: always
     volumes:
       - db_data:/var/lib/mysql
@@ -31,13 +31,13 @@ services:
         max-file: "3"
 
   # Ideas On Purpose's local WordPress development environment.
-  # Update image version with `docker run ideasonpurpose/wordpress init`
+  # Update image version with `docker run ideasonpurpose/wordpress init`   
   # Project info: https://github.com/ideasonpurpose/docker-wordpress-dev
   wordpress:
     depends_on:
       - db
     # image: &wp_img ideasonpurpose/wordpress:dev
-    image: &wp_img ideasonpurpose/wordpress:6.9.4
+    image: &wp_img ideasonpurpose/wordpress:7.0
     restart: always
     volumes:
       - wp_data:/var/www/html
@@ -82,7 +82,7 @@ services:
   # Utility service for running composer commands
   # Image from: https://hub.docker.com/_/composer
   composer:
-    image: composer:2.9
+    image: composer:2.10
     profiles: ["utility"]
     user: "${UID:-1000}:${GID:-1000}"
     environment:
@@ -173,7 +173,7 @@ services:
     command: |
       bash -c  'for i in {1..10}
                 do echo -e "⏳  \033[33mWaiting for DB server...\033[0m" &&
-                  mysql --ssl-mode=DISABLED -s -h db -e "exit" && break || sleep 3
+                  mysql --ssl-mode=DISABLED -s -h db -e "SELECT 1" && break || sleep 3
                 done &&
                 sleep 2 &&
                 echo -e "✔️   \033[32mConnected to DB\033[0m" &&
@@ -197,7 +197,7 @@ services:
     command: |
       bash -c  'for i in {1..10}
                 do echo -e "⏳  \033[33mWaiting for DB server...\033[0m" &&
-                  mysql --ssl-mode=DISABLED -s -h db -e "exit" && break || sleep 3
+                  mysql --ssl-mode=DISABLED -s -h db -e "SELECT 1" && break || sleep 3
                 done &&
                 sleep 2 &&
                 echo -e "✔️   \033[32mConnected to DB\033[0m" &&
@@ -205,7 +205,7 @@ services:
                 mysqladmin --ssl-mode=DISABLED -hdb -v -f create $${MYSQL_DATABASE} &&
                 echo Database \"$${MYSQL_DATABASE}\" created &&
                 echo Reloading database from dumpfile &&
-                mysql --ssl-mode=DISABLED -hdb $${MYSQL_DATABASE} < $$(ls /usr/src/dumpfiles/*.sql | tail -n1)'
+                mysql --ssl-mode=DISABLED -hdb $${MYSQL_DATABASE} < $$(ls -t /usr/src/dumpfiles/*.sql | head -n1)'
 
   # Activates the theme directly in the database
   theme-activate:
@@ -220,7 +220,7 @@ services:
     command: |
       bash -c  'for i in {1..10}
                 do echo -e "⏳  \033[33mWaiting for DB server...\033[0m" &&
-                  mysql --ssl-mode=DISABLED -s -h db -e "exit" && break || sleep 3
+                  mysql --ssl-mode=DISABLED -s -h db -e "SELECT 1" && break || sleep 3
                 done &&
                 sleep 2 &&
                 echo -e "✔️   \033[32mConnected to DB\033[0m" &&