@plaudit/webpack-extensions 2.44.1 → 2.44.3

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

@@ -3,7 +3,7 @@ export default class BlockJSONManagingPlugin implements WebpackPluginInstance {
     private readonly standaloneBlocks;
     private readonly processingModules;
     static readonly mappableModuleKeys: readonly ["viewScriptModule", "scriptModule"];
-    static readonly mappableNonModuleKeys: readonly ["editorStyle", "style", "viewStyle", "editorScript", "script", "viewScript"];
+    static readonly mappableNonModuleKeys: readonly ["editorScript", "script", "viewScript", "editorStyle", "style", "viewStyle"];
     private static readonly styleExtensionPattern;
     private static readonly scriptExtensionPattern;
     private static readonly mappableKeys;

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

@@ -12,7 +12,7 @@ class BlockJSONManagingPlugin {
     standaloneBlocks;
     processingModules;
     static mappableModuleKeys = ["viewScriptModule", "scriptModule"];
-    static mappableNonModuleKeys = ["editorStyle", "style", "viewStyle", "editorScript", "script", "viewScript"];
+    static mappableNonModuleKeys = ["editorScript", "script", "viewScript", "editorStyle", "style", "viewStyle"];
     static styleExtensionPattern = /\.(p?c|sa)ss$/i;
     static scriptExtensionPattern = /\.m?[tj]sx?$/i;
     static mappableKeys = [...BlockJSONManagingPlugin.mappableNonModuleKeys, ...BlockJSONManagingPlugin.mappableModuleKeys];
@@ -382,14 +382,14 @@ class BlockJSONManagingPlugin {
                 const scriptHandles = {};
                 const styleHandles = {};
                 const rawAssetData = JSON.parse(rawAssetDataSource);
-                const mappableKeys = [...BlockJSONManagingPlugin.mappableModuleKeys, ...BlockJSONManagingPlugin.mappableNonModuleKeys];
+                const usedHandles = {};
                 for (const [blockFolder, config] of blockDirConfigs) {
-                    for (const mappableKey of mappableKeys) {
+                    for (const mappableKey of BlockJSONManagingPlugin.mappableKeys) {
                         const cfg = config[mappableKey];
                         if (cfg) {
                             if (Array.isArray(cfg)) {
                                 for (let i = 0; i < cfg.length; i++) {
-                                    const assetDetails = getAssetDetails(blockFolder, cfg[i], rawAssetData, mappableKey);
+                                    const assetDetails = getAssetDetails(blockFolder, cfg[i], rawAssetData, mappableKey, usedHandles);
                                     if (assetDetails) {
                                         (assetDetails[0] ? styleHandles : scriptHandles)[assetDetails[1]] = assetDetails[2];
                                         cfg[i] = assetDetails[1];
@@ -397,7 +397,7 @@ class BlockJSONManagingPlugin {
                                 }
                             }
                             else {
-                                const assetDetails = getAssetDetails(blockFolder, cfg, rawAssetData, mappableKey);
+                                const assetDetails = getAssetDetails(blockFolder, cfg, rawAssetData, mappableKey, usedHandles);
                                 if (assetDetails) {
                                     (assetDetails[0] ? styleHandles : scriptHandles)[assetDetails[1]] = assetDetails[2];
                                     config[mappableKey] = assetDetails[1];
@@ -421,9 +421,8 @@ class BlockJSONManagingPlugin {
             compilation.emitAsset("blockdir.config.php", new webpack_1.sources.RawSource("<?php return "
                 + json_to_php_but_with____injection_1.default.make({ indent: "\t", linebreak: "\n", shortArraySyntax: true })(sortedBlockDirConfigData, "")
                     .replaceAll(/(\n\t*)\[\s+],/gs, "$1[],")
-                    .replaceAll(/\[\n\t+([^\n]+)\n\t+]/gs, "[$1]")
+                    .replaceAll(/\[\n\t+([^\n]+)\n\t+]/gs, (_, inner) => `[${inner.trim()}]`)
                     .replaceAll(/'rest' => \[\n\t+(\[(?:'[^']+')?]),\n\t+('[^']+')(?:,\n\t+(\[[^\n]+]))?\n\t+]/gs, (_, deps, hash, args) => `'rest' => [${[deps, hash, args].filter(value => !!value).join(", ")}]`)
-                    .replaceAll(/\[\t+]/gs, "[]")
                 + ";"));
         });
     }
@@ -496,7 +495,7 @@ function makeSync() {
     });
     return res;
 }
-function getAssetDetails(blockFolder, asset, rawAssetData, mappableKey) {
+function getAssetDetails(blockFolder, asset, rawAssetData, mappableKey, usedHandles) {
     if (!asset.startsWith("file:./")) {
         return undefined;
     }
@@ -508,8 +507,15 @@ function getAssetDetails(blockFolder, asset, rawAssetData, mappableKey) {
     if (!assetData) {
         return undefined;
     }
+    let handle = src.substring(0, src.length - (isCss ? 4 : 3));
+    if (usedHandles[handle] !== undefined) {
+        handle += "-" + (++usedHandles[handle]);
+    }
+    else {
+        usedHandles[handle] = 0;
+    }
     return [
-        isCss, src.substring(0, src.length - (isCss ? 4 : 3)),
+        isCss, handle,
         { src, rest: isCss || mappableKey.startsWith("editor") ? [assetData.dependencies, assetData.version] : [assetData.dependencies, assetData.version, { strategy: 'defer' }] }
     ];
 }

package/package.json

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