@plaudit/webpack-extensions 2.65.1 → 2.65.3

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -52,9 +52,8 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
                     finalHandleName = (0, shared_1.convertUsageLocationsHandleToEmittableHandle)(handleName, basename);
                 }
                 else {
-                    const baseFinalHandleName = `${handlePrefix}.${(0, shared_1.kebabCase)(basename)}`;
                     const handleNameMap = usedHandleNames[type];
-                    finalHandleName = (0, shared_1.convertUsageLocationsHandleToEmittableHandle)(handleName, basename);
+                    const baseFinalHandleName = finalHandleName = `${handlePrefix}.${(0, shared_1.convertUsageLocationsHandleToEmittableHandle)((0, shared_1.kebabCase)(basename), basename)}`;
                     for (let count = 0; finalHandleName in handleNameMap && handleNameMap[finalHandleName] !== src;) {
                         finalHandleName = `${baseFinalHandleName}-${++count}`;
                     }
@@ -202,7 +201,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
         PlainEntrypointsConfigFileGeneratorPlugin.semaphore.resolve(this.id, myAssetHandles);
         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, myAssetHandles.length
             ? {
-                group: this.group, requiresBaseURI: true, action: writer => writer.append("require_once __DIR__.'/plain-entrypoints-loader.php';"),
+                group: this.group, requiresBaseURI: true, action: writer => writer.require("/plain-entrypoints-loader.php", { dirRelative: true, once: true }),
                 staticallyLoadedEntrypoints: relevantEntrypoints.flatMap(re => re.entrypoint.getEntrypointChunk().files.values().toArray())
             }
             : undefined);

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.d.ts

@@ -22,4 +22,5 @@ export declare class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhas
     private static remapReferencedPHPFilesOnKey;
     private static normalizeRenderTemplate;
     protected attachUniquePhase(compilation: Compilation): void;
+    protected attachStandardPhase(compilation: Compilation): void;
 }

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlainEntrypointsStyleBlockJSONPlugin = void 0;
 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");
@@ -13,7 +14,6 @@ const shared_1 = require("../shared");
 const php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const webpack_1 = require("webpack");
-const promises_1 = __importDefault(require("node:fs/promises"));
 class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
     blocksDest;
     webpackRemoveEmptyScriptsPlugin;
@@ -31,13 +31,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
             if (node_path_1.default.basename(srcPath).toLowerCase() !== "block.json" || !('purpose' in metadata) || metadata.purpose !== "block-json-inclusion-assurance") {
                 continue;
             }
-            const entrypointChunk = entrypoint.getEntrypointChunk();
-            for (const danglingBlockJsFile of [...entrypointChunk.files, ...entrypointChunk.auxiliaryFiles]) {
-                if (!danglingBlockJsFile.endsWith("block.json")) {
-                    compilation.deleteAsset(danglingBlockJsFile);
-                }
-            }
-            const asset = [...compilation.chunkGraph.getChunkEntryModulesIterable(entrypointChunk)][0]?.originalSource();
+            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";
@@ -99,7 +93,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
             group: this.group,
             requiresBaseURI: false,
             staticallyLoadedEntrypoints: relevantEntrypoints.flatMap(re => re.entrypoint.getEntrypointChunk().files.values().toArray()),
-            action: writer => writer.append(`require_once __DIR__.${php_writer_1.Expr.convertJsonToPHP("/" + node_path_1.default.join(this.blocksDest, "blockdir-loader.php"))};`)
+            action: writer => writer.require(node_path_1.default.join(this.blocksDest, "blockdir-loader.php"), { dirRelative: true, once: true })
         } : undefined);
     }
     emitBlockLoaderFile(compilation, blockData) {
@@ -378,5 +372,22 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
             this.emitBlockLoaderFile(compilation, blockData);
         });
     }
+    attachStandardPhase(compilation) {
+        super.attachStandardPhase(compilation);
+        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 (node_path_1.default.basename(srcPath).toLowerCase() !== "block.json" || !('purpose' in metadata) || metadata.purpose !== "block-json-inclusion-assurance") {
+                    continue;
+                }
+                const entrypointChunk = entrypoint.getEntrypointChunk();
+                for (const danglingBlockJsFile of [...entrypointChunk.files, ...entrypointChunk.auxiliaryFiles]) {
+                    if (!danglingBlockJsFile.endsWith("block.json")) {
+                        compilation.deleteAsset(danglingBlockJsFile);
+                    }
+                }
+            }
+        });
+    }
 }
 exports.PlainEntrypointsStyleBlockJSONPlugin = PlainEntrypointsStyleBlockJSONPlugin;

package/build/plugins/SpecialAssetHandlingPlugin.js

@@ -48,7 +48,7 @@ class SpecialAssetHandlingPlugin extends AbstractBiPhasicGroupPlugin_1.AbstractB
                 }
                 SpecialAssetHandlingPlugin.semaphore.resolve(this.id, specialAssetData);
                 UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, Object.keys(specialAssetData).length > 0
-                    ? { group: 'special-assets', requiresBaseURI: true, action: writer => writer.append("require_once __DIR__.'/special-assets.php';") }
+                    ? { group: 'special-assets', requiresBaseURI: true, action: writer => writer.require("/special-assets.php", { dirRelative: true, once: true }) }
                     : undefined);
             }
             catch (e) {

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

@@ -130,6 +130,10 @@ export declare abstract class Constants {
     static readonly __DIR__: EnclosedLiteral;
     static readonly ABSPATH: EnclosedLiteral;
 }
+export type AppendExprArgs = {
+    chain?: boolean;
+    return?: boolean;
+};
 export type ActionOrFilterArgs = {
     priority?: number | Expr;
     functionArgParameters?: string[];
@@ -143,6 +147,10 @@ export type FunctionCreationArgs = {
     assignToName?: boolean;
     scopeActionDescription?: string;
 };
+export type RequireOrIncludeArgs = {
+    dirRelative?: boolean;
+    once?: boolean;
+} & AppendExprArgs;
 export declare class PHPWriter {
     private readonly inlineFirstLine;
     private readonly scopeStack;
@@ -167,14 +175,8 @@ export declare class PHPWriter {
      * @param expr This is treated as literal *regardless of its type*
      * @param opts flags to add additional markup around the expression
      */
-    appendExpr(expr: string | Expr, opts?: {
-        chain?: boolean;
-        return?: boolean;
-    }): this;
-    assign(assignee: ConstructorParameters<typeof Assignment>[0] | string, expression: unknown, opts?: {
-        chain?: boolean;
-        return?: boolean;
-    }): this;
+    appendExpr(expr: string | Expr, opts?: AppendExprArgs): this;
+    assign(assignee: ConstructorParameters<typeof Assignment>[0] | string, expression: unknown, opts?: AppendExprArgs): this;
     return(expression: unknown | Expr): this;
     static(variable: Var | string, opts?: {
         initializer?: unknown | Literal;
@@ -187,10 +189,8 @@ export declare class PHPWriter {
      * @param opts
      */
     call(func: string | EnclosableExpression, args: unknown[], opts?: {
-        chain?: boolean;
         assignTo?: ConstructorParameters<typeof Assignment>[0];
-        return?: boolean;
-    }): this;
+    } & AppendExprArgs): this;
     action(name: string | Expr, contents: (writer: PHPWriter) => void, args?: ActionOrFilterArgs): this;
     filter(name: string | Expr, contents: (writer: PHPWriter) => void, args?: ActionOrFilterArgs): this;
     actionOrFilter(type: 'action' | 'filter', name: string | Expr, contents: (writer: PHPWriter) => void, args: ActionOrFilterArgs): this;
@@ -207,6 +207,9 @@ export declare class PHPWriter {
     openPHP(): this;
     namespace(namespace: string): this;
     use(...uses: string[]): this;
+    require(filePath: string | Expr, args?: RequireOrIncludeArgs): this;
+    include(filePath: string | Expr, args?: RequireOrIncludeArgs): this;
+    requireOrInclude(type: 'require' | 'include', filePath: string | Expr, args: RequireOrIncludeArgs): this;
     /**
      * Starts a scope that, when paired with {@link #closeScope()}, allows for automating unset calls.
      * All scopes started MUST be paired with either an {@link #closeScope()} or {@link #popScope()} call.

package/build/utils/php-writer.js

@@ -12,6 +12,7 @@ class Expr {
     static jsonToPHPConverter = json_to_php_but_with____injection_1.default.make({ shortArraySyntax: true });
     static convertJsonToPHP = (obj) => obj instanceof Expr ? obj.toString() : Expr.jsonToPHPConverter(obj);
     constructor() { }
+    // noinspection JSUnusedGlobalSymbols - this technically-unused method is necessary for TypeScript to differentiate subclasses of Expr from any
     typeName() {
         return this.constructor.name;
     }
@@ -514,6 +515,20 @@ class PHPWriter {
         }
         return this;
     }
+    require(filePath, args = {}) {
+        return this.requireOrInclude('require', filePath, args);
+    }
+    include(filePath, args = {}) {
+        return this.requireOrInclude('include', filePath, args);
+    }
+    requireOrInclude(type, filePath, args) {
+        const command = args.once ? `${type}_once` : type;
+        if (args.dirRelative && typeof filePath === 'string' && !filePath.startsWith("/")) {
+            filePath = "/" + filePath;
+        }
+        const path = args.dirRelative ? Op.join(Constants.__DIR__, filePath) : Expr.convertJsonToPHP(filePath);
+        return this.appendExpr(`${command} ${path}`, args);
+    }
     /**
      * Starts a scope that, when paired with {@link #closeScope()}, allows for automating unset calls.
      * All scopes started MUST be paired with either an {@link #closeScope()} or {@link #popScope()} call.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.65.1",
+  "version": "2.65.3",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/build"