@plaudit/webpack-extensions 2.35.0 → 2.37.0

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

@@ -73,13 +73,13 @@ class BlockJSONManagingPlugin {
                         }
                     }
                 }
+                //TODO: Fix modules support when running in non-dev mode
                 const blockDirConfigData = {};
                 for (const [name, sourceDir] of currentBlockJSONAssets) {
                     const assetContents = this.processingModules ? node_fs_1.default.readFileSync(testableCompilationAssets[name], 'utf8') : compilation.assets[name]?.buffer().toString();
                     if (!assetContents) {
                         continue;
                     }
-                    blockDirConfigData[name] = true;
                     const json = JSON.parse(assetContents);
                     const currentAssetKeyMappings = { directMappings: {}, referencedFiles: {}, compositeHash: "" };
                     for (const mappableKey of BlockJSONManagingPlugin[this.processingModules ? 'mappableModuleKeys' : 'mappableNonModuleKeys']) {
@@ -193,10 +193,11 @@ class BlockJSONManagingPlugin {
                         }
                     }
                     compilation[name in compilation.assets ? 'updateAsset' : 'emitAsset'](name, new webpack_1.sources.RawSource(JSON.stringify(json, undefined, "  ")));
+                    blockDirConfigData[node_path_1.default.dirname(name)] = json;
                 }
                 const sortedBlockDirConfigData = Object.fromEntries(Object.entries(blockDirConfigData)
                     .sort(([a], [b]) => a.localeCompare(b)));
-                compilation.emitAsset("blockdir.config", new webpack_1.sources.RawSource((0, php_serializer_1.default)(sortedBlockDirConfigData)));
+                compilation.emitAsset("blockdir.config", new webpack_1.sources.RawSource((0, php_serializer_1.default)(sortedBlockDirConfigData, { excludedKeys: ["$schema"] })));
             });
         });
     }

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

@@ -0,0 +1,4 @@
+import type { Compiler, WebpackPluginInstance } from "webpack";
+export default class MiniCSSExtractPluginErrorCleaner implements WebpackPluginInstance {
+    apply(compiler: Compiler): void;
+}

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class MiniCSSExtractPluginErrorCleaner {
+    apply(compiler) {
+        compiler.hooks.done.tap("CleanupMiniCssExtractPlugin", stats => {
+            if (stats.hasErrors()) {
+                if (!stats.compilation.errors.every(error => error.message.includes("mini-css-extract-plugin")) && stats.compilation.errors.length % 2 === 0) {
+                    stats.compilation.errors = stats.compilation.errors.filter(error => !error.message.includes("mini-css-extract-plugin"));
+                }
+            }
+        });
+    }
+}
+exports.default = MiniCSSExtractPluginErrorCleaner;

package/build/wordpress-scripts-wrapper/php-serializer.d.ts

@@ -1 +1,6 @@
-export default function phpSerialize(value: any, objectsAsArrays?: boolean): string;
+type Config = {
+    objectsAsArrays?: boolean;
+    excludedKeys?: string[];
+};
+export default function phpSerialize(value: any, config?: Config): string;
+export {};

package/build/wordpress-scripts-wrapper/php-serializer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = phpSerialize;
-function phpSerialize(value, objectsAsArrays = true) {
+function phpSerialize(value, config) {
     switch (typeof value) {
         case "undefined":
             return "N;";
@@ -12,15 +12,15 @@ function phpSerialize(value, objectsAsArrays = true) {
             else if (Array.isArray(value)) {
                 let res = `a:${value.length}:{`;
                 for (let i = 0; i < value.length; i++) {
-                    res += `i:${i};${phpSerialize(value[i], objectsAsArrays)}`;
+                    res += `i:${i};${phpSerialize(value[i], config)}`;
                 }
                 return (res.endsWith('};') ? res.substring(0, res.length - 1) : res) + "}";
             }
-            return entriesInArrayAndObjectFormat(objectsAsArrays ? 'a' : 'O:8:"stdClass"', Object.entries(value), objectsAsArrays);
+            return entriesInArrayAndObjectFormat(config?.objectsAsArrays ?? true ? 'a' : 'O:8:"stdClass"', Object.entries(value), config);
         case "boolean":
             return `b:${value ? 1 : 0};`;
         case "number":
-            return Number.isInteger(value) ? serializeInteger(value) : `d:${value}`;
+            return Number.isInteger(value) ? serializeInteger(value) : `d:${value};`;
         case "string":
             return `s:${Buffer.byteLength(value, 'utf8')}:"${value}";`;
         case "function":
@@ -35,14 +35,19 @@ function phpSerialize(value, objectsAsArrays = true) {
 function serializeInteger(value) {
     const str = value.toString();
     if (str.includes("e") || str.includes("E")) {
-        return `d:${str.replace(/e/i, ".0e")}`;
+        return `d:${str.replace(/e/i, ".0e")};`;
     }
-    return `i:${str}`;
+    return `i:${str};`;
 }
-function entriesInArrayAndObjectFormat(prefix, entries, objectsAsArrays) {
-    let res = `${prefix}:${entries.length}:{`;
+function entriesInArrayAndObjectFormat(prefix, entries, config) {
+    const excludedKeys = config?.excludedKeys ?? [];
+    let res = "";
+    let count = 0;
     for (const [k, v] of entries) {
-        res += `${phpSerialize(k, objectsAsArrays)}${phpSerialize(v, objectsAsArrays)}`;
+        if (!excludedKeys.includes(k)) {
+            count++;
+            res += `${phpSerialize(k, config)}${phpSerialize(v, config)}`;
+        }
     }
-    return (res.endsWith('};') ? res.substring(0, res.length - 1) : res) + "}";
+    return `${prefix}:${count}:{` + (res.endsWith('};') ? res.substring(0, res.length - 1) : res) + "}";
 }

package/build/wordpress-scripts-wrapper.js

@@ -7,6 +7,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const AdditionalDependencyInjectorPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/AdditionalDependencyInjectorPlugin"));
 const BlockJSONManagingPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/BlockJSONManagingPlugin"));
 const ExtensionsConfigFileGeneratorPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/ExtensionsConfigFileGeneratorPlugin"));
+const MiniCSSExtractPluginErrorCleaner_1 = __importDefault(require("./wordpress-scripts-wrapper/MiniCSSExtractPluginErrorCleaner"));
 const VariablesJSMonitorPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/VariablesJSMonitorPlugin"));
 const BrowserSyncPlugin_1 = require("./wordpress-scripts-wrapper/BrowserSyncPlugin");
 const static_configs_1 = require("./wordpress-scripts-wrapper/static-configs");
@@ -17,9 +18,6 @@ const webpack_remove_empty_scripts_1 = __importDefault(require("webpack-remove-e
 function joinPossiblyAbsolutePaths(...paths) {
     return paths.reduce((res, p) => !res || node_path_1.default.isAbsolute(p) ? p : node_path_1.default.join(res, p), '') || '.';
 }
-function test(content, map, meta) {
-    this.resourcePath;
-}
 function mapToRealEntrypoints(entrypoint, dir, mapper = (entrypoint) => entrypoint, lazyDependent) {
     return (Array.isArray(entrypoint) ? entrypoint : [entrypoint])
         .map(ep => joinPossiblyAbsolutePaths(dir, mapper(ep)))
@@ -342,7 +340,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
         plugins.push(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 MiniCSSExtractPluginErrorCleaner_1.default());
         if (variablesFilePath) {
             plugins.push(new VariablesJSMonitorPlugin_1.default(variablesFilePath));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.35.0",
+  "version": "2.37.0",
   "license": "UNLICENSED",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",