@plaudit/webpack-extensions 2.89.2 → 3.0.0-rc.1

package/{dist → build}/plugins/EnhancedBlockJSONPlugin.js

@@ -1,18 +1,20 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnhancedBlockJSONPlugin = void 0;
-const node_crypto_1 = require("node:crypto");
-const promises_1 = require("node:fs/promises");
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const php_writer_1 = require("@plaudit/php-writer");
-const expressions_1 = require("@plaudit/php-writer/expressions");
-const webpack_1 = require("webpack");
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const AbstractBiPhasicGroupAndEntryPlugin_1 = require("./AbstractBiPhasicGroupAndEntryPlugin");
 const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
+const php_writer_1 = require("@plaudit/php-writer");
+const expressions_1 = require("@plaudit/php-writer/expressions");
 const shared_1 = require("../shared");
-const path_query_and_related_helpers_1 = require("../utils/path-query-and-related-helpers");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
+const webpack_1 = require("webpack");
 class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
     dest;
     webpackRemoveEmptyScriptsPlugin;
@@ -25,18 +27,18 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
     async processAssets(compilation, parsedAssetJsonProvider) {
         const applicableBlockJsonFiles = {};
         const blockJsonOriginToOutputMapping = {};
-        const staticallyLoadedEntrypoints = [];
         const relevantEntrypoints = this.getRelevantEntrypoints(compilation).toArray();
         for (const { entrypoint, metadata, srcPath } of relevantEntrypoints) {
-            staticallyLoadedEntrypoints.push(...entrypoint.getEntrypointChunk().files);
-            if ((0, node_path_1.basename)(srcPath).toLowerCase() !== "block.json" || !('purpose' in metadata) || metadata.purpose !== "block-json-inclusion-assurance") {
+            if (node_path_1.default.basename(srcPath).toLowerCase() !== "block.json" || !('purpose' in metadata) || metadata.purpose !== "block-json-inclusion-assurance") {
                 continue;
             }
             const asset = [...compilation.chunkGraph.getChunkEntryModulesIterable(entrypoint.getEntrypointChunk())][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 = EnhancedBlockJSONPlugin.extractAssetSource(compilation, epBlockJson) ?? await (0, promises_1.readFile)(srcPath, 'utf-8');
+                    const blockJsonText = EnhancedBlockJSONPlugin.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;
@@ -47,11 +49,11 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
             }
         }
         for (const { entrypoint, metadata, srcPath } of relevantEntrypoints) {
-            if ((0, node_path_1.basename)(srcPath).toLowerCase() === "block.json" || 'purpose' in metadata) {
+            if (node_path_1.default.basename(srcPath).toLowerCase() === "block.json" || 'purpose' in metadata) {
                 continue;
             }
             const entrypointChunk = entrypoint.getEntrypointChunk();
-            const epBlockJson = entrypointChunk.auxiliaryFiles.values().find(auxFile => (0, node_path_1.basename)(auxFile) === "block.json")
+            const epBlockJson = entrypointChunk.auxiliaryFiles.values().find(auxFile => node_path_1.default.basename(auxFile) === "block.json")
                 ?? blockJsonOriginToOutputMapping[metadata.blockJsonOrigin];
             if (epBlockJson) {
                 const assetData = parsedAssetJsonProvider(entrypoint, metadata)?.assetData;
@@ -60,25 +62,20 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
                     continue;
                 }
                 const workableBlockEntrypointsInfo = entrypoint.getFiles()
-                    .filter(file => !this.webpackRemoveEmptyScriptsPlugin['trash'].includes(file))
+                    .map(file => this.stripOffBlocksDestPrefix(file))
+                    .filter(file => !this.webpackRemoveEmptyScriptsPlugin['trash'].includes(node_path_1.default.join(this.dest.destination, file)))
                     .map(file => [file, (0, shared_1.scriptOrStyleTest)(file, shared_1.scriptExtension)])
                     .filter((item) => item[1] !== '')
                     .map(([file, assetType]) => {
-                    const enqueuingFlags = (0, path_query_and_related_helpers_1.mergeTwoEnqueuingControlFlagSets)(file, metadata.enqueuingFlags, this.dest.enqueuingFlags);
-                    const { scriptArgsObject, inlinedAsset } = (0, path_query_and_related_helpers_1.convertEnqueuingControlFlagsToScriptArgsObject)(compilation, file, enqueuingFlags);
-                    if (inlinedAsset !== undefined) {
-                        staticallyLoadedEntrypoints.push(file);
-                    }
                     const wasOriginallyAStyleField = (0, shared_1.isStyleField)(metadata.entrypointField);
-                    const outputPath = this.stripOffBlocksDestPrefix(file);
                     if (wasOriginallyAStyleField !== (assetType === "style")) { // This means that the file is extracted
                         const entrypointField = (0, shared_1.convertEntrypointFieldForAssetType)(metadata.entrypointField, assetType);
                         return {
-                            ...metadata, outputPath, assetData, originalValue: undefined, hash: entrypointChunk.hash ?? "",
-                            entrypointField, handleGroup: (0, shared_1.getHandleGroup)(entrypointField), scriptArgsObject, inlinedAsset
+                            ...metadata, outputPath: file, assetData, originalValue: undefined, hash: entrypointChunk.hash ?? "",
+                            entrypointField, handleGroup: (0, shared_1.getHandleGroup)(entrypointField)
                         };
                     }
-                    return { ...metadata, outputPath, assetData, hash: entrypointChunk.hash ?? "", scriptArgsObject, inlinedAsset };
+                    return ({ ...metadata, outputPath: file, assetData, hash: entrypointChunk.hash ?? "" });
                 });
                 if (applicableBlockJsonFiles[epBlockJson]) {
                     applicableBlockJsonFiles[epBlockJson].workableBlockEntrypointsInfo.push(...workableBlockEntrypointsInfo);
@@ -90,10 +87,10 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
         }
         EnhancedBlockJSONPlugin.semaphore.resolve(this.id, {
             collatableWorkableBlockInfo: applicableBlockJsonFiles, blocksDest: this.dest.destination,
-            emittingWpmlXml: compilation.getAsset((0, node_path_1.join)(this.dest.destination, "wpml-config.xml")) !== undefined
+            emittingWpmlXml: compilation.getAsset(node_path_1.default.join(this.dest.destination, "wpml-config.xml")) !== undefined
         });
         const generateLoader = (writer) => {
-            writer.require((0, node_path_1.join)(this.dest.destination, "blockdir-loader.php"), { dirRelative: true, once: true });
+            writer.require(node_path_1.default.join(this.dest.destination, "blockdir-loader.php"), { dirRelative: true, once: true });
         };
         let action;
         const lazyLoader = this.dest.lazyLoader;
@@ -113,71 +110,22 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, Object.keys(applicableBlockJsonFiles).length ? {
             group: this.group,
             requiresBaseURI: false,
-            staticallyLoadedEntrypoints,
+            staticallyLoadedEntrypoints: relevantEntrypoints.flatMap(re => re.entrypoint.getEntrypointChunk().files.values().toArray()),
             action
         } : undefined);
     }
-    emitBlockLoaderFile(compilation, blockDirConfig) {
+    emitBlockLoaderFile(compilation, blockData) {
         if (this.config.useUnifiedLoader) {
-            const { '__metadata': metadata, ...blockData } = blockDirConfig;
-            const splitOutInlinedAssets = (handles, type) => {
-                const registerableHandles = {};
-                const inlinedAssets = [];
-                for (const [handle, handleData] of Object.entries(handles)) {
-                    const { inlinedAsset, ...finalizedHandle } = handleData;
-                    if (inlinedAsset !== undefined) {
-                        finalizedHandle.src = false;
-                        inlinedAssets.push([handle, type, inlinedAsset, handleData, handleData.src]);
-                    }
-                    registerableHandles[handle] = finalizedHandle;
-                }
-                return [registerableHandles, inlinedAssets];
-            };
-            const [finalizedScriptHandles, inlinableScripts] = splitOutInlinedAssets(metadata.scriptHandles, 'script');
-            const [finalizedStyleHandles, inlinableStyles] = splitOutInlinedAssets(metadata.styleHandles, 'style');
-            const finalizedMetadata = Object.fromEntries(Object.entries(metadata)
-                .map(([key, value]) => {
-                if (key === 'scriptHandles') {
-                    return [key, []];
-                }
-                if (key === 'styleHandles') {
-                    return [key, []];
-                }
-                if (key === 'scriptModuleHandles') {
-                    return [key, []];
-                }
-                return [key, value];
-            }));
-            const writer = new php_writer_1.PHPWriter()
+            const metadata = blockData['__metadata'];
+            delete blockData['__metadata'];
+            (0, shared_1.emitPHPWriterAsAsset)(new php_writer_1.PHPWriter()
                 .action("init", writer => {
-                const baseUriVar = new expressions_1.Var("base_uri");
-                writer.call("plaudit_webpack_extensions__resolve_base_uri", [expressions_1.Constants.__DIR__], { assignTo: baseUriVar });
-                this.callRegisterFunction('script', writer, baseUriVar, Object.entries(finalizedScriptHandles));
-                this.callRegisterFunction('style', writer, baseUriVar, Object.entries(finalizedStyleHandles));
-                this.callRegisterFunction('script_module', writer, baseUriVar, Object.entries(metadata.scriptModuleHandles));
-                writer.call("\\Plaudit\\Common\\ACF\\BlockManager::autoloadSubfoldersV3", [
-                    expressions_1.Constants.__DIR__, // string $dir
-                    new expressions_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(blockData, false, "\t")), // array $blockdirConfig
-                    expressions_1.Constants.__FILE__, // string $blockdirConfigFile
-                    new expressions_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(finalizedMetadata, false, "\t")), // array $metadata
-                    null // ?string $urlPrefix
-                ]);
-                for (const inlinableScript of inlinableScripts) {
-                    (0, shared_1.appendAddInlineAssetCall)(compilation, writer, ...inlinableScript);
-                }
-                for (const inlinableStyle of inlinableStyles) {
-                    (0, shared_1.appendAddInlineAssetCall)(compilation, writer, ...inlinableStyle);
-                }
-            }, { accountForAlreadyDoing: this.config.includePostInitFallback });
-            (0, shared_1.emitPHPWriterAsAsset)(writer, compilation, (0, node_path_1.join)(this.dest.destination, "blockdir-loader.php"));
+                writer.call("\\Plaudit\\Common\\ACF\\BlockManager::autoloadSubfoldersV3", [expressions_1.Constants.__DIR__, new expressions_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(blockData, false, "\t")),
+                    expressions_1.Constants.__FILE__, new expressions_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(metadata, false, "\t")), null]);
+            }, { accountForAlreadyDoing: this.config.includePostInitFallback }), compilation, node_path_1.default.join(this.dest.destination, "blockdir-loader.php"));
         }
         else {
-            compilation.emitAsset((0, node_path_1.join)(this.dest.destination, "blockdir.config.php"), new webpack_1.sources.RawSource((0, shared_1.makeEmittableConfigPHP)(blockDirConfig, true)));
-        }
-    }
-    callRegisterFunction(type, writer, baseUriVar, handles) {
-        for (const [name, { src, rest }] of handles) {
-            writer.call(`wp_register_${type}`, [name, src === false ? false : expressions_1.Op.concat(baseUriVar, src), ...rest]);
+            compilation.emitAsset(node_path_1.default.join(this.dest.destination, "blockdir.config.php"), new webpack_1.sources.RawSource((0, shared_1.makeEmittableConfigPHP)(blockData, true)));
         }
     }
     transformBlocks(compilation, collatedWorkableBlockInfo, emittingWpmlXml) {
@@ -194,8 +142,8 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
                 compilation.errors.push((0, shared_1.newWebpackErrorForFile)(`${blockJsonAssetName} does not have recorded text`, blockJsonAssetName));
                 continue;
             }
-            const sourceDir = (0, node_path_1.dirname)(blockJsonSourcePath);
-            const outputDir = (0, node_path_1.join)(compilation.compiler.outputPath, (0, node_path_1.dirname)(blockJsonAssetName));
+            const sourceDir = node_path_1.default.dirname(blockJsonSourcePath);
+            const outputDir = node_path_1.default.join(compilation.compiler.outputPath, node_path_1.default.dirname(blockJsonAssetName));
             const blockJson = JSON.parse(blockJsonText);
             const pathsNeedRemapping = !this.config.standaloneBlocks && blockJson["plaudit"] !== "simple";
             EnhancedBlockJSONPlugin.remapReferencedPHPFilesOnKey(blockJson, "setup", pathsNeedRemapping, sourceDir, outputDir, compilation, true);
@@ -209,11 +157,11 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
                 blockJson["version"] = hashForVersion;
             }
             EnhancedBlockJSONPlugin.normalizeRenderTemplate(blockJson, pathsNeedRemapping, sourceDir, outputDir, compilation);
-            const blockDirName = (0, node_path_1.dirname)((0, node_path_1.relative)(this.dest.destination, blockJsonAssetName));
+            const blockDirName = node_path_1.default.dirname(node_path_1.default.relative(this.dest.destination, blockJsonAssetName));
             blockData[blockDirName] = EnhancedBlockJSONPlugin
                 .doFileOrHandleReplacements(compilation, Object.fromEntries(Object.entries(blockJson).filter(([k]) => k !== '$schema')), workableBlockEntrypointsInfo, epi => epi.handle);
-            const emittableBlockJson = EnhancedBlockJSONPlugin.doFileOrHandleReplacements(compilation, blockJson, workableBlockEntrypointsInfo, epi => "file:./" + (0, node_path_1.relative)(blockDirName, epi.outputPath));
-            compilation[blockJsonAssetName in compilation.assets ? 'updateAsset' : 'emitAsset'](blockJsonAssetName, new webpack_1.sources.RawSource(JSON.stringify(emittableBlockJson, undefined, "  ")));
+            compilation[blockJsonAssetName in compilation.assets ? 'updateAsset' : 'emitAsset'](blockJsonAssetName, new webpack_1.sources.RawSource(JSON.stringify(EnhancedBlockJSONPlugin
+                .doFileOrHandleReplacements(compilation, blockJson, workableBlockEntrypointsInfo, epi => "file:./" + node_path_1.default.relative(blockDirName, epi.outputPath)), undefined, "  ")));
         }
         return {
             __metadata: {
@@ -225,7 +173,7 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
                     .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 => {
-                    return [hd.handle, { src: hd.outputPath, rest: [hd.originalValue !== undefined ? hd.assetData.dependencies : [], hd.assetData.version], inlinedAsset: hd.inlinedAsset }];
+                    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])))
@@ -238,20 +186,7 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
     static convertToScriptHandles(handleData) {
         return handleData.map(hd => {
             const deps = hd.originalValue !== undefined ? hd.assetData.dependencies : [];
-            let scriptArgsObject;
-            if (hd.scriptArgsObject !== undefined) {
-                scriptArgsObject = hd.scriptArgsObject;
-            }
-            else if (hd.inlinedAsset !== undefined) {
-                scriptArgsObject = hd.inlinedAsset.position === 'before' ? { strategy: "defer" } : undefined;
-            }
-            else if (!hd.entrypointField.startsWith("editor")) {
-                scriptArgsObject = { strategy: "defer" };
-            }
-            else {
-                scriptArgsObject = undefined;
-            }
-            return [hd.handle, { src: hd.outputPath, rest: scriptArgsObject !== undefined ? [deps, hd.assetData.version, scriptArgsObject] : [deps, hd.assetData.version], inlinedAsset: hd.inlinedAsset }];
+            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) {
@@ -299,13 +234,13 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
         return this.dest.destination && file.startsWith(this.dest.destination + "/") ? file.substring(this.dest.destination.length + 1 /* we also need to drop the "/" */) : file;
     }
     static hashThingForAsset(thing) {
-        return (0, node_crypto_1.createHash)('md5').update(thing).digest("hex").substring(0, 20).toLowerCase();
+        return node_crypto_1.default.createHash('md5').update(thing).digest("hex").substring(0, 20).toLowerCase();
     }
     static stripFilePrefix(file) {
         return file.startsWith("file:./") ? file.substring(7) : file;
     }
     static findCommonAncestor(...paths) {
-        return paths.map(p => (0, node_path_1.normalize)(p).split(node_path_1.sep)).reduce((prior, current) => {
+        return paths.map(p => node_path_1.default.normalize(p).split(node_path_1.default.sep)).reduce((prior, current) => {
             for (let i = 0, limit = Math.min(prior.length, current.length); i < limit; i++) {
                 if (prior[i] !== current[i]) {
                     return prior.slice(0, i);
@@ -316,7 +251,9 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
     }
     static findRelativeRouteBetween(path1, path2) {
         const commonAncestor = EnhancedBlockJSONPlugin.findCommonAncestor(path1, path2);
-        return (".." + node_path_1.sep).repeat(path1.split(node_path_1.sep).length - commonAncestor.length) + (0, node_path_1.relative)(commonAncestor.join(node_path_1.sep), path2);
+        const route = Array(path1.split(node_path_1.default.sep).length - commonAncestor.length).fill("..");
+        route.push(node_path_1.default.relative(commonAncestor.join(node_path_1.default.sep), path2));
+        return route.join(node_path_1.default.sep);
     }
     static remapReferencedPHPFilesOnKey(blockJson, key, pathsNeedRemapping, sourceDir, outputDir, compilation, inPlaudit) {
         const rawValue = (inPlaudit ? blockJson["plaudit"] : blockJson)?.[key];
@@ -332,7 +269,7 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
             }
             else {
                 if (fileReferences.length !== 0) {
-                    compilation.warnings.push((0, shared_1.newWebpackErrorForFile)(`Encountered a block with a mixture of file-reference and non-file-reference elements in the "${inPlaudit ? 'plaudit.' : ''}${key}" property`, (0, node_path_1.join)(sourceDir, 'block.json')));
+                    compilation.warnings.push((0, shared_1.newWebpackErrorForFile)(`Encountered a block with a mixture of file-reference and non-file-reference elements in the "${inPlaudit ? 'plaudit.' : ''}${key}" property`, node_path_1.default.join(sourceDir, 'block.json')));
                     rawFiles = fileReferences;
                 }
                 else {
@@ -349,11 +286,11 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
         }
         const mappedFiles = pathsNeedRemapping
             ? rawFiles
-                .map(p => (0, node_path_1.normalize)((0, node_path_1.join)(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p))))
-                .filter(node_fs_1.existsSync)
+                .map(p => node_path_1.default.normalize(node_path_1.default.join(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p))))
+                .filter(p => node_fs_1.default.existsSync(p))
                 .map(p => `file:./${EnhancedBlockJSONPlugin.findRelativeRouteBetween(outputDir, p)}`)
             : rawFiles
-                .filter(p => (0, node_fs_1.existsSync)((0, node_path_1.normalize)((0, node_path_1.join)(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p)))));
+                .filter(p => node_fs_1.default.existsSync(node_path_1.default.normalize(node_path_1.default.join(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p)))));
         if (mappedFiles.length === 0) {
             if (deleteOnEmpty && rawValue !== undefined) {
                 delete (inPlaudit ? blockJson["plaudit"] : blockJson)[key];
@@ -389,11 +326,11 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
             : [`${blockName.substring(blockName.indexOf('/') + 1)}.php`, "template.php", "template.twig"]);
         const renderTemplate = pathsNeedRemapping
             ? rawRenderTemplate
-                .map(p => (0, node_path_1.normalize)((0, node_path_1.join)(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p))))
-                .filter(node_fs_1.existsSync)
+                .map(p => node_path_1.default.normalize(node_path_1.default.join(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p))))
+                .filter(p => node_fs_1.default.existsSync(p))
                 .map(p => `file:./${EnhancedBlockJSONPlugin.findRelativeRouteBetween(outputDir, p)}`)
             : rawRenderTemplate
-                .filter(p => (0, node_fs_1.existsSync)((0, node_path_1.normalize)((0, node_path_1.join)(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p)))));
+                .filter(p => node_fs_1.default.existsSync(node_path_1.default.normalize(node_path_1.default.join(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p)))));
         if (renderTemplate.length === 0) {
             delete blockJson["render_template"];
             delete blockJson["render"];
@@ -412,7 +349,7 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
             }
             delete blockJson[invalidTemplateLocation];
             if (renderTemplate.length > 1) {
-                compilation.warnings.push((0, shared_1.newWebpackErrorForFile)("Encountered a block with multiple possible render files", (0, node_path_1.join)(sourceDir, 'block.json')));
+                compilation.warnings.push((0, shared_1.newWebpackErrorForFile)("Encountered a block with multiple possible render files", node_path_1.default.join(sourceDir, 'block.json')));
                 blockJson[validTemplateLocation] = renderTemplate.find(p => p.endsWith(".php")) ?? renderTemplate[0];
             }
             else {
@@ -459,7 +396,7 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
         compilation.hooks.processAssets.tapPromise({ name: `${this.constructor.name}_CompileLoader`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER }, async () => {
             const relevantEntrypoints = this.getRelevantEntrypoints(compilation).toArray();
             for (const { entrypoint, metadata, srcPath } of relevantEntrypoints) {
-                if ((0, node_path_1.basename)(srcPath).toLowerCase() !== "block.json" || !('purpose' in metadata) || metadata.purpose !== "block-json-inclusion-assurance") {
+                if (node_path_1.default.basename(srcPath).toLowerCase() !== "block.json" || !('purpose' in metadata) || metadata.purpose !== "block-json-inclusion-assurance") {
                     continue;
                 }
                 const entrypointChunk = entrypoint.getEntrypointChunk();

package/{dist → build}/plugins/ExtensionsConfigFileGeneratorPlugin.d.ts

@@ -1,19 +1,15 @@
 import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
-import { MinimumViableMetadata, ParsedAssetJsonProvider, VerifiedAdvancedOutputConfig } from "../shared";
+import { ParsedAssetJsonProvider, VerifiedAdvancedOutputConfig } from "../shared";
 import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
 import { Compilation, type Compiler } from "webpack";
-export type ExtensionConfigFileGeneratorMetadata = MinimumViableMetadata & {
-    extensionId: string;
-};
-export declare class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryPlugin<ExtensionConfigFileGeneratorMetadata> {
+export declare class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryPlugin {
     private readonly extensionsSrcPath;
     private readonly dest;
     private static readonly semaphore;
     private setupFiles;
-    constructor(config: VerifiedPlauditWordpressWebpackConfig, extensionsSrcPath: string, dest: VerifiedAdvancedOutputConfig, context: string, entry: EntryProvider<ExtensionConfigFileGeneratorMetadata>);
+    constructor(config: VerifiedPlauditWordpressWebpackConfig, extensionsSrcPath: string, dest: VerifiedAdvancedOutputConfig, context: string, entry: EntryProvider);
     get extensionsDestPath(): string;
     apply(compiler: Compiler): void;
-    private walkSubtreeForMetaInfo;
     private generateVersionThreeConfigFile;
     protected attachUniquePhase(compilation: Compilation): void;
     protected processAssets(compilation: Compilation, parsedAssetJsonProvider: ParsedAssetJsonProvider): void;

package/{dist → build}/plugins/ExtensionsConfigFileGeneratorPlugin.js

@@ -1,41 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtensionsConfigFileGeneratorPlugin = void 0;
-const promises_1 = require("node:fs/promises");
-const node_path_1 = __importStar(require("node:path"));
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
 const php_writer_1 = require("@plaudit/php-writer");
 const expressions_1 = require("@plaudit/php-writer/expressions");
 const AbstractBiPhasicGroupAndEntryPlugin_1 = require("./AbstractBiPhasicGroupAndEntryPlugin");
@@ -64,49 +34,24 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
                 compilation.contextDependencies.add(this.extensionsSrcPath);
             }
             const emissionPromises = [];
-            for await (const { name: setupFilePath } of await (0, promises_1.opendir)(this.extensionsSrcPath, { encoding: 'utf-8' })) {
+            for await (const { name: setupFilePath } of await promises_1.default.opendir(this.extensionsSrcPath, { encoding: 'utf-8' })) {
                 if (setupFilePath.endsWith("-setup.php")) {
                     const setupFileSourcePath = node_path_1.default.join(this.extensionsSrcPath, setupFilePath);
                     compilation.fileDependencies.add(setupFileSourcePath);
-                    emissionPromises.push((0, promises_1.readFile)(setupFileSourcePath).then(contents => {
+                    emissionPromises.push(promises_1.default.readFile(setupFileSourcePath).then(contents => {
                         compilation.emitAsset(node_path_1.default.join(this.dest.destination, setupFilePath), new webpack_1.sources.RawSource(contents), { size: Buffer.byteLength(contents) });
                         const blockSlug = /^(.+?)-setup.php$/i.exec(setupFilePath)?.[1];
                         return [blockSlug, setupFilePath];
                     }));
                 }
             }
-            await this.walkSubtreeForMetaInfo(compilation, this.extensionsSrcPath, this.dest, [], emissionPromises);
             this.setupFiles = (await Promise.all(emissionPromises))
                 .filter((item) => item[0] !== undefined).sort((a, b) => a[0].localeCompare(b[0]));
         });
     }
-    async walkSubtreeForMetaInfo(compilation, srcRoot, dest, parents, emissionPromises) {
-        if (!compilation.contextDependencies.has(srcRoot)) {
-            compilation.contextDependencies.add(srcRoot);
-        }
-        for await (const dirent of await (0, promises_1.opendir)(srcRoot)) {
-            if (dirent.name.startsWith("~")) {
-                continue;
-            }
-            if (dirent.isFile()) {
-                if (dirent.name === "setup.php") {
-                    const setupFilePath = (0, node_path_1.join)(...parents, dirent.name);
-                    const setupFileSourcePath = node_path_1.default.join(this.extensionsSrcPath, setupFilePath);
-                    compilation.fileDependencies.add(setupFileSourcePath);
-                    emissionPromises.push((0, promises_1.readFile)(setupFileSourcePath).then(contents => {
-                        compilation.emitAsset(node_path_1.default.join(this.dest.destination, setupFilePath), new webpack_1.sources.RawSource(contents), { size: Buffer.byteLength(contents) });
-                        return [parents.join("-") /* blockSlug */, setupFilePath];
-                    }));
-                }
-            }
-            else if (dirent.isDirectory()) {
-                await this.walkSubtreeForMetaInfo(compilation, (0, node_path_1.join)(srcRoot, dirent.name), dest, [...parents, dirent.name], emissionPromises);
-            }
-        }
-    }
     generateVersionThreeConfigFile(compilation, relevantAssetData, setupFilePaths) {
         const handlePrefix = `${this.config.targetHandlePrefix}_block-extensions`;
-        const regex = /^(.+?)-((?:editor-|view-|)(?:style|script|script-module))$/i;
+        const regex = /^(.+?)-((?:editor-|view-|)(?:style|script|script-module))\.(?:css|m?js)$/i;
         const blockExtensionsConfig = {
             metadata: { version: this.config.extensionsVersion }, scriptHandles: {}, scriptModuleHandles: {}, styleHandles: {}, blocks: {}, setupFiles: {}
         };
@@ -117,7 +62,7 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
             return [assetPath, entry[1]];
         });
         for (const [assetPath, assetData] of normalizedAssetData) {
-            const match = regex.exec(assetData.extensionId);
+            const match = regex.exec(assetPath);
             if (!match) {
                 continue;
             }
@@ -182,16 +127,7 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
         });
     }
     processAssets(compilation, parsedAssetJsonProvider) {
-        const relevantAssetData = Object.fromEntries(this.getRelevantEntrypoints(compilation)
-            .map(({ entrypoint, metadata, srcPath }) => {
-            const providedData = parsedAssetJsonProvider(entrypoint, metadata);
-            if (providedData === undefined) {
-                compilation.errors.push((0, shared_1.newWebpackErrorForFile)(`assets.json did not contain information for ${srcPath}`, srcPath));
-                return undefined;
-            }
-            return [providedData.assetName, { ...providedData.assetData, extensionId: metadata.extensionId }];
-        })
-            .filter(item => item !== undefined));
+        const relevantAssetData = this.extractRelevantAssetData(compilation, parsedAssetJsonProvider);
         const staticallyLoadedEntrypoints = Object.keys(relevantAssetData);
         const generateLoader = (writer) => {
             writer.require(this.extensionsDestPath + "extensions-loader.php", { dirRelative: true, once: true });

package/{dist → build}/plugins/ExtensionsConfigFileGeneratorPluginV1.d.ts

@@ -1,5 +1,5 @@
 import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
-import type { ParsedAssetJsonProvider } from "../shared";
+import { ParsedAssetJsonProvider } from "../shared";
 import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
 import { Compilation } from "webpack";
 export declare class ExtensionsConfigFileGeneratorPluginV1 extends AbstractBiPhasicGroupAndEntryPlugin {

package/{dist → build}/plugins/ExtensionsConfigFileGeneratorPluginV1.js

@@ -20,12 +20,8 @@ class ExtensionsConfigFileGeneratorPluginV1 extends AbstractBiPhasicGroupAndEntr
     processAssets(compilation, parsedAssetJsonProvider) {
         const regex = /^(.+?)-((?<prefix>editor-|view-|)(?<type>style|script|script-module))\.(?<extension>css|m?js)$/i;
         const mapping = {};
-        const prefix = this.extensionsDest + node_path_1.default.sep;
         for (let fileWithAssetData of Object.keys(this.extractRelevantAssetData(compilation, parsedAssetJsonProvider))) {
             let match;
-            if (fileWithAssetData.startsWith(prefix)) {
-                fileWithAssetData = fileWithAssetData.substring(prefix.length);
-            }
             if ((match = regex.exec(fileWithAssetData)) && match[1] && match[2]) {
                 if (match.groups?.['type'] === 'style' && match.groups['extension'] !== 'css') {
                     fileWithAssetData = fileWithAssetData.replace(/\.m?js$/i, ".css");