@plaudit/webpack-extensions 3.5.1 → 3.6.0

package/CHANGELOG.md

@@ -5,9 +5,26 @@ 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.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`
+- Inline scripts to not emit with a sourcemap outside of dev mode
+  - This comes from version `2.89.0`
+
+### Fixed
+- Unnecessary `.asset.php` files being emitted for inlined scripts
+  - This comes from version `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`
+
 ## [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`
 
 ## [3.5.0] - 2026-03-30
 ### Added
@@ -80,6 +97,18 @@ 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.89.0] - 2026-03-31
+### Changed
+- The block.json handling logic to use encoded location data in filenames that are enumerated within block.json
+- Inline scripts to not emit with a sourcemap outside of dev mode
+
+### Fixed
+- Unnecessary `.asset.php` files being emitted for inlined scripts
+
+## [2.88.2] - 2026-03-30
+### Fixed
+- The conflicting handle detection logic in block.json handling
+
 ## [2.88.1] - 2026-03-30
 ### Fixed
 - The paths in package.json that were broken after switching to dist

package/USER-GUIDE.md

@@ -345,9 +345,9 @@ While every common flag is accounted for in this schema, there are some things t
 Location-encoding filenames are composed of two or more `.`-separated segments (the file extension being one of those segments).
 The following is a brief list of notes followed by a breakdown of the individual segments:
 - The only required segments are the location and type segments (the type segment is the file extension).
-- So long as there is at least one location and type segment (the type segment MUST be last), "invalid" segments are allowed (this is for the purposes of giving human-readable names to files)
-- Each file can enumerate any combination enqueuing locations
-- The first item is special in that, if it encodes a location, in can optionally be suffixed with a type override (see the [Enqueuing Location](#enqueuing-location) section for more details)
+- So long as there is at least one location and type segment (the type segment MUST be last), "invalid" segments are allowed so that files can be given human-readable names
+- Each file can list any combination enqueuing locations
+- The first item is special in that, if it encodes a location, it can optionally be suffixed with a type override (see the [Enqueuing Location](#enqueuing-location) section for more details)
 
 Notes on how to read the following table:
 - Brackets in the token column mean "optional section"
@@ -472,7 +472,7 @@ If you use both methods for the same entrypoint, the dependencies from the confi
 ## Entrypoint Types
 
 ### Blocks
-This was first entrypoint type added, and, due to how it integrates with WordPress, it both has and needs the least amount of configuration.
+This was the first entrypoint type added, and, due to how it integrates with WordPress, it both has and needs the least amount of configuration.
 In fact, under most circumstances, the proper configuration value is just `true`.
 
 #### File Structure

package/dist/plugins/EnhancedBlockJSONPlugin.js

@@ -25,8 +25,10 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
     async processAssets(compilation, parsedAssetJsonProvider) {
         const applicableBlockJsonFiles = {};
         const blockJsonOriginToOutputMapping = {};
+        const staticallyLoadedEntrypoints = [];
         const relevantEntrypoints = this.getRelevantEntrypoints(compilation).toArray();
         for (const { entrypoint, metadata, srcPath } of relevantEntrypoints) {
+            staticallyLoadedEntrypoints.push(...entrypoint.getEntrypointChunk().files);
             if ((0, node_path_1.basename)(srcPath).toLowerCase() !== "block.json" || !('purpose' in metadata) || metadata.purpose !== "block-json-inclusion-assurance") {
                 continue;
             }
@@ -64,6 +66,9 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
                     .map(([file, assetType]) => {
                     const enqueuingFlags = (0, path_query_and_related_helpers_1.mergeTwoEnqueuingControlFlagSets)(file, metadata.enqueuingFlags, this.dest.enqueuingFlags);
                     const { scriptArgsObject, inlinedAsset } = (0, path_query_and_related_helpers_1.convertEnqueuingControlFlagsToScriptArgsObject)(compilation, file, enqueuingFlags);
+                    if (inlinedAsset !== undefined) {
+                        staticallyLoadedEntrypoints.push(file);
+                    }
                     const wasOriginallyAStyleField = (0, shared_1.isStyleField)(metadata.entrypointField);
                     const outputPath = this.stripOffBlocksDestPrefix(file);
                     if (wasOriginallyAStyleField !== (assetType === "style")) { // This means that the file is extracted
@@ -108,7 +113,7 @@ class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.Abst
         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, Object.keys(applicableBlockJsonFiles).length ? {
             group: this.group,
             requiresBaseURI: false,
-            staticallyLoadedEntrypoints: relevantEntrypoints.flatMap(re => re.entrypoint.getEntrypointChunk().files.values().toArray()),
+            staticallyLoadedEntrypoints,
             action
         } : undefined);
     }

package/dist/plugins/UnifiedLoaderGenerator.d.ts

@@ -3,7 +3,7 @@ import { AbstractBiPhasicGroupPlugin } from "./AbstractBiPhasicGroupPlugin";
 import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
 import { PseudoSemaphore } from "../utils/pseduo-semaphore";
 import { Compilation } from "webpack";
-type LoaderInfo = {
+export type LoaderInfo = {
     group: string;
     action(writer: PHPWriter): void;
     requiresBaseURI: boolean;
@@ -18,4 +18,3 @@ export declare class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin
     private withDistDevLoader;
     private ensureDistExists;
 }
-export {};

package/dist/shared.js

@@ -327,7 +327,14 @@ 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));
     }
-    const args = [handle, new expressions_1.HereOrNowDoc(`plaudit_inlined_${type}_${(0, node_crypto_1.createHash)('md5').update(handle).digest("hex")}`, inlinedAsset.contents, false)];
+    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)];
     if (type === 'script' && inlinedAsset.position === 'before') {
         args.push('before');
     }

package/dist/utils/common-config-helpers.js

@@ -148,8 +148,9 @@ function resolveEntryFromDirectory(commonConfig, srcRoot, dest) {
                             const [entrypointPath, rawLocalPathQueryParameters] = (0, path_query_and_related_helpers_1.unpackPotentiallyPrefixedFilePath)(originalValue);
                             const absoluteSrc = (0, node_path_1.normalize)((0, node_path_1.join)(dir, entrypointPath));
                             filesRegisteredByJson.push(absoluteSrc);
+                            const parsedFilename = (0, location_encoding_filename_parser_1.parseLocationEncodingFilenameForBlock)(absoluteSrc);
                             const { flags: localEnqueuingFlags, handle, remainder: localPathQueryParameters } = (0, path_query_and_related_helpers_1.unpackEnqueuingControlFlagsFromPathQueryParameters)(rawLocalPathQueryParameters, absoluteSrc, "path query parameters");
-                            const enqueuingFlags = (0, path_query_and_related_helpers_1.mergeTwoEnqueuingControlFlagSets)(absoluteSrc, localEnqueuingFlags, dest.enqueuingFlags);
+                            const enqueuingFlags = (0, path_query_and_related_helpers_1.mergeTwoEnqueuingControlFlagSets)(absoluteSrc, localEnqueuingFlags, parsedFilename?.flags, dest.enqueuingFlags);
                             const pathQueryParameters = { ...dest.pathQueryParameters, ...localPathQueryParameters };
                             try {
                                 const stats = await (0, promises_1.stat)(absoluteSrc);
@@ -173,7 +174,7 @@ function resolveEntryFromDirectory(commonConfig, srcRoot, dest) {
                         }
                         const absoluteSrc = (0, node_path_1.normalize)((0, node_path_1.join)(dir, dirent.name));
                         if (filesRegisteredByJson.includes(absoluteSrc)) {
-                            continue; //TODO: Should we make it so that encoded location data is merged in for files loaded via block.json?
+                            continue;
                         }
                         const parsedFilename = (0, location_encoding_filename_parser_1.parseLocationEncodingFilenameForBlock)(absoluteSrc);
                         if (!parsedFilename) {
@@ -305,7 +306,7 @@ function resolveEntryFromDirectory(commonConfig, srcRoot, dest) {
         const perAssetPathGroupedEntrypoints = groupEntrypointsByAssetFile(allEntrypoints.flatMap(e => e[0]), e => e[0]);
         const conflictingHandles = Object.values(seenExplicitHandles)
             .flatMap(handles => Object.entries(handles))
-            .filter(([, sources]) => sources.length > 0)
+            .filter(([, sources]) => sources.length > 1)
             .map(([handle, sources]) => `${handle}: ${sources.join(", ")}`);
         if (conflictingHandles.length > 0) {
             throw (0, shared_1.newCleanWebpackError)("Encountered conflicting explicitly-set handles:\n" + conflictingHandles.join("\n"));

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

@@ -36,7 +36,7 @@ export type NormalizedEnqueuingControlFlags = {
     fetchpriority?: FetchPriority;
     position?: 'before' | 'after';
 };
-export declare function mergeTwoEnqueuingControlFlagSets(file: string, baseArgs: NormalizedEnqueuingControlFlags | undefined, ancestorArgs: NormalizedEnqueuingControlFlags | undefined): NormalizedEnqueuingControlFlags | undefined;
+export declare function mergeTwoEnqueuingControlFlagSets(file: string, ...argsBlocks: (NormalizedEnqueuingControlFlags | undefined)[]): NormalizedEnqueuingControlFlags | undefined;
 export declare function unpackEnqueuingControlFlagsFromPathQueryParameters(pathQueryParameters: PathQueryParameters | undefined, file: string, sourceType: 'registerScriptArgs' | 'path query parameters'): {
     flags?: NormalizedEnqueuingControlFlags;
     handle?: string;

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

@@ -102,25 +102,28 @@ function isValidPositionForInlineStrategy(position) {
 function newInvalidPositionForInlineStrategyError(position, file) {
     return (0, shared_1.newWebpackErrorForFile)(`The position value for the inlined asset was invalid. Received: ${position}, Expected: undefined|'before'|'after'`, file);
 }
-function mergeTwoEnqueuingControlFlagSets(file, baseArgs, ancestorArgs) {
-    if (baseArgs === undefined) {
-        return ancestorArgs;
+function mergeTwoEnqueuingControlFlagSets(file, ...argsBlocks) {
+    const filteredArgsBlocks = argsBlocks.filter(argsBlock => argsBlock !== undefined);
+    if (filteredArgsBlocks.length === 0) {
+        return undefined;
     }
-    if (ancestorArgs === undefined) {
-        return baseArgs;
+    if ((0, shared_1.arrayIsLength)(filteredArgsBlocks, 1)) {
+        return filteredArgsBlocks[0];
     }
-    // This must be kept in sync with NormalizedScriptEnqueuingControlFlags
+    const res = {};
     for (const key of ['strategy', 'in_footer', 'fetchpriority', 'inline', 'position']) {
-        if (key in baseArgs) {
-            if (key in ancestorArgs && ancestorArgs[key] !== baseArgs[key]) {
-                throw (0, shared_1.newWebpackErrorForFile)(`The ${key} values in the registerScriptArgs and the pathQueryParameters for the file conflict`, file);
+        for (const argsBlock of filteredArgsBlocks) {
+            if (key in argsBlock) {
+                if (!(key in res)) {
+                    res[key] = argsBlock[key];
+                }
+                else if (argsBlock[key] !== res[key]) {
+                    throw (0, shared_1.newWebpackErrorForFile)(`The ${key} values in the control flag sets for the file conflict`, file);
+                }
             }
         }
-        else if (key in ancestorArgs) {
-            baseArgs[key] = ancestorArgs[key];
-        }
     }
-    return baseArgs;
+    return res;
 }
 function unpackEnqueuingControlFlagsFromPathQueryParameters(pathQueryParameters, file, sourceType) {
     if (pathQueryParameters === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/dist",