@plaudit/webpack-extensions 3.20.2 → 3.21.1

package/CHANGELOG.md

@@ -5,55 +5,69 @@ 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.21.1] - 2026-09-04
+### Fixed
+- The `inline` flag not getting picked up if it was set from within the webpack.config.js file
+  - Forward-port from `2.99.3`
+- Inlined assets getting put in the registered assets list
+  - Forward-port from `2.99.3`
+- An unnecessary call to `plaudit_webpack_extensions__resolve_base_uri` being emitted when a "registration" batch exclusively contains inlined assets
+  - Forward-port from `2.99.3`
+
+## [3.21.0] - 2026-09-03
+### Added
+- Logic to associate inline scripts with non-inlined scripts that have the same handle for Plain entrypoints
+  - This is intended to make using the "inlined script that does early prep for a deferred script" pattern easier
+
 ## [3.20.2] - 2026-09-01
 ### Removed
 - The duplicated `isDistDevOutputPath` logic around the initialization of the `@plaudit/dev-webpack-plugin`
-  - This comes from version `2.99.2`
+  - Forward-port from `2.99.2`
 
 ## [3.20.1] - 2026-08-26
 ### Internals
 - Updated to the 34.x line of `@wordpress/scripts`
-  - This comes from version `2.99.1`
+  - Forward-port from `2.99.1`
 - Removed the `@types/wordpress` override
-  - This comes from version `2.99.1`
+  - Forward-port from `2.99.1`
 
 ## [3.20.0] - 2026-08-24
 ### Added
 - Mixable versions of the `BiPhasicGroup...` plugins
-  - This comes from version `2.99.0`
+  - Forward-port from `2.99.0`
 - Entrypoints to allow other code to reference some of the plugins and utilities
-  - This comes from version `2.99.0`
+  - Forward-port from `2.99.0`
 
 ### Internals
 - Dropped unnecessary constructor parameters to make re-using the more general components easier
-  - This comes from version `2.99.0`
+  - Forward-port from `2.99.0`
 
 ## [3.19.0] - 2026-08-18
 ### Added
 - Automatic sync of WordPress's bundled packages list
-  - This comes from version `2.98.0`
+  - Forward-port from `2.98.0`
 
 ## [3.18.0] - 2026-08-18
 ### Added
 - David's improvements to build pipeline efficiency (Credit: David)
-  - This comes from version `2.97.0`
+  - Forward-port from `2.97.0`
 - Support for David's `@plaudit/dev-webpack-plugin` (Credit: David)
-  - This comes from version `2.97.0`
+  - Forward-port from `2.97.0`
 
 ### Changed
 - To Webpack's standard plugin interface (`WebpackPluginInstance`)
-  - This comes from version `2.97.0`
+  - Forward-port from `2.97.0`
 
 ### Removed
 - Browsersync and its tests (Credit: David)
-  - This comes from version `2.97.0`
+  - Forward-port from `2.97.0`
 
 ## [3.17.0] - 2026-08-18
 ### Added
 - A port of WordPress's Dependency Extraction Webpack Plugin because they keep breaking it
-  - This comes from version `2.96.0`
+  - Forward-port from `2.96.0`
 - Warnings and additional info for entrypoints that are lazy-loaded and assigned to actual locations
-  - This comes from version `2.96.0`
+  - Forward-port from `2.96.0`
 - An `externalize` that is not a string, an array, an object, or false is now rejected rather than silently ignored
   - This matches with what webpack's `output.library` config supports
 
@@ -73,7 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 - `processTranslationConfigs` because it should not be used and didn't actually do anything
-  - This comes from version `2.96.2`
+  - Forward-port from `2.96.2`
 
 ### Internals
 - Added more integration tests
@@ -82,9 +96,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Logic so that files and directories with names equal to "example" or "examples" or that include "example" as a name segment are skipped
   - This is done to allow us to include example files
-  - This comes from version `2.95.0`
+  - Forward-port from `2.95.0`
 - Updated the user guide with this information
-  - This comes from version `2.95.0`
+  - Forward-port from `2.95.0`
 
 ### Fixed
 - The TOC in the user guide being out of date
@@ -92,25 +106,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [3.15.1] - 2026-07-20
 ### Fixed
 - A bug that caused all styles bound for editor use to be emitted as inline CSS
-  - This comes from version `2.94.1`
+  - Forward-port from `2.94.1`
 
 ## [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`
+  - Forward-port from `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`
+  - Forward-port from `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.93.0`
+  - Forward-port from `2.93.0`
 - The `useBlockSupportsAsThemeJsonDefaults` flag to allow the new logic to be disabled
-  - This comes from version `2.93.0`
+  - Forward-port from `2.93.0`
 
 ## [3.13.0] - 2026-07-14
 ### Added
@@ -162,45 +176,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [3.9.4] - 2026-06-10
 ### Fixed
 - Libraries externalizing in a way that does not account for the variable potentially being undeclared
-  - This comes from version `2.92.4`
+  - Forward-port from `2.92.4`
 
 ## [3.9.3] - 2026-05-27
 ### Fixed
 - A couple more dependency snarls
-  - This comes from version `2.92.3`
+  - Forward-port from `2.92.3`
 
 ## [3.9.2] - 2026-05-26
 ### Fixed
 - The `"supports-bindings": true` flag resulting in emission of invalid PHP code
-  - This comes from version `2.92.2`
+  - Forward-port from `2.92.2`
 
 ## [3.9.1] - 2026-05-21
 ### Fixed
 - Compatibility issues with module-mode building
-  - This comes from version `2.92.1`
+  - Forward-port from `2.92.1`
 - `module_dependencies` being set to `null` instead of being omitted
-  - This comes from version `2.92.1`
+  - Forward-port from `2.92.1`
 
 ## [3.9.0] - 2026-05-20
 ### Added
 - Support for marking `block.json` attributes with `"supports-bindings": true` to enable block binding support in the editor
-  - This comes from version `2.92.0`
+  - Forward-port from `2.92.0`
 
 ## [3.8.0] - 2026-05-20
 ### Added
 - Support for the `module_dependencies` property on `script` assets
-  - This comes from version `2.91.0`
+  - Forward-port from `2.91.0`
 
 ## [3.7.0] - 2026-05-04
 ### Added
 - PNPM 11 compatibility
-  - This comes from version `2.90.0`
+  - Forward-port from `2.90.0`
 
 ## [3.6.3] - 2026-04-27
 ### Fixed
 - An `ENOENT` error when the `srcDir` does not map to an actual directory on disk
   - It now matches the behavior of manually-declared sources and exits due to not having anything to build
-  - This comes from version `2.89.2`
+  - Forward-port from `2.89.2`
 
 ## [3.6.2] - 2026-04-09
 ### Changed
@@ -209,44 +223,44 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [3.6.1] - 2026-04-06
 ### Fixed
 - The emitter for the Extensions v1 format including an extra path element
-  - This comes from version `2.89.1`
+  - Forward-port from `2.89.1`
 
 ## [3.6.0] - 2026-03-31
 ### Changed
 - The block.json handling logic to use encoded location data in filenames that are enumerated within block.json
-  - This comes from version `2.89.0`
+  - Forward-port from `2.89.0`
 - Inline scripts to not emit with a sourcemap outside of dev mode
-  - This comes from version `2.89.0`
+  - Forward-port from `2.89.0`
 
 ### Fixed
 - Unnecessary `.asset.php` files being emitted for inlined scripts
-  - This comes from version `2.89.0`
+  - Forward-port from `2.89.0`
 
 ## [3.5.2] - 2026-03-30
 ### Fixed
 - The conflicting handle detection logic in block.json handling
-  - This comes from version `2.88.2`
+  - Forward-port from `2.88.2`
 
 ## [3.5.1] - 2026-03-30
 ### Fixed
 - The paths in package.json that were broken after switching to dist
-  - This comes from version `2.88.1`
+  - Forward-port from `2.88.1`
 
 ## [3.5.0] - 2026-03-30
 ### Added
 - Support for explicitly setting the handle for block assets
-  - This comes from version `2.88.0`
+  - Forward-port from `2.88.0`
 
 ## [3.4.1] - 2026-03-17
 ### Changed
 - The `blockdir-loader.php` generation logic to use static wp_register_* calls like `plain-entrypoints-loader.php`
-  - This comes from version `2.87.1`
+  - Forward-port from `2.87.1`
 
 ## [3.4.0] - 2026-03-16
 ### Added
 - Support for a directory-based `extensions` layout
   - This only applies to sites using extensions v2 and higher
-  - This comes from version `2.87.0`
+  - Forward-port from `2.87.0`
 
 ## [3.3.0] - 2026-03-16
 ### Added
@@ -263,25 +277,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [3.2.0] - 2026-03-16
 ### Added
 - Support for `Location-Encoding Filenames`
-  - This comes from version `2.86.0`
+  - Forward-port from `2.86.0`
 - Support for standardized flag sets
-  - This comes from version `2.86.0`
+  - Forward-port from `2.86.0`
 
 ## [3.1.2] - 2026-03-06
 ### Fixed
 - `defer` and `async` not being supported strategies in some pipelines
-  - This comes from version `2.85.3`
+  - Forward-port from `2.85.3`
 
 ## [3.1.1] - 2026-03-06
 ### Fixed
 - Inlined scripts without any other path query parameters not being placed in the footer by default
-  - This comes from version `2.85.2`
+  - Forward-port from `2.85.2`
 
 ## [3.1.0] - 2026-03-05
 ### Added
 - Support for inlining (and otherwise controlling the enqueuing of) assets
   - This only applies to plain entrypoints and assets declared within block.json files at present
-  - This comes from version `2.85.0`
+  - Forward-port from `2.85.0`
 
 ## [3.0.1] - 2026-02-12
 ### Added
@@ -303,6 +317,15 @@ 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.99.3] - 2026-09-04
+### Fixed
+- The `inline` flag not getting picked up if it was set from within the webpack.config.js file
+- Inlined assets getting put in the registered assets list
+- An unnecessary call to `plaudit_webpack_extensions__resolve_base_uri` being emitted when a "registration" batch exclusively contains inlined assets
+
+### Internals
+- Tweaked a few things to make adding new enqueue locations easier
+
 ## [2.99.2] - 2026-09-01
 ### Removed
 - The duplicated `isDistDevOutputPath` logic around the initialization of the `@plaudit/dev-webpack-plugin`

package/dist/plugins/PlainEntrypointsConfigFileGeneratorPlugin.d.ts

@@ -10,6 +10,8 @@ export declare class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractB
     private static readonly semaphore;
     constructor(config: VerifiedPlauditWordpressWebpackConfig, buildRoot: string, outputDir: string, dest: VerifiedAdvancedOutputConfig, useUnifiedLoader: boolean, context: string, entry: EntryProvider<BlockEntrypointInfo>);
     private generatePlainEntrypointsLoader;
+    private static writeHandleItem;
+    private static collatePotentiallyMergeableAssets;
     private static addHandlesToHandleLists;
     private static appendEnqueuingHandleLists;
     private static separateHandleListByPriority;

package/dist/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -32,29 +32,12 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
             inline: [],
             ...Object.fromEntries((0, shared_1.constantKeys)(shared_1.standardLocationNamesMeta).map(sln => [sln, []]))
         };
-        const usedHandleNames = { script: {}, script_module: {}, style: {} };
-        const plainEntrypointsConfig = { scriptHandles: {}, script_moduleHandles: {}, styleHandles: {} };
-        for (const { handles, handlePrefix } of assets) {
-            for (const { src, rest, locations, type, handleName, lazyLoader, ...otherProps } of handles) {
-                const cleanBasename = (0, node_path_1.basename)(src).replace(/_(?:script(?:-\d+)?\.js|style(?:-\d+)?\.css)$|(?<!_(script|style))\.(js|css)$/, "");
-                let finalHandleName;
-                const handleNameMap = usedHandleNames[type];
-                const baseFinalHandleName = finalHandleName = (0, shared_1.convertUsageLocationsHandleToEmittableHandle)({ niceName: (0, shared_1.kebabCase)(cleanBasename) }, handlePrefix, cleanBasename);
-                for (let count = 0; finalHandleName in handleNameMap && handleNameMap[finalHandleName] !== src;) {
-                    finalHandleName = `${baseFinalHandleName}-${++count}`;
-                }
-                if (handleName !== undefined) {
-                    finalHandleName = (0, shared_1.convertUsageLocationsHandleToEmittableHandle)(handleName, handlePrefix, finalHandleName.substring(handlePrefix.length + 1));
-                }
-                handleNameMap[finalHandleName] = src;
-                plainEntrypointsConfig[`${type}Handles`][finalHandleName] = { src, rest, locations, type, lazyLoader, ...otherProps };
-            }
-        }
-        PlainEntrypointsConfigFileGeneratorPlugin.addHandlesToHandleLists(compilation, 'script', Object.entries(plainEntrypointsConfig.scriptHandles)
+        const plainEntrypointsConfig = PlainEntrypointsConfigFileGeneratorPlugin.collatePotentiallyMergeableAssets(assets);
+        PlainEntrypointsConfigFileGeneratorPlugin.addHandlesToHandleLists(compilation, 'script', plainEntrypointsConfig.scriptHandles
             .toSorted(([a], [b]) => a.localeCompare(b)), handleLists);
-        PlainEntrypointsConfigFileGeneratorPlugin.addHandlesToHandleLists(compilation, 'script_module', Object.entries(plainEntrypointsConfig.script_moduleHandles)
+        PlainEntrypointsConfigFileGeneratorPlugin.addHandlesToHandleLists(compilation, 'script_module', plainEntrypointsConfig.script_moduleHandles
             .toSorted(([a], [b]) => a.localeCompare(b)), handleLists);
-        const sortedStyleHandles = Object.entries(plainEntrypointsConfig.styleHandles)
+        const sortedStyleHandles = plainEntrypointsConfig.styleHandles
             .toSorted(([a], [b]) => a.localeCompare(b));
         PlainEntrypointsConfigFileGeneratorPlugin.addHandlesToHandleLists(compilation, 'style', sortedStyleHandles, handleLists);
         const callItemSorter = (a, b) => a.handle.localeCompare(b.handle);
@@ -63,32 +46,25 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
         }
         const file = new php_writer_1.PHPFile();
         const writer = file.getWriter("");
-        if (handleLists.register.length > 0) {
-            if (!this.useUnifiedLoader) {
+        const hasRegisterScripts = handleLists.register.length > 0;
+        if (hasRegisterScripts || handleLists.inline.length > 0) {
+            if (hasRegisterScripts && !this.useUnifiedLoader) {
                 (0, shared_1.emitResolveBaseUriFunction)(writer);
             }
             const baseUriVar = new expressions_1.Var("base_uri");
-            for (const [priority, prioritizedHandleList] of PlainEntrypointsConfigFileGeneratorPlugin.separateHandleListByPriority(handleLists.register)) {
+            const inlineAndRegisterHandleLists = [...handleLists.register, ...handleLists.inline];
+            for (const [priority, prioritizedHandleList] of PlainEntrypointsConfigFileGeneratorPlugin.separateHandleListByPriority(inlineAndRegisterHandleLists)) {
                 writer.action("init", writer => {
-                    writer.call("plaudit_webpack_extensions__resolve_base_uri", [expressions_1.Constants.__DIR__], { assignTo: baseUriVar });
-                    for (const { handle, type, data } of prioritizedHandleList) {
-                        if (data.inlinedAsset !== undefined) {
-                            writer.call(`wp_register_${type}`, [handle, false, ...data.rest]);
-                            (0, shared_1.appendAddInlineAssetCall)(compilation, writer, handle, type, data);
-                        }
-                        else {
-                            writer.call(`wp_register_${type}`, [handle, expressions_1.Op.concat(baseUriVar, (0, node_path_1.relative)(emitDir, data.src)), ...data.rest]);
-                        }
+                    const state = { baseUriVar, emitDir, writer };
+                    if (prioritizedHandleList.find(handleItem => handleItem.data.inlinedAsset === undefined)) {
+                        writer.call("plaudit_webpack_extensions__resolve_base_uri", [expressions_1.Constants.__DIR__], { assignTo: baseUriVar });
                     }
-                }, { priority, accountForAlreadyDoing: this.config.includePostInitFallback });
-            }
-            for (const [priority, prioritizedHandleList] of PlainEntrypointsConfigFileGeneratorPlugin.separateHandleListByPriority(handleLists.inline)) {
-                writer.action("init", writer => {
-                    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, false, ...data.rest]);
-                        if (data.inlinedAsset !== undefined) {
-                            (0, shared_1.appendAddInlineAssetCall)(compilation, writer, handle, type, data);
+                    for (const handleItem of prioritizedHandleList) {
+                        PlainEntrypointsConfigFileGeneratorPlugin.writeHandleItem(compilation, handleItem, state);
+                        if (handleItem.data.associatedInlinedHandles !== undefined) {
+                            for (const associatedHandle of handleItem.data.associatedInlinedHandles) {
+                                PlainEntrypointsConfigFileGeneratorPlugin.writeHandleItem(compilation, { data: associatedHandle, handle: handleItem.handle, type: associatedHandle.type }, state);
+                            }
                         }
                     }
                 }, { priority, accountForAlreadyDoing: this.config.includePostInitFallback });
@@ -138,15 +114,88 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
         }
         (0, shared_1.emitPHPWriterAsAsset)(file, compilation, "plain-entrypoints-loader.php");
     }
+    static writeHandleItem(compilation, { data, handle, type }, { baseUriVar, emitDir, writer }) {
+        if (data.inlinedAsset !== undefined) {
+            if (!data.inlinedAsset.omitRegistration) {
+                writer.call(`wp_register_${type}`, [handle, false, ...data.rest]);
+            }
+            (0, shared_1.appendAddInlineAssetCall)(compilation, writer, handle, type, data);
+        }
+        else {
+            writer.call(`wp_register_${type}`, [handle, expressions_1.Op.concat(baseUriVar, (0, node_path_1.relative)(emitDir, data.src)), ...data.rest]);
+        }
+    }
+    static collatePotentiallyMergeableAssets(assets) {
+        const collatedHandles = { scriptHandles: {}, script_moduleHandles: {}, styleHandles: {} };
+        for (const { handles, handlePrefix } of assets) {
+            for (const { src, rest, locations, type, handleName, lazyLoader, ...otherProps } of handles) {
+                const cleanBasename = (0, node_path_1.basename)(src).replace(/_(?:script(?:-\d+)?\.js|style(?:-\d+)?\.css)$|(?<!_(script|style))\.(js|css)$/, "");
+                let finalHandleName = (0, shared_1.convertUsageLocationsHandleToEmittableHandle)({ niceName: (0, shared_1.kebabCase)(cleanBasename) }, handlePrefix, cleanBasename);
+                if (handleName !== undefined) {
+                    finalHandleName = (0, shared_1.convertUsageLocationsHandleToEmittableHandle)(handleName, handlePrefix, finalHandleName.substring(handlePrefix.length + 1));
+                }
+                (collatedHandles[`${type}Handles`][finalHandleName] ??= []).push({ src, rest, locations, type, lazyLoader, ...otherProps });
+            }
+        }
+        const plainEntrypointsConfig = { scriptHandles: [], script_moduleHandles: [], styleHandles: [] };
+        for (const key of ['scriptHandles', 'script_moduleHandles', 'styleHandles']) {
+            for (const [baseFinalHandleName, handles] of Object.entries(collatedHandles[key])) {
+                if ((0, shared_1.arrayIsLength)(handles, 1)) {
+                    plainEntrypointsConfig[key].push([baseFinalHandleName, handles[0]]);
+                }
+                else if ((0, shared_1.hasAtLeastOneItem)(handles)) {
+                    const inlinedHandles = handles.filter(item => item.inlinedAsset !== undefined);
+                    if (inlinedHandles.length === 0) {
+                        plainEntrypointsConfig[key].push([baseFinalHandleName, handles[0]]);
+                        let count = 1;
+                        for (const handle of handles.slice(1)) {
+                            plainEntrypointsConfig[key].push([`${baseFinalHandleName}-${count++}`, handle]);
+                        }
+                    }
+                    else {
+                        const emittedHandles = handles.filter(item => item.inlinedAsset === undefined);
+                        inlinedHandlesLoop: for (const inlinedHandle of inlinedHandles) {
+                            for (const emittedHandle of emittedHandles) {
+                                const canMerge = (0, shared_1.canMergeHandles)(emittedHandle, inlinedHandle);
+                                if (!canMerge) {
+                                    continue;
+                                }
+                                if ((0, shared_1.hasDeferringStrategy)(emittedHandle)) {
+                                    inlinedHandle.inlinedAsset.position = 'before';
+                                }
+                                if (canMerge === 'dependent') {
+                                    emittedHandle.rest[0].push(`${baseFinalHandleName}-${emittedHandles.length}`);
+                                    emittedHandles.push(inlinedHandle);
+                                }
+                                else {
+                                    (emittedHandle.associatedInlinedHandles ??= []).push(inlinedHandle);
+                                }
+                                continue inlinedHandlesLoop;
+                            }
+                            emittedHandles.push(inlinedHandle);
+                        }
+                        if ((0, shared_1.hasAtLeastOneItem)(emittedHandles)) {
+                            plainEntrypointsConfig[key].push([baseFinalHandleName, emittedHandles[0]]);
+                            let count = 1;
+                            for (const handle of emittedHandles.slice(1)) {
+                                plainEntrypointsConfig[key].push([`${baseFinalHandleName}-${count++}`, handle]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return plainEntrypointsConfig;
+    }
     static addHandlesToHandleLists(compilation, type, handles, handleLists) {
         const defaultPriority = 10;
         for (const [handle, data] of handles) {
-            if (data.locations.register !== false) {
-                handleLists.register.push({ handle, type, data, priority: typeof data.locations.register === 'number' ? data.locations.register : 10 });
-            }
-            else if (data.inlinedAsset !== undefined) {
+            if (data.inlinedAsset !== undefined) {
                 handleLists.inline.push({ handle, type, data, priority: typeof data.locations.inline === 'number' ? data.locations.inline : 10 });
             }
+            else if (data.locations.register !== false) {
+                handleLists.register.push({ handle, type, data, priority: typeof data.locations.register === 'number' ? data.locations.register : 10 });
+            }
             if (data.lazyLoader !== undefined) {
                 // A lazily loaded handle is enqueued by its generated function and never by an action, so it
                 // is deliberately kept out of the location lists. Those lists are also what the lazy function
@@ -203,7 +252,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
         }
     }
     static appendEnqueuingHandleLists(writer, handleLists) {
-        for (const [sln, { action, supports_hook_name, additional_action_code }] of (0, shared_1.constantEntries)(shared_1.standardLocationNamesMeta)) {
+        for (const [sln, { action, supports_hook_name, additional_action_code }] of (0, shared_1.iterableStandardLocationNamesMeta)()) {
             const handleList = handleLists[sln];
             if (handleList.length > 0) {
                 writer.linebreak();
@@ -214,7 +263,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin extends AbstractBiPhasicGroupAnd
                             const hook_name_var = new expressions_1.Var("hook_name", "?string");
                             writer.action(action, writer => {
                                 additional_action_code?.before?.(writer);
-                                if (hookNamedHandleLists.global) {
+                                if (hookNamedHandleLists.global.length > 0) {
                                     for (const handle of hookNamedHandleLists.global) {
                                         writer.call(`wp_enqueue_${handle.type}`, [handle.handle]);
                                     }
@@ -315,7 +364,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 { assetMeta, 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 { assetMeta, scriptArgsObject } = (0, path_query_and_related_helpers_1.convertEnqueuingControlFlagsToScriptArgsObject)(compilation, file, (0, path_query_and_related_helpers_1.mergeTwoEnqueuingControlFlagSets)(file, flags, this.dest.enqueuingFlags, this.dest.locations.inline !== undefined ? { inline: true } : undefined), 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

@@ -35,21 +35,33 @@ export type ScriptArgsObject = {
 };
 export type InlinedAsset = {
     position?: 'before' | 'after';
+    omitRegistration?: boolean;
 };
 export type IAHandleData = BaseHandleData & AssetMetaSegment;
 export type HandleData = BaseHandleData & (AssetMetaSegment | {
     inlinedAsset?: undefined;
     assetContents?: string;
 });
+type OptionalLocationMeta = {
+    supports_hook_name?: boolean;
+    additional_action_code?: {
+        before?(writer: PHPWriter): unknown;
+        after?(writer: PHPWriter): unknown;
+    };
+    alternate_names?: [string, ...string[]];
+};
 export declare const standardLocationNamesMeta: {
     readonly clientView: {
         readonly action: "wp_enqueue_scripts";
+        readonly alternate_names: ["client-view", "view"];
     };
     readonly clientEditor: {
         readonly action: "enqueue_block_editor_assets";
+        readonly alternate_names: ["client-editor", "editor"];
     };
     readonly blockAssets: {
         readonly action: "enqueue_block_assets";
+        readonly alternate_names: ["block-assets"];
     };
     readonly admin: {
         readonly action: "admin_enqueue_scripts";
@@ -67,14 +79,11 @@ export declare const standardLocationNamesMeta: {
 };
 export type StandardLocationNameMeta = {
     action: typeof standardLocationNamesMeta[keyof typeof standardLocationNamesMeta]['action'];
-    supports_hook_name?: boolean;
-    additional_action_code?: {
-        before?(writer: PHPWriter): unknown;
-        after?(writer: PHPWriter): unknown;
-    };
-};
+} & OptionalLocationMeta;
 export type StandardLocationNames = keyof typeof standardLocationNamesMeta;
 export declare function isStandardLocationName(name: string): name is StandardLocationNames;
+export declare function iterableStandardLocationNamesMeta(): [StandardLocationNames, StandardLocationNameMeta][];
+export declare function normalizeLocationName(name: string): StandardLocationNames | 'register';
 type LocationWithHookNameSupport = boolean | number | string | string[] | {
     hook_name?: string | string[];
     priority?: number;
@@ -98,6 +107,20 @@ export type NormalizedUsageLocations = Omit<UsageLocations, 'registerScriptArgs'
     registerScriptArgs?: InputRegisterScriptArgs;
 };
 export declare function isNormalizedUsageLocations(usageLocations: UsageLocations): usageLocations is NormalizedUsageLocations;
+export type EnqueuedAssetType = 'script' | 'script_module' | 'style';
+export type ExtendedHandleData = HandleData & {
+    locations: UsageLocations;
+    handleName?: UsageLocations['handle'];
+    lazyLoader: string | undefined;
+    type: EnqueuedAssetType;
+    associatedInlinedHandles?: ExtendedHandleData[];
+};
+export declare function convertHookLocationToNamesAndPriority(hookLocation: NonNullable<Exclude<UsageLocations[keyof typeof standardLocationNamesMeta], false>>): [string[], number];
+export declare function hasDeferringStrategy(handle: HandleData): boolean;
+/**
+ * @return {@code true} -> "can share the same handle", {@code false} -> "cannot be merged", {@code 'dependent'} -> "one handle can be listed as a dependency of the other"
+ */
+export declare function canMergeHandles(handleA: ExtendedHandleData, handleB: ExtendedHandleData): boolean | 'dependent';
 export declare function constantKeys<K extends string, V>(object: {
     [k in K]?: V;
 }): K[];
@@ -273,7 +296,7 @@ export declare function resolveLegacyBlockScriptsInFolder(folder: string): strin
  * @param type 'script_module' is NOT supported at this time; however, it is *handled* in this function
  * @param handleData
  */
-export declare function appendAddInlineAssetCall(compilation: Compilation, writer: PHPWriter, handle: string, type: 'script' | 'style' | 'script_module', handleData: IAHandleData): void;
+export declare function appendAddInlineAssetCall(compilation: Compilation, writer: PHPWriter, handle: string, type: EnqueuedAssetType, handleData: IAHandleData): 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>;
 /**

package/dist/shared.js

@@ -20,8 +20,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.styleExtension = exports.scriptWithModuleExtension = exports.scriptWithoutModuleExtension = exports.scriptExtension = exports.entrypointFields = exports.standardLocationNamesMeta = void 0;
 exports.isParsedAssetsJson = isParsedAssetsJson;
 exports.isStandardLocationName = isStandardLocationName;
+exports.iterableStandardLocationNamesMeta = iterableStandardLocationNamesMeta;
+exports.normalizeLocationName = normalizeLocationName;
 exports.isRegisterScriptArgsShorthandName = isRegisterScriptArgsShorthandName;
 exports.isNormalizedUsageLocations = isNormalizedUsageLocations;
+exports.convertHookLocationToNamesAndPriority = convertHookLocationToNamesAndPriority;
+exports.hasDeferringStrategy = hasDeferringStrategy;
+exports.canMergeHandles = canMergeHandles;
 exports.constantKeys = constantKeys;
 exports.constantEntries = constantEntries;
 exports.determineCurrentSourceType = determineCurrentSourceType;
@@ -76,9 +81,9 @@ function isParsedAssetsJson(thing) {
     return true;
 }
 exports.standardLocationNamesMeta = {
-    clientView: { action: "wp_enqueue_scripts" },
-    clientEditor: { action: "enqueue_block_editor_assets" },
-    blockAssets: { action: "enqueue_block_assets" },
+    clientView: { action: "wp_enqueue_scripts", alternate_names: ['client-view', 'view'] },
+    clientEditor: { action: "enqueue_block_editor_assets", alternate_names: ['client-editor', 'editor'] },
+    blockAssets: { action: "enqueue_block_assets", alternate_names: ['block-assets'] },
     admin: { action: "admin_enqueue_scripts", supports_hook_name: true },
     login: { action: "login_enqueue_scripts" },
     customizer: { action: "customize_controls_enqueue_scripts" },
@@ -87,12 +92,115 @@ exports.standardLocationNamesMeta = {
 function isStandardLocationName(name) {
     return Object.hasOwn(exports.standardLocationNamesMeta, name);
 }
+function iterableStandardLocationNamesMeta() {
+    return constantEntries(exports.standardLocationNamesMeta);
+}
+function normalizeLocationName(name) {
+    if (isStandardLocationName(name) || name === 'register') {
+        return name;
+    }
+    for (const [standardName, { alternate_names }] of iterableStandardLocationNamesMeta()) {
+        if (alternate_names?.includes(name)) {
+            return standardName;
+        }
+    }
+    throw new Error(`"${name}" is neither a standard nor alternate location name`);
+}
 function isRegisterScriptArgsShorthandName(name) {
     return ['lazy', 'eager', 'inline'].includes(name);
 }
 function isNormalizedUsageLocations(usageLocations) {
     return typeof usageLocations.registerScriptArgs !== 'string';
 }
+function convertHookLocationToNamesAndPriority(hookLocation) {
+    if (typeof hookLocation === 'string') {
+        return [[hookLocation], 10];
+    }
+    if (typeof hookLocation === 'number') {
+        return [[], hookLocation];
+    }
+    if (typeof hookLocation === 'boolean') {
+        return [[], 10];
+    }
+    if (Array.isArray(hookLocation)) {
+        return [hookLocation, 10];
+    }
+    // if it's in object-form
+    return [typeof hookLocation.hook_name === 'string' ? [hookLocation.hook_name] : hookLocation.hook_name ?? [], hookLocation.priority ?? 10];
+}
+function hasDeferringStrategy(handle) {
+    return handle.rest[2]?.strategy === 'async' || handle.rest[2]?.strategy === 'defer';
+}
+/**
+ * @return {@code true} -> "can share the same handle", {@code false} -> "cannot be merged", {@code 'dependent'} -> "one handle can be listed as a dependency of the other"
+ */
+function canMergeHandles(handleA, handleB) {
+    if (handleA.inlinedAsset === undefined && handleB.inlinedAsset === undefined) {
+        return false; // We cannot merge handles for two non-inlined assets
+    }
+    if (handleA.lazyLoader !== handleB.lazyLoader) {
+        return false; // We cannot merge handles for assets that will be loaded under separate conditions
+    }
+    if (node_path_1.default.dirname(handleA.src) !== node_path_1.default.dirname(handleB.src)) {
+        return false; // We don't want assets from different locations to be able to have their handles overlap
+    }
+    const additionalArgsA = handleA.rest.length === 3 ? handleA.rest[2] : {};
+    const additionalArgsB = handleB.rest.length === 3 ? handleB.rest[2] : {};
+    if (additionalArgsA.module_dependencies !== additionalArgsB.module_dependencies) {
+        if (additionalArgsA.module_dependencies === undefined) {
+            return false;
+        }
+        if (additionalArgsB.module_dependencies === undefined) {
+            return false;
+        }
+        if (additionalArgsA.module_dependencies.length !== additionalArgsB.module_dependencies.length) {
+            return false;
+        }
+        for (const modDep of additionalArgsA.module_dependencies) {
+            if (!additionalArgsB.module_dependencies.includes(modDep)) {
+                return false;
+            }
+        }
+    }
+    if (additionalArgsA.in_footer !== additionalArgsB.in_footer) {
+        return 'dependent';
+    }
+    if (hasDeferringStrategy(handleA) && handleB.inlinedAsset?.position === 'after') {
+        return false;
+    }
+    if (hasDeferringStrategy(handleB) && handleA.inlinedAsset?.position === 'after') {
+        return false;
+    }
+    if (handleA.locations.register !== handleB.locations.register) {
+        return false; //TODO: Maybe make this more granular?
+    }
+    for (const standardLocation of constantKeys(exports.standardLocationNamesMeta)) {
+        const locA = handleA.locations[standardLocation];
+        const locB = handleB.locations[standardLocation];
+        if (locA === locB) {
+            continue;
+        }
+        if (locA === undefined || locA === false || locB === undefined || locB === false) {
+            return false;
+        }
+        const [locAHookNames, locAPriority] = convertHookLocationToNamesAndPriority(locA);
+        const [locBHookNames, locBPriority] = convertHookLocationToNamesAndPriority(locB);
+        if (locAHookNames.length !== locBHookNames.length) {
+            return false;
+        }
+        if (locAHookNames.length > 0) {
+            for (const hookName of locAHookNames) {
+                if (!locBHookNames.includes(hookName)) {
+                    return false;
+                }
+            }
+        }
+        if (locAPriority !== locBPriority) {
+            return 'dependent'; // We cannot merge hooks across priority boundaries, but we can have one require the other
+        }
+    }
+    return true;
+}
 function constantKeys(object) {
     return Object.keys(object);
 }

package/dist/utils/location-encoding-filename-parser.d.ts

@@ -17,14 +17,14 @@ export declare function parseLocationEncodingFilenameForBlock(filename: string,
     handle: ParsedLocationEncodingFilename['locations']['handle'];
 }) | undefined;
 /**
- * This handles detecting all keys of standardLocationNamesMeta as well as "view", "client-view", "editor", "client-editor", and "block-assets".
+ * This handles detecting all keys of standardLocationNamesMeta as well as the values listed in their associated alternate_names properties
  * It MUST be kept in sync with standardLocationNamesMeta
  * @param segment
  */
 export declare function extractLocationFromPropertyEncodingFilenameSegment(segment: string): {
+    readonly locationName: false;
+    readonly priority?: undefined;
+} | {
     readonly locationName: "admin" | "analytics" | "blockAssets" | "clientEditor" | "clientView" | "customizer" | "login" | "register";
     readonly priority: number | true;
-} | {
-    readonly priority?: undefined;
-    readonly locationName: false;
 };

package/dist/utils/location-encoding-filename-parser.js

@@ -98,27 +98,23 @@ function parseLocationEncodingFilenameForBlock(filename, errorBuilder = shared_1
     }
     return parsedFilename;
 }
-const standardLocationNamesAndPriorityPatternInFilenameSegment = /^(?:(?<view>clientView|client-view|view)|(?<editor>clientEditor|client-editor|editor)|(?<blockAssets>blockAssets|block-assets)|(?<locationName>admin|login|customizer|analytics|register))(?:[-=](?<priority>-?\d+))?$/;
+let standardLocationNamesAndPriorityPatternInFilenameSegment;
 /**
- * This handles detecting all keys of standardLocationNamesMeta as well as "view", "client-view", "editor", "client-editor", and "block-assets".
+ * This handles detecting all keys of standardLocationNamesMeta as well as the values listed in their associated alternate_names properties
  * It MUST be kept in sync with standardLocationNamesMeta
  * @param segment
  */
 function extractLocationFromPropertyEncodingFilenameSegment(segment) {
-    const { view, editor, blockAssets, locationName, priority: rawPriority } = standardLocationNamesAndPriorityPatternInFilenameSegment.exec(segment)
-        ?.groups ?? {};
-    const priority = rawPriority !== undefined ? parseInt(rawPriority) : true;
-    if (view) {
-        return { locationName: "clientView", priority };
-    }
-    if (editor) {
-        return { locationName: "clientEditor", priority };
+    if (!standardLocationNamesAndPriorityPatternInFilenameSegment) {
+        const matchableLocationNames = (0, shared_1.iterableStandardLocationNamesMeta)()
+            .flatMap(([standardName, { alternate_names = [] }]) => [standardName, ...alternate_names])
+            .join("|");
+        standardLocationNamesAndPriorityPatternInFilenameSegment = new RegExp(`^(?<locationName>${matchableLocationNames}|register)(?:[-=](?<priority>-?\\d+))?$`);
     }
-    if (blockAssets) {
-        return { locationName: "blockAssets", priority };
+    const { locationName, priority: rawPriority } = standardLocationNamesAndPriorityPatternInFilenameSegment.exec(segment)?.groups ?? {};
+    if (!locationName) {
+        return { locationName: false };
     }
-    if (locationName) {
-        return { locationName, priority };
-    }
-    return { locationName: false };
+    const priority = rawPriority !== undefined ? parseInt(rawPriority) : true;
+    return { locationName: (0, shared_1.normalizeLocationName)(locationName), priority };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "3.20.2",
+  "version": "3.21.1",
   "license": "SEE LICENSE IN LICENSE.md",
   "repository": {
     "type": "git",
@@ -34,19 +34,19 @@
     }
   },
   "devDependencies": {
-    "@plaudit/dev-webpack-plugin": "^1.3.1",
+    "@plaudit/dev-webpack-plugin": "^1.5.0",
     "@plaudit/gutenberg-api-extensions": "^2.98.2",
     "@types/jsdom": "^30.0.0",
-    "@types/node": "^26.3.0",
+    "@types/node": "^26.4.1",
     "@types/postcss-functions": "^4.0.4",
     "@types/postcss-import": "^14.0.3",
     "@types/tapable": "^2.3.0",
     "@types/webpack-sources": "^3.2.3",
-    "@wordpress/dependency-extraction-webpack-plugin": "^6.53.0",
+    "@wordpress/dependency-extraction-webpack-plugin": "^6.54.0",
     "atob": "^2.1.2",
     "css-loader": "^6.11.0",
     "glob": "^7.2.3",
-    "jest": "^30.4.2",
+    "jest": "^30.5.1",
     "lodash": "^4.18.1",
     "mini-css-extract-plugin": "^2.10.2",
     "mkdirp": "^3.0.1",
@@ -61,7 +61,7 @@
     "@plaudit/postcss-color-function": "^5.1.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
     "@plaudit/postcss-variables": "^2.0.1",
-    "@wordpress/scripts": "^34.1.0",
+    "@wordpress/scripts": "^34.2.0",
     "autoprefixer": "^10.5.4",
     "copy-webpack-plugin": "10.2.4",
     "css-minimizer-webpack-plugin": "^8.0.0",
@@ -69,7 +69,7 @@
     "fork-ts-checker-webpack-plugin": "^9.1.0",
     "jsdom": "^30.0.1",
     "json2php": "0.0.12",
-    "postcss": "^8.5.26",
+    "postcss": "^8.5.28",
     "postcss-calc": "^10.1.1",
     "postcss-functions": "^4.0.2",
     "postcss-import": "^16.2.0",
@@ -79,7 +79,7 @@
     "postcss-property-lookup": "^3.0.0",
     "postcss-reporter": "^7.1.0",
     "postcss-url": "^10.1.4",
-    "webpack": "^5.109.2",
+    "webpack": "^5.110.3",
     "webpack-remove-empty-scripts": "^1.1.1",
     "xml-formatter": "^3.7.0"
   },