@ideasonpurpose/build-tools-wordpress 2.2.3 → 2.2.5

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.2.4
+
+> 10 September 2025
+
+- Make iop-format-prettier work globally
+
+#### v2.2.3
+
+> 9 September 2025
+
+- trying explicit PHP plugin loading
+
 #### v2.2.2
 
 > 9 September 2025

package/README.md

@@ -1,6 +1,6 @@
 # @ideasonpurpose/build-tools-wordpress
 
-#### Version 2.2.3
+#### Version 2.2.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-php-prettier.js

@@ -11,8 +11,10 @@
 import prettier from "prettier";
 import prettierConfig from "@ideasonpurpose/prettier-config" with { type: "json" };
 
-// Add dynamic import for the plugin
-const phpPlugin = (await import("@prettier/plugin-php")).default;
+const phpPlugin = await import("@prettier/plugin-php");
+
+// Explicitly reset the plugin because global installs can't resolve it
+prettierConfig.plugins = [phpPlugin];
 
 import { readFile, writeFile } from "fs/promises";
 import { resolve, basename } from "path";
@@ -56,7 +58,7 @@ const isInTag = (html, offset) => {
  */
 export function tokenizeHTML(htmlContent) {
   let tokenizedHTML = "";
-  const phpCodeBlocks = {};
+  const phpCodeBlocks = new Map();  // Changed to Map for better performance and type safety
   let tokenCount = 0;
 
   /**
@@ -101,7 +103,7 @@ export function tokenizeHTML(htmlContent) {
     tokenizedHTML += htmlContent.slice(lastIndex, match.index);
 
     token = tokenizeCodeBlock(match[0], tokenizedHTML);
-    phpCodeBlocks[token] = match[0];
+    phpCodeBlocks.set(token, match[0]);
     tokenizedHTML += token;
 
     lastIndex = match.index + match[0].length;
@@ -113,7 +115,7 @@ export function tokenizeHTML(htmlContent) {
 
 export function unTokenizeHTML(tokenizedHTML, phpCodeBlocks) {
   let phpContent = tokenizedHTML;
-  for (const token in phpCodeBlocks) {
+  for (const [token, phpBlock] of phpCodeBlocks) {
     /**
      * Create a pattern from token that matches whitespace breaks resulting
      * from Prettier's HTML formatting, usually on very long lines.
@@ -123,7 +125,7 @@ export function unTokenizeHTML(tokenizedHTML, phpCodeBlocks) {
     const regexToken = new RegExp(token.replace("_ />", "_\\s+\\/>"), "g");
     phpContent = phpContent.replace(
       regexToken,
-      phpCodeBlocks[token].replace(/\$/g, "$$$$"),
+      phpBlock.replace(/\$/g, "$$$$"),
     );
   }
   return phpContent;
@@ -160,7 +162,7 @@ async function formatHTMLThenPHP(filepath) {
       ...phpOptions,
       parser: "php",
       embeddedLanguageFormatting: "auto",
-      plugins: [phpPlugin],  // Explicitly pass the plugin
+      // plugins: [phpPlugin], // Explicitly pass the plugin
     });
 
     await writeFile(filepath, phpFormatted, "utf8");

package/example/docker-compose.yml

@@ -49,6 +49,8 @@ services:
       - 9003
 
     # Link external plugin projects by defining host:container path pairs in .env
+    # An example .env entry looks like this:
+    #  IOP_DEV_PLUGIN_1="../iop-data-model/:/var/www/html/wp-content/plugins/iop-data-model"
     environment:
       IOP_DEV_PLUGIN_1:
       IOP_DEV_PLUGIN_2:
@@ -58,6 +60,8 @@ services:
       IOP_DEV_PLUGIN_6:
       IOP_DEV_PLUGIN_7:
       IOP_DEV_PLUGIN_8:
+      WP_ENVIRONMENT_TYPE:
+      WP_MULTISITE:
 
     # Apache will throw errors for any ulimit value below 8192
     # NOTE THAT THIS MIGHT BE MORE THAN THE SYSTEM OFFERS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ideasonpurpose/build-tools-wordpress",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "Build scripts and dependencies for IOP's WordPress development environments.",
   "homepage": "https://github.com/ideasonpurpose/build-tools-wordpress#readme",
   "bugs": {
@@ -34,41 +34,41 @@
   "prettier": "@ideasonpurpose/prettier-config",
   "dependencies": {
     "@ideasonpurpose/prettier-config": "^1.0.1",
-    "@ideasonpurpose/stylelint-config": "^1.1.1",
+    "@ideasonpurpose/stylelint-config": "^1.1.4",
     "@prettier/plugin-php": "^0.24.0",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.1",
+    "@rollup/plugin-node-resolve": "^16.0.2",
     "@svgr/webpack": "^8.1.0",
-    "@wordpress/dependency-extraction-webpack-plugin": "^6.30.0",
+    "@wordpress/dependency-extraction-webpack-plugin": "^6.32.0",
     "ansi-html": "^0.0.9",
     "archiver": "^7.0.1",
     "auto-changelog": "^2.5.0",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
-    "caniuse-lite": "^1.0.30001741",
+    "caniuse-lite": "^1.0.30001748",
     "chalk": "^5.6.2",
     "chalk-cli": "^6.0.0",
     "classnames": "^2.5.1",
-    "cli-truncate": "^5.0.0",
+    "cli-truncate": "^5.1.0",
     "copy-webpack-plugin": "^13.0.1",
     "cosmiconfig": "^9.0.0",
-    "cross-env": "^10.0.0",
+    "cross-env": "^10.1.0",
     "css-loader": "^7.1.2",
     "cssnano": "^7.1.1",
-    "dotenv": "^17.2.2",
-    "esbuild-loader": "^4.3.0",
-    "eslint": "^9.35.0",
-    "filesize": "^11.0.2",
-    "fs-extra": "^11.3.1",
-    "globby": "^14.1.0",
+    "dotenv": "^17.2.3",
+    "esbuild-loader": "^4.4.0",
+    "eslint": "^9.37.0",
+    "filesize": "^11.0.13",
+    "fs-extra": "^11.3.2",
+    "globby": "^15.0.0",
     "http-proxy": "^1.18.1",
-    "humanize-duration": "^3.33.0",
+    "humanize-duration": "^3.33.1",
     "image-minimizer-webpack-plugin": "^4.1.4",
     "is-text-path": "^3.0.0",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.9.4",
-    "ora": "^8.2.0",
+    "ora": "^9.0.0",
     "postcss": "^8.5.6",
     "postcss-loader": "^8.2.0",
     "postcss-scss": "^4.0.9",
@@ -76,19 +76,19 @@
     "pretty-hrtime": "^1.0.3",
     "read-package-up": "^11.0.0",
     "replacestream": "^4.0.3",
-    "sass-embedded": "^1.92.1",
+    "sass-embedded": "^1.93.2",
     "sass-loader": "^16.0.5",
     "semver": "^7.7.2",
-    "sharp": "^0.34.3",
+    "sharp": "^0.34.4",
     "sort-package-json": "^3.4.0",
     "string-length": "^6.0.0",
     "style-loader": "^4.0.0",
     "svgo": "^4.0.0",
     "svgo-loader": "^4.0.0",
     "version-everything": "^0.11.4",
-    "webpack": "^5.101.3",
+    "webpack": "^5.102.0",
     "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-dev-middleware": "^7.4.3",
+    "webpack-dev-middleware": "^7.4.5",
     "webpack-dev-server": "^5.2.2"
   },
   "peerDependencies": {

package/test/format-php-prettier.test.js

@@ -34,9 +34,9 @@ describe("HTML-PHP Prettier", () => {
       await readFile("./test/fixtures/format-php-prettier/basic-html.php")
     ).toString();
 
-    const { phpCodeBlocks: codeBlocks } = tokenizeHTML(input);
+    const { phpCodeBlocks } = tokenizeHTML(input);
 
-    const tokens = Object.keys(codeBlocks);
+    const tokens = Array.from(phpCodeBlocks.keys());
 
     expect(tokens[0]).toMatch(/^<php_\d+_* \/>$/);
     expect(tokens[1]).toMatch(/^_php_\d+_*$/);
@@ -51,9 +51,9 @@ describe("HTML-PHP Prettier", () => {
       )
     ).toString();
 
-    const { phpCodeBlocks: codeBlocks } = tokenizeHTML(input);
+    const { phpCodeBlocks } = tokenizeHTML(input);
 
-    const tokens = Object.keys(codeBlocks);
+    const tokens = Array.from(phpCodeBlocks.keys());
 
     expect(tokens).toHaveLength(1);
   });
@@ -69,7 +69,8 @@ describe("HTML-PHP Prettier", () => {
 
     // console.log({input, tokenizedHTML})
 
-    const tokens = Object.keys(phpCodeBlocks);
+    // const tokens = Object.keys(phpCodeBlocks);
+    const tokens = Array.from(phpCodeBlocks.keys());
 
     expect(tokens[0]).toMatch(/^_php_\d+_*$/);
     expect(tokens[1]).toMatch(/^_php_\d+_*$/);
@@ -141,8 +142,8 @@ describe("HTML-PHP Prettier", () => {
 
     expect(tokenizedHTML).toContain("<php_0____ />");
     expect(tokenizedHTML).toContain("<php_1____ />");
-    expect(phpCodeBlocks).toHaveProperty("<php_0____ />");
-    expect(phpCodeBlocks).toHaveProperty("<php_1____ />");
+    expect(phpCodeBlocks.has("<php_0____ />")).toBe(true);
+    expect(phpCodeBlocks.has("<php_1____ />")).toBe(true);
   });
 
   /**