@plaudit/webpack-extensions 3.14.0 → 3.15.0

package/CHANGELOG.md

@@ -5,13 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.15.0] - 2026-07-17
+### Changed
+- The `add_editor_style()` enqueue path to use `block_editor_settings_all` to avoid a litany of bugs courtesy of WordPress's high-quality code
+  - This comes from version `2.94.0`
+
+## [3.14.1] - 2026-07-15
+### Fixed
+- The new supported features code overriding unintended data in theme.json
+  - This comes from version `2.93.1`
+
 ## [3.14.0] - 2026-07-15
 ### Added
 - Logic to emit code that makes the supported features declared in block.json file the defaults for those blocks in the "theme.json" file
   - This uses filters to achieve the "defaulting", which means that it's plugin and theme agnostic
-  - This comes from version `2.92.4`
+  - This comes from version `2.93.0`
 - The `useBlockSupportsAsThemeJsonDefaults` flag to allow the new logic to be disabled
-  - This comes from version `2.92.4`
+  - This comes from version `2.93.0`
 
 ## [3.13.0] - 2026-07-14
 ### Added
@@ -204,6 +214,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Legacy PostCSS features that have been integrated into modern CSS
 - `@extends` support
 
+## [2.94.0] - 2026-07-17
+### Changed
+- The `add_editor_style()` enqueue path to use `block_editor_settings_all` to avoid a litany of bugs courtesy of WordPress's high-quality code
+
+## [2.93.1] - 2026-07-15
+### Fixed
+- The new supported features code overriding unintended data in theme.json
+
 ## [2.93.0] - 2026-07-15
 ### Added
 - Logic to emit code that makes the supported features declared in block.json file the defaults for those blocks in the "theme.json" file

package/dist/plugins/EnhancedBlockJSONPlugin.d.ts

@@ -22,7 +22,6 @@ export declare class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEnt
     constructor(config: VerifiedPlauditWordpressWebpackConfig, dest: VerifiedAdvancedOutputConfig, webpackRemoveEmptyScriptsPlugin: WebpackRemoveEmptyScriptsPlugin, context: string, entry: EntryProvider<BlockEntrypointInfo>);
     protected processAssets(compilation: Compilation, parsedAssetJsonProvider: ParsedAssetJsonProvider): Promise<void>;
     private emitBlockLoaderFile;
-    private static readonly IGNORED_THEME_JSON_FLAG_PROPS;
     private static pickOutFlagPropsFromBlockSupports;
     private callRegisterFunction;
     private transformBlocks;

package/dist/plugins/EnhancedBlockJSONPlugin.js

@@ -227,25 +227,40 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
         }
     }
     // This isn't strictly necessary, but it allows us to trivially eliminate commonly-used block supports flags that aren't used in theme.json
-    static IGNORED_THEME_JSON_FLAG_PROPS = ['align', 'alignWide', 'anchor', 'contentRole', 'interactivity', 'listView', 'plaudit'];
+    // private static readonly IGNORED_THEME_JSON_FLAG_PROPS = ['align', 'alignWide', 'anchor', 'contentRole', 'inserter', 'interactivity', 'listView', 'plaudit'];
     static pickOutFlagPropsFromBlockSupports(supports) {
-        const entries = [];
-        for (const [key, value] of Object.entries(supports)) {
-            if (!key.startsWith("__") && !EnhancedBlockJSONPlugin.IGNORED_THEME_JSON_FLAG_PROPS.includes(key) && value) {
-                if (typeof value === 'object') {
-                    if (!Array.isArray(value)) {
-                        const v = EnhancedBlockJSONPlugin.pickOutFlagPropsFromBlockSupports(value);
-                        if (v !== undefined) {
-                            entries.push([key, v]);
-                        }
+        function isRecord(value) {
+            return typeof value === 'object' && !!value && !Array.isArray(value);
+        }
+        let addedProp = false;
+        const res = {};
+        if ('color' in supports) {
+            const color = supports.color;
+            if (isRecord(color)) {
+                const colorFlags = {};
+                for (const prop of ['background', 'link', 'text']) {
+                    if (supports[prop]) {
+                        colorFlags[prop] = true;
+                        res.color = colorFlags;
+                        addedProp = true;
                     }
                 }
-                else if (typeof value === 'boolean') {
-                    entries.push([key, true]);
+            }
+        }
+        if ('dimensions' in supports) {
+            const dimensions = supports.dimensions;
+            if (isRecord(dimensions)) {
+                const dimensionsFlags = {};
+                for (const prop of ['aspectRatio']) {
+                    if (supports[prop]) {
+                        dimensionsFlags[prop] = true;
+                        res.color = dimensionsFlags;
+                        addedProp = true;
+                    }
                 }
             }
         }
-        return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+        return addedProp ? res : undefined;
     }
     callRegisterFunction(type, writer, baseUriVar, handles) {
         for (const [name, { src, rest }] of handles) {

package/dist/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -101,14 +101,19 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
             const aPriority = typeof a[1].locations.clientEditor === 'boolean' ? 10 : a[1].locations.clientEditor;
             const bPriority = typeof b[1].locations.clientEditor === 'boolean' ? 10 : b[1].locations.clientEditor;
             return aPriority - bPriority;
-        })
-            .map(info => info[1].src);
+        });
         if (sortedEditorStyleHandles.length > 0) {
             writer.linebreak();
-            for (const handleSrc of sortedEditorStyleHandles) {
-                const handlePath = (0, node_path_1.join)(this.outputDir, (0, node_path_1.relative)(emitDir, handleSrc));
-                writer.call("add_editor_style", [(0, shared_1.leadingSlashIt)(handlePath)]);
-            }
+            const editorSettings = new expressions_1.Var("editor_settings");
+            writer.filter("block_editor_settings_all", writer => {
+                for (const [handle, data] of sortedEditorStyleHandles) {
+                    const contents = data.inlinedAsset?.contents;
+                    if (contents) {
+                        writer.appendExpr(new expressions_1.Assignment(new expressions_1.ArrayAccess(editorSettings, "styles"), new expressions_1.PHPArray({ css: (0, shared_1.wrapInlineAssetContents)(compilation, "plaudit_editor_style", handle, contents) }), true));
+                    }
+                }
+                writer.return(editorSettings);
+            }, { functionArgParameters: [editorSettings], accountForAlreadyDoing: false });
         }
         const lazyLoadedHandles = Object.values(handleLists)
             .flatMap(handleList => handleList.map(handle => [handle.data.lazyLoader, handle]))
@@ -297,7 +302,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
                 const { dependencies = [], module_dependencies = undefined } = isScript === entrypointChunkIsScript ? assetData : {};
                 const { lazyLoader, locations } = this.dest;
                 const { flags } = (0, path_query_and_related_helpers_1.unpackEnqueuingControlFlagsFromPathQueryParameters)(typeof locations.registerScriptArgs === 'object' ? locations.registerScriptArgs : { strategy: locations.registerScriptArgs }, file, "registerScriptArgs");
-                const { inlinedAsset, scriptArgsObject } = (0, path_query_and_related_helpers_1.convertEnqueuingControlFlagsToScriptArgsObject)(compilation, file, (0, path_query_and_related_helpers_1.mergeTwoEnqueuingControlFlagSets)(file, flags, this.dest.enqueuingFlags));
+                const { inlinedAsset, scriptArgsObject } = (0, path_query_and_related_helpers_1.convertEnqueuingControlFlagsToScriptArgsObject)(compilation, file, (0, path_query_and_related_helpers_1.mergeTwoEnqueuingControlFlagSets)(file, flags, this.dest.enqueuingFlags), type === 'style' && (!!locations.clientEditor || locations.clientEditor === 0));
                 const completeScriptArgsObject = module_dependencies?.length ? { ...scriptArgsObject, module_dependencies } : scriptArgsObject;
                 const rest = isScript && completeScriptArgsObject !== undefined ? [dependencies, assetData.version, completeScriptArgsObject] : [dependencies, assetData.version];
                 const destPath = (0, node_path_1.join)(compilation.outputOptions.path, file);

package/dist/shared.d.ts

@@ -1,4 +1,5 @@
 import { PHPFile, PHPWriter } from "@plaudit/php-writer";
+import { HereOrNowDoc } from "@plaudit/php-writer/expressions";
 import type { Options as PostcssFunctionsOptions } from "postcss-functions";
 import { type AssetInfo, type Compilation, type Configuration, type Entrypoint, WebpackError, type Compiler } from "webpack";
 import { SourceType } from "./utils/entrypoint-resolution-logic";
@@ -264,6 +265,7 @@ export declare function resolveLegacyBlockScriptsInFolder(folder: string): strin
  * @param file something that represents the file that is being inlined (this is purely for error-reporting purposes)
  */
 export declare function appendAddInlineAssetCall(compilation: Compilation, writer: PHPWriter, handle: string, type: 'script' | 'style' | 'script_module', inlinedAsset: InlinedAsset, handleData: HandleData, file: string): void;
+export declare function wrapInlineAssetContents(compilation: Compilation, wrapperIdPrefix: string, handle: string, contents: string): HereOrNowDoc;
 export declare function synchronousDirIterator(dirPath: string): Generator<import("node:fs").Dirent<string>, void, unknown>;
 /**
  * A type-guarded version of `instanceof Error` for Node.js.

package/dist/shared.js

@@ -52,6 +52,7 @@ exports.emitPHPWriterAsAsset = emitPHPWriterAsAsset;
 exports.dedent = dedent;
 exports.resolveLegacyBlockScriptsInFolder = resolveLegacyBlockScriptsInFolder;
 exports.appendAddInlineAssetCall = appendAddInlineAssetCall;
+exports.wrapInlineAssetContents = wrapInlineAssetContents;
 exports.synchronousDirIterator = synchronousDirIterator;
 exports.instanceOfNodeError = instanceOfNodeError;
 const node_crypto_1 = require("node:crypto");
@@ -400,19 +401,18 @@ function appendAddInlineAssetCall(compilation, writer, handle, type, inlinedAsse
     if (handleData.rest[0]?.length) { // If there are any dependencies
         compilation.errors.push(newWebpackErrorForFile("Inlined scripts MUST NOT have dependencies. It WILL cause runtime inconsistencies and potentially cause sever performance issues", handleData.src));
     }
-    let contents;
-    if (compilation.outputOptions.path?.endsWith("-dev")) {
-        contents = inlinedAsset.contents;
-    }
-    else {
-        contents = inlinedAsset.contents.replaceAll(/\/\*#\s+sourceMappingURL=.*?\*\/|\/\/#\s+sourceMappingURL=[^\r\n]*?([\r\n]|$)/gis, "$1");
-    }
-    const args = [handle, new expressions_1.HereOrNowDoc(`plaudit_inlined_${type}_${(0, node_crypto_1.createHash)('md5').update(handle).digest("hex")}`, contents.trim(), false)];
+    const args = [handle, wrapInlineAssetContents(compilation, `plaudit_inlined_${type}`, handle, inlinedAsset.contents)];
     if (type === 'script' && inlinedAsset.position === 'before') {
         args.push('before');
     }
     writer.call(`wp_add_inline_${type}`, args);
 }
+function wrapInlineAssetContents(compilation, wrapperIdPrefix, handle, contents) {
+    if (!compilation.outputOptions.path?.endsWith("-dev")) {
+        contents = contents.replaceAll(/\/\*#\s+sourceMappingURL=.*?\*\/|\/\/#\s+sourceMappingURL=[^\r\n]*?([\r\n]|$)/gis, "$1");
+    }
+    return new expressions_1.HereOrNowDoc(`${wrapperIdPrefix}_${(0, node_crypto_1.createHash)('md5').update(handle).digest("hex")}`, contents.trim(), false);
+}
 function* synchronousDirIterator(dirPath) {
     try {
         using dir = (0, node_fs_1.opendirSync)(dirPath);

package/dist/utils/path-query-and-related-helpers.d.ts

@@ -51,8 +51,9 @@ export declare function unpackEnqueuingControlFlagsFromPathQueryParameters(pathQ
  * @param compilation
  * @param file
  * @param flags
+ * @param forceRecordContents
  */
-export declare function convertEnqueuingControlFlagsToScriptArgsObject(compilation: Compilation, file: string, flags: NormalizedEnqueuingControlFlags | undefined): {
+export declare function convertEnqueuingControlFlagsToScriptArgsObject(compilation: Compilation, file: string, flags: NormalizedEnqueuingControlFlags | undefined, forceRecordContents?: boolean): {
     scriptArgsObject?: ScriptArgsObject;
     inlinedAsset?: InlinedAsset;
 };

package/dist/utils/path-query-and-related-helpers.js

@@ -192,8 +192,9 @@ function unpackEnqueuingControlFlagsFromPathQueryParameters(pathQueryParameters,
  * @param compilation
  * @param file
  * @param flags
+ * @param forceRecordContents
  */
-function convertEnqueuingControlFlagsToScriptArgsObject(compilation, file, flags) {
+function convertEnqueuingControlFlagsToScriptArgsObject(compilation, file, flags, forceRecordContents = false) {
     if (flags === undefined) {
         return {};
     }
@@ -245,11 +246,14 @@ function convertEnqueuingControlFlagsToScriptArgsObject(compilation, file, flags
             scriptArgsObject.in_footer = true;
         }
     }
+    else if (forceRecordContents) {
+        inlinedAsset = { contents: getAssetFileContents(compilation, file) };
+    }
     if (fetchpriority !== undefined) {
         if (!isValidFetchPriority(fetchpriority)) {
             throw newInvalidFetchPriorityError(fetchpriority, file);
         }
-        if (inlinedAsset !== undefined) {
+        if (inline) {
             compilation.warnings.push((0, shared_1.newWebpackErrorForFile)("Fetchpriority has no effect on inlined assets", file));
         }
         scriptArgsObject.fetchpriority = fetchpriority;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/dist",
@@ -28,7 +28,7 @@
     }
   },
   "devDependencies": {
-    "@plaudit/gutenberg-api-extensions": "^2.97.1",
+    "@plaudit/gutenberg-api-extensions": "^2.98.0",
     "@types/browser-sync-webpack-plugin": "^2.2.5",
     "@types/jsdom": "^28.0.3",
     "@types/node": "^25.9.5",
@@ -42,13 +42,13 @@
     "webpack-bundle-analyzer": "^5.3.1"
   },
   "dependencies": {
-    "@plaudit/php-writer": "^1.5.2",
+    "@plaudit/php-writer": "^1.5.5",
     "@plaudit/postcss-color-function": "^5.1.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
     "@plaudit/postcss-variables": "^2.0.1",
     "@wordpress/dependency-extraction-webpack-plugin": "^6.51.0",
     "@wordpress/scripts": "^32.6.0",
-    "autoprefixer": "^10.5.3",
+    "autoprefixer": "^10.5.4",
     "browser-sync": "^3.0.4",
     "copy-webpack-plugin": "10.2.4",
     "css-minimizer-webpack-plugin": "^8.0.0",
@@ -56,7 +56,7 @@
     "fork-ts-checker-webpack-plugin": "^9.1.0",
     "http-proxy-middleware": "^3.0.7",
     "jsdom": "^29.1.1",
-    "json2php": "^0.0.12",
+    "json2php": "0.0.12",
     "postcss": "^8.5.19",
     "postcss-calc": "^10.1.1",
     "postcss-functions": "^4.0.2",