@ideasonpurpose/build-tools-wordpress 2.1.11 → 2.2.1

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.2.0
+
+> 7 September 2025
+
+- bump deps
+- Update websocket reload for v5, cleanup
+- Testing some watch fixes
+
+#### v2.1.11
+
+> 3 September 2025
+
+- bump deps
+
 #### v2.1.10
 
 > 3 September 2025

package/README.md

@@ -1,6 +1,6 @@
 # @ideasonpurpose/build-tools-wordpress
 
-#### Version 2.1.11
+#### Version 2.2.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)

package/bin/format-php-prettier.js

@@ -126,6 +126,16 @@ export function unTokenizeHTML(tokenizedHTML, phpCodeBlocks) {
   return phpContent;
 }
 
+/**
+ * Formats a mixed HTML & PHP file with these steps:
+ *  1. Tokenize PHP Blocks as HTML-safe and attribute-safe strings
+ *  2. Format the result as HTML
+ *  3. Un-tokenize HTML back to PHP
+ *  4. Format again as PHP
+ *  5. Overwrite the file
+ *
+ * @param {string} filepath - The path to the file to format (must be a valid file path).
+ */
 async function formatHTMLThenPHP(filepath) {
   try {
     const startTime = process.hrtime.bigint();

package/config/webpack.config.js

@@ -16,7 +16,7 @@ import {
   buildConfig,
   DependencyManifestPlugin,
   devserverProxy,
-  findLocalPort,
+  // findLocalPort,
   WatchRunReporterPlugin,
 } from "../index.js";
 
@@ -107,6 +107,19 @@ export default async (env) => {
 
   const devtool = config.devtool || false;
 
+  // Debug: Log the watchFiles paths
+  const watchPath =
+    path.resolve(config.src, "..") + "/**/*.{php,html,svg,json}";
+  console.log(chalk.cyan("🔍 Watching files:"), watchPath);
+  console.log(
+    chalk.cyan("📁 Theme directory:"),
+    path.resolve(config.src, ".."),
+  );
+
+  // // Temporarily disable polling to test native file watching
+  // const usePollingDebug = false; // Set to false to test without polling
+  // const pollIntervalDebug = 400;
+
   return {
     stats,
     module: {
@@ -248,7 +261,6 @@ export default async (env) => {
       host: "0.0.0.0",
       allowedHosts: "all",
       port: "auto",
-      // hot: true, // TODO: What does 'only' do? https://webpack.js.org/configuration/dev-server/#devserverhot
       hot: true, // Enable hot module replacement with fallback to full reload
       client: {
         logging: "info",
@@ -278,8 +290,10 @@ export default async (env) => {
           if (/.+(hot-update)\.(js|json|js\.map)$/.test(filePath)) {
             return false;
           }
-          // SHORT_CIRCUIT FOR TESTING
-          return true;
+
+          // // SHORT_CIRCUIT FOR TESTING
+          // console.log("DEBUG writeToDisk:", { filePath });
+          // return true;
 
           if (/.+\.(svg|json|php|jpg|png)$/.test(filePath)) {
             const fileStat = statSync(filePath, { throwIfNoEntry: false });
@@ -309,6 +323,11 @@ export default async (env) => {
               // console.log("DEBUG writeToDisk:", { cached: relPath });
             }
           }
+
+          // SHORT_CIRCUIT FOR TESTING
+          return true;
+
+          console.log("DEBUG writeToDisk:", { filePath });
           return false;
         },
         // stats,
@@ -331,13 +350,6 @@ export default async (env) => {
       },
 
       setupMiddlewares: (middlewares, devServer) => {
-        // devServer.compiler.options.devServer.port =  devServer.options.port;
-        // devServer.compiler._devServer =  devServer;
-        // if (!devServer) {
-        //   throw new Error("webpack-dev-server is not defined");
-        // }
-
-        //  devServer.internalIP('v4').then(ip => console.log('!!!!!!', ip));
 
         /**
          * The `/inform` route is an annoying bit of code. Here's why:
@@ -352,9 +364,12 @@ export default async (env) => {
 
         /**
          * The "/webpack/reload" endpoint will trigger a full devServer refresh
-         * Originally from our Browsersync implementation:
          *
-         * https://github.com/ideasonpurpose/wp-theme-init/blob/ad8039c9757ffc3a0a0ed0adcc616a013fdc8604/src/ThemeInit.php#L202
+         * @link https://github.com/webpack/webpack-dev-server/blob/master/migration-v5.md#-breaking-changes
+         * @link https://github.com/webpack/webpack-dev-server/issues/3121#issuecomment-3264080704
+         *
+         * Originally from our Browsersync implementation:
+         * @link https://github.com/ideasonpurpose/wp-theme-init/blob/ad8039c9757ffc3a0a0ed0adcc616a013fdc8604/src/ThemeInit.php#L202
          */
         devServer.app.get("/webpack/reload", (req, res) => {
           console.log(
@@ -363,8 +378,9 @@ export default async (env) => {
 
           devServer.sendMessage(
             devServer.webSocketServer.clients,
-            "content-changed",
+            "static-changed",
           );
+
           res.json({ status: "Reloading!" });
         });
 
@@ -373,7 +389,8 @@ export default async (env) => {
 
       watchFiles: {
         paths: [
-          path.resolve(config.src, "../**/*.{php,html,svg,json}"), // WordPress
+          // Watch all PHP, HTML, SVG, and JSON files in the theme directory
+          path.resolve(config.src, "..") + "/**/*.{php,html,svg,json}",
         ],
         options: {
           ignored: [
@@ -382,14 +399,10 @@ export default async (env) => {
             "**/node_modules/**",
             "**/dist/**",
           ],
-          ignoreInitial: true,
+          ignoreInitial: false, // Allow initial file discovery
           ignorePermissionErrors: true,
-          /**
-           * TODO: Can polling be removed everywhere?
-           * @link  https://github.com/docker/for-win/issues/56#issuecomment-576749639
-           */
-          usePolling,
-          interval: pollInterval,
+          usePolling: false,
+          // interval: pollIntervalDebug,
         },
       },
 

package/lib/devserver-proxy.js

@@ -61,7 +61,13 @@ export async function devserverProxy(config) {
 
   const proxy = [
     {
-      context: ["**"],
+      context: [
+        "**",
+        "!/ws",
+        "!/sockjs-node",
+        "!/__webpack_dev_server__",
+        "!/webpack-dev-server",
+      ],
       target: target.origin,
       secure: false,
       autoRewrite: true,
@@ -69,6 +75,7 @@ export async function devserverProxy(config) {
       changeOrigin: true, // needed for virtual hosted sites
       cookieDomainRewrite: "", // was `${config.host}:8080` ??
       headers: { "Accept-Encoding": "identity" },
+      ws: true,
 
       onError: (err, req, res) => {
         if (err.code === "ECONNRESET") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ideasonpurpose/build-tools-wordpress",
-  "version": "2.1.11",
+  "version": "2.2.1",
   "description": "Build scripts and dependencies for IOP's WordPress development environments.",
   "homepage": "https://github.com/ideasonpurpose/build-tools-wordpress#readme",
   "bugs": {
@@ -35,6 +35,7 @@
   "dependencies": {
     "@ideasonpurpose/prettier-config": "^1.0.1",
     "@ideasonpurpose/stylelint-config": "^1.1.1",
+    "@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",
@@ -45,8 +46,8 @@
     "auto-changelog": "^2.5.0",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
-    "caniuse-lite": "^1.0.30001739",
-    "chalk": "^5.6.0",
+    "caniuse-lite": "^1.0.30001741",
+    "chalk": "^5.6.2",
     "chalk-cli": "^6.0.0",
     "classnames": "^2.5.1",
     "cli-truncate": "^5.0.0",
@@ -57,7 +58,7 @@
     "cssnano": "^7.1.1",
     "dotenv": "^17.2.2",
     "esbuild-loader": "^4.3.0",
-    "eslint": "^9.34.0",
+    "eslint": "^9.35.0",
     "filesize": "^11.0.2",
     "fs-extra": "^11.3.1",
     "globby": "^14.1.0",
@@ -71,10 +72,11 @@
     "postcss": "^8.5.6",
     "postcss-loader": "^8.2.0",
     "postcss-scss": "^4.0.9",
+    "prettier": "^3.6.2",
     "pretty-hrtime": "^1.0.3",
     "read-package-up": "^11.0.0",
     "replacestream": "^4.0.3",
-    "sass-embedded": "^1.92.0",
+    "sass-embedded": "^1.92.1",
     "sass-loader": "^16.0.5",
     "semver": "^7.7.2",
     "sharp": "^0.34.3",
@@ -86,7 +88,7 @@
     "version-everything": "^0.11.4",
     "webpack": "^5.101.3",
     "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-dev-middleware": "^7.4.2",
+    "webpack-dev-middleware": "^7.4.3",
     "webpack-dev-server": "^5.2.2"
   },
   "peerDependencies": {