@plaudit/webpack-extensions 2.35.0 → 2.36.0

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

@@ -79,7 +79,6 @@ class BlockJSONManagingPlugin {
                     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 +192,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/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/package.json

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