@plaudit/webpack-extensions 2.5.2 → 2.6.1

package/build/wordpress-scripts-wrapper/VariablesJSMonitorPlugin.d.ts

@@ -0,0 +1,6 @@
+import type { Compiler, WebpackPluginInstance } from "webpack";
+export default class VariablesJSMonitorPlugin implements WebpackPluginInstance {
+    private readonly variablesFilePath;
+    constructor(variablesFilePath: string);
+    apply(compiler: Compiler): void;
+}

package/build/wordpress-scripts-wrapper/VariablesJSMonitorPlugin.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class VariablesJSMonitorPlugin {
+    variablesFilePath;
+    constructor(variablesFilePath) {
+        this.variablesFilePath = variablesFilePath;
+    }
+    apply(compiler) {
+        compiler.hooks.make.tap('VariablesJSMonitorPlugin', compilation => {
+            if (!compilation.fileDependencies.has(this.variablesFilePath)) {
+                compilation.fileDependencies.add(this.variablesFilePath);
+            }
+        });
+    }
+}
+exports.default = VariablesJSMonitorPlugin;

package/build/wordpress-scripts-wrapper.js

@@ -11,6 +11,7 @@ const browser_sync_webpack_plugin_1 = __importDefault(require("browser-sync-webp
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
 const webpack_remove_empty_scripts_1 = __importDefault(require("webpack-remove-empty-scripts"));
+const VariablesJSMonitorPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/VariablesJSMonitorPlugin"));
 function joinPossiblyAbsolutePaths(...paths) {
     return paths.reduce((res, p) => !res || node_path_1.default.isAbsolute(p) ? p : node_path_1.default.join(res, p), '') || '.';
 }
@@ -138,7 +139,7 @@ function disableDefaultURLProcessing(webpackConfig) {
 function injectPostcssConfigOverrides(webpackConfig, variables, verbose) {
     if (webpackConfig.module?.rules) {
         const postcssConfig = (0, static_configs_1.postcssConfigBuilder)(verbose, (name) => {
-            return variables[name] ?? (name === 'ENV' ? '' : undefined);
+            return variables(name) ?? (name === 'ENV' ? '' : undefined);
         });
         for (const rule of webpackConfig.module.rules) {
             if (isTruthy(rule) && typeof rule === 'object' && Array.isArray(rule.use)) {
@@ -188,9 +189,14 @@ function parseEntrypointsJSON(dir) {
 }
 module.exports = function (config, webpackConfig = require("@wordpress/scripts/config/webpack.config")) {
     testForDuplicatedEntryPaths(config);
-    const { standaloneBlocks = false, variables = ["variables.js", "src/site/variables.js"].map(p => node_path_1.default.join(process.cwd(), p)).filter(p => node_fs_1.default.existsSync(p)).map(p => require(p))[0] ?? {}, verbose = process.argv.includes('--verbose') || process.env['VERBOSE'] === 'true' } = config;
+    const { standaloneBlocks = false, variables: rawVariables, verbose = process.argv.includes('--verbose') || process.env['VERBOSE'] === 'true' } = config;
+    let variablesFilePath = undefined;
+    let currentVariables = rawVariables ?? {};
+    if (!rawVariables) {
+        variablesFilePath = ["variables.js", "src/site/variables.js"].map(p => node_path_1.default.join(process.cwd(), p)).filter(p => node_fs_1.default.existsSync(p))[0];
+    }
     disableDefaultURLProcessing(webpackConfig);
-    injectPostcssConfigOverrides(webpackConfig, variables, verbose);
+    injectPostcssConfigOverrides(webpackConfig, name => currentVariables[name], verbose);
     let first = true;
     const sources = Array.isArray(config.src) ? config.src.map(s => [s, s]) : Object.entries(config.src);
     return sources.map(([src, dest]) => {
@@ -214,6 +220,9 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
             stage: webpack_remove_empty_scripts_1.default.STAGE_AFTER_PROCESS_PLUGINS,
             extensions: ['css', 'scss', 'sass', 'less', 'styl', 'pcss']
         }));
+        if (variablesFilePath) {
+            plugins.push(new VariablesJSMonitorPlugin_1.default(variablesFilePath));
+        }
         if (copyFiles) {
             plugins.push(new BlockJSONStyleRemappingPlugin_1.default(standaloneBlocks));
         }
@@ -231,67 +240,59 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
         }
         let entry;
         if (srcIsDirectory) {
-            const rawEntrypoints = node_fs_1.default.readdirSync(srcRoot, 'utf8')
-                .map(dir => joinPossiblyAbsolutePaths(srcRoot, dir))
-                .filter(dir => node_fs_1.default.statSync(dir).isDirectory())
-                .flatMap(dir => {
-                const res = [];
-                try {
-                    const blockJSON = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(dir, 'block.json'), 'utf8'));
-                    for (const key of ["editorStyle", "style", "editorScript", "viewScript", "script"]) {
-                        if (key in blockJSON) {
-                            res.push(...mapToRealEntrypoints(blockJSON[key], dir, ep => ep.startsWith("file:") ? ep.substring(5) : ep));
-                        }
-                    }
-                    return res;
-                }
-                catch (e) {
+            entry = () => {
+                const rawEntrypoints = node_fs_1.default.readdirSync(srcRoot, 'utf8')
+                    .map(dir => joinPossiblyAbsolutePaths(srcRoot, dir))
+                    .filter(dir => node_fs_1.default.statSync(dir).isDirectory())
+                    .flatMap(dir => {
+                    const res = [];
                     try {
-                        const packageJSON = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(dir, 'package.json'), 'utf8'));
-                        res.push(...mapToRealEntrypoints(packageJSON['main'], dir));
-                        res.push(...mapToRealEntrypoints(packageJSON['style'], dir));
+                        const blockJSON = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(dir, 'block.json'), 'utf8'));
+                        for (const key of ["editorStyle", "style", "editorScript", "viewScript", "script"]) {
+                            if (key in blockJSON) {
+                                res.push(...mapToRealEntrypoints(blockJSON[key], dir, ep => ep.startsWith("file:") ? ep.substring(5) : ep));
+                            }
+                        }
+                        return res;
                     }
                     catch (e) {
                         try {
-                            res.push(...parseEntrypointsJSON(dir));
+                            const packageJSON = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(dir, 'package.json'), 'utf8'));
+                            res.push(...mapToRealEntrypoints(packageJSON['main'], dir));
+                            res.push(...mapToRealEntrypoints(packageJSON['style'], dir));
                         }
                         catch (e) {
-                            // This just means that the directory doesn't contain any declared entrypoints.
+                            try {
+                                res.push(...parseEntrypointsJSON(dir));
+                            }
+                            catch (e) {
+                                // This just means that the directory doesn't contain any declared entrypoints.
+                            }
                         }
                     }
-                }
-                return res;
-            });
-            const perAssetPathGroupedEntrypoints = groupEntrypointsByAssetFile(rawEntrypoints, e => e[0]);
-            entry = {};
-            for (const groupedEntrypoints of perAssetPathGroupedEntrypoints.values()) {
-                if (groupedEntrypoints.length === 1) {
-                    entry[groupedEntrypoints[0][0]] = groupedEntrypoints[0][1];
-                }
-                else {
-                    const typeCounts = {};
-                    for (const entrypoint of groupedEntrypoints) {
-                        addPotentiallyDuplicatedEntrypointName(entry, entrypoint, typeCounts);
+                    return res;
+                });
+                const perAssetPathGroupedEntrypoints = groupEntrypointsByAssetFile(rawEntrypoints, e => e[0]);
+                const currentEntry = {};
+                for (const groupedEntrypoints of perAssetPathGroupedEntrypoints.values()) {
+                    if (groupedEntrypoints.length === 1) {
+                        currentEntry[groupedEntrypoints[0][0]] = groupedEntrypoints[0][1];
+                    }
+                    else {
+                        const typeCounts = {};
+                        for (const entrypoint of groupedEntrypoints) {
+                            addPotentiallyDuplicatedEntrypointName(currentEntry, entrypoint, typeCounts);
+                        }
                     }
                 }
-            }
+                return currentEntry;
+            };
         }
         else {
             const baseDest = node_path_1.default.basename(destPath);
-            entry = {
+            entry = () => ({
                 [baseDest.includes('.') ? node_path_1.default.basename(baseDest, node_path_1.default.extname(baseDest)) : baseDest]: srcRoot
-            };
-        }
-        let output;
-        if (srcIsDirectory) {
-            output = {
-                path: joinPossiblyAbsolutePaths(process.cwd(), destPath)
-            };
-        }
-        else {
-            output = {
-                path: joinPossiblyAbsolutePaths(process.cwd(), node_path_1.default.dirname(destPath))
-            };
+            });
         }
         return {
             ...webpackConfig,
@@ -299,7 +300,7 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
             mode: "production",
             output: {
                 ...webpackConfig.output,
-                ...output
+                path: joinPossiblyAbsolutePaths(process.cwd(), srcIsDirectory ? destPath : node_path_1.default.dirname(destPath))
             },
             plugins: copyFiles
                 ? plugins.map(plugin => plugin.constructor.name === 'CopyPlugin'
@@ -309,7 +310,13 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
                 : (srcIsDirectory
                     ? plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin' && plugin.constructor.name !== 'CleanWebpackPlugin')
                     : plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin')),
-            entry
+            entry() {
+                if (variablesFilePath) {
+                    delete require.cache[require.resolve(variablesFilePath)];
+                    currentVariables = require(variablesFilePath);
+                }
+                return entry();
+            }
         };
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.5.2",
+  "version": "2.6.1",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",
@@ -38,7 +38,7 @@
     "eslint": "^8.43.0",
     "eslint-plugin-jsdoc": "^43.1.1",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
-    "postcss": "^8.4.24",
+    "postcss": "^8.4.25",
     "postcss-calc": "^9.0.1",
     "postcss-fallback": "^0.1.0",
     "postcss-functions": "^4.0.2",