@plaudit/webpack-extensions 2.63.2 → 2.65.0

package/build/plugins/ExtensionsConfigFileGeneratorPluginV1.js

@@ -5,45 +5,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtensionsConfigFileGeneratorPluginV1 = void 0;
 const node_path_1 = __importDefault(require("node:path"));
-const AbstractMultiPhaseLibraryPlugin_1 = require("./AbstractMultiPhaseLibraryPlugin");
+const AbstractBiPhasicGroupAndEntryPlugin_1 = require("./AbstractBiPhasicGroupAndEntryPlugin");
 const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
 const php_serializer_1 = require("../utils/php-serializer");
 const php_writer_1 = require("../utils/php-writer");
 const webpack_1 = require("webpack");
-class ExtensionsConfigFileGeneratorPluginV1 extends AbstractMultiPhaseLibraryPlugin_1.AbstractMultiPhaseLibraryPlugin {
+class ExtensionsConfigFileGeneratorPluginV1 extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
     extensionsDest;
-    constructor(extensionsDest) {
-        super(`extensions-v1-${extensionsDest}`, [UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore]);
+    constructor(config, extensionsDest, context, entry) {
+        super(config, `extensions-v1-${extensionsDest}`, [UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
         this.extensionsDest = extensionsDest;
     }
-    apply(compiler) {
-        super.apply(compiler);
-        compiler.hooks.compilation.tap(this.constructor.name, compilation => {
-            compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
-                UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, { group: `extensions-config-v1-${this.extensionsDest}`, requiresBaseURI: false, action: writer => {
-                        writer
-                            .use("Plaudit\\Common\\Lib\\GutenbergUtils")
-                            .call("GutenbergUtils::installExtensionsSupport", [php_writer_1.Op.join(php_writer_1.Constants.__DIR__, this.extensionsDest)]);
-                    } });
-            });
-            compilation.hooks.afterProcessAssets.tap(`${this.constructor.name}_AfterProcessAssets`, compilationAssets => {
-                const regex = /^(.+?)-((?:editor-|view-|)(?:style|script|script-module))\.(?:css|m?js)$/i;
-                const mapping = {};
-                for (const asset of Object.keys(compilationAssets)) {
-                    let match;
-                    if ((match = /^(.+?)-setup.php$/i.exec(asset)) && match[1]) {
-                        (mapping[match[1]] ?? (mapping[match[1]] = [{}]))[1] = `${asset}`;
-                    }
-                    else if ((match = regex.exec(asset)) && match[1] && match[2]) {
-                        const resourceInfo = (mapping[match[1]] ?? (mapping[match[1]] = [{}]))[0];
-                        const key = match[2].replace(/-[sm]/gi, chars => chars.substring(1).toUpperCase());
-                        (resourceInfo[key] ?? (resourceInfo[key] = [])).push([`plaudit_block-extension_${match[1]}-${match[2]}`, asset]);
-                    }
-                }
-                compilation.emitAsset(node_path_1.default.join(this.extensionsDest, "mapping.config"), new webpack_1.sources.RawSource((0, php_serializer_1.phpSerialize)(mapping)));
-            });
-        });
+    attachUniquePhase() { }
+    processAssets(compilation, assetsJson) {
+        const regex = /^(.+?)-((?:editor-|view-|)(?:style|script|script-module))\.(?:css|m?js)$/i;
+        const mapping = {};
+        for (const fileWithAssetData of Object.keys(this.extractRelevantAssetData(compilation, assetsJson))) {
+            let match;
+            if ((match = regex.exec(fileWithAssetData)) && match[1] && match[2]) {
+                const resourceInfo = (mapping[match[1]] ?? (mapping[match[1]] = [{}]))[0];
+                const key = match[2].replace(/-[sm]/gi, chars => chars.substring(1).toUpperCase());
+                (resourceInfo[key] ?? (resourceInfo[key] = [])).push([`plaudit_block-extension_${match[1]}-${match[2]}`, fileWithAssetData]);
+            }
+        }
+        compilation.emitAsset(node_path_1.default.join(this.extensionsDest, "mapping.config"), new webpack_1.sources.RawSource((0, php_serializer_1.phpSerialize)(mapping)));
+        UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, { group: `extensions-config-v1-${this.extensionsDest}`, requiresBaseURI: false, action: writer => {
+                writer
+                    .use("Plaudit\\Common\\Lib\\GutenbergUtils")
+                    .call("GutenbergUtils::installExtensionsSupport", [php_writer_1.Op.join(php_writer_1.Constants.__DIR__, this.extensionsDest)]);
+            } });
     }
-    attachSecondPhase(compilation) { }
 }
 exports.ExtensionsConfigFileGeneratorPluginV1 = ExtensionsConfigFileGeneratorPluginV1;

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.d.ts

@@ -1,18 +1,18 @@
-import { UnpackedBlockEntrypointInfo, UsageLocations } from "../shared";
-import { AbstractMultiPhaseLibraryAndEntryPlugin, EntryProvider } from "./AbstractMultiPhaseLibraryAndEntryPlugin";
-import { Compilation, type Compiler } from "webpack";
-export declare class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractMultiPhaseLibraryAndEntryPlugin<UnpackedBlockEntrypointInfo | string> {
+import { ParsedAssetsJson, UnpackedBlockEntrypointInfo, UsageLocations } from "../shared";
+import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
+import { Compilation } from "webpack";
+export declare class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryPlugin<UnpackedBlockEntrypointInfo | string> {
     private readonly buildRoot;
     private readonly outputDir;
     private readonly usageLocations;
-    private readonly handlePrefix;
     private readonly useUnifiedLoader;
     private static readonly semaphore;
-    constructor(buildRoot: string, outputDir: string, usageLocations: UsageLocations, handlePrefix: string, useUnifiedLoader: boolean, context: string, entry: EntryProvider<UnpackedBlockEntrypointInfo | string>);
-    apply(compiler: Compiler): void;
+    constructor(config: VerifiedPlauditWordpressWebpackConfig, buildRoot: string, outputDir: string, usageLocations: UsageLocations, useUnifiedLoader: boolean, context: string, entry: EntryProvider<UnpackedBlockEntrypointInfo | string>);
     private generatePlainEntrypointsLoader;
     private static addHandlesToHandleLists;
     private static appendEnqueuingHandleLists;
     private static separateHandleListByPriority;
-    protected attachSecondPhase(compilation: Compilation): void;
+    protected attachUniquePhase(compilation: Compilation): void;
+    protected processAssets(compilation: Compilation, assetsJson: ParsedAssetsJson): void;
 }

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -8,97 +8,22 @@ const node_path_1 = __importDefault(require("node:path"));
 const shared_1 = require("../shared");
 const php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
-const AbstractMultiPhaseLibraryAndEntryPlugin_1 = require("./AbstractMultiPhaseLibraryAndEntryPlugin");
+const AbstractBiPhasicGroupAndEntryPlugin_1 = require("./AbstractBiPhasicGroupAndEntryPlugin");
 const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
 const webpack_1 = require("webpack");
-class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractMultiPhaseLibraryAndEntryPlugin_1.AbstractMultiPhaseLibraryAndEntryPlugin {
+class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
     buildRoot;
     outputDir;
     usageLocations;
-    handlePrefix;
     useUnifiedLoader;
-    static semaphore = new pseduo_semaphore_1.PseudoSemaphore([], "Plain");
-    constructor(buildRoot, outputDir, usageLocations, handlePrefix, useUnifiedLoader, context, entry) {
-        super("plain-entrypoints-v2", [PlainEntrypointsConfigFileGeneratorPlugin.semaphore, UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
+    static semaphore = new pseduo_semaphore_1.PseudoSemaphore("Plain");
+    constructor(config, buildRoot, outputDir, usageLocations, useUnifiedLoader, context, entry) {
+        super(config, "plain-entrypoints-v2", [PlainEntrypointsConfigFileGeneratorPlugin.semaphore, UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
         this.buildRoot = buildRoot;
         this.outputDir = outputDir;
         this.usageLocations = usageLocations;
-        this.handlePrefix = handlePrefix;
         this.useUnifiedLoader = useUnifiedLoader;
     }
-    apply(compiler) {
-        super.apply(compiler);
-        compiler.hooks.compilation.tap(this.constructor.name, compilation => {
-            compilation.hooks.processAssets.tapPromise({ name: this.constructor.name, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ANALYSE, additionalAssets: true }, async (assets) => {
-                if (!("assets.json" in assets)) {
-                    return;
-                }
-                try {
-                    const rawAssetDataSource = assets["assets.json"]?.source();
-                    if (typeof rawAssetDataSource !== 'string') {
-                        PlainEntrypointsConfigFileGeneratorPlugin.semaphore.reject(this.id);
-                        compilation.errors.push(new Error("assets.json is unexpectedly missing or not a string"));
-                        return;
-                    }
-                    const assetDataSource = JSON.parse(rawAssetDataSource);
-                    if (!(0, shared_1.isRawAssetData)(assetDataSource)) {
-                        PlainEntrypointsConfigFileGeneratorPlugin.semaphore.reject(this.id);
-                        compilation.errors.push(new Error("assets.json is does not match the RawAssetData format"));
-                        return;
-                    }
-                    const isScriptRegex = /\.m?[jt]sx?(\?|$)/i;
-                    const myAssetHandles = [];
-                    for (const { entrypoint, srcPath } of this.getRelevantEntrypoints(compilation)) {
-                        const entrypointChunk = entrypoint.getEntrypointChunk();
-                        const assetData = entrypointChunk.files.values()
-                            .map(file => assetDataSource[file]).find(v => v !== undefined);
-                        if (!assetData) {
-                            continue;
-                        }
-                        const handles = [];
-                        const entrypointChunkIsScript = isScriptRegex.test(srcPath);
-                        const chunkFiles = entrypoint.chunks.flatMap(chunk => {
-                            return [...chunk.files].filter(file => entrypointChunkIsScript || !isScriptRegex.test(file))
-                                .map(file => [file, chunk === entrypointChunk]);
-                        });
-                        if (chunkFiles.length === 1) {
-                            chunkFiles[0][1] = true;
-                        }
-                        for (const [file, useHandleName] of chunkFiles) {
-                            const extension = node_path_1.default.extname(file).toLowerCase();
-                            const type = extension === ".js" ? 'script' : (extension === ".mjs" ? 'script_module' : 'style');
-                            const isScript = type !== 'style';
-                            const dependencies = isScript === entrypointChunkIsScript ? assetData.dependencies : [];
-                            const rest = isScript && this.usageLocations.registerScriptArgs !== undefined
-                                ? [dependencies, assetData.version, this.usageLocations.registerScriptArgs] : [dependencies, assetData.version];
-                            const destPath = node_path_1.default.join(compilation.outputOptions.path, file);
-                            handles.push({
-                                src: destPath, rest, type,
-                                locations: this.usageLocations,
-                                handleName: useHandleName ? this.usageLocations.handle : undefined,
-                            });
-                        }
-                        myAssetHandles.push({
-                            handles,
-                            handlePrefix: this.handlePrefix
-                        });
-                    }
-                    PlainEntrypointsConfigFileGeneratorPlugin.semaphore.resolve(this.id, myAssetHandles);
-                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, myAssetHandles.length
-                        ? { group: this.libraryType, requiresBaseURI: true, action: writer => writer.append("require_once __DIR__.'/plain-entrypoints-loader.php';") }
-                        : undefined);
-                }
-                catch (e) {
-                    PlainEntrypointsConfigFileGeneratorPlugin.semaphore.reject(this.id);
-                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reject(this.id);
-                    throw e;
-                }
-            });
-            compilation.hooks.afterProcessAssets.tap(this.constructor.name, () => {
-                compilation.deleteAsset("assets.json");
-            });
-        });
-    }
     generatePlainEntrypointsLoader(compilation, assets) {
         const emitDir = node_path_1.default.join(this.buildRoot, this.outputDir);
         const handleLists = {
@@ -233,10 +158,54 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractMultiPhaseLibrar
         }
         return lists.entries().toArray().sort((a, b) => a[0] - b[0]);
     }
-    attachSecondPhase(compilation) {
-        compilation.hooks.processAssets.tapPromise({ name: `${this.constructor.name}_CompileLoader`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT }, async () => {
+    attachUniquePhase(compilation) {
+        compilation.hooks.processAssets.tapPromise({ name: this.constructor.name, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT }, async () => {
             this.generatePlainEntrypointsLoader(compilation, (await PlainEntrypointsConfigFileGeneratorPlugin.semaphore.wait()).flat());
         });
     }
+    processAssets(compilation, assetsJson) {
+        const isScriptRegex = /\.m?[jt]sx?(\?|$)/i;
+        const myAssetHandles = [];
+        const relevantEntrypoints = this.getRelevantEntrypoints(compilation);
+        for (const { entrypoint, srcPath } of relevantEntrypoints) {
+            const entrypointChunk = entrypoint.getEntrypointChunk();
+            const assetData = entrypointChunk.files.values()
+                .map(file => assetsJson[file]).find(v => v !== undefined);
+            if (!assetData) {
+                continue;
+            }
+            const handles = [];
+            const entrypointChunkIsScript = isScriptRegex.test(srcPath);
+            const chunkFiles = entrypoint.chunks.flatMap(chunk => {
+                return [...chunk.files].filter(file => entrypointChunkIsScript || !isScriptRegex.test(file))
+                    .map(file => [file, chunk === entrypointChunk]);
+            });
+            if (chunkFiles.length === 1) {
+                chunkFiles[0][1] = true;
+            }
+            for (const [file, useHandleName] of chunkFiles) {
+                const extension = node_path_1.default.extname(file).toLowerCase();
+                const type = extension === ".js" ? 'script' : (extension === ".mjs" ? 'script_module' : 'style');
+                const isScript = type !== 'style';
+                const dependencies = isScript === entrypointChunkIsScript ? assetData.dependencies : [];
+                const rest = isScript && this.usageLocations.registerScriptArgs !== undefined
+                    ? [dependencies, assetData.version, this.usageLocations.registerScriptArgs] : [dependencies, assetData.version];
+                const destPath = node_path_1.default.join(compilation.outputOptions.path, file);
+                handles.push({
+                    src: destPath, rest, type,
+                    locations: this.usageLocations,
+                    handleName: useHandleName ? this.usageLocations.handle : undefined,
+                });
+            }
+            myAssetHandles.push({ handles, handlePrefix: this.config.plainEntrypointsHandlePrefix });
+        }
+        PlainEntrypointsConfigFileGeneratorPlugin.semaphore.resolve(this.id, myAssetHandles);
+        UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, myAssetHandles.length
+            ? {
+                group: this.group, requiresBaseURI: true, action: writer => writer.append("require_once __DIR__.'/plain-entrypoints-loader.php';"),
+                staticallyLoadedEntrypoints: Object.keys(relevantEntrypoints)
+            }
+            : undefined);
+    }
 }
 exports.PlainEntrypointsConfigFileGeneratorPlugin = PlainEntrypointsConfigFileGeneratorPlugin;

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.d.ts

@@ -1,15 +1,14 @@
-import { AbstractMultiPhaseLibraryAndEntryPlugin, EntryProvider } from "./AbstractMultiPhaseLibraryAndEntryPlugin";
-import { UnpackedBlockEntrypointInfo } from "../shared";
+import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
+import { ParsedAssetsJson, UnpackedBlockEntrypointInfo } from "../shared";
 import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
-import { Compilation, type Compiler } from "webpack";
+import { Compilation } from "webpack";
 import type WebpackRemoveEmptyScriptsPlugin from "webpack-remove-empty-scripts";
-export declare class PlainEntrypointsStyleBlockJSONPlugin extends AbstractMultiPhaseLibraryAndEntryPlugin<UnpackedBlockEntrypointInfo | string> {
-    private readonly config;
+export declare class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin<UnpackedBlockEntrypointInfo | string> {
     private readonly blocksDest;
     private readonly webpackRemoveEmptyScriptsPlugin;
     private static readonly semaphore;
     constructor(config: VerifiedPlauditWordpressWebpackConfig, blocksDest: string, webpackRemoveEmptyScriptsPlugin: WebpackRemoveEmptyScriptsPlugin, context: string, entry: EntryProvider<UnpackedBlockEntrypointInfo | string>);
-    apply(compiler: Compiler): void;
+    protected processAssets(compilation: Compilation, rawAssetData: ParsedAssetsJson): Promise<void>;
     private emitBlockLoaderFile;
     private transformBlocks;
     private static extractAssetSource;
@@ -22,5 +21,5 @@ export declare class PlainEntrypointsStyleBlockJSONPlugin extends AbstractMultiP
     static findRelativeRouteBetween(path1: string, path2: string): string;
     private static remapReferencedPHPFilesOnKey;
     private static normalizeRenderTemplate;
-    protected attachSecondPhase(compilation: Compilation): void;
+    protected attachUniquePhase(compilation: Compilation): void;
 }

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.js

@@ -7,129 +7,100 @@ exports.PlainEntrypointsStyleBlockJSONPlugin = void 0;
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const AbstractMultiPhaseLibraryAndEntryPlugin_1 = require("./AbstractMultiPhaseLibraryAndEntryPlugin");
+const AbstractBiPhasicGroupAndEntryPlugin_1 = require("./AbstractBiPhasicGroupAndEntryPlugin");
 const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
 const shared_1 = require("../shared");
 const php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const webpack_1 = require("webpack");
 const promises_1 = __importDefault(require("node:fs/promises"));
-class PlainEntrypointsStyleBlockJSONPlugin extends AbstractMultiPhaseLibraryAndEntryPlugin_1.AbstractMultiPhaseLibraryAndEntryPlugin {
-    config;
+class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
     blocksDest;
     webpackRemoveEmptyScriptsPlugin;
-    static semaphore = new pseduo_semaphore_1.PseudoSemaphore({ collatableWorkableBlockInfo: {}, blocksDest: "", emittingWpmlXml: false }, "Block JSON v3");
+    static semaphore = new pseduo_semaphore_1.PseudoSemaphore("Block JSON v3");
     constructor(config, blocksDest, webpackRemoveEmptyScriptsPlugin, context, entry) {
-        super(`block-json-${blocksDest}`, [PlainEntrypointsStyleBlockJSONPlugin.semaphore, UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
-        this.config = config;
+        super(config, `block-json-${blocksDest}`, [PlainEntrypointsStyleBlockJSONPlugin.semaphore, UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
         this.blocksDest = blocksDest;
         this.webpackRemoveEmptyScriptsPlugin = webpackRemoveEmptyScriptsPlugin;
     }
-    apply(compiler) {
-        super.apply(compiler);
-        compiler.hooks.compilation.tap(this.constructor.name, compilation => {
-            compilation.hooks.processAssets.tapPromise({ name: this.constructor.name, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ANALYSE, additionalAssets: true }, async (assets) => {
-                if (!("assets.json" in assets)) {
-                    return;
+    async processAssets(compilation, rawAssetData) {
+        const applicableBlockJsonFiles = {};
+        const blockJsonOriginToOutputMapping = {};
+        const relevantEntrypoints = this.getRelevantEntrypoints(compilation);
+        for (const { entrypoint, metadata, srcPath } of relevantEntrypoints) {
+            if (node_path_1.default.basename(srcPath).toLowerCase() !== "block.json" || metadata !== "block-json-inclusion-assurance") {
+                continue;
+            }
+            const entrypointChunk = entrypoint.getEntrypointChunk();
+            for (const danglingBlockJsFile of [...entrypointChunk.files, ...entrypointChunk.auxiliaryFiles]) {
+                if (!danglingBlockJsFile.endsWith("block.json")) {
+                    compilation.deleteAsset(danglingBlockJsFile);
                 }
-                try {
-                    const rawAssetDataSource = assets["assets.json"]?.source();
-                    if (typeof rawAssetDataSource !== 'string') {
-                        PlainEntrypointsStyleBlockJSONPlugin.semaphore.reject(this.id);
-                        compilation.errors.push(new Error("assets.json is unexpectedly missing or not a string"));
-                        return;
-                    }
-                    const assetDataSource = JSON.parse(rawAssetDataSource);
-                    if (!(0, shared_1.isRawAssetData)(assetDataSource)) {
-                        PlainEntrypointsStyleBlockJSONPlugin.semaphore.reject(this.id);
-                        compilation.errors.push(new Error("assets.json is does not match the RawAssetData format"));
-                        return;
-                    }
-                    const applicableBlockJsonFiles = {};
-                    const blockJsonOriginToOutputMapping = {};
-                    const relevantEntrypoints = this.getRelevantEntrypoints(compilation);
-                    for (const { entrypoint, metadata, srcPath } of relevantEntrypoints) {
-                        if (node_path_1.default.basename(srcPath).toLowerCase() !== "block.json" || metadata !== "block-json-inclusion-assurance") {
-                            continue;
-                        }
-                        const entrypointChunk = entrypoint.getEntrypointChunk();
-                        for (const danglingBlockJsFile of [...entrypointChunk.files, ...entrypointChunk.auxiliaryFiles]) {
-                            if (!danglingBlockJsFile.endsWith("block.json")) {
-                                compilation.deleteAsset(danglingBlockJsFile);
-                            }
-                        }
-                        const asset = [...compilation.chunkGraph.getChunkEntryModulesIterable(entrypointChunk)][0]?.originalSource();
-                        if (asset) {
-                            //TODO: Can we guarantee that entrypoint.name is always non-null?
-                            const epBlockJson = entrypoint.name + ".json";
-                            if (!applicableBlockJsonFiles[epBlockJson]) {
-                                const blockJsonText = PlainEntrypointsStyleBlockJSONPlugin.extractAssetSource(compilation, epBlockJson)
-                                    ?? await promises_1.default.readFile(srcPath, 'utf-8');
-                                if (!blockJsonText) {
-                                    compilation.errors.push((0, shared_1.newWebpackErrorForFile)(`Unable to extract the source for ${epBlockJson}`, srcPath));
-                                    continue;
-                                }
-                                applicableBlockJsonFiles[epBlockJson] = { sourcePath: srcPath, workableBlockEntrypointsInfo: [], blockJsonText };
-                            }
-                            blockJsonOriginToOutputMapping[srcPath] = epBlockJson;
-                        }
+            }
+            const asset = [...compilation.chunkGraph.getChunkEntryModulesIterable(entrypointChunk)][0]?.originalSource();
+            if (asset) {
+                //TODO: Can we guarantee that entrypoint.name is always non-null?
+                const epBlockJson = entrypoint.name + ".json";
+                if (!applicableBlockJsonFiles[epBlockJson]) {
+                    const blockJsonText = PlainEntrypointsStyleBlockJSONPlugin.extractAssetSource(compilation, epBlockJson)
+                        ?? await promises_1.default.readFile(srcPath, 'utf-8');
+                    if (!blockJsonText) {
+                        compilation.errors.push((0, shared_1.newWebpackErrorForFile)(`Unable to extract the source for ${epBlockJson}`, srcPath));
+                        continue;
                     }
-                    for (const { entrypoint, metadata, srcPath } of relevantEntrypoints) {
-                        if (node_path_1.default.basename(srcPath).toLowerCase() === "block.json" || typeof metadata === 'string') {
-                            continue;
-                        }
-                        const entrypointChunk = entrypoint.getEntrypointChunk();
-                        const epBlockJson = entrypointChunk.auxiliaryFiles.values().find(auxFile => node_path_1.default.basename(auxFile) === "block.json")
-                            ?? blockJsonOriginToOutputMapping[metadata.blockJsonOrigin];
-                        if (epBlockJson) {
-                            //TODO: Do we need to handle a single entrypoint potentially emitting multiple primary files?
-                            const assetData = entrypointChunk.files.values().map(file => assetDataSource[file])
-                                .find(assetData => assetData !== undefined);
-                            if (!assetData) {
-                                compilation.errors.push((0, shared_1.newWebpackErrorForFile)(`assets.json did not contain information for ${srcPath}`, srcPath));
-                                continue;
-                            }
-                            const workableBlockEntrypointsInfo = entrypoint.getFiles()
-                                .map(file => this.stripOffBlocksDestPrefix(file))
-                                .filter(file => !this.webpackRemoveEmptyScriptsPlugin['trash'].includes(node_path_1.default.join(this.blocksDest, file)))
-                                .map(file => [file, (0, shared_1.scriptOrStyleTest)(file, shared_1.scriptExtension)])
-                                .filter((item) => item[1] !== '')
-                                .map(([file, assetType]) => {
-                                const wasOriginallyAStyleField = (0, shared_1.isStyleField)(metadata.entrypointField);
-                                if (wasOriginallyAStyleField !== (assetType === "style")) { // This means that the file is extracted
-                                    return {
-                                        ...metadata, outputPath: file, assetData, originalValue: undefined, hash: entrypointChunk.hash ?? "",
-                                        entrypointField: (0, shared_1.convertEntrypointFieldForAssetType)(metadata.entrypointField, assetType)
-                                    };
-                                }
-                                return ({ ...metadata, outputPath: file, assetData, hash: entrypointChunk.hash ?? "" });
-                            });
-                            if (applicableBlockJsonFiles[epBlockJson]) {
-                                applicableBlockJsonFiles[epBlockJson].workableBlockEntrypointsInfo.push(...workableBlockEntrypointsInfo);
-                            }
-                            else {
-                                applicableBlockJsonFiles[epBlockJson] = { sourcePath: workableBlockEntrypointsInfo[0]?.blockJsonOrigin, workableBlockEntrypointsInfo };
-                            }
-                        }
+                    applicableBlockJsonFiles[epBlockJson] = { sourcePath: srcPath, workableBlockEntrypointsInfo: [], blockJsonText };
+                }
+                blockJsonOriginToOutputMapping[srcPath] = epBlockJson;
+            }
+        }
+        for (const { entrypoint, metadata, srcPath } of relevantEntrypoints) {
+            if (node_path_1.default.basename(srcPath).toLowerCase() === "block.json" || typeof metadata === 'string') {
+                continue;
+            }
+            const entrypointChunk = entrypoint.getEntrypointChunk();
+            const epBlockJson = entrypointChunk.auxiliaryFiles.values().find(auxFile => node_path_1.default.basename(auxFile) === "block.json")
+                ?? blockJsonOriginToOutputMapping[metadata.blockJsonOrigin];
+            if (epBlockJson) {
+                //TODO: Do we need to handle a single entrypoint potentially emitting multiple primary files?
+                const assetData = entrypointChunk.files.values().map(file => rawAssetData[file])
+                    .find(assetData => assetData !== undefined);
+                if (!assetData) {
+                    compilation.errors.push((0, shared_1.newWebpackErrorForFile)(`assets.json did not contain information for ${srcPath}`, srcPath));
+                    continue;
+                }
+                const workableBlockEntrypointsInfo = entrypoint.getFiles()
+                    .map(file => this.stripOffBlocksDestPrefix(file))
+                    .filter(file => !this.webpackRemoveEmptyScriptsPlugin['trash'].includes(node_path_1.default.join(this.blocksDest, file)))
+                    .map(file => [file, (0, shared_1.scriptOrStyleTest)(file, shared_1.scriptExtension)])
+                    .filter((item) => item[1] !== '')
+                    .map(([file, assetType]) => {
+                    const wasOriginallyAStyleField = (0, shared_1.isStyleField)(metadata.entrypointField);
+                    if (wasOriginallyAStyleField !== (assetType === "style")) { // This means that the file is extracted
+                        return {
+                            ...metadata, outputPath: file, assetData, originalValue: undefined, hash: entrypointChunk.hash ?? "",
+                            entrypointField: (0, shared_1.convertEntrypointFieldForAssetType)(metadata.entrypointField, assetType)
+                        };
                     }
-                    compilation.deleteAsset("assets.json");
-                    PlainEntrypointsStyleBlockJSONPlugin.semaphore.resolve(this.id, {
-                        collatableWorkableBlockInfo: applicableBlockJsonFiles, blocksDest: this.blocksDest,
-                        emittingWpmlXml: compilation.getAsset(node_path_1.default.join(this.blocksDest, "wpml-config.xml")) !== undefined
-                    });
-                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, Object.keys(applicableBlockJsonFiles).length ? {
-                        group: this.libraryType,
-                        requiresBaseURI: false,
-                        action: writer => writer.append(`require_once __DIR__.${php_writer_1.Expr.convertJsonToPHP("/" + node_path_1.default.join(this.blocksDest, "blockdir-loader.php"))};`)
-                    } : undefined);
+                    return ({ ...metadata, outputPath: file, assetData, hash: entrypointChunk.hash ?? "" });
+                });
+                if (applicableBlockJsonFiles[epBlockJson]) {
+                    applicableBlockJsonFiles[epBlockJson].workableBlockEntrypointsInfo.push(...workableBlockEntrypointsInfo);
                 }
-                catch (e) {
-                    PlainEntrypointsStyleBlockJSONPlugin.semaphore.reject(this.id);
-                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reject(this.id);
-                    throw e;
+                else {
+                    applicableBlockJsonFiles[epBlockJson] = { sourcePath: workableBlockEntrypointsInfo[0]?.blockJsonOrigin, workableBlockEntrypointsInfo };
                 }
-            });
+            }
+        }
+        PlainEntrypointsStyleBlockJSONPlugin.semaphore.resolve(this.id, {
+            collatableWorkableBlockInfo: applicableBlockJsonFiles, blocksDest: this.blocksDest,
+            emittingWpmlXml: compilation.getAsset(node_path_1.default.join(this.blocksDest, "wpml-config.xml")) !== undefined
         });
+        UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, Object.keys(applicableBlockJsonFiles).length ? {
+            group: this.group,
+            requiresBaseURI: false,
+            staticallyLoadedEntrypoints: Object.keys(relevantEntrypoints),
+            action: writer => writer.append(`require_once __DIR__.${php_writer_1.Expr.convertJsonToPHP("/" + node_path_1.default.join(this.blocksDest, "blockdir-loader.php"))};`)
+        } : undefined);
     }
     emitBlockLoaderFile(compilation, blockData) {
         if (this.config.useUnifiedLoader) {
@@ -166,7 +137,6 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractMultiPhaseLibraryAndE
             const pathsNeedRemapping = !this.config.standaloneBlocks && blockJson["plaudit"] !== "simple";
             PlainEntrypointsStyleBlockJSONPlugin.remapReferencedPHPFilesOnKey(blockJson, "setup", pathsNeedRemapping, sourceDir, outputDir, compilation, true);
             PlainEntrypointsStyleBlockJSONPlugin.remapReferencedPHPFilesOnKey(blockJson, "variations", pathsNeedRemapping, sourceDir, outputDir, compilation, false);
-            PlainEntrypointsStyleBlockJSONPlugin.normalizeRenderTemplate(blockJson, pathsNeedRemapping, sourceDir, outputDir, compilation);
             const hashForVersion = PlainEntrypointsStyleBlockJSONPlugin
                 .hashThingForAsset([blockJsonText, ...workableBlockEntrypointsInfo.map(bi => bi.hash)].join("~"));
             if (blockJson["version"]) {
@@ -175,6 +145,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractMultiPhaseLibraryAndE
             else {
                 blockJson["version"] = hashForVersion;
             }
+            PlainEntrypointsStyleBlockJSONPlugin.normalizeRenderTemplate(blockJson, pathsNeedRemapping, sourceDir, outputDir, compilation);
             const blockDirName = node_path_1.default.dirname(node_path_1.default.relative(this.blocksDest, blockJsonAssetName));
             blockData[blockDirName] = PlainEntrypointsStyleBlockJSONPlugin
                 .doFileOrHandleReplacements(compilation, Object.fromEntries(Object.entries(blockJson).filter(([k]) => k !== '$schema')), workableBlockEntrypointsInfo, epi => epi.handle);
@@ -373,7 +344,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractMultiPhaseLibraryAndE
             }
         }
     }
-    attachSecondPhase(compilation) {
+    attachUniquePhase(compilation) {
         compilation.hooks.processAssets.tapPromise({ name: `${this.constructor.name}_CompileLoader`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT }, async () => {
             const allSemaphoreData = (await PlainEntrypointsStyleBlockJSONPlugin.semaphore.wait())
                 .reduce((acc, cur) => {

package/build/plugins/SpecialAssetHandlingPlugin.d.ts

@@ -1,12 +1,11 @@
 import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
-import { AbstractMultiPhaseLibraryPlugin } from "./AbstractMultiPhaseLibraryPlugin";
-import { Compilation, type Compiler } from "webpack";
-export declare class SpecialAssetHandlingPlugin extends AbstractMultiPhaseLibraryPlugin {
-    private readonly config;
+import { AbstractBiPhasicGroupPlugin } from "./AbstractBiPhasicGroupPlugin";
+import { Compilation } from "webpack";
+export declare class SpecialAssetHandlingPlugin extends AbstractBiPhasicGroupPlugin {
     private static readonly semaphore;
     private static validPathname?;
     constructor(config: VerifiedPlauditWordpressWebpackConfig);
-    apply(compiler: Compiler): void;
+    protected attachStandardPhase(compilation: Compilation): void;
     private collateAssets;
-    protected attachSecondPhase(compilation: Compilation): void;
+    protected attachUniquePhase(compilation: Compilation): void;
 }