@plaudit/webpack-extensions 2.66.4 → 2.66.6

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.js

@@ -68,6 +68,7 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
             const blockSlug = match[1], assetType = match[2];
             if (blockSlug && assetType) {
                 const key = assetType.replace(/-[sm]/gi, chars => chars.substring(1).toUpperCase());
+                //TODO: Handle deduplicating handles in the same way that PlainEntrypointsStyleBlockJSONPlugin does
                 const handle = `${handlePrefix}_${blockSlug}-${assetType}`;
                 const isCss = (0, shared_1.isStyleField)(assetType);
                 const handleGroup = isCss ? 'styleHandles'
@@ -98,7 +99,7 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
         })
             .toSorted(([a], [b]) => a.localeCompare(b)));
         new php_writer_1.PHPWriter()
-            .call("Plaudit\\Common\\Lib\\GutenbergUtils::loadExtensionsV3", [new php_writer_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(blockExtensionsConfig, false)), php_writer_1.Expr.call("trailingslashit", [php_writer_1.Constants.__DIR__]),
+            .call("Plaudit\\Common\\Lib\\GutenbergUtils::loadExtensionsV3", [new php_writer_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(blockExtensionsConfig, false)), php_writer_1.Op.concat(php_writer_1.Constants.__DIR__, '/'),
             php_writer_1.Expr.call("plaudit_webpack_extensions__resolve_base_uri", [php_writer_1.Constants.__DIR__])])
             .emitAsset(compilation, node_path_1.default.join(this.dest.destination, "extensions-loader.php"));
     }

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.d.ts

@@ -1,8 +1,18 @@
 import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
-import { ParsedAssetsJson, BlockEntrypointInfo } from "../shared";
+import { ParsedAssetsJson, BlockEntrypointInfo, FileSegmentBlockEntrypointInfo } from "../shared";
 import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
 import { Compilation } from "webpack";
 import type WebpackRemoveEmptyScriptsPlugin from "webpack-remove-empty-scripts";
+type WorkableBlockEntrypointInfo = Omit<FileSegmentBlockEntrypointInfo, 'originalValue'> & Partial<Pick<FileSegmentBlockEntrypointInfo, 'originalValue'>> & {
+    outputPath: string;
+    assetData: ParsedAssetsJson[string];
+    hash: string;
+};
+type CollatedWorkableBlockInfo = Record<string, {
+    sourcePath?: string;
+    workableBlockEntrypointsInfo: WorkableBlockEntrypointInfo[];
+    blockJsonText?: string;
+}>;
 export declare class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin<BlockEntrypointInfo> {
     private readonly blocksDest;
     private readonly webpackRemoveEmptyScriptsPlugin;
@@ -23,4 +33,6 @@ export declare class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhas
     private static normalizeRenderTemplate;
     protected attachUniquePhase(compilation: Compilation): void;
     protected attachStandardPhase(compilation: Compilation): void;
+    protected deduplicateEntrypointHandles(workableBlockInfo: CollatedWorkableBlockInfo): CollatedWorkableBlockInfo;
 }
+export {};

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.js

@@ -70,9 +70,10 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
                     .map(([file, assetType]) => {
                     const wasOriginallyAStyleField = (0, shared_1.isStyleField)(metadata.entrypointField);
                     if (wasOriginallyAStyleField !== (assetType === "style")) { // This means that the file is extracted
+                        const entrypointField = (0, shared_1.convertEntrypointFieldForAssetType)(metadata.entrypointField, assetType);
                         return {
                             ...metadata, outputPath: file, assetData, originalValue: undefined, hash: entrypointChunk.hash ?? "",
-                            entrypointField: (0, shared_1.convertEntrypointFieldForAssetType)(metadata.entrypointField, assetType)
+                            entrypointField, handleGroup: (0, shared_1.getHandleGroup)(entrypointField)
                         };
                     }
                     return ({ ...metadata, outputPath: file, assetData, hash: entrypointChunk.hash ?? "" });
@@ -155,7 +156,9 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
                 scriptModuleHandles: Object.fromEntries(PlainEntrypointsStyleBlockJSONPlugin
                     .convertToScriptHandles(handleData.filter(hd => !(0, shared_1.isStyleField)(hd.entrypointField) && (0, shared_1.isScriptModuleField)(hd.entrypointField)))),
                 styleHandles: Object.fromEntries(handleData.filter(hd => (0, shared_1.isStyleField)(hd.entrypointField))
-                    .map(hd => [hd.handle, { src: hd.outputPath, rest: [hd.assetData.dependencies, hd.assetData.version] }]))
+                    .map(hd => {
+                    return [hd.handle, { src: hd.outputPath, rest: [hd.originalValue !== undefined ? hd.assetData.dependencies : [], hd.assetData.version] }];
+                }))
             },
             ...Object.fromEntries(Object.entries(blockData).sort((a, b) => a[0].localeCompare(b[0])))
         };
@@ -166,8 +169,8 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
     }
     static convertToScriptHandles(handleData) {
         return handleData.map(hd => {
-            return [hd.handle, { src: hd.outputPath, rest: hd.entrypointField.startsWith("editor")
-                        ? [hd.assetData.dependencies, hd.assetData.version] : [hd.assetData.dependencies, hd.assetData.version, { strategy: "defer" }] }];
+            const deps = hd.originalValue !== undefined ? hd.assetData.dependencies : [];
+            return [hd.handle, { src: hd.outputPath, rest: hd.entrypointField.startsWith("editor") ? [deps, hd.assetData.version] : [deps, hd.assetData.version, { strategy: "defer" }] }];
         });
     }
     static doFileOrHandleReplacements(compilation, blockJson, workableBlockEntrypointsInfo, getter) {
@@ -368,7 +371,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
                 }
                 return acc;
             }, {});
-            const blockData = this.transformBlocks(compilation, workableBlockInfo, semaphoreData.some(sd => sd.emittingWpmlXml));
+            const blockData = this.transformBlocks(compilation, this.deduplicateEntrypointHandles(workableBlockInfo), semaphoreData.some(sd => sd.emittingWpmlXml));
             this.emitBlockLoaderFile(compilation, blockData);
         });
     }
@@ -389,5 +392,28 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
             }
         });
     }
+    deduplicateEntrypointHandles(workableBlockInfo) {
+        const handleRecords = { scriptHandles: {}, scriptModuleHandles: {}, styleHandles: {} };
+        for (const { workableBlockEntrypointsInfo } of Object.values(workableBlockInfo)) {
+            for (const { handleGroup, handle, originalValue, outputPath } of workableBlockEntrypointsInfo) {
+                if (originalValue !== undefined) {
+                    handleRecords[handleGroup][handle] = outputPath;
+                }
+            }
+        }
+        return Object.fromEntries(Object.entries(workableBlockInfo).map((e) => {
+            const deduplicatedWorkableBlockEntrypointsInfo = e[1].workableBlockEntrypointsInfo.map(bei => {
+                if (handleRecords[bei.handleGroup][bei.handle] === bei.outputPath) {
+                    return bei;
+                }
+                for (let count = 1, handle = `${bei.handle}_${count}`;; handle = `${bei.handle}_${++count}`) {
+                    if (!handleRecords[bei.handleGroup][handle] || handleRecords[bei.handleGroup][handle] === bei.outputPath) {
+                        return { ...bei, handle };
+                    }
+                }
+            });
+            return [e[0], { ...e[1], workableBlockEntrypointsInfo: deduplicatedWorkableBlockEntrypointsInfo }];
+        }));
+    }
 }
 exports.PlainEntrypointsStyleBlockJSONPlugin = PlainEntrypointsStyleBlockJSONPlugin;

package/build/shared.d.ts

@@ -79,6 +79,7 @@ export type PlauditWordpressWebpackConfig = {
 export type FileSegmentBlockEntrypointInfo = {
     blockJsonOrigin: string;
     entrypointField: EntrypointFields[number];
+    handleGroup: ReturnType<typeof getHandleGroup>;
     originalValue: string;
     entrypointName: string;
     handle: string;
@@ -99,8 +100,9 @@ export declare const scriptWithoutModuleExtension: RegExp;
 export declare const scriptWithModuleExtension: RegExp;
 export declare const styleExtension: RegExp;
 export declare function scriptOrStyleTest(entryPath: string, scriptExtension: RegExp): "" | "style" | "script";
-export declare function isStyleField(field: string): boolean;
-export declare function isScriptModuleField(field: string): boolean;
+export declare function isStyleField(field: string): field is 'style' | 'viewStyle' | 'editorStyle';
+export declare function isScriptModuleField(field: string): field is 'scriptModule' | 'viewScriptModule';
+export declare function getHandleGroup(field: string): 'styleHandles' | 'scriptHandles' | 'scriptModuleHandles';
 export declare function hasAtLeastOneItem<T>(list: T[]): list is [T, ...T[]];
 export type TupleOf<T, N extends number> = N extends N ? number extends N ? T[] : _TupleOf<T, N, []> : never;
 type _TupleOf<T, N extends number, R extends unknown[]> = R['length'] extends N ? R : _TupleOf<T, N, [T, ...R]>;

package/build/shared.js

@@ -13,6 +13,7 @@ exports.leadingSlashIt = leadingSlashIt;
 exports.scriptOrStyleTest = scriptOrStyleTest;
 exports.isStyleField = isStyleField;
 exports.isScriptModuleField = isScriptModuleField;
+exports.getHandleGroup = getHandleGroup;
 exports.hasAtLeastOneItem = hasAtLeastOneItem;
 exports.arrayIsLength = arrayIsLength;
 exports.kebabCase = kebabCase;
@@ -90,6 +91,15 @@ function isStyleField(field) {
 function isScriptModuleField(field) {
     return field.includes("odule");
 }
+function getHandleGroup(field) {
+    if (isStyleField(field)) {
+        return 'styleHandles';
+    }
+    if (isScriptModuleField(field)) {
+        return 'scriptModuleHandles';
+    }
+    return 'scriptHandles';
+}
 function hasAtLeastOneItem(list) {
     return list.length > 0 && list[0] !== undefined && list[0] !== null;
 }

package/build/utils/common-config-helpers.js

@@ -39,12 +39,14 @@ function mapToRealEntrypoints(entrypoint, dir, supportedExtensions, args) {
         .filter(ep => supportedExtensions(ep) && node_fs_1.default.statSync(ep, { throwIfNoEntry: false })?.isFile())
         .map(ep => {
         const parsedEntrypoint = node_path_1.default.parse(ep);
+        const entrypointField = shared_1.styleExtension.test(ep) ? 'style' : shared_1.scriptWithModuleExtension.test(ep) ? 'scriptModule' : 'script';
         const fakeEntrypointInfo = {
             blockJsonOrigin: args.entrypointJsonOrigin,
-            entrypointField: shared_1.styleExtension.test(ep) ? 'style' : shared_1.scriptWithModuleExtension.test(ep) ? 'scriptModule' : 'script',
+            entrypointField,
             originalValue: ep,
             entrypointName: parsedEntrypoint.name,
             handle: (0, shared_1.convertUsageLocationsHandleToEmittableHandle)(dest.locations.handle, parsedEntrypoint.name),
+            handleGroup: (0, shared_1.getHandleGroup)(entrypointField),
             dest
         };
         return [joinPossiblyAbsolutePaths(dest.destination, node_path_1.default.basename(parsedEntrypoint.dir), parsedEntrypoint.name),
@@ -166,12 +168,9 @@ function resolveEntryFromDirectory(commonConfig, srcRoot, dest) {
                         const overallSource = node_path_1.default.dirname(blockJsonOrigin);
                         const overallSourceRelativeName = node_path_1.default.relative(overallSource, node_path_1.default.normalize(node_path_1.default.join(blockJsonOrigin, node_path_1.default.relative(overallSource, presentEntrypoint.extensionlessExpectedSrc))));
                         const handleSuffix = (0, shared_1.convertUsageLocationsHandleToEmittableHandle)(dest.locations.handle, overallSourceRelativeName);
+                        const handleGroup = (0, shared_1.getHandleGroup)(presentEntrypoint.entrypointField);
                         if (!entrypointNamesWithEffectiveDuplicates[presentEntrypoint.entrypointName]) {
-                            return {
-                                blockJsonOrigin, ...presentEntrypoint,
-                                handle: `${handlePrefix}/${handleSuffix}`,
-                                dest
-                            };
+                            return { blockJsonOrigin, ...presentEntrypoint, handle: `${handlePrefix}/${handleSuffix}`, dest, handleGroup };
                         }
                         const baseSuffix = `_${(0, shared_1.isStyleField)(presentEntrypoint.entrypointField) ? "style" : "script"}`;
                         let count = 0, suffix = baseSuffix, deduplicatedEntrypointName;
@@ -186,7 +185,7 @@ function resolveEntryFromDirectory(commonConfig, srcRoot, dest) {
                             ...presentEntrypoint,
                             entrypointName: deduplicatedEntrypointName,
                             extensionlessExpectedSrc: deduplicatedExtensionlessExpectedSrc,
-                            handle: `${handlePrefix}/${count ? handleSuffix + "_" + count : handleSuffix}`,
+                            handle: `${handlePrefix}/${count ? handleSuffix + "_" + count : handleSuffix}`, handleGroup,
                             dest
                         };
                     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.66.4",
+  "version": "2.66.6",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/build"
@@ -16,9 +16,9 @@
     }
   },
   "devDependencies": {
-    "@plaudit/gutenberg-api-extensions": "^2.76.1",
+    "@plaudit/gutenberg-api-extensions": "^2.77.0",
     "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/node": "^24.4.0",
+    "@types/node": "^24.5.2",
     "@types/postcss-functions": "^4.0.4",
     "@types/tapable": "^2.2.7",
     "@types/webpack": "^5.28.5",
@@ -35,8 +35,8 @@
     "@plaudit/postcss-silent-extend": "^3.0.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
     "@plaudit/postcss-variables": "^1.1.0",
-    "@wordpress/dependency-extraction-webpack-plugin": "^6.30.0",
-    "@wordpress/scripts": "^30.23.0",
+    "@wordpress/dependency-extraction-webpack-plugin": "^6.31.0",
+    "@wordpress/scripts": "^30.24.0",
     "autoprefixer": "^10.4.21",
     "browser-sync": "^3.0.4",
     "copy-webpack-plugin": "^10.2.4",
@@ -64,7 +64,7 @@
     "react-dom": "^18.3.1",
     "webpack": "^5.101.3",
     "webpack-remove-empty-scripts": "^1.1.1",
-    "xml-formatter": "^3.6.6"
+    "xml-formatter": "^3.6.7"
   },
   "engines": {
     "node": ">=20"