@plaudit/webpack-extensions 2.68.1 → 2.69.0

package/build/plugins/AbstractBiPhasicGroupAndEntryPlugin.d.ts

@@ -1,5 +1,5 @@
-import { ParsedAssetsJson, VerifiedAdvancedOutputConfig } from "../shared";
-import type { ExtensibleEntryObject, VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import { ParsedAssetsJson, VerifiedAdvancedOutputConfig, VerifiedPlauditWordpressWebpackConfig } from "../shared";
+import type { ExtensibleEntryObject } from "../utils/common-config-helpers";
 import { PseudoSemaphore } from "../utils/pseduo-semaphore";
 import { AbstractBiPhasicGroupPlugin } from "./AbstractBiPhasicGroupPlugin";
 import { Compilation, Compiler, Entrypoint } from "webpack";

package/build/plugins/AbstractBiPhasicGroupPlugin.d.ts

@@ -1,7 +1,6 @@
-import { Compilation, Compiler, type WebpackPluginInstance } from "webpack";
 import { PseudoSemaphore } from "../utils/pseduo-semaphore";
-import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
-import { ParsedAssetsJson } from "../shared";
+import { type ParsedAssetsJson, type VerifiedPlauditWordpressWebpackConfig } from "../shared";
+import { Compilation, Compiler, type WebpackPluginInstance } from "webpack";
 type TapWithAssetsJsonOptions = {
     name?: string;
     stage?: (typeof Compilation.PROCESS_ASSETS_STAGE_REPORT) | (typeof Compilation.PROCESS_ASSETS_STAGE_ANALYSE);

package/build/plugins/AbstractBiPhasicGroupPlugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractBiPhasicGroupPlugin = void 0;
-const webpack_1 = require("webpack");
 const shared_1 = require("../shared");
+const webpack_1 = require("webpack");
 class AbstractBiPhasicGroupPlugin {
     config;
     group;

package/build/plugins/AdditionalDependencyInjectorPlugin.d.ts

@@ -1,6 +1,6 @@
 import { AbstractBiPhasicGroupPlugin } from "./AbstractBiPhasicGroupPlugin";
 import type { AbstractBiPhasicGroupAndEntryPlugin } from "./AbstractBiPhasicGroupAndEntryPlugin";
-import { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import { VerifiedPlauditWordpressWebpackConfig } from "../shared";
 import { Compilation } from "webpack";
 export declare class AdditionalDependencyInjectorPlugin extends AbstractBiPhasicGroupPlugin {
     private readonly processingModules;

package/build/plugins/EnhancedDynamicEntryPlugin.d.ts

@@ -1,5 +1,5 @@
 import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
-import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import type { VerifiedPlauditWordpressWebpackConfig } from "../shared";
 export declare class EnhancedDynamicEntryPlugin extends AbstractBiPhasicGroupAndEntryPlugin {
     constructor(config: VerifiedPlauditWordpressWebpackConfig, context: string, entry: EntryProvider);
     protected attachUniquePhase(): void;

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.d.ts

@@ -1,6 +1,5 @@
 import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
-import { ParsedAssetsJson, VerifiedAdvancedOutputConfig } from "../shared";
-import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import { ParsedAssetsJson, VerifiedAdvancedOutputConfig, VerifiedPlauditWordpressWebpackConfig } from "../shared";
 import { Compilation, type Compiler } from "webpack";
 export declare class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryPlugin {
     private readonly extensionsSrcPath;

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.js

@@ -49,7 +49,7 @@ class ExtensionsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryP
         });
     }
     generateVersionThreeConfigFile(compilation, relevantAssetData, setupFilePaths) {
-        const handlePrefix = `${this.config.plainEntrypointsHandlePrefix}_block-extensions`;
+        const handlePrefix = `${this.config.targetHandlePrefix}_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: {}

package/build/plugins/ExtensionsConfigFileGeneratorPluginV1.d.ts

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

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.d.ts

@@ -1,5 +1,4 @@
-import { ParsedAssetsJson, BlockEntrypointInfo, UsageLocations } from "../shared";
-import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import { ParsedAssetsJson, BlockEntrypointInfo, UsageLocations, VerifiedPlauditWordpressWebpackConfig } from "../shared";
 import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
 import { Compilation } from "webpack";
 export declare class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAndEntryPlugin<BlockEntrypointInfo> {

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -85,7 +85,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
                     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]);
                     }
-                }, { priority, accountForAlreadyDoing: true });
+                }, { priority, accountForAlreadyDoing: this.config.plainEntrypointsSettings.includePostInitFallback });
             }
             const sortedEditorStyleHandles = sortedStyleHandles
                 .filter(([_, { locations: { clientEditor }, type }]) => type === 'style' && (clientEditor || typeof clientEditor === 'number'))
@@ -188,7 +188,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
                     handleName: useHandleName ? this.usageLocations.handle : undefined,
                 });
             }
-            myAssetHandles.push({ handles, handlePrefix: this.config.plainEntrypointsHandlePrefix });
+            myAssetHandles.push({ handles, handlePrefix: this.config.targetHandlePrefix });
         }
         PlainEntrypointsConfigFileGeneratorPlugin.semaphore.resolve(this.id, myAssetHandles);
         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, myAssetHandles.length

package/build/plugins/PlainEntrypointsStyleBlockJSONPlugin.d.ts

@@ -1,6 +1,5 @@
 import { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "./AbstractBiPhasicGroupAndEntryPlugin";
-import { ParsedAssetsJson, BlockEntrypointInfo, FileSegmentBlockEntrypointInfo } from "../shared";
-import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import { ParsedAssetsJson, BlockEntrypointInfo, FileSegmentBlockEntrypointInfo, VerifiedPlauditWordpressWebpackConfig } from "../shared";
 import { Compilation } from "webpack";
 import type WebpackRemoveEmptyScriptsPlugin from "webpack-remove-empty-scripts";
 type WorkableBlockEntrypointInfo = Omit<FileSegmentBlockEntrypointInfo, 'originalValue'> & Partial<Pick<FileSegmentBlockEntrypointInfo, 'originalValue'>> & {

package/build/plugins/SpecialAssetHandlingPlugin.d.ts

@@ -1,4 +1,4 @@
-import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import { VerifiedPlauditWordpressWebpackConfig } from "../shared";
 import { AbstractBiPhasicGroupPlugin } from "./AbstractBiPhasicGroupPlugin";
 import { Compilation } from "webpack";
 export declare class SpecialAssetHandlingPlugin extends AbstractBiPhasicGroupPlugin {

package/build/plugins/UnifiedLoaderGenerator.d.ts

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

package/build/plugins/VariablesJSMonitorPlugin.d.ts

@@ -1,4 +1,4 @@
-import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
+import type { VerifiedPlauditWordpressWebpackConfig } from "../shared";
 import type { Compiler, WebpackPluginInstance } from "webpack";
 export declare class VariablesJSMonitorPlugin implements WebpackPluginInstance {
     private readonly config;

package/build/shared.d.ts

@@ -82,7 +82,11 @@ type OptionalCfgFields = 'directoryLayout' | 'externalize' | 'lazyLoader';
 export type VerifiedAdvancedOutputConfig = Required<Omit<AdvancedOutputConfig, 'locations' | OptionalCfgFields>> & Pick<AdvancedOutputConfig, OptionalCfgFields> & {
     locations: UsageLocations;
 };
-export type PlauditWordpressWebpackConfig = {
+type DeprecatedPlauditWordpressWebpackConfigProps = {
+    plainEntrypointsHandlePrefix?: string;
+    plainEntrypointsVersion?: PlainEntrypointsSettings['version'];
+};
+type PlauditWordpressWebpackConfigProps = {
     standaloneBlocks?: boolean;
     variables?: Record<string, any>;
     verbose?: boolean;
@@ -98,12 +102,23 @@ export type PlauditWordpressWebpackConfig = {
     useWebpackResourceFiltering?: boolean;
     outputDir?: string;
     extensionsVersion?: 1 | 2 | 3;
-    plainEntrypointsHandlePrefix?: string;
-    plainEntrypointsVersion?: 1 | 2;
+    targetHandlePrefix?: string;
+    plainEntrypointsSettings?: PlainEntrypointsSettings;
     srcDir?: string;
     srcPrefixes?: string[];
     useUnifiedLoader?: boolean;
 };
+type PlainEntrypointsSettings = {
+    includePostInitFallback?: boolean;
+    version: 1 | 2;
+};
+export type PlauditWordpressWebpackConfig = PlauditWordpressWebpackConfigProps & DeprecatedPlauditWordpressWebpackConfigProps;
+export type VerifiedPlauditWordpressWebpackConfig = Required<Omit<PlauditWordpressWebpackConfigProps, 'variables' | 'src' | 'externals' | 'plainEntrypointsSettings'>> & {
+    variablesFilePath?: string;
+    currentVariables: Record<string, any>;
+} & Pick<PlauditWordpressWebpackConfig, 'externals'> & {
+    plainEntrypointsSettings: Required<PlainEntrypointsSettings>;
+};
 export type FileSegmentBlockEntrypointInfo = {
     blockJsonOrigin: string;
     entrypointField: EntrypointFields[number];

package/build/utils/common-config-helpers.d.ts

@@ -1,12 +1,8 @@
 import type { AbstractBiPhasicGroupAndEntryPlugin, EntryProvider } from "../plugins/AbstractBiPhasicGroupAndEntryPlugin";
 import type { AdditionalDependencyInjectorPlugin } from "../plugins/AdditionalDependencyInjectorPlugin";
-import { EntrypointFields, PlauditWordpressWebpackConfig, BlockEntrypointInfo, VerifiedAdvancedOutputConfig } from "../shared";
+import { EntrypointFields, VerifiedPlauditWordpressWebpackConfig, BlockEntrypointInfo, VerifiedAdvancedOutputConfig } from "../shared";
 import type { Compiler, Configuration, DynamicEntryPlugin, WebpackPluginInstance } from "webpack";
 import type WebpackRemoveEmptyScriptsPlugin from "webpack-remove-empty-scripts";
-export type VerifiedPlauditWordpressWebpackConfig = Required<Omit<PlauditWordpressWebpackConfig, 'variables' | 'src' | 'externals'>> & {
-    variablesFilePath?: string;
-    currentVariables: Record<string, any>;
-} & Pick<PlauditWordpressWebpackConfig, 'externals'>;
 export type CommonPluginConfig = {
     plugins: (WebpackPluginInstance | ((this: Compiler, compiler: Compiler) => void))[];
     removeEmptyScriptsPlugin: WebpackRemoveEmptyScriptsPlugin;

package/build/wordpress-scripts-wrapper.js

@@ -172,7 +172,11 @@ 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 } = 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 = "", srcDir = "", useUnifiedLoader = false } = config;
+    const plainEntrypointsSettings = {
+        version: config.plainEntrypointsSettings?.version ?? config.plainEntrypointsVersion ?? 1,
+        includePostInitFallback: config.plainEntrypointsSettings?.includePostInitFallback ?? true
+    };
     let srcPrefixes;
     const trailingSlashedSrcDir = srcDir && !srcDir.endsWith("/") ? srcDir + "/" : srcDir;
     if (config.srcPrefixes === undefined) {
@@ -181,12 +185,12 @@ function buildVerifiedConfig(config) {
     else {
         srcPrefixes = (srcDir && !config.srcPrefixes.includes(trailingSlashedSrcDir) ? [...config.srcPrefixes, trailingSlashedSrcDir] : config.srcPrefixes);
     }
-    let plainEntrypointsHandlePrefix = config.plainEntrypointsHandlePrefix ?? "";
-    if (plainEntrypointsVersion > 1) {
-        if (!plainEntrypointsHandlePrefix) {
-            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");
+    let targetHandlePrefix = config.targetHandlePrefix ?? config.plainEntrypointsHandlePrefix ?? "";
+    if (plainEntrypointsSettings.version > 1) {
+        if (!targetHandlePrefix) {
+            targetHandlePrefix = deriveDefaultHandlePrefixFromComposerJsonOrThemeName();
+            if (!targetHandlePrefix) {
+                throw new Error("Plain Entrypoints V2 and higher require either 'targetHandlePrefix' to be set or an adjacent composer.json or style.css file to be present");
             }
         }
         if (!outputDir) {
@@ -220,7 +224,7 @@ function buildVerifiedConfig(config) {
     }
     const cfg = {
         currentVariables, postcss, standaloneBlocks, stats, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries, processTranslationConfigs, combineAssetMetadata,
-        useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsVersion, plainEntrypointsHandlePrefix, srcDir, srcPrefixes, useUnifiedLoader
+        useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsSettings, srcDir, srcPrefixes, targetHandlePrefix, useUnifiedLoader
     };
     // Destination -> source map
     const allocatedDestinations = {};
@@ -309,7 +313,7 @@ function deriveDefaultHandlePrefixFromComposerJsonOrThemeName() {
         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");
+        throw new ReferenceError("targetHandlePrefix 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'));
 }
@@ -317,7 +321,7 @@ 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) {
-        throw new ReferenceError("plainEntrypointsHandlePrefix was not set and the adjacent style.css file does not have a valid name in it");
+        throw new ReferenceError("targetHandlePrefix was not set and the adjacent style.css file does not have a valid name in it");
     }
     return (0, shared_1.kebabCase)(themeName);
 }
@@ -522,7 +526,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources, canClean
                     }
                 }
                 const baseDest = stripExtension(dest.destination);
-                if (config.plainEntrypointsVersion > 1) {
+                if (config.plainEntrypointsSettings.version > 1) {
                     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 } } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.68.1",
+  "version": "2.69.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/build"
@@ -16,9 +16,9 @@
     }
   },
   "devDependencies": {
-    "@plaudit/gutenberg-api-extensions": "^2.77.0",
+    "@plaudit/gutenberg-api-extensions": "^2.77.2",
     "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/node": "^24.5.2",
+    "@types/node": "^24.6.0",
     "@types/postcss-functions": "^4.0.4",
     "@types/tapable": "^2.2.7",
     "@types/webpack": "^5.28.5",
@@ -59,7 +59,7 @@
     "postcss-url": "^10.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "webpack": "^5.101.3",
+    "webpack": "^5.102.0",
     "webpack-remove-empty-scripts": "^1.1.1",
     "xml-formatter": "^3.6.7"
   },