@ideasonpurpose/build-tools-wordpress 2.6.3 → 2.6.5

package/.github/workflows/npm-publish.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       # https://github.com/marketplace/actions/checkout
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       # https://github.com/actions/setup-node
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: '24'
           registry-url: 'https://registry.npmjs.org'

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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.6.4
+
+> 5 April 2026
+
+- chore: update actions versions in npm-publish workflow and bump version-everything dependency
+- feat: add new formatting functions for handling list elements and normalize newlines
+
+#### v2.6.3
+
+> 4 April 2026
+
+- bump deps
+- feat: add formatter for WordPress block pattern PHP files and corresponding tests
+
 #### v2.6.2
 
 > 23 March 2026

package/README.md

@@ -1,6 +1,6 @@
 # @ideasonpurpose/build-tools-wordpress
 
-#### Version 2.6.3
+#### Version 2.6.5
 
 [![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)

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

@@ -84,6 +84,7 @@ export function normalizeCommentTagSpacing(content) {
     "wp:heading",
     "wp:image",
     "wp:list",
+    "wp:list-item",
     "wp:media-text",
     "wp:paragraph",
     "wp:pattern",
@@ -111,6 +112,49 @@ export function normalizeCommentTagSpacing(content) {
   return newContent;
 }
 
+/**
+ * Remove extra blank lines (more than 2) and trim leading/trailing whitespace
+ * @param {string} content
+ * @returns {string}
+ */
+export function normalizeNewlines(content) {
+  return (
+    content
+      .replace(/^[ \t]+$/gm, "")
+      .replace(/\n{3,}/g, "\n\n")
+      .trim() + "\n"
+  );
+}
+
+/**
+ * Special handling of space inside <li> elements
+ *   @param {string} content
+ *   @returns {string}
+ */
+export function trimInsideListElements(content) {
+  return content
+    .replace(/\s*<!-- wp:list /g, "<!-- wp:list ")
+    .replace(/>\s*<!-- wp:list /g, ">\n\n<!-- wp:list ")
+    .replace(/>\s*<!-- wp:list-item /g, ">\n\n<!-- wp:list-item ")
+    .replace(/<!-- \/wp:list-item -->\s*</g, "<!-- \/wp:list-item -->\n\n<")
+    .replace(/<li>\s*/g, "<li>")
+    .replace(/\s*<\/li>/g, "</li>");
+}
+
+/**
+ * @param {string} content
+ * @returns {Promise<string>}
+ */
+export function formatWithPrettier(content) {
+  return prettier.format(content, {
+    parser: "html",
+    tabWidth: 2,
+    useTabs: false,
+    printWidth: 80,
+    htmlWhitespaceSensitivity: "css",
+  });
+}
+
 /**
  * @param {String} filepath
  */
@@ -119,20 +163,20 @@ async function formatWPBlockPattern(filepath) {
     const startTime = process.hrtime.bigint();
     const rawFile = await readFile(filepath, "utf8");
 
-    const formattedHTML = await prettier.format(rawFile, {
-      parser: "html",
-      tabWidth: 0,
-      useTabs: false,
-      printWidth: 80,
-      htmlWhitespaceSensitivity: "css",
-    });
-
-    const cleanedWhiteSpace = normalizeCommentTagSpacing(formattedHTML);
-    const formattedCommentsJSON = formatAllWpComments(cleanedWhiteSpace);
-    const finalFormatted =
-      formattedCommentsJSON.replace(/\n{3,}/g, "\n\n").trim() + "\n";
+    const formatters = [
+      formatWithPrettier,
+      normalizeCommentTagSpacing,
+      formatAllWpComments,
+      trimInsideListElements,
+      normalizeNewlines,
+    ];
+
+    const outputHtml = await formatters.reduce(
+      async (acc, fn) => fn(await acc),
+      Promise.resolve(rawFile),
+    );
 
-    await writeFile(filepath, finalFormatted, "utf8");
+    await writeFile(filepath, outputHtml, "utf8");
     const endTime = process.hrtime.bigint();
     const duration = Number(endTime - startTime);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ideasonpurpose/build-tools-wordpress",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "Build scripts and dependencies for IOP's WordPress development environments.",
   "homepage": "https://github.com/ideasonpurpose/build-tools-wordpress#readme",
   "bugs": {
@@ -88,7 +88,7 @@
     "style-loader": "^4.0.0",
     "svgo": "^4.0.1",
     "svgo-loader": "^5.0.0",
-    "version-everything": "^0.11.4",
+    "version-everything": "^0.12.2",
     "webpack": "^5.105.4",
     "webpack-bundle-analyzer": "^5.3.0",
     "webpack-dev-middleware": "^8.0.2",

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

@@ -8,6 +8,7 @@ import {
   formatWpCommentJson,
   formatAllWpComments,
   normalizeCommentTagSpacing,
+  trimInsideListElements,
 } from "../bin/format-wp-block-pattern.js";
 
 describe("Format JSON in WP Block comments", () => {
@@ -96,6 +97,17 @@ describe("Normalize whitespace", () => {
     const actual = normalizeCommentTagSpacing(input);
     expect(actual).toMatch(/<\/div>\n<!-- \/wp:group -->/);
   });
+
+  test("List handling", async () => {
+    const input = (
+      await readFile(
+        "./test/fixtures/format-wp-block-pattern/nested-list.php",
+      )
+    ).toString();
+
+    const actual = trimInsideListElements(input);
+    expect(actual).toMatch(/<\/div>\n<!-- \/wp:group -->/);
+  });
 });