@ideasonpurpose/build-tools-wordpress 2.0.6 → 2.1.0

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.0.6
+
+> 20 March 2025
+
+- try moving webpack-cli to peerDependencies
+
 #### v2.0.5
 
 > 20 March 2025

package/README.md

@@ -1,6 +1,6 @@
 # @ideasonpurpose/build-tools-wordpress
 
-#### Version 2.0.6
+#### Version 2.1.0
 
 [![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/config/ideasonpurpose.config.js

@@ -22,7 +22,6 @@ export default {
   entry: ["./js/main.js", "./js/admin.js", "./js/editor.js"],
   publicPath: `/wp-content/themes/${themeName}/dist/`,
 
-  sass: "sass-embedded",
   esTarget: "es2020",
 
   devtool: "source-map",

package/config/webpack.config.js

@@ -23,12 +23,6 @@ import {
 import autoprefixer from "autoprefixer";
 import cssnano from "cssnano";
 
-/**
- * Sass flavors for conditional sass-loader implementations
- */
-// import * as nodeSass from "sass";
-// import * as dartSass from "sass-embedded";
-
 // Experimenting with this
 import DependencyExtractionWebpackPlugin from "@wordpress/dependency-extraction-webpack-plugin";
 
@@ -95,14 +89,6 @@ export default async (env) => {
 
   const proxy = isProduction ? {} : await devserverProxy(config);
 
-  setTimeout(() =>
-    console.log(
-      chalk.magenta.bold("sass implementation"),
-      chalk.yellow.bold(config.sass),
-      // config.sass === "sass" ? nodeSass : dartSass,
-    ),
-  );
-
   /**
    * `usePolling` is a placeholder, try and detect native Windows Docker mounts
    * since they don't support file-watching (no inotify events), if there's
@@ -121,95 +107,19 @@ export default async (env) => {
 
   const devtool = config.devtool || false;
 
-  const sassLibs = ["sass-embedded", "sass", "node-sass"];
-  const sassImplementation = sassLibs.includes(config.sass)
-    ? { implementation: config.sass }
-    : {};
-
-  // console.log({
-  //   metaurl: new URL("webpack/stats/index.html", import.meta.url),
-  //   config,
-  //   // devServerProxy: await devserverProxy(config),
-  // });
-
   return {
-    // stats: "errors-warnings",
     stats,
     module: {
       rules: [
-        // {
-        //   test: /\.(js|jsx|mjs)$/,
-        //   include: [
-        //     path.resolve(config.src),
-        //     path.resolve("../tools/node_modules"),
-        //     path.resolve("../site/node_modules"),
-        //   ],
-        //   exclude: function (module) {
-        //     const moduleRegex = new RegExp(
-        //       `node_modules/(${config.transpileDependencies.join("|")})`
-        //     );
-        //     return /node_modules/.test(module) && !moduleRegex.test(module);
-        //   },
-
-        //   /**
-        //    * EXPERIMENTAL!!
-        //    * If JS compilation breaks, try reverting this first.
-        //    */
-        //   loader: "esbuild-loader",
-        //   options: {
-        //     loader: "jsx",
-        //     target: "es2015",
-        //   },
-
-        /**
-         * Updated 2022-09, simpler
-         */
         {
           test: /\.[jt]sx?$/,
-          // test: /\.js$/,
           loader: "esbuild-loader",
           options: {
             loader: "jsx",
             target: config.esTarget,
           },
         },
-        // {
-        //   test: /\.tsx?$/,
-        //   loader: "esbuild-loader",
-        //   options: {
-        //     loader: "tsx",
-        //     target: config.esTarget,
-        //   },
-        // },
-
-        // use: {
-        //   loader: "babel-loader",
-        //   options: {
-        //     cacheDirectory: !isProduction,
-        //     sourceType: "unambiguous",
-        //     plugins: [
-        //       "@babel/plugin-syntax-dynamic-import",
-        //       ...(isProduction
-        //         ? []
-        //         : ["@babel/plugin-transform-react-jsx-source"]),
-        //     ],
-        //     presets: [
-        //       [
-        //         "@babel/preset-env",
-        //         {
-        //           forceAllTransforms: true,
-        //           useBuiltIns: "usage",
-        //           configPath: config.src,
-        //           corejs: 3,
-        //           modules: false,
-        //           debug: false,
-        //         },
-        //       ],
-        //       "@babel/preset-react",
-        //     ],
-        //   },
-        // },
-        // },
+
         {
           test: /\.(scss|css)$/,
           use: [
@@ -244,25 +154,14 @@ export default async (env) => {
             {
               loader: "sass-loader",
               options: {
-                ...sassImplementation,
-                // implementation: config.sass === "sass" ? nodeSass : dartSass,
-                // implementation: nodeSass,
-                // implementation: await import(config.sass),
+                implementation: "sass-embedded",
                 sourceMap: !isProduction,
                 warnRuleAsWarning: true,
                 webpackImporter: false,
                 sassOptions: {
-                  // api: "modern",
                   api: "modern-compiler",
 
-                  // includePaths: [
-                  //   path.resolve(config.src, "sass"),
-                  //   path.resolve(config.src),
-                  //   // path.resolve("../site/node_modules"),
-                  //   path.resolve("node_modules"),
-                  // ],
-                  // style: "expanded",
-                  // verbose: true,
+                  loadPaths: [path.resolve(config.src, "sass")],
                 },
               },
             },
@@ -327,8 +226,6 @@ export default async (env) => {
         "node_modules",
         new URL("../../build-tools-wordpress/node_modules", import.meta.url)
           .pathname,
-        // path.resolve("../tools/node_modules"),
-        // path.resolve("./node_modules"), // for local development when running outside of Docker
       ],
     },
 
@@ -372,31 +269,7 @@ export default async (env) => {
           },
         },
         reconnect: 30,
-        // webSocketURL: {
-        //   port: parseInt(process.env.PORT), // external port, so websockets hit the right endpoint
-        // },
       },
-      // webSocketServer: "ws",
-      // static: {
-      //   // TODO: Should contentBase be `false` when there's a proxy?
-      //   directory: path.join("/usr/src/site/", config.contentBase),
-      //   /*
-      //    * TODO: Poll options were enabled as a workaround for Docker-win volume inotify
-      //    *       issues. Looking to make this conditional...
-      //    *       Maybe defined `isWindows` or `hasiNotify` for assigning a value
-      //    *       Placeholder defined at the top of the file.
-      //    *       For now, `usePolling` is a boolean (set to true)
-      //    *       ref: https://github.com/docker/for-win/issues/56
-      //    *            https://www.npmjs.com/package/is-windows
-      //    *       TODO: Safe to remove?
-      //    *       TODO: Test on vanilla Windows (should now work in WSL)
-      //    */
-
-      //   watch: {
-      //     poll: usePolling && pollInterval,
-      //     ignored: ["node_modules", "vendor"],
-      //   },
-      // },
 
       devMiddleware: {
         index: false, // enable root proxying

package/lib/buildConfig.js

@@ -32,7 +32,6 @@ const defaultConfig = {
 
   contentBase: "/dist/", // TODO: Should this be false?
   manifestFile: "./dependency-manifest.json",
-  sass: "sass-embedded",
   esTarget: "es2020",
 
   devtool: "source-map",
@@ -163,32 +162,6 @@ export async function buildConfig(configFile = { config: {} }) {
     }, {});
   }
 
-  /**
-   * Normalize the sass implementation, default to 'sass-embedded'
-   *
-   * Returns a known module name (string) which will be dynamically imported into the config
-   */
-  const sassInput = config.sass.toString().toLowerCase();
-  const nodeSass = ["sass", "node-sass"];
-  config.sass = nodeSass.includes(sassInput) ? "sass" : "sass-embedded";
-
-  /**
-   * Print a deprecation warning for node-sass
-   * @link https://sass-lang.com/blog/libsass-is-deprecated/
-   */
-  if (sassInput === "node-sass") {
-    console.log(
-      "⚠️ ",
-      chalk.bold.yellow("NOTICE"),
-      chalk.yellow("NOTICE node-sass is no longer supported. The js-compiled"),
-    );
-    console.log(chalk.yellow("   dart-sass package will be used instead."));
-    console.log(
-      chalk.cyan("     https://sass-lang.com/blog/libsass-is-deprecated/"),
-    );
-    console.log(chalk.cyan("     https://www.npmjs.com/package/sass"));
-  }
-
   /**
    * Remap proxy: true to default value
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ideasonpurpose/build-tools-wordpress",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "description": "Build scripts and dependencies for IOP's WordPress development environments.",
   "homepage": "https://github.com/ideasonpurpose/build-tools-wordpress#readme",
   "bugs": {
@@ -33,7 +33,7 @@
   "prettier": "@ideasonpurpose/prettier-config",
   "dependencies": {
     "@ideasonpurpose/prettier-config": "^1.0.0",
-    "@ideasonpurpose/stylelint-config": "^1.1.0",
+    "@ideasonpurpose/stylelint-config": "^1.1.1",
     "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
@@ -44,8 +44,7 @@
     "auto-changelog": "^2.5.0",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
-    "body-parser": "^1.20.3",
-    "caniuse-lite": "^1.0.30001706",
+    "caniuse-lite": "^1.0.30001707",
     "chalk": "^5.4.1",
     "chalk-cli": "^5.0.1",
     "classnames": "^2.5.1",
@@ -57,7 +56,7 @@
     "cssnano": "^7.0.6",
     "dotenv": "^16.4.7",
     "esbuild-loader": "^4.3.0",
-    "eslint": "^9.22.0",
+    "eslint": "^9.23.0",
     "filesize": "^10.1.6",
     "fs-extra": "^11.3.0",
     "globby": "^14.1.0",
@@ -74,8 +73,7 @@
     "pretty-hrtime": "^1.0.3",
     "read-package-up": "^11.0.0",
     "replacestream": "^4.0.3",
-    "sass": "^1.86.0",
-    "sass-embedded": "^1.86.0",
+    "sass-embedded": "^1.86.1",
     "sass-loader": "^16.0.5",
     "semver": "^7.7.1",
     "sharp": "^0.33.5",
@@ -88,14 +86,14 @@
     "webpack": "^5.98.0",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-dev-middleware": "^7.4.2",
-    "webpack-dev-server": "^5.2.0"
+    "webpack-dev-server": "^5.2.1"
   },
   "peerDependencies": {
     "webpack-cli": "^6.0.1"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^3.0.9",
-    "vitest": "^3.0.9"
+    "@vitest/coverage-v8": "^3.1.1",
+    "vitest": "^3.1.1"
   },
   "version-everything": {
     "files": [