@plaudit/webpack-extensions 2.56.4 → 2.57.1

package/build/plugins/BlockJSONManagingPlugin.d.ts

@@ -12,6 +12,7 @@ export declare class BlockJSONManagingPlugin implements WebpackPluginInstance {
     private static readonly blockJsonAssetKeyMapping;
     private static readonly syncsManager;
     readonly additionalMetadata: Map<string, any>;
+    private readonly id;
     constructor(standaloneBlocks: boolean, processingModules: boolean | undefined, blocksDest: string);
     static recordRawDependency(entrypoint: string, dependency: string): void;
     static recordBlockJSONAssetSourceDir(entrypoint: string, source: string): void;

package/build/plugins/BlockJSONManagingPlugin.js

@@ -9,6 +9,8 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const shared_1 = require("../shared");
 const webpack_1 = require("webpack");
+const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
+const php_writer_1 = require("../utils/php-writer");
 class BlockJSONManagingPlugin {
     standaloneBlocks;
     processingModules;
@@ -22,10 +24,15 @@ class BlockJSONManagingPlugin {
     static blockJsonAssetKeyMapping = new Map();
     static syncsManager = new shared_1.SyncsManager();
     additionalMetadata = new Map();
+    id;
     constructor(standaloneBlocks, processingModules, blocksDest) {
         this.standaloneBlocks = standaloneBlocks;
         this.processingModules = processingModules;
         this.blocksDest = blocksDest;
+        this.id = Math.random().toString();
+        if (!this.processingModules) {
+            UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.register(this.id);
+        }
     }
     static recordRawDependency(entrypoint, dependency) {
         let deps = BlockJSONManagingPlugin.blockJsonRawDependenciesMap.get(entrypoint);
@@ -42,6 +49,7 @@ class BlockJSONManagingPlugin {
             this.additionalMetadata.clear();
             this.registerAssetProcessor(compilation);
             if (!this.processingModules) {
+                UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reset(this.id);
                 this.registerBlockJsonProcessor(compilation);
             }
         });
@@ -312,6 +320,15 @@ class BlockJSONManagingPlugin {
     }
     registerBlockJsonProcessor(compilation) {
         const blockDirConfigData = {};
+        compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
+            UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, ['block.json', writer => {
+                    writer
+                        .use("Plaudit\\Common\\ACF\\BlockManager")
+                        .action("init", writer => {
+                        writer.call("BlockManager::autoloadSubfolders", [new php_writer_1.Expr(`__DIR__.${php_writer_1.Expr.convertJsonToPHP("/" + this.blocksDest)}`)]);
+                    });
+                }]);
+        });
         compilation.hooks.afterProcessAssets.tap(`${this.constructor.name}_GenerateMetadata`, compilationAssets => {
             const currentBlockJSONAssets = BlockJSONManagingPlugin.blockJSONAssetSourceDirs.entries()
                 .filter(([name]) => name in compilationAssets)

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.d.ts

@@ -3,10 +3,11 @@ export declare class ExtensionsConfigFileGeneratorPlugin implements WebpackPlugi
     private readonly extensionsPath;
     private readonly version;
     private readonly extensionsDest;
+    private readonly handlePrefix;
     private static readonly semaphore;
     private static cache;
     private readonly id;
-    constructor(extensionsPath: string, version: 1 | 2, extensionsDest: string);
+    constructor(extensionsPath: string, version: 1 | 2, extensionsDest: string, handlePrefix: string);
     apply(compiler: Compiler): void;
     private makeVersionOneAfterProcessAssets;
     private stripExtensionsDest;

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.js

@@ -10,19 +10,24 @@ const shared_1 = require("../shared");
 const php_serializer_1 = require("../utils/php-serializer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const webpack_1 = require("webpack");
+const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
+const php_writer_1 = require("../utils/php-writer");
 class ExtensionsConfigFileGeneratorPlugin {
     extensionsPath;
     version;
     extensionsDest;
-    static semaphore = new pseduo_semaphore_1.PseudoSemaphore({ assets: [], setupFiles: [] });
+    handlePrefix;
+    static semaphore = new pseduo_semaphore_1.PseudoSemaphore({ assets: [], setupFiles: [] }, "Extensions");
     static cache = undefined;
     id;
-    constructor(extensionsPath, version, extensionsDest) {
+    constructor(extensionsPath, version, extensionsDest, handlePrefix) {
         this.extensionsPath = extensionsPath;
         this.version = version;
         this.extensionsDest = extensionsDest;
+        this.handlePrefix = handlePrefix;
         this.id = Math.random().toString();
         ExtensionsConfigFileGeneratorPlugin.semaphore.register(this.id);
+        UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.register(this.id);
     }
     apply(compiler) {
         compiler.hooks.make.tapPromise(this.constructor.name, async (compilation) => {
@@ -46,6 +51,20 @@ class ExtensionsConfigFileGeneratorPlugin {
             compiler.hooks.compilation.tap(this.constructor.name, compilation => {
                 ExtensionsConfigFileGeneratorPlugin.cache = undefined;
                 ExtensionsConfigFileGeneratorPlugin.semaphore.reset(this.id);
+                UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reset(this.id);
+                compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
+                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, ['extensions-config-v2', writer => {
+                            writer
+                                .use("Plaudit\\Base\\API\\ThemeUtils")
+                                .call("trailingslashit", [new php_writer_1.Expr(`__DIR__.${php_writer_1.Expr.convertJsonToPHP("/" + this.extensionsDest)}`)], { assignTo: "$filePathPrefix" })
+                                .call("plaudit_webpack_extensions__resolve_base_uri", [new php_writer_1.Expr(`__DIR__.'/${this.extensionsDest}'`)], { assignTo: "$fileUriPrefix" })
+                                .call("ThemeUtils::loadExtensionsV2", [
+                                new php_writer_1.Expr(`$filePathPrefix.'mapping.config.php'`), new php_writer_1.Expr("$filePathPrefix"), new php_writer_1.Expr("$fileUriPrefix"),
+                                `${this.handlePrefix ? this.handlePrefix : node_path_1.default.basename(process.cwd())}_extension_`
+                            ])
+                                .call("unset", [new php_writer_1.Expr("$filePathPrefix"), new php_writer_1.Expr("$fileUriPrefix")]);
+                        }]);
+                });
                 compilation.hooks.processAssets.tapPromise(tapName, async (assets) => {
                     try {
                         //TODO: Add handling of extracted CSS from JS
@@ -144,6 +163,14 @@ class ExtensionsConfigFileGeneratorPlugin {
         }
         else {
             compiler.hooks.thisCompilation.tap(this.constructor.name, compilation => {
+                UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reset(this.id);
+                compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
+                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, ['extensions-config-v1', writer => {
+                            writer
+                                .use("Plaudit\\Base\\API\\ThemeUtils")
+                                .call("ThemeUtils::installExtensionSupport", [new php_writer_1.Expr(`__DIR__.${php_writer_1.Expr.convertJsonToPHP(this.extensionsDest)}`)]);
+                        }]);
+                });
                 compilation.hooks.afterProcessAssets.tap(`${this.constructor.name}_AfterProcessAssets`, this.makeVersionOneAfterProcessAssets(compilation));
             });
         }

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.d.ts

@@ -6,13 +6,13 @@ export declare class PlainEntrypointsConfigFileGeneratorPlugin implements Webpac
     private readonly outputDir;
     private readonly usageLocations;
     private readonly handlePrefix;
+    private readonly useUnifiedLoader;
     private static readonly semaphore;
     private static cache?;
     private readonly id;
-    constructor(buildRoot: string, outputDir: string, usageLocations: UsageLocations, handlePrefix: string);
+    constructor(buildRoot: string, outputDir: string, usageLocations: UsageLocations, handlePrefix: string, useUnifiedLoader: boolean);
     apply(compiler: Compiler): void;
-    private static afterProcessAssets;
-    private static getEmitPath;
+    private afterProcessAssets;
     private static addHandlesToHandleLists;
     private static appendEnqueuingHandleLists;
     private static separateHandleListByPriority;
@@ -21,4 +21,3 @@ export declare class PlainEntrypointsConfigFileGeneratorPlugin implements Webpac
      */
     static emitResolveBaseUriFunction(writer: PHPWriter): void;
 }
-export declare function kebabCase(value: string): string;

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -4,40 +4,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlainEntrypointsConfigFileGeneratorPlugin = void 0;
-exports.kebabCase = kebabCase;
 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 webpack_1 = require("webpack");
+const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
 class PlainEntrypointsConfigFileGeneratorPlugin {
     buildRoot;
     outputDir;
     usageLocations;
     handlePrefix;
-    static semaphore = new pseduo_semaphore_1.PseudoSemaphore([]);
+    useUnifiedLoader;
+    static semaphore = new pseduo_semaphore_1.PseudoSemaphore([], "Plain");
     static cache = undefined;
     id;
-    constructor(buildRoot, outputDir, usageLocations, handlePrefix) {
+    constructor(buildRoot, outputDir, usageLocations, handlePrefix, useUnifiedLoader) {
         this.buildRoot = buildRoot;
         this.outputDir = outputDir;
         this.usageLocations = usageLocations;
         this.handlePrefix = handlePrefix;
+        this.useUnifiedLoader = useUnifiedLoader;
         this.id = Math.random().toString();
         PlainEntrypointsConfigFileGeneratorPlugin.semaphore.register(this.id);
+        UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.register(this.id);
     }
     apply(compiler) {
         const tapName = { name: `${this.constructor.name}_ProcessPlainEntrypointFiles`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT };
         compiler.hooks.compilation.tap(this.constructor.name, compilation => {
             PlainEntrypointsConfigFileGeneratorPlugin.cache = undefined;
             PlainEntrypointsConfigFileGeneratorPlugin.semaphore.reset(this.id);
+            UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reset(this.id);
+            compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
+                UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, ['plain-entrypoints-v2', writer => {
+                        writer.append("require_once __DIR__.'/plain-entrypoints-loader.php';");
+                    }]);
+            });
             compilation.hooks.processAssets.tapPromise(tapName, async (assets) => {
                 try {
-                    const emitDir = node_path_1.default.join(this.buildRoot, this.outputDir);
                     if (PlainEntrypointsConfigFileGeneratorPlugin.cache === undefined) {
                         PlainEntrypointsConfigFileGeneratorPlugin.cache = { assets: [] };
                         compilation.hooks.afterProcessAssets.tap(`${this.constructor.name}_CompileLoader`, () => {
-                            PlainEntrypointsConfigFileGeneratorPlugin.afterProcessAssets(compilation, emitDir);
+                            this.afterProcessAssets(compilation);
                         });
                     }
                     const rawAssetDataSource = assets["assets.json"]?.source();
@@ -100,12 +108,14 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
                 }
                 catch (e) {
                     PlainEntrypointsConfigFileGeneratorPlugin.semaphore.reject(this.id);
+                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reject(this.id);
                     throw e;
                 }
             });
         });
     }
-    static afterProcessAssets(compilation, emitDir) {
+    afterProcessAssets(compilation) {
+        const emitDir = node_path_1.default.join(this.buildRoot, this.outputDir);
         //TODO: Add support for editorStyles via the 'block_editor_settings_all' filter
         const handleLists = {
             register: [],
@@ -135,7 +145,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
                 }
                 else {
                     const basename = node_path_1.default.basename(src).replace(/_(?:script(?:-\d+)?\.js|style(?:-\d+)?\.css)$|(?<!_(script|style))\.(js|css)$/, "");
-                    const baseFinalHandleName = `${handlePrefix}.${kebabCase(basename)}`;
+                    const baseFinalHandleName = `${handlePrefix}.${(0, shared_1.kebabCase)(basename)}`;
                     const handleNameMap = (isScript ? usedScriptHandleNames : usedStyleHandleNames);
                     finalHandleName = baseFinalHandleName;
                     for (let count = 0; finalHandleName in handleNameMap && handleNameMap[finalHandleName] !== src;) {
@@ -163,7 +173,9 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
         }
         const writer = new php_writer_1.PHPWriter();
         if (handleLists.register.length > 0) {
-            PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+            if (!this.useUnifiedLoader) {
+                PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+            }
             for (const [priority, prioritizedHandleList] of PlainEntrypointsConfigFileGeneratorPlugin.separateHandleListByPriority(handleLists.register)) {
                 writer.action("init", writer => {
                     writer.call("plaudit_webpack_extensions__resolve_base_uri", [new php_writer_1.Expr('__DIR__')], { assignTo: "$base_uri" });
@@ -185,11 +197,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
             }
         }
         PlainEntrypointsConfigFileGeneratorPlugin.appendEnqueuingHandleLists(writer, handleLists);
-        const assetPath = PlainEntrypointsConfigFileGeneratorPlugin.getEmitPath(compilation, emitDir);
-        writer.emitAsset(compilation, assetPath);
-    }
-    static getEmitPath(compilation, emitDir) {
-        return node_path_1.default.relative(compilation.outputOptions.path ?? process.cwd(), node_path_1.default.join(emitDir, "plain-entrypoints-loader.php"));
+        writer.emitAsset(compilation, "plain-entrypoints-loader.php");
     }
     static addHandlesToHandleLists(type, handles, handleLists) {
         for (const [handle, data] of handles) {
@@ -263,7 +271,3 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
     }
 }
 exports.PlainEntrypointsConfigFileGeneratorPlugin = PlainEntrypointsConfigFileGeneratorPlugin;
-function kebabCase(value) {
-    const kebabCaseRegexes = [[/([a-z])([A-Z])/g, "$1-$2"], [/[\s_.\-]+/g, "-"]];
-    return kebabCaseRegexes.reduce((str, [pattern, replacement]) => str.replace(pattern, replacement), value).toLowerCase();
-}

package/build/plugins/SpecialAssetHandlingPlugin.d.ts

@@ -1,12 +1,12 @@
-import type { Compiler, WebpackPluginInstance } from "webpack";
+import { type Compiler, type WebpackPluginInstance } from "webpack";
 export declare class SpecialAssetHandlingPlugin implements WebpackPluginInstance {
     private readonly outputDir;
+    private readonly useUnifiedLoader;
     private static readonly semaphore;
-    private static readonly previouslyIncludedFilenames;
     private static hasAttachedAssetCollatorForCurrentBatch;
     private static validPathname?;
     private readonly id;
-    constructor(outputDir: string);
+    constructor(outputDir: string, useUnifiedLoader: boolean);
     apply(compiler: Compiler): void;
     private collateAssets;
 }

package/build/plugins/SpecialAssetHandlingPlugin.js

@@ -8,22 +8,32 @@ const node_path_1 = __importDefault(require("node:path"));
 const PlainEntrypointsConfigFileGeneratorPlugin_1 = require("./PlainEntrypointsConfigFileGeneratorPlugin");
 const php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
+const webpack_1 = require("webpack");
+const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
 class SpecialAssetHandlingPlugin {
     outputDir;
-    static semaphore = new pseduo_semaphore_1.PseudoSemaphore({});
-    static previouslyIncludedFilenames = new Set(); // This allows us to ensure that assets that were previously being preloaded can be removed
+    useUnifiedLoader;
+    static semaphore = new pseduo_semaphore_1.PseudoSemaphore({}, "Special");
     static hasAttachedAssetCollatorForCurrentBatch = false;
     static validPathname = undefined;
     id;
-    constructor(outputDir) {
+    constructor(outputDir, useUnifiedLoader) {
         this.outputDir = outputDir;
+        this.useUnifiedLoader = useUnifiedLoader;
         this.id = Math.random().toString();
         SpecialAssetHandlingPlugin.semaphore.register(this.id);
+        UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.register(this.id);
     }
     apply(compiler) {
         compiler.hooks.compilation.tap(this.constructor.name, compilation => {
             SpecialAssetHandlingPlugin.hasAttachedAssetCollatorForCurrentBatch = false;
             SpecialAssetHandlingPlugin.semaphore.reset(this.id);
+            UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reset(this.id);
+            compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
+                UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, ['special-assets', writer => {
+                        writer.append("require_once __DIR__.'/special-assets.php';");
+                    }]);
+            });
             compilation.hooks.processAssets.tapPromise(this.constructor.name, async (assets) => {
                 try {
                     const specialAssetData = {};
@@ -38,13 +48,6 @@ class SpecialAssetHandlingPlugin {
                         const filename = node_path_1.default.join(node_path_1.default.basename(node_path_1.default.dirname(pathname)), node_path_1.default.basename(pathname));
                         const queryStart = assetInfo.sourceFilename.indexOf('?');
                         if (queryStart < 0) {
-                            if (SpecialAssetHandlingPlugin.previouslyIncludedFilenames.has(filename)) {
-                                specialAssetData[filename] = {
-                                    preload: false,
-                                    fetchpriority: null,
-                                    crossorigin: null
-                                };
-                            }
                             continue;
                         }
                         const params = new URLSearchParams(assetInfo.sourceFilename.substring(queryStart + 1)
@@ -84,7 +87,9 @@ class SpecialAssetHandlingPlugin {
             writer.emitAsset(compilation, outputFile);
             return;
         }
-        PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+        if (!this.useUnifiedLoader) {
+            PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+        }
         writer.action("wp_head", writer => {
             writer.call("plaudit_webpack_extensions__resolve_base_uri", [new php_writer_1.Expr('__DIR__')], { assignTo: "$base_uri" }).closePHP();
             for (let [filename, { preload, fetchpriority, crossorigin }] of preloadedAssets) {

package/build/plugins/UnifiedLoaderGenerator.d.ts

@@ -0,0 +1,10 @@
+import { PseudoSemaphore } from "../utils/pseduo-semaphore";
+import { PHPWriter } from "../utils/php-writer";
+import { Compiler, WebpackPluginInstance } from "webpack";
+export declare class UnifiedLoaderGenerator implements WebpackPluginInstance {
+    static readonly semaphore: PseudoSemaphore<[string, (writer: PHPWriter) => void] | undefined>;
+    private static attached;
+    private readonly id;
+    constructor();
+    apply(compiler: Compiler): void;
+}

package/build/plugins/UnifiedLoaderGenerator.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnifiedLoaderGenerator = void 0;
+const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
+const php_writer_1 = require("../utils/php-writer");
+const webpack_1 = require("webpack");
+const PlainEntrypointsConfigFileGeneratorPlugin_1 = require("./PlainEntrypointsConfigFileGeneratorPlugin");
+class UnifiedLoaderGenerator {
+    static semaphore = new pseduo_semaphore_1.PseudoSemaphore(undefined, "Unified");
+    static attached = false;
+    id;
+    constructor() {
+        this.id = Math.random().toString();
+        UnifiedLoaderGenerator.semaphore.register(this.id);
+    }
+    apply(compiler) {
+        const tapName = { name: this.constructor.name, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT };
+        compiler.hooks.compilation.tap(this.constructor.name, compilation => {
+            UnifiedLoaderGenerator.attached = false;
+            UnifiedLoaderGenerator.semaphore.reset(this.id);
+            compilation.hooks.processAssets.tapPromise(tapName, async () => {
+                try {
+                    UnifiedLoaderGenerator.semaphore.resolve(this.id, undefined);
+                    if (!UnifiedLoaderGenerator.attached) {
+                        UnifiedLoaderGenerator.attached = true;
+                        const writerCallbacks = Object.values(Object.fromEntries((await UnifiedLoaderGenerator.semaphore.wait())
+                            .filter(a => a !== undefined))); // A simple deduplication trick
+                        if (writerCallbacks.length > 0) {
+                            compilation.hooks.afterProcessAssets.tap(this.constructor.name, () => {
+                                const writer = new php_writer_1.PHPWriter();
+                                PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+                                for (const writerCallback of writerCallbacks) {
+                                    writerCallback(writer);
+                                }
+                                writer.emitAsset(compilation, "unified-loader.php");
+                            });
+                        }
+                    }
+                }
+                catch (e) {
+                    UnifiedLoaderGenerator.semaphore.reject(this.id);
+                    throw e;
+                }
+            });
+        });
+    }
+}
+exports.UnifiedLoaderGenerator = UnifiedLoaderGenerator;

package/build/shared.d.ts

@@ -69,6 +69,7 @@ export type PlauditWordpressWebpackConfig = {
     plainEntrypointsVersion?: 1 | 2;
     srcDir?: string;
     srcPrefixes?: string[];
+    useUnifiedLoader?: boolean;
 };
 export declare function makeEmittableConfigPHP(data: any): string;
 export type Sync<V> = {
@@ -92,4 +93,6 @@ export declare const scriptWithoutModuleExtension: RegExp;
 export declare const scriptWithModuleExtension: RegExp;
 export declare const styleExtension: RegExp;
 export declare function scriptOrStyleTest(entryPath: string, scriptExtension: RegExp): "" | "script" | "style";
+export declare function hasAtLeastOneItem<T>(list: T[]): list is [T, ...T[]];
+export declare function kebabCase(value: string): string;
 export {};

package/build/shared.js

@@ -9,6 +9,8 @@ exports.determineCurrentSourceType = determineCurrentSourceType;
 exports.makeEmittableConfigPHP = makeEmittableConfigPHP;
 exports.leadingSlashIt = leadingSlashIt;
 exports.scriptOrStyleTest = scriptOrStyleTest;
+exports.hasAtLeastOneItem = hasAtLeastOneItem;
+exports.kebabCase = kebabCase;
 const json_to_php_but_with____injection_1 = __importDefault(require("./utils/json-to-php-but-with-__-injection"));
 function isRawAssetData(thing) {
     if (!thing || typeof thing !== 'object') {
@@ -78,3 +80,10 @@ exports.styleExtension = /(?<filename>.+)(?<extension>\.(p?c|sa)ss)$/i;
 function scriptOrStyleTest(entryPath, scriptExtension) {
     return scriptExtension.test(entryPath) ? "script" : (exports.styleExtension.test(entryPath) ? "style" : "");
 }
+function hasAtLeastOneItem(list) {
+    return list.length > 0;
+}
+function kebabCase(value) {
+    const kebabCaseRegexes = [[/([a-z])([A-Z])/g, "$1-$2"], [/[\s_.\-]+/g, "-"]];
+    return kebabCaseRegexes.reduce((str, [pattern, replacement]) => str.replace(pattern, replacement), value).toLowerCase();
+}

package/build/utils/pseduo-semaphore.d.ts

@@ -1,8 +1,10 @@
 export declare class PseudoSemaphore<T> {
     private readonly defaultValue;
+    private readonly name;
     private flagSet;
     private readonly flags;
-    constructor(defaultValue: T);
+    private readonly debugMode;
+    constructor(defaultValue: T, name: string);
     register(id: string): void;
     resolve(id: string, value: T): void;
     reject(id: string): void;

package/build/utils/pseduo-semaphore.js

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PseudoSemaphore = void 0;
 class PseudoSemaphore {
     defaultValue;
+    name;
     flagSet = 0;
     flags = new Map();
-    constructor(defaultValue) {
+    debugMode = false;
+    constructor(defaultValue, name) {
         this.defaultValue = defaultValue;
+        this.name = name;
     }
     register(id) {
         if (this.flags.has(id)) {
@@ -16,16 +19,25 @@ class PseudoSemaphore {
         this.resolve(id, this.defaultValue);
     }
     resolve(id, value) {
+        if (this.debugMode) {
+            console.error("RESOLVED:", this.name, id);
+        }
         const flag = this.getFlag(id);
         flag[1].resolve(value); // This is deliberately unsafe - I would rather see a cascading failure than a silent one
         flag[2] = true;
     }
     reject(id) {
+        if (this.debugMode) {
+            console.error("REJECTED:", this.name, id);
+        }
         const flag = this.getFlag(id);
         flag[1].reject(); // This is deliberately unsafe - I would rather see a cascading failure than a silent one
         flag[2] = true;
     }
     reset(id) {
+        if (this.debugMode) {
+            console.error("RESET:", this.name, id);
+        }
         const flag = this.getFlag(id);
         // We reject if we reset early to avoid any permanently-hanging promises
         if (!flag[2]) {

package/build/wordpress-scripts-wrapper.js

@@ -22,6 +22,7 @@ const dependency_extraction_webpack_plugin_config_builder_1 = require("./plugins
 const dependency_extraction_webpack_plugin_1 = __importDefault(require("@wordpress/dependency-extraction-webpack-plugin"));
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
 const webpack_remove_empty_scripts_1 = __importDefault(require("webpack-remove-empty-scripts"));
+const UnifiedLoaderGenerator_1 = require("./plugins/UnifiedLoaderGenerator");
 function resolveLegacyBlockScriptsInFolder(folder) {
     const blockScriptEntrypoints = [];
     for (const blockDir of node_fs_1.default.readdirSync(folder)) {
@@ -168,7 +169,7 @@ function injectSupportForInliningSVGsAsStrings(rules) {
     });
 }
 function buildVerifiedConfig(config) {
-    const { standaloneBlocks = false, stats = 'errors-warnings', variables: rawVariables, verbose = process.argv.includes('--verbose') || process.env['VERBOSE'] === 'true', postcss = {}, externals, assumeGlobalizedPlauditLibraries = true, processTranslationConfigs = true, combineAssetMetadata = true, useWebpackResourceFiltering = true, outputDir = "", extensionsVersion = 1, plainEntrypointsHandlePrefix = "", plainEntrypointsVersion = 1, srcDir = "" } = config;
+    const { standaloneBlocks = false, stats = 'errors-warnings', variables: rawVariables, verbose = process.argv.includes('--verbose') || process.env['VERBOSE'] === 'true', postcss = {}, externals, assumeGlobalizedPlauditLibraries = true, processTranslationConfigs = true, combineAssetMetadata = true, useWebpackResourceFiltering = true, outputDir = "", extensionsVersion = 1, plainEntrypointsVersion = 1, srcDir = "", useUnifiedLoader = true } = config;
     let srcPrefixes;
     const trailingSlashedSrcDir = srcDir && !srcDir.endsWith("/") ? srcDir + "/" : srcDir;
     if (config.srcPrefixes === undefined) {
@@ -177,9 +178,13 @@ function buildVerifiedConfig(config) {
     else {
         srcPrefixes = (srcDir && !config.srcPrefixes.includes(trailingSlashedSrcDir) ? [...config.srcPrefixes, trailingSlashedSrcDir] : config.srcPrefixes);
     }
+    let plainEntrypointsHandlePrefix = config.plainEntrypointsHandlePrefix ?? "";
     if (plainEntrypointsVersion > 1) {
         if (!plainEntrypointsHandlePrefix) {
-            throw new Error("Plain Entrypoints V2 and higher require 'plainEntrypointsHandlePrefix' to be set");
+            plainEntrypointsHandlePrefix = derivePlainEntrypointsHandlePrefixFromComposerJsonOrThemeName();
+            if (!plainEntrypointsHandlePrefix) {
+                throw new Error("Plain Entrypoints V2 and higher require either 'plainEntrypointsHandlePrefix' to be set or an adjacent composer.json or style.css file to be present");
+            }
         }
         if (!outputDir) {
             throw new Error("Plain Entrypoints V2 and higher require 'outputDir' to be set");
@@ -233,7 +238,7 @@ function buildVerifiedConfig(config) {
     }
     const cfg = {
         currentVariables, postcss, standaloneBlocks, stats, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries, processTranslationConfigs, combineAssetMetadata,
-        useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsVersion, plainEntrypointsHandlePrefix, srcDir, srcPrefixes
+        useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsVersion, plainEntrypointsHandlePrefix, srcDir, srcPrefixes, useUnifiedLoader
     };
     return cfg.outputDir ? { cfg, sources } : withDerivedOutputDir(cfg, sources);
 }
@@ -279,6 +284,28 @@ function finalizeEntryDestination(entry, dynamicEffectiveDestinationsWithExpecte
     allocatedDestinations[derivedDestination] = entry[0];
     return [entry[0], { ...entry[1], destination: derivedDestination }];
 }
+function derivePlainEntrypointsHandlePrefixFromComposerJsonOrThemeName() {
+    let composerJson;
+    try {
+        composerJson = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(process.cwd(), "composer.json"), 'utf-8'));
+    }
+    catch {
+        // Then composer.json doesn't exist
+        return derivePlainEntrypointsHandlePrefixFromThemeName();
+    }
+    if (typeof composerJson !== 'object' || typeof composerJson.name !== 'string' || !composerJson.name) {
+        throw new ReferenceError("plainEntrypointsHandlePrefix was not set and the adjacent composer.json file does not have a valid name in it");
+    }
+    return (0, shared_1.kebabCase)(composerJson.name.replace(/plaudit\/plaudit/, 'plaudit'));
+}
+function derivePlainEntrypointsHandlePrefixFromThemeName() {
+    const styleFileContents = node_fs_1.default.readFileSync(node_path_1.default.join(process.cwd(), "style.css"), 'utf-8');
+    const themeName = /^\W*Theme\s*Name:\s*(.+)$/im.exec(styleFileContents)?.[1]?.trim();
+    if (!themeName) {
+        throw new ReferenceError("plainEntrypointsHandlePrefix was not set and the adjacent style.css file does not have a valid name in it");
+    }
+    return (0, shared_1.kebabCase)(themeName);
+}
 function withDerivedOutputDir(cfg, sources) {
     const destinations = sources.map(([_, { destination }]) => destination.split(/[\/\\]/g));
     if (destinations.length < 2) {
@@ -353,8 +380,11 @@ function buildCommonPluginConfig(srcRoot, scriptExtension, webpackConfig, dest,
         extensions: ['css', 'scss', 'sass', 'less', 'styl', 'pcss']
     });
     plugins.push(removeEmptyScriptsPlugin, new MiniCSSExtractPluginErrorCleaner_1.MiniCSSExtractPluginErrorCleaner());
+    if (config.useUnifiedLoader) {
+        plugins.push(new UnifiedLoaderGenerator_1.UnifiedLoaderGenerator());
+    }
     if (config.useWebpackResourceFiltering) {
-        plugins.push(new SpecialAssetHandlingPlugin_1.SpecialAssetHandlingPlugin(config.outputDir));
+        plugins.push(new SpecialAssetHandlingPlugin_1.SpecialAssetHandlingPlugin(config.outputDir, config.useUnifiedLoader));
     }
     if (variablesFilePath) {
         plugins.push(new VariablesJSMonitorPlugin_1.VariablesJSMonitorPlugin(variablesFilePath));
@@ -467,7 +497,7 @@ function makeBlocksWebpackConfig(config, commonConfig, webpackConfig, dest, src,
     return (0, common_config_helpers_1.commonMakeWebpackConfig)(config, commonConfig, webpackConfig, true, dest, src, srcRoot, (0, common_config_helpers_1.resolveEntryFromDirectory)(commonConfig, srcRoot, dest), plugins);
 }
 function makeExtensionsWebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, plugins) {
-    plugins.push(new ExtensionsConfigFileGeneratorPlugin_1.ExtensionsConfigFileGeneratorPlugin(srcRoot, config.extensionsVersion, dest.destination));
+    plugins.push(new ExtensionsConfigFileGeneratorPlugin_1.ExtensionsConfigFileGeneratorPlugin(srcRoot, config.extensionsVersion, dest.destination, config.plainEntrypointsHandlePrefix));
     const entry = async () => {
         const rawEntrypoints = [];
         for await (const dirent of await promises_1.default.opendir(srcRoot)) {
@@ -490,7 +520,7 @@ function makePlainV1WebpackConfig(config, commonConfig, webpackConfig, dest, src
     return (0, common_config_helpers_1.commonMakeWebpackConfig)(config, commonConfig, webpackConfig, srcIsDirectory, dest, src, srcRoot, entry, plugins);
 }
 function makePlainV2WebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, plugins, srcIsDirectory) {
-    plugins.push(new PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin(process.cwd(), config.outputDir, dest.locations ?? {}, config.plainEntrypointsHandlePrefix));
+    plugins.push(new PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin(process.cwd(), config.outputDir, dest.locations ?? {}, config.plainEntrypointsHandlePrefix, config.useUnifiedLoader));
     const baseDest = stripExtension(dest.destination);
     const entry = srcIsDirectory // This being true implies that srcRoot is not an array
         ? (0, common_config_helpers_1.resolveEntryFromDirectory)(commonConfig, srcRoot, dest)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.56.4",
+  "version": "2.57.1",
   "license": "UNLICENSED",
   "files": [
     "/build"
@@ -63,7 +63,7 @@
     "postcss-url": "^10.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "webpack": "^5.101.0",
+    "webpack": "^5.101.1",
     "webpack-remove-empty-scripts": "^1.1.1",
     "xml-formatter": "^3.6.6"
   },