@plaudit/webpack-extensions 2.65.3 → 2.66.1

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.d.ts

@@ -10,7 +10,7 @@ export declare class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasi
     constructor(config: VerifiedPlauditWordpressWebpackConfig, extensionsSrcPath: string, dest: VerifiedAdvancedOutputConfig, context: string, entry: EntryProvider);
     get extensionsDestPath(): string;
     apply(compiler: Compiler): void;
-    private generateVersionTwoConfigFile;
+    private generateVersionThreeConfigFile;
     protected attachUniquePhase(compilation: Compilation): void;
     protected processAssets(compilation: Compilation, rawAssetData: ParsedAssetsJson): void;
 }

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.js

@@ -48,7 +48,8 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
                 .filter((item) => item[0] !== undefined).sort((a, b) => a[0].localeCompare(b[0]));
         });
     }
-    generateVersionTwoConfigFile(compilation, relevantAssetData, setupFilePaths) {
+    generateVersionThreeConfigFile(compilation, relevantAssetData, setupFilePaths) {
+        const handlePrefix = `${this.config.plainEntrypointsHandlePrefix}_block-extensions`;
         const regex = /^(.+?)-((?:editor-|view-|)(?:style|script|script-module))\.(?:css|m?js)$/i;
         const blockExtensionsConfig = {
             metadata: { version: this.config.extensionsVersion }, scriptHandles: {}, scriptModuleHandles: {}, styleHandles: {}, blocks: {}, setupFiles: {}
@@ -67,7 +68,7 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
             const blockSlug = match[1], assetType = match[2];
             if (blockSlug && assetType) {
                 const key = assetType.replace(/-[sm]/gi, chars => chars.substring(1).toUpperCase());
-                const handle = `plaudit_block-extension_${blockSlug}-${assetType}`;
+                const handle = `${handlePrefix}_${blockSlug}-${assetType}`;
                 const isCss = (0, shared_1.isStyleField)(assetType);
                 const handleGroup = isCss ? 'styleHandles'
                     : ((0, shared_1.isScriptModuleField)(assetType) ? 'scriptModuleHandles' : 'scriptHandles');
@@ -96,7 +97,14 @@ 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)));
-        compilation.emitAsset(node_path_1.default.join(this.dest.destination, "mapping.config.php"), new webpack_1.sources.RawSource((0, shared_1.makeEmittableConfigPHP)(blockExtensionsConfig, true)));
+        new php_writer_1.PHPWriter()
+            .withScope(writer => {
+            const fileUriPrefixVar = new php_writer_1.Var("fileUriPrefix");
+            writer
+                .call("plaudit_webpack_extensions__resolve_base_uri", [php_writer_1.Constants.__DIR__], { assignTo: fileUriPrefixVar })
+                .call("Plaudit\\Common\\Lib\\GutenbergUtils::loadExtensionsV3", [new php_writer_1.EnclosedLiteral((0, shared_1.makeEmittableConfigPHP)(blockExtensionsConfig, false)), php_writer_1.Constants.__DIR__, fileUriPrefixVar]);
+        })
+            .emitAsset(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 () => {
@@ -117,7 +125,7 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
             }, {}))
                 .sort((a, b) => a.plugin.group.localeCompare(b.plugin.group));
             for (const { plugin, relevantAssetData, setupFiles } of plugins) {
-                plugin.generateVersionTwoConfigFile(compilation, relevantAssetData, setupFiles);
+                plugin.generateVersionThreeConfigFile(compilation, relevantAssetData, setupFiles);
             }
         });
     }
@@ -125,38 +133,22 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
         const relevantAssetData = this.extractRelevantAssetData(compilation, rawAssetData);
         const staticallyLoadedEntrypoints = Object.keys(relevantAssetData);
         const generateLoader = (writer) => {
-            const filePathPrefixVar = new php_writer_1.Var("filePathPrefix");
-            const fileUriPrefixVar = new php_writer_1.Var("fileUriPrefix");
-            writer
-                .assign(filePathPrefixVar, new php_writer_1.Literal(`__DIR__.${php_writer_1.Expr.convertJsonToPHP(this.extensionsDestPath)}`))
-                .call("plaudit_webpack_extensions__resolve_base_uri", [filePathPrefixVar], { assignTo: fileUriPrefixVar })
-                .call("GutenbergUtils::loadExtensionsV2", [
-                new php_writer_1.Literal(`__DIR__.${php_writer_1.Expr.convertJsonToPHP(this.extensionsDestPath + "mapping.config.php")}`),
-                filePathPrefixVar, fileUriPrefixVar,
-                `${this.config.plainEntrypointsHandlePrefix || node_path_1.default.basename(process.cwd())}_extension_`
-            ]);
+            writer.require(this.extensionsDestPath + "extensions-loader.php", { dirRelative: true, once: true });
         };
         let action;
-        const potentialHandle = this.dest.locations?.handle;
-        if (potentialHandle) {
-            if (typeof potentialHandle === 'string') {
-                try {
-                    action = writer => writer.use("Plaudit\\Common\\Lib\\GutenbergUtils").function(potentialHandle, [], generateLoader, { returnType: 'void' });
-                }
-                catch (e) {
-                    compilation.errors.push((0, shared_1.newWebpackErrorForFile)(["An error occurred while emitting a function for dynamically loading extensions", { cause: e }], this.extensionsSrcPath));
-                    this.rejectSemaphores();
-                    return;
-                }
+        const lazyLoader = this.dest.lazyLoader;
+        if (lazyLoader) {
+            try {
+                action = writer => writer.function(lazyLoader, [], generateLoader, { returnType: 'void' });
             }
-            else {
-                compilation.errors.push(new Error("The extensions directoryLayout's handle support is limited to static strings"));
+            catch (e) {
+                compilation.errors.push((0, shared_1.newWebpackErrorForFile)(["An error occurred while emitting a function for lazily loading extensions", { cause: e }], this.extensionsSrcPath));
                 this.rejectSemaphores();
                 return;
             }
         }
         else {
-            action = writer => writer.use("Plaudit\\Common\\Lib\\GutenbergUtils").withScope(generateLoader);
+            action = writer => writer.withScope(generateLoader);
         }
         const myCacheData = { plugin: this, setupFiles: this.setupFiles, relevantAssetData };
         ExtensionsConfigFileGeneratorPlugin.semaphore.resolve(this.id, myCacheData);

package/build/plugins/ExtensionsConfigFileGeneratorPluginV1.js

@@ -32,7 +32,7 @@ class ExtensionsConfigFileGeneratorPluginV1 extends AbstractBiPhasicGroupAndEntr
         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, { group: `extensions-config-v1-${this.extensionsDest}`, requiresBaseURI: false, action: writer => {
                 writer
                     .use("Plaudit\\Common\\Lib\\GutenbergUtils")
-                    .call("GutenbergUtils::installExtensionsSupport", [php_writer_1.Op.join(php_writer_1.Constants.__DIR__, this.extensionsDest)]);
+                    .call("GutenbergUtils::installExtensionsSupport", [php_writer_1.Op.concat(php_writer_1.Constants.__DIR__, this.extensionsDest)]);
             } });
     }
 }

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -88,7 +88,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
                 writer.action("init", writer => {
                     writer.call("plaudit_webpack_extensions__resolve_base_uri", [php_writer_1.Constants.__DIR__], { assignTo: baseUriVar });
                     for (const { handle, type, data } of prioritizedHandleList) {
-                        writer.call(`wp_register_${type}`, [handle, php_writer_1.Op.join(baseUriVar, node_path_1.default.relative(emitDir, data.src)), ...data.rest]);
+                        writer.call(`wp_register_${type}`, [handle, php_writer_1.Op.concat(baseUriVar, node_path_1.default.relative(emitDir, data.src)), ...data.rest]);
                     }
                 }, { priority, accountForAlreadyDoing: true });
             }

package/build/plugins/SpecialAssetHandlingPlugin.js

@@ -116,7 +116,7 @@ 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.join(baseUriVar, filename)])} ?>" ${dynamicAttrs}>`);
+                writer.append(`<link rel="preload" href="<?= ${php_writer_1.Expr.call("esc_url", [php_writer_1.Op.concat(baseUriVar, filename)])} ?>" ${dynamicAttrs}>`);
             }
             writer.openPHP();
         });

package/build/shared.d.ts

@@ -48,8 +48,9 @@ export type AdvancedOutputConfig = {
     externalize?: Required<Configuration>['output']['library'];
     bundleAnalyzer?: boolean;
     locations?: UsageLocations | UsageLocations['handle'];
+    lazyLoader?: string;
 };
-type OptionalCfgFields = 'directoryLayout' | 'externalize';
+type OptionalCfgFields = 'directoryLayout' | 'externalize' | 'lazyLoader';
 export type VerifiedAdvancedOutputConfig = Required<Omit<AdvancedOutputConfig, 'locations' | OptionalCfgFields>> & Pick<AdvancedOutputConfig, OptionalCfgFields> & {
     locations: UsageLocations;
 };
@@ -68,7 +69,7 @@ export type PlauditWordpressWebpackConfig = {
     combineAssetMetadata?: boolean;
     useWebpackResourceFiltering?: boolean;
     outputDir?: string;
-    extensionsVersion?: 1 | 2;
+    extensionsVersion?: 1 | 2 | 3;
     plainEntrypointsHandlePrefix?: string;
     plainEntrypointsVersion?: 1 | 2;
     srcDir?: string;

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

@@ -66,7 +66,7 @@ export declare class Op extends ParenthesesEnclosableExpression {
     constructor(operator: string, ...args: unknown[]);
     toString(): string;
     static binary(left: unknown, operator: string, right: unknown): Op;
-    static join(...args: unknown[]): Op;
+    static concat(...args: unknown[]): Op;
 }
 export declare class Not extends ParenthesesEnclosableExpression {
     readonly expression: EnclosableExpression;

package/build/utils/php-writer.js

@@ -131,7 +131,7 @@ class Op extends ParenthesesEnclosableExpression {
     static binary(left, operator, right) {
         return new Op(operator, left, right);
     }
-    static join(...args) {
+    static concat(...args) {
         return new Op(".", ...args);
     }
 }
@@ -248,11 +248,10 @@ class Assignment extends ParenthesesEnclosableExpression {
         }
     }
     toString() {
-        const assignmentValue = isEnclosableExpression(this.value) ? this.value.toEnclosedForm() : Expr.convertJsonToPHP(this.value);
         if (this.push) {
-            return this.assignees[0].toEnclosedForm() + "[] = " + assignmentValue;
+            return this.assignees[0].toEnclosedForm() + "[] = " + Expr.convertJsonToPHP(this.value);
         }
-        return [...this.assignees.map(t => t.toEnclosedForm()), assignmentValue].join(" = ");
+        return [...this.assignees.map(t => t.toEnclosedForm()), Expr.convertJsonToPHP(this.value)].join(" = ");
     }
 }
 exports.Assignment = Assignment;
@@ -312,7 +311,20 @@ class PHPWriter {
      * @param opts flags to add additional markup around the expression
      */
     appendExpr(expr, opts = {}) {
-        const res = (opts.return ? "return " : "") + expr.toString();
+        let expression;
+        if (isEnclosableExpression(expr)) {
+            expression = opts.chain ? expr.toEnclosedForm() : expr.toString();
+        }
+        else if (opts.chain && expr instanceof Expr) {
+            throw new Error(`Cannot chain non-enclosable expressions`);
+        }
+        else {
+            expression = expr.toString();
+        }
+        if (opts.chain && expr instanceof Expr && !isEnclosableExpression(expr)) {
+            throw new Error(`Cannot chain non-enclosable expressions`);
+        }
+        const res = (opts.return ? "return " : "") + expression;
         return this.append(!opts.chain ? res + ';' : res);
     }
     assign(assignee, expression, opts = {}) {
@@ -526,7 +538,7 @@ class PHPWriter {
         if (args.dirRelative && typeof filePath === 'string' && !filePath.startsWith("/")) {
             filePath = "/" + filePath;
         }
-        const path = args.dirRelative ? Op.join(Constants.__DIR__, filePath) : Expr.convertJsonToPHP(filePath);
+        const path = args.dirRelative ? Op.concat(Constants.__DIR__, filePath) : Expr.convertJsonToPHP(filePath);
         return this.appendExpr(`${command} ${path}`, args);
     }
     /**

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 = "", extensionsVersion = 1, plainEntrypointsVersion = 1, srcDir = "", useUnifiedLoader = false } = 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 } = config;
     let srcPrefixes;
     const trailingSlashedSrcDir = srcDir && !srcDir.endsWith("/") ? srcDir + "/" : srcDir;
     if (config.srcPrefixes === undefined) {
@@ -184,7 +184,7 @@ function buildVerifiedConfig(config) {
     let plainEntrypointsHandlePrefix = config.plainEntrypointsHandlePrefix ?? "";
     if (plainEntrypointsVersion > 1) {
         if (!plainEntrypointsHandlePrefix) {
-            plainEntrypointsHandlePrefix = derivePlainEntrypointsHandlePrefixFromComposerJsonOrThemeName();
+            plainEntrypointsHandlePrefix = deriveDefaultHandlePrefixFromComposerJsonOrThemeName();
             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");
             }
@@ -214,6 +214,10 @@ function buildVerifiedConfig(config) {
     if (!rawVariables) {
         variablesFilePath = ["variables.js", "src/site/variables.js"].map(p => node_path_1.default.join(process.cwd(), p)).filter(p => node_fs_1.default.existsSync(p))[0];
     }
+    let extensionsVersion = config.extensionsVersion ?? 1;
+    if (extensionsVersion === 2) {
+        extensionsVersion = 3; // Version 3 is a backwards-compatible upgrade of version 2, so we can automatically upgrade everything
+    }
     const cfg = {
         currentVariables, postcss, standaloneBlocks, stats, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries, processTranslationConfigs, combineAssetMetadata,
         useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsVersion, plainEntrypointsHandlePrefix, srcDir, srcPrefixes, useUnifiedLoader
@@ -291,21 +295,25 @@ function finalizeEntryDestination(entry, dynamicEffectiveDestinationsWithExpecte
     allocatedDestinations[derivedDestination] = entry[0];
     return [entry[0], { ...entry[1], destination: derivedDestination }];
 }
-function derivePlainEntrypointsHandlePrefixFromComposerJsonOrThemeName() {
+let defaultHandlePrefix = undefined;
+function deriveDefaultHandlePrefixFromComposerJsonOrThemeName() {
+    if (defaultHandlePrefix !== undefined) {
+        return defaultHandlePrefix;
+    }
     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();
+        return deriveDefaultHandlePrefixFromThemeName();
     }
     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() {
+function deriveDefaultHandlePrefixFromThemeName() {
     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) {

package/package.json

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