@plaudit/webpack-extensions 2.5.1 → 2.6.0

package/build/wordpress-scripts-wrapper.js

@@ -96,7 +96,7 @@ function addPotentiallyDuplicatedEntrypointName(entry, entrypoint, typeCounts) {
     }
     entry[potentialKey] = entrypoint[1];
 }
-module.exports = function (config, webpackConfig = require("@wordpress/scripts/config/webpack.config")) {
+function testForDuplicatedEntryPaths(config) {
     const seenPaths = groupEntrypointsByAssetFile(Array.isArray(config.src) ? config.src : Object.values(config.src).map(bn => typeof bn === 'string' ? bn : bn.destination), bn => bn);
     let projectPrefix = undefined;
     let duplicatedPaths = "";
@@ -120,7 +120,8 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
         console.error(`Encountered multiple paths that produce the same effective bundle name:${duplicatedPaths}`);
         process.exit(1);
     }
-    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;
+}
+function disableDefaultURLProcessing(webpackConfig) {
     const cssLoader = require.resolve('css-loader');
     if (cssLoader && webpackConfig.module?.rules) {
         for (const rule of webpackConfig.module.rules) {
@@ -133,16 +134,11 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
             }
         }
     }
-    let currentEntrypoint = '';
+}
+function injectPostcssConfigOverrides(webpackConfig, variables, verbose) {
     if (webpackConfig.module?.rules) {
         const postcssConfig = (0, static_configs_1.postcssConfigBuilder)(verbose, (name) => {
-            if (variables[name]) {
-                return variables[name];
-            }
-            if (name === 'ENV') { // This is purely a backwards-compatibility issue.
-                return currentEntrypoint.endsWith('public.pcss') ? 'PUBLIC' : (currentEntrypoint.endsWith('block-editor.pcss') ? 'EDITOR' : '');
-            }
-            return undefined;
+            return variables[name] ?? (name === 'ENV' ? '' : undefined);
         });
         for (const rule of webpackConfig.module.rules) {
             if (isTruthy(rule) && typeof rule === 'object' && Array.isArray(rule.use)) {
@@ -164,10 +160,40 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
             }
         }
     }
+}
+function parseEntrypointsJSON(dir) {
+    const entrypointsJSON = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(dir, 'entrypoints.json'), 'utf8'));
+    if (Array.isArray(entrypointsJSON)) {
+        return mapToRealEntrypoints(entrypointsJSON, dir);
+    }
+    else {
+        return Object.entries(entrypointsJSON).map(([name, config]) => {
+            if (typeof config === 'string') {
+                return [name, joinPossiblyAbsolutePaths(dir, config)];
+            }
+            else if (Array.isArray(config)) {
+                return [name, config.map(c => joinPossiblyAbsolutePaths(dir, c))];
+            }
+            else {
+                if (typeof config.import === 'string') {
+                    config.import = joinPossiblyAbsolutePaths(dir, config.import);
+                }
+                else {
+                    config.import = config.import.map(c => joinPossiblyAbsolutePaths(dir, c));
+                }
+                return [name, config];
+            }
+        });
+    }
+}
+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;
+    disableDefaultURLProcessing(webpackConfig);
+    injectPostcssConfigOverrides(webpackConfig, variables, 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]) => {
-        currentEntrypoint = src;
         const srcRoots = typeof dest !== 'string' && dest.withLegacyBlocksIn
             ? [...src.split(','), ...resolveLegacyBlockScriptsInFolder(dest.withLegacyBlocksIn)]
             : src.split(',');
@@ -184,7 +210,10 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
                     syntactic: true,
                 }
             }
-        }), new webpack_remove_empty_scripts_1.default({ stage: webpack_remove_empty_scripts_1.default.STAGE_AFTER_PROCESS_PLUGINS, extensions: ['css', 'scss', 'sass', 'less', 'styl', 'pcss'] }));
+        }), new webpack_remove_empty_scripts_1.default({
+            stage: webpack_remove_empty_scripts_1.default.STAGE_AFTER_PROCESS_PLUGINS,
+            extensions: ['css', 'scss', 'sass', 'less', 'styl', 'pcss']
+        }));
         if (copyFiles) {
             plugins.push(new BlockJSONStyleRemappingPlugin_1.default(standaloneBlocks));
         }
@@ -202,72 +231,53 @@ 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 {
-                            const entrypointsJSON = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(dir, 'entrypoints.json'), 'utf8'));
-                            if (Array.isArray(entrypointsJSON)) {
-                                res.push(...mapToRealEntrypoints(entrypointsJSON, dir));
-                            }
-                            else {
-                                for (const [name, config] of Object.entries(entrypointsJSON)) {
-                                    if (typeof config === 'string') {
-                                        res.push([name, joinPossiblyAbsolutePaths(dir, config)]);
-                                    }
-                                    else if (Array.isArray(config)) {
-                                        res.push([name, config.map(c => joinPossiblyAbsolutePaths(dir, c))]);
-                                    }
-                                    else {
-                                        if (typeof config.import === 'string') {
-                                            config.import = joinPossiblyAbsolutePaths(dir, config.import);
-                                        }
-                                        else {
-                                            config.import = config.import.map(c => joinPossiblyAbsolutePaths(dir, c));
-                                        }
-                                        res.push([name, config]);
-                                    }
-                                }
-                            }
+                            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);
@@ -275,24 +285,13 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
                 [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,
             devtool: 'source-map',
             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'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "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",