@plaudit/webpack-extensions 2.70.1 → 2.72.0

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtensionsConfigFileGeneratorPlugin = void 0;
 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");
 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");
 class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
@@ -98,10 +99,9 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
             return [block[0], Object.fromEntries(Object.entries(block[1]).toSorted(([a], [b]) => a.localeCompare(b)))];
         })
             .toSorted(([a], [b]) => a.localeCompare(b)));
-        new php_writer_1.PHPWriter()
-            .call("Plaudit\\Common\\Lib\\GutenbergUtils::loadExtensionsV3", [new php_writer_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(blockExtensionsConfig, false)), php_writer_1.Op.concat(php_writer_1.Constants.__DIR__, '/'),
-            php_writer_1.Expr.call("plaudit_webpack_extensions__resolve_base_uri", [php_writer_1.Constants.__DIR__])])
-            .emitAsset(compilation, node_path_1.default.join(this.dest.destination, "extensions-loader.php"));
+        (0, shared_1.emitPHPWriterAsAsset)(new php_writer_1.PHPWriter()
+            .call("Plaudit\\Common\\Lib\\GutenbergUtils::loadExtensionsV3", [new expressions_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(blockExtensionsConfig, false)), expressions_1.Op.concat(expressions_1.Constants.__DIR__, '/'),
+            expressions_1.Expr.call("plaudit_webpack_extensions__resolve_base_uri", [expressions_1.Constants.__DIR__])]), compilation, node_path_1.default.join(this.dest.destination, "extensions-loader.php"));
     }
     attachUniquePhase(compilation) {
         compilation.hooks.processAssets.tapPromise({ name: this.constructor.name, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT }, async () => {

package/build/plugins/ExtensionsConfigFileGeneratorPluginV1.js

@@ -5,10 +5,10 @@ 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 php_writer_1 = require("@plaudit/php-writer");
+const expressions_1 = require("@plaudit/php-writer/expressions");
 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 AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
     extensionsDest;
@@ -28,11 +28,11 @@ class ExtensionsConfigFileGeneratorPluginV1 extends AbstractBiPhasicGroupAndEntr
                 (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)));
+        compilation.emitAsset(node_path_1.default.join(this.extensionsDest, "mapping.config"), new webpack_1.sources.RawSource((0, php_writer_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.concat(php_writer_1.Constants.__DIR__, this.extensionsDest)]);
+                    .call("GutenbergUtils::installExtensionsSupport", [expressions_1.Op.concat(expressions_1.Constants.__DIR__, this.extensionsDest)]);
             } });
     }
 }

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -5,8 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlainEntrypointsConfigFileGeneratorPlugin = void 0;
 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 shared_1 = require("../shared");
-const php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const AbstractBiPhasicGroupAndEntryPlugin_1 = require("./AbstractBiPhasicGroupAndEntryPlugin");
 const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
@@ -78,12 +79,12 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
             if (!this.useUnifiedLoader) {
                 (0, shared_1.emitResolveBaseUriFunction)(writer);
             }
-            const baseUriVar = new php_writer_1.Var("base_uri");
+            const baseUriVar = new expressions_1.Var("base_uri");
             for (const [priority, prioritizedHandleList] of PlainEntrypointsConfigFileGeneratorPlugin.separateHandleListByPriority(handleLists.register)) {
                 writer.action("init", writer => {
-                    writer.call("plaudit_webpack_extensions__resolve_base_uri", [php_writer_1.Constants.__DIR__], { assignTo: baseUriVar });
+                    writer.call("plaudit_webpack_extensions__resolve_base_uri", [expressions_1.Constants.__DIR__], { assignTo: baseUriVar });
                     for (const { handle, type, data } of prioritizedHandleList) {
-                        writer.call(`wp_register_${type}`, [handle, php_writer_1.Op.concat(baseUriVar, node_path_1.default.relative(emitDir, data.src)), ...data.rest]);
+                        writer.call(`wp_register_${type}`, [handle, expressions_1.Op.concat(baseUriVar, node_path_1.default.relative(emitDir, data.src)), ...data.rest]);
                     }
                 }, { priority, accountForAlreadyDoing: this.config.includePostInitFallback });
             }
@@ -100,7 +101,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
             }
         }
         PlainEntrypointsConfigFileGeneratorPlugin.appendEnqueuingHandleLists(writer, handleLists);
-        writer.emitAsset(compilation, "plain-entrypoints-loader.php");
+        (0, shared_1.emitPHPWriterAsAsset)(writer, compilation, "plain-entrypoints-loader.php");
     }
     static addHandlesToHandleLists(type, handles, handleLists) {
         for (const [handle, data] of handles) {

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.d.ts

@@ -1,5 +1,5 @@
 import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
-import { ParsedAssetsJson, BlockEntrypointInfo, FileSegmentBlockEntrypointInfo } from "../shared";
+import { ParsedAssetsJson, BlockEntrypointInfo, FileSegmentBlockEntrypointInfo, VerifiedAdvancedOutputConfig } from "../shared";
 import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
 import { Compilation } from "webpack";
 import type WebpackRemoveEmptyScriptsPlugin from "webpack-remove-empty-scripts";
@@ -14,10 +14,10 @@ type CollatedWorkableBlockInfo = Record<string, {
     blockJsonText?: string;
 }>;
 export declare class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin<BlockEntrypointInfo> {
-    private readonly blocksDest;
+    private readonly dest;
     private readonly webpackRemoveEmptyScriptsPlugin;
     private static readonly semaphore;
-    constructor(config: VerifiedPlauditWordpressWebpackConfig, blocksDest: string, webpackRemoveEmptyScriptsPlugin: WebpackRemoveEmptyScriptsPlugin, context: string, entry: EntryProvider<BlockEntrypointInfo>);
+    constructor(config: VerifiedPlauditWordpressWebpackConfig, dest: VerifiedAdvancedOutputConfig, webpackRemoveEmptyScriptsPlugin: WebpackRemoveEmptyScriptsPlugin, context: string, entry: EntryProvider<BlockEntrypointInfo>);
     protected processAssets(compilation: Compilation, rawAssetData: ParsedAssetsJson): Promise<void>;
     private emitBlockLoaderFile;
     private transformBlocks;

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.js

@@ -10,17 +10,18 @@ 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 php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const webpack_1 = require("webpack");
 class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
-    blocksDest;
+    dest;
     webpackRemoveEmptyScriptsPlugin;
     static semaphore = new pseduo_semaphore_1.PseudoSemaphore("Block JSON v3");
-    constructor(config, blocksDest, webpackRemoveEmptyScriptsPlugin, context, entry) {
-        super(config, `block-json-${blocksDest}`, [PlainEntrypointsStyleBlockJSONPlugin.semaphore, UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
-        this.blocksDest = blocksDest;
+    constructor(config, dest, webpackRemoveEmptyScriptsPlugin, context, entry) {
+        super(config, `block-json-${dest.destination}`, [PlainEntrypointsStyleBlockJSONPlugin.semaphore, UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
+        this.dest = dest;
         this.webpackRemoveEmptyScriptsPlugin = webpackRemoveEmptyScriptsPlugin;
     }
     async processAssets(compilation, rawAssetData) {
@@ -64,7 +65,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
                 }
                 const workableBlockEntrypointsInfo = entrypoint.getFiles()
                     .map(file => this.stripOffBlocksDestPrefix(file))
-                    .filter(file => !this.webpackRemoveEmptyScriptsPlugin['trash'].includes(node_path_1.default.join(this.blocksDest, 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]) => {
@@ -87,29 +88,46 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
             }
         }
         PlainEntrypointsStyleBlockJSONPlugin.semaphore.resolve(this.id, {
-            collatableWorkableBlockInfo: applicableBlockJsonFiles, blocksDest: this.blocksDest,
-            emittingWpmlXml: compilation.getAsset(node_path_1.default.join(this.blocksDest, "wpml-config.xml")) !== undefined
+            collatableWorkableBlockInfo: applicableBlockJsonFiles, blocksDest: this.dest.destination,
+            emittingWpmlXml: compilation.getAsset(node_path_1.default.join(this.dest.destination, "wpml-config.xml")) !== undefined
         });
+        const generateLoader = (writer) => {
+            writer.require(node_path_1.default.join(this.dest.destination, "blockdir-loader.php"), { dirRelative: true, once: true });
+        };
+        let action;
+        const lazyLoader = this.dest.lazyLoader;
+        if (lazyLoader) {
+            try {
+                action = writer => writer.function(lazyLoader, [], generateLoader, { returnType: 'void' });
+            }
+            catch (e) {
+                compilation.errors.push((0, shared_1.newWebpackErrorForFile)(["An error occurred while emitting a function for lazily loading blocks", { cause: e }], this.dest.destination));
+                this.rejectSemaphores();
+                return;
+            }
+        }
+        else {
+            action = writer => writer.withScope(generateLoader);
+        }
         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, Object.keys(applicableBlockJsonFiles).length ? {
             group: this.group,
             requiresBaseURI: false,
             staticallyLoadedEntrypoints: relevantEntrypoints.flatMap(re => re.entrypoint.getEntrypointChunk().files.values().toArray()),
-            action: writer => writer.require(node_path_1.default.join(this.blocksDest, "blockdir-loader.php"), { dirRelative: true, once: true })
+            action
         } : undefined);
     }
     emitBlockLoaderFile(compilation, blockData) {
         if (this.config.useUnifiedLoader) {
             const metadata = blockData['__metadata'];
             delete blockData['__metadata'];
-            new php_writer_1.PHPWriter()
+            (0, shared_1.emitPHPWriterAsAsset)(new php_writer_1.PHPWriter()
                 .action("init", writer => {
-                writer.call("\\Plaudit\\Common\\ACF\\BlockManager::autoloadSubfoldersV3", [php_writer_1.Constants.__DIR__, new php_writer_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(blockData, false, "\t")),
-                    php_writer_1.Constants.__FILE__, new php_writer_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(metadata, false, "\t")), null]);
-            }, { accountForAlreadyDoing: this.config.includePostInitFallback })
-                .emitAsset(compilation, node_path_1.default.join(this.blocksDest, "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(node_path_1.default.join(this.blocksDest, "blockdir.config.php"), new webpack_1.sources.RawSource((0, shared_1.makeEmittableConfigPHP)(blockData, true)));
+            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) {
@@ -141,7 +159,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
                 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));
+            const blockDirName = node_path_1.default.dirname(node_path_1.default.relative(this.dest.destination, blockJsonAssetName));
             blockData[blockDirName] = PlainEntrypointsStyleBlockJSONPlugin
                 .doFileOrHandleReplacements(compilation, Object.fromEntries(Object.entries(blockJson).filter(([k]) => k !== '$schema')), workableBlockEntrypointsInfo, epi => epi.handle);
             compilation[blockJsonAssetName in compilation.assets ? 'updateAsset' : 'emitAsset'](blockJsonAssetName, new webpack_1.sources.RawSource(JSON.stringify(PlainEntrypointsStyleBlockJSONPlugin
@@ -215,7 +233,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
         return blockJson;
     }
     stripOffBlocksDestPrefix(file) {
-        return this.blocksDest && file.startsWith(this.blocksDest + "/") ? file.substring(this.blocksDest.length + 1 /* we also need to drop the "/" */) : file;
+        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 node_crypto_1.default.createHash('md5').update(thing).digest("hex").substring(0, 20).toLowerCase();
@@ -348,9 +366,9 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
                 (acc[cur.blocksDest] ?? (acc[cur.blocksDest] = [])).push(cur);
                 return acc;
             }, {});
-            const semaphoreData = allSemaphoreData[this.blocksDest];
+            const semaphoreData = allSemaphoreData[this.dest.destination];
             if (semaphoreData === undefined) {
-                compilation.errors.push(new Error(`Semaphore data missing for ${this.blocksDest}`));
+                compilation.errors.push(new Error(`Semaphore data missing for ${this.dest.destination}`));
                 return;
             }
             const workableBlockInfo = semaphoreData.map(sd => sd.collatableWorkableBlockInfo)

package/build/plugins/SpecialAssetHandlingPlugin.js

@@ -5,8 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpecialAssetHandlingPlugin = void 0;
 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 shared_1 = require("../shared");
-const php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const AbstractBiPhasicGroupPlugin_1 = require("./AbstractBiPhasicGroupPlugin");
 const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
@@ -68,7 +69,7 @@ class SpecialAssetHandlingPlugin extends AbstractBiPhasicGroupPlugin_1.AbstractB
         const writer = new php_writer_1.PHPWriter();
         if (!preloadedAssets.length) {
             if (!this.config.useUnifiedLoader) {
-                writer.emitAsset(compilation, outputFile);
+                (0, shared_1.emitPHPWriterAsAsset)(writer, compilation, outputFile);
             }
             return;
         }
@@ -76,8 +77,8 @@ class SpecialAssetHandlingPlugin extends AbstractBiPhasicGroupPlugin_1.AbstractB
             (0, shared_1.emitResolveBaseUriFunction)(writer);
         }
         writer.action("wp_head", writer => {
-            const baseUriVar = new php_writer_1.Var("base_uri");
-            writer.call("plaudit_webpack_extensions__resolve_base_uri", [php_writer_1.Constants.__DIR__], { assignTo: baseUriVar }).closePHP();
+            const baseUriVar = new expressions_1.Var("base_uri");
+            writer.call("plaudit_webpack_extensions__resolve_base_uri", [expressions_1.Constants.__DIR__], { assignTo: baseUriVar }).closePHP();
             for (let [filename, { preload, fetchpriority, crossorigin }] of preloadedAssets) {
                 if (!preload) {
                     continue;
@@ -116,11 +117,11 @@ class SpecialAssetHandlingPlugin extends AbstractBiPhasicGroupPlugin_1.AbstractB
                     attributes.push(["crossorigin", crossorigin]);
                 }
                 const dynamicAttrs = attributes.map(([k, v]) => v ? `${k}="${v}"` : k).join(" ");
-                writer.append(`<link rel="preload" href="<?= ${php_writer_1.Expr.call("esc_url", [php_writer_1.Op.concat(baseUriVar, filename)])} ?>" ${dynamicAttrs}>`);
+                writer.append(`<link rel="preload" href="<?= ${expressions_1.Expr.call("esc_url", [expressions_1.Op.concat(baseUriVar, filename)])} ?>" ${dynamicAttrs}>`);
             }
             writer.openPHP();
         });
-        writer.emitAsset(compilation, outputFile);
+        (0, shared_1.emitPHPWriterAsAsset)(writer, compilation, outputFile);
     }
     attachUniquePhase(compilation) {
         compilation.hooks.processAssets.tapPromise({ name: this.constructor.name, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT }, async () => {

package/build/plugins/UnifiedLoaderGenerator.d.ts

@@ -1,6 +1,6 @@
+import { PHPWriter } from "@plaudit/php-writer";
 import { AbstractBiPhasicGroupPlugin } from "./AbstractBiPhasicGroupPlugin";
 import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
-import { PHPWriter } from "../utils/php-writer";
 import { PseudoSemaphore } from "../utils/pseduo-semaphore";
 import { Compilation } from "webpack";
 type LoaderInfo = {

package/build/plugins/UnifiedLoaderGenerator.js

@@ -5,10 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnifiedLoaderGenerator = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+const php_writer_1 = require("@plaudit/php-writer");
 const AbstractBiPhasicGroupPlugin_1 = require("./AbstractBiPhasicGroupPlugin");
 const shared_1 = require("../shared");
-const json_to_php_but_with____injection_1 = __importDefault(require("../utils/json-to-php-but-with-__-injection"));
-const php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const webpack_1 = require("webpack");
 class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPhasicGroupPlugin {
@@ -53,7 +52,7 @@ class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPha
                     continue;
                 }
                 const parsedPath = node_path_1.default.parse(file);
-                const contents = `<?php return ${(0, json_to_php_but_with____injection_1.default)(assetData)};\n`;
+                const contents = `<?php return ${(0, php_writer_1.json2php)(assetData)};\n`;
                 compilation.emitAsset(node_path_1.default.join(parsedPath.dir, parsedPath.name) + ".asset.php", new webpack_1.sources.RawSource(contents), { size: Buffer.byteLength(contents) });
             }
             if (this.config.useUnifiedLoader) {
@@ -65,7 +64,7 @@ class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPha
                     for (const { action } of groupedLoaderInfo) {
                         action(writer);
                     }
-                    writer.emitAsset(compilation, "unified-loader.php");
+                    (0, shared_1.emitPHPWriterAsAsset)(writer, compilation, "unified-loader.php");
                 });
             }
         });

package/build/shared.d.ts

@@ -1,6 +1,6 @@
-import { PHPWriter } from "./utils/php-writer";
+import { PHPWriter } from "@plaudit/php-writer";
 import type { Options as PostcssFunctionsOptions } from "postcss-functions";
-import { Compilation, type Configuration, WebpackError } from "webpack";
+import { AssetInfo, Compilation, type Configuration, WebpackError } from "webpack";
 export type ParsedAssetsJson = Record<string, {
     dependencies: string[];
     version: string;
@@ -146,4 +146,5 @@ export declare function newWebpackErrorForFile(error: string | ConstructorParame
  */
 export declare function emitResolveBaseUriFunction(writer: PHPWriter): void;
 export declare function getAssetsJson(compilation: Compilation): ParsedAssetsJson;
+export declare function emitPHPWriterAsAsset(writer: PHPWriter, compilation: Compilation, file: string, assetInfo?: AssetInfo): void;
 export {};

package/build/shared.js

@@ -24,9 +24,10 @@ exports.parseEnvFile = parseEnvFile;
 exports.newWebpackErrorForFile = newWebpackErrorForFile;
 exports.emitResolveBaseUriFunction = emitResolveBaseUriFunction;
 exports.getAssetsJson = getAssetsJson;
+exports.emitPHPWriterAsAsset = emitPHPWriterAsAsset;
 const promises_1 = __importDefault(require("node:fs/promises"));
-const json_to_php_but_with____injection_1 = __importDefault(require("./utils/json-to-php-but-with-__-injection"));
-const php_writer_1 = require("./utils/php-writer");
+const php_writer_1 = require("@plaudit/php-writer");
+const expressions_1 = require("@plaudit/php-writer/expressions");
 const webpack_1 = require("webpack");
 function isParsedAssetsJson(thing) {
     if (!thing || typeof thing !== 'object') {
@@ -73,7 +74,7 @@ function convertUsageLocationsHandleToEmittableHandle(handle, generatedHandle) {
     return emittableHandle.replaceAll("{basename}", generatedHandle);
 }
 function makeEmittableConfigPHP(data, asFullFile, parentIndent = "") {
-    const prettyPrintedMetadata = json_to_php_but_with____injection_1.default.make({ indent: "\t", linebreak: "\n", shortArraySyntax: true })(data, parentIndent)
+    const prettyPrintedMetadata = php_writer_1.json2php.make({ indent: "\t", linebreak: "\n", shortArraySyntax: true })(data, parentIndent)
         .replaceAll(/(\n\t*)\[\s+],/gs, "$1[],")
         .replaceAll(/\[\n\t+([^\n]+)\n\t+]/gs, (_, inner) => `[${inner.trim()}]`)
         .replaceAll(/'rest' => \[\n\t+(\[(?:'[^']+')?]),\n\t+('[^']+')(?:,\n\t+(\[[^\n]+]))?\n\t+]/gs, (_, deps, hash, args) => `'rest' => [${[deps, hash, args].filter(value => !!value).join(", ")}]`);
@@ -143,24 +144,24 @@ function newWebpackErrorForFile(error, file) {
  * The primary benefit of emitting a function instead of baking its contents into each function that uses it is that it allows us to avoid recomputing the base uri multiple times
  */
 function emitResolveBaseUriFunction(writer) {
-    const dir = new php_writer_1.Var("dir");
-    const baseUris = new php_writer_1.Var("base_uris");
-    const assignmentTarget = new php_writer_1.ArrayAccess(baseUris, dir);
-    const path = new php_writer_1.Var("path");
+    const dir = new expressions_1.Var("dir");
+    const baseUris = new expressions_1.Var("base_uris");
+    const assignmentTarget = new expressions_1.ArrayAccess(baseUris, dir);
+    const path = new expressions_1.Var("path");
     writer.function("plaudit_webpack_extensions__resolve_base_uri", [dir], writer => {
         writer
             .static(baseUris, { initializer: [] })
-            .if(php_writer_1.Expr.isset(assignmentTarget))
+            .if(expressions_1.Expr.isset(assignmentTarget))
             .return(assignmentTarget)
-            .elseIf(php_writer_1.Expr.call("str_starts_with", [dir, php_writer_1.Constants.ABSPATH]))
-            .assign(path, php_writer_1.Expr.call("ltrim", [php_writer_1.Expr.call("substr", [dir, php_writer_1.Expr.call("strlen", [php_writer_1.Constants.ABSPATH])]), "/"]))
-            .elseIf(php_writer_1.Expr.call("str_starts_with", [dir, "/workspace/website"]))
-            .assign(path, php_writer_1.Expr.call("ltrim", [php_writer_1.Expr.call("substr", [dir, 18]), "/"]))
+            .elseIf(expressions_1.Expr.call("str_starts_with", [dir, expressions_1.Constants.ABSPATH]))
+            .assign(path, expressions_1.Expr.call("ltrim", [expressions_1.Expr.call("substr", [dir, expressions_1.Expr.call("strlen", [expressions_1.Constants.ABSPATH])]), "/"]))
+            .elseIf(expressions_1.Expr.call("str_starts_with", [dir, "/workspace/website"]))
+            .assign(path, expressions_1.Expr.call("ltrim", [expressions_1.Expr.call("substr", [dir, 18]), "/"]))
             .else()
             .call("error_log", ["UNABLE TO FIGURE OUT WHAT THE RELATIVE PATH TO THE BUILT FILES DIRECTORY SHOULD BE"])
             .assign(path, "")
             .endIf()
-            .call("trailingslashit", [php_writer_1.Expr.call("home_url", [path])], { return: true, assignTo: assignmentTarget });
+            .call("trailingslashit", [expressions_1.Expr.call("home_url", [path])], { return: true, assignTo: assignmentTarget });
     }, { returnType: "string", includeExistenceCheck: true });
 }
 function getAssetsJson(compilation) {
@@ -178,3 +179,7 @@ function getAssetsJson(compilation) {
     compilation.updateAsset("assets.json", s => s, a => ({ ...a, "parsed-assets-json": parsedAssetJson }));
     return parsedAssetJson;
 }
+function emitPHPWriterAsAsset(writer, compilation, file, assetInfo) {
+    const contents = writer.toString() + "\n";
+    compilation[file in compilation.assets ? 'updateAsset' : 'emitAsset'](file, new webpack_1.sources.RawSource(contents), { size: Buffer.byteLength(contents), ...assetInfo });
+}

package/build/wordpress-scripts-wrapper.js

@@ -172,7 +172,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 = "", plainEntrypointsVersion = 1, srcDir = "", useUnifiedLoader = false, includePostInitFallback = true } = 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 = "", plainEntrypointsVersion = 1, srcDir = "", useUnifiedLoader = false, includePostInitFallback = false } = config;
     let srcPrefixes;
     const trailingSlashedSrcDir = srcDir && !srcDir.endsWith("/") ? srcDir + "/" : srcDir;
     if (config.srcPrefixes === undefined) {
@@ -480,6 +480,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources, canClean
         const { bundleAnalyzer, assumeGlobalizedPlauditLibraries, externalize } = currentBatch[0].dest;
         const { plugins, removeEmptyScriptsPlugin, makeAdditionalDependencyInjectorPlugin } = buildCommonPluginConfig(webpackConfig, config, bundleAnalyzer, assumeGlobalizedPlauditLibraries, externalize);
         handleDisablingTSCheckerIfNecessary(currentBatch.flatMap(a => a.srcRoots), scriptExtension, plugins);
+        const contextPath = webpackConfig.context ?? process.cwd();
         for (const { dest, src, srcIsDirectory, srcRoot } of currentBatch) {
             let plugin;
             const sourceType = (0, shared_1.determineCurrentSourceType)(dest, srcIsDirectory);
@@ -487,7 +488,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources, canClean
                 if (!srcIsDirectory) {
                     continue;
                 }
-                plugin = new PlainEntrypointsStyleBlockJSONPlugin_1.PlainEntrypointsStyleBlockJSONPlugin(config, dest.destination, removeEmptyScriptsPlugin, webpackConfig.context ?? process.cwd(), (0, common_config_helpers_1.resolveEntryFromDirectory)(commonConfig, srcRoot, dest));
+                plugin = new PlainEntrypointsStyleBlockJSONPlugin_1.PlainEntrypointsStyleBlockJSONPlugin(config, dest, removeEmptyScriptsPlugin, contextPath, (0, common_config_helpers_1.resolveEntryFromDirectory)(commonConfig, srcRoot, dest));
                 plugins.push(plugin);
                 if (config.processTranslationConfigs && !processingModules) {
                     plugins.push(new WPMLConfigBuilder_1.WPMLConfigBuilderPlugin(dest.destination, plugin));
@@ -510,8 +511,8 @@ function processIndividualWebpackConfig(config, webpackConfig, sources, canClean
                     return Object.fromEntries(rawEntrypoints);
                 };
                 plugin = config.extensionsVersion > 1
-                    ? new ExtensionsConfigFileGeneratorPlugin_1.ExtensionsConfigFileGeneratorPlugin(config, srcRoot, dest, webpackConfig.context ?? process.cwd(), entry)
-                    : new ExtensionsConfigFileGeneratorPluginV1_1.ExtensionsConfigFileGeneratorPluginV1(config, dest.destination, webpackConfig.context ?? process.cwd(), entry);
+                    ? new ExtensionsConfigFileGeneratorPlugin_1.ExtensionsConfigFileGeneratorPlugin(config, srcRoot, dest, contextPath, entry)
+                    : new ExtensionsConfigFileGeneratorPluginV1_1.ExtensionsConfigFileGeneratorPluginV1(config, dest.destination, contextPath, entry);
                 plugins.push(plugin);
             }
             else if (sourceType === "plain" /* SourceType.plain */) {
@@ -526,14 +527,14 @@ function processIndividualWebpackConfig(config, webpackConfig, sources, canClean
                     const entry = srcIsDirectory // This being true implies that srcRoot is not an array
                         ? (0, common_config_helpers_1.resolveEntryFromDirectory)(commonConfig, srcRoot, dest)
                         : () => ({ [baseDest]: { import: Array.isArray(srcRoot) ? srcRoot : [srcRoot], plauditMetadata: { purpose: "plain-entrypoint", dest } } });
-                    plugin = new PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin(config, process.cwd(), config.outputDir, dest.locations, config.useUnifiedLoader, webpackConfig.context ?? process.cwd(), entry);
+                    plugin = new PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin(config, process.cwd(), config.outputDir, dest.locations, config.useUnifiedLoader, contextPath, entry);
                 }
                 else {
                     if (srcIsDirectory) {
                         console.error("Using directory mode with legacy plain entrypoint handling is not supported");
                         continue;
                     }
-                    plugin = new EnhancedDynamicEntryPlugin_1.EnhancedDynamicEntryPlugin(config, webpackConfig.context ?? process.cwd(), () => ({ [baseDest]: { import: Array.isArray(srcRoot) ? srcRoot : [srcRoot], plauditMetadata: { purpose: "plain-entrypoint", dest } } }));
+                    plugin = new EnhancedDynamicEntryPlugin_1.EnhancedDynamicEntryPlugin(config, contextPath, () => ({ [baseDest]: { import: Array.isArray(srcRoot) ? srcRoot : [srcRoot], plauditMetadata: { purpose: "plain-entrypoint", dest } } }));
                 }
                 plugins.push(plugin);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.70.1",
+  "version": "2.72.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/build"
@@ -22,9 +22,9 @@
   "devDependencies": {
     "@plaudit/gutenberg-api-extensions": "^2.77.2",
     "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/node": "^24.6.1",
+    "@types/node": "^24.7.2",
     "@types/postcss-functions": "^4.0.4",
-    "@types/tapable": "^2.2.7",
+    "@types/tapable": "^2.3.0",
     "@types/webpack": "^5.28.5",
     "@types/webpack-sources": "^3.2.3",
     "postcss-load-config": "^4.0.2",
@@ -34,6 +34,7 @@
     "webpack-bundle-analyzer": "^4.10.2"
   },
   "dependencies": {
+    "@plaudit/php-writer": "^1.0.0",
     "@plaudit/postcss-color-function": "^5.0.0",
     "@plaudit/postcss-legacy-shorthand": "^1.0.0",
     "@plaudit/postcss-silent-extend": "^3.0.0",
@@ -63,7 +64,7 @@
     "postcss-url": "^10.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "webpack": "^5.102.0",
+    "webpack": "^5.102.1",
     "webpack-remove-empty-scripts": "^1.1.1",
     "xml-formatter": "^3.6.7"
   },

package/build/utils/json-to-php-but-with-__-injection.d.ts

@@ -1,11 +0,0 @@
-type MakeProps = {
-    linebreak?: string;
-    indent?: string;
-    shortArraySyntax?: boolean;
-    stripSpaces?: boolean;
-};
-declare const make: (props?: MakeProps) => (obj: unknown, parentIndent?: string) => string;
-declare const json2php: ReturnType<typeof make> & {
-    make: typeof make;
-};
-export default json2php;

package/build/utils/json-to-php-but-with-__-injection.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const acceptedObjectTypes = ['[object Array]', '[object Object]'];
-const make = (props = {}) => {
-    const linebreak = props.linebreak ?? '';
-    const indent = props.indent ?? '';
-    const stripSpaces = props.stripSpaces ?? false;
-    const shortArraySyntax = props.shortArraySyntax ?? true;
-    const arrOpen = shortArraySyntax ? '[' : 'array(';
-    const arrClose = shortArraySyntax ? ']' : ')';
-    const arrow = stripSpaces ? '=>' : ' => ';
-    function transformInner(obj, parentIndent, state) {
-        switch (typeof obj) {
-            case 'undefined':
-                return 'null';
-            case 'bigint':
-            case 'number':
-            case 'boolean':
-                return obj.toString();
-            case 'string':
-                const res = obj.replace("\\", '\\\\').replaceAll("'", "\\'");
-                if (!/\s*/.test(res) && !state.isKey && state.path.length === 4 && state.path[1] === 'attributes' && state.path[3] === 'default' && state.parent?.['translatable']) {
-                    return `__('${res}')`;
-                }
-                return `'${res}'`;
-            case 'object':
-                if (obj === null)
-                    return 'null';
-                const objType = Object.prototype.toString.call(obj);
-                if (objType === '[object Date]')
-                    return obj.toISOString();
-                if (!acceptedObjectTypes.includes(objType))
-                    return 'null';
-                const nestIndent = parentIndent + indent;
-                const items = Array.isArray(obj)
-                    ? obj.map((item, i) => transformInner(item, nestIndent, { path: [...state.path, i], parent: obj }))
-                    : Object.entries(obj).map(([key, value]) => {
-                        return transformInner(key, nestIndent, { path: [...state.path, key], parent: obj, isKey: true })
-                            + arrow + transformInner(value, nestIndent, { path: [...state.path, key], parent: obj });
-                    });
-                const itemStr = items.join(`,${linebreak === '' && !stripSpaces ? ' ' : linebreak + nestIndent}`);
-                return `${arrOpen}${linebreak + nestIndent}${itemStr}${linebreak + parentIndent}${arrClose}`;
-            default:
-                return 'null';
-        }
-    }
-    return function transform(obj, parentIndent = '') {
-        return transformInner(obj, parentIndent, { path: [] });
-    };
-};
-const json2php = make();
-json2php.make = make;
-exports.default = json2php;

package/build/utils/php-serializer.d.ts

@@ -1,6 +0,0 @@
-type Config = {
-    objectsAsArrays?: boolean;
-    excludedKeys?: string[];
-};
-export declare function phpSerialize(value: any, config?: Config): string;
-export {};

package/build/utils/php-serializer.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.phpSerialize = phpSerialize;
-function phpSerialize(value, config) {
-    switch (typeof value) {
-        case "undefined":
-            return "N;";
-        case "object":
-            if (value === null) {
-                return "N;"; // Yep. Null is an "object" in JavaScript
-            }
-            else if (Array.isArray(value)) {
-                let res = `a:${value.length}:{`;
-                for (let i = 0; i < value.length; i++) {
-                    res += `i:${i};${phpSerialize(value[i], config)}`;
-                }
-                return (res.endsWith('};') ? res.substring(0, res.length - 1) : res) + "}";
-            }
-            return entriesInArrayAndObjectFormat(config?.objectsAsArrays ?? true ? 'a' : 'O:8:"stdClass"', Object.entries(value), config);
-        case "boolean":
-            return `b:${value ? 1 : 0};`;
-        case "number":
-            return Number.isInteger(value) ? serializeInteger(value) : `d:${value};`;
-        case "string":
-            return `s:${Buffer.byteLength(value, 'utf8')}:"${value}";`;
-        case "function":
-            throw new Error(`We are unable to serialize functions into a form readable by PHP.`);
-        case "symbol":
-            value = value.toString();
-            return `s:${Buffer.byteLength(value, 'utf8')}:"${value}";`;
-        case "bigint":
-            return serializeInteger(value);
-    }
-}
-function serializeInteger(value) {
-    const str = value.toString();
-    if (str.includes("e") || str.includes("E")) {
-        return `d:${str.replace(/e/i, ".0e")};`;
-    }
-    return `i:${str};`;
-}
-function entriesInArrayAndObjectFormat(prefix, entries, config) {
-    const excludedKeys = config?.excludedKeys ?? [];
-    let res = "";
-    let count = 0;
-    for (const [k, v] of entries) {
-        if (!excludedKeys.includes(k)) {
-            count++;
-            res += `${phpSerialize(k, config)}${phpSerialize(v, config)}`;
-        }
-    }
-    return `${prefix}:${count}:{` + (res.endsWith('};') ? res.substring(0, res.length - 1) : res) + "}";
-}