@plaudit/webpack-extensions 2.76.0 → 2.76.2

package/build/plugins/{PlainEntrypointsStyleBlockJSONPlugin.d.ts → EnhancedBlockJSONPlugin.d.ts}

@@ -13,7 +13,7 @@ type CollatedWorkableBlockInfo = Record<string, {
     workableBlockEntrypointsInfo: WorkableBlockEntrypointInfo[];
     blockJsonText?: string;
 }>;
-export declare class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin<BlockEntrypointInfo> {
+export declare class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin<BlockEntrypointInfo> {
     private readonly dest;
     private readonly webpackRemoveEmptyScriptsPlugin;
     private static readonly semaphore;

package/build/plugins/{PlainEntrypointsStyleBlockJSONPlugin.js → EnhancedBlockJSONPlugin.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlainEntrypointsStyleBlockJSONPlugin = void 0;
+exports.EnhancedBlockJSONPlugin = void 0;
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_fs_1 = __importDefault(require("node:fs"));
@@ -15,12 +15,12 @@ const expressions_1 = require("@plaudit/php-writer/expressions");
 const shared_1 = require("../shared");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const webpack_1 = require("webpack");
-class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
+class EnhancedBlockJSONPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.AbstractBiPhasicGroupAndEntryPlugin {
     dest;
     webpackRemoveEmptyScriptsPlugin;
     static semaphore = new pseduo_semaphore_1.PseudoSemaphore("Block JSON v3");
     constructor(config, dest, webpackRemoveEmptyScriptsPlugin, context, entry) {
-        super(config, `block-json-${dest.destination}`, [PlainEntrypointsStyleBlockJSONPlugin.semaphore, UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
+        super(config, `block-json-${dest.destination}`, [EnhancedBlockJSONPlugin.semaphore, UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore], context, entry);
         this.dest = dest;
         this.webpackRemoveEmptyScriptsPlugin = webpackRemoveEmptyScriptsPlugin;
     }
@@ -37,7 +37,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
                 //TODO: Can we guarantee that entrypoint.name is always non-null?
                 const epBlockJson = entrypoint.name + ".json";
                 if (!applicableBlockJsonFiles[epBlockJson]) {
-                    const blockJsonText = PlainEntrypointsStyleBlockJSONPlugin.extractAssetSource(compilation, epBlockJson)
+                    const blockJsonText = EnhancedBlockJSONPlugin.extractAssetSource(compilation, epBlockJson)
                         ?? await promises_1.default.readFile(srcPath, 'utf-8');
                     if (!blockJsonText) {
                         compilation.errors.push((0, shared_1.newWebpackErrorForFile)(`Unable to extract the source for ${epBlockJson}`, srcPath));
@@ -85,7 +85,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
                 }
             }
         }
-        PlainEntrypointsStyleBlockJSONPlugin.semaphore.resolve(this.id, {
+        EnhancedBlockJSONPlugin.semaphore.resolve(this.id, {
             collatableWorkableBlockInfo: applicableBlockJsonFiles, blocksDest: this.dest.destination,
             emittingWpmlXml: compilation.getAsset(node_path_1.default.join(this.dest.destination, "wpml-config.xml")) !== undefined
         });
@@ -146,9 +146,9 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
             const outputDir = node_path_1.default.join(compilation.compiler.outputPath, node_path_1.default.dirname(blockJsonAssetName));
             const blockJson = JSON.parse(blockJsonText);
             const pathsNeedRemapping = !this.config.standaloneBlocks && blockJson["plaudit"] !== "simple";
-            PlainEntrypointsStyleBlockJSONPlugin.remapReferencedPHPFilesOnKey(blockJson, "setup", pathsNeedRemapping, sourceDir, outputDir, compilation, true);
-            PlainEntrypointsStyleBlockJSONPlugin.remapReferencedPHPFilesOnKey(blockJson, "variations", pathsNeedRemapping, sourceDir, outputDir, compilation, false);
-            const hashForVersion = PlainEntrypointsStyleBlockJSONPlugin
+            EnhancedBlockJSONPlugin.remapReferencedPHPFilesOnKey(blockJson, "setup", pathsNeedRemapping, sourceDir, outputDir, compilation, true);
+            EnhancedBlockJSONPlugin.remapReferencedPHPFilesOnKey(blockJson, "variations", pathsNeedRemapping, sourceDir, outputDir, compilation, false);
+            const hashForVersion = EnhancedBlockJSONPlugin
                 .hashThingForAsset([blockJsonText, ...workableBlockEntrypointsInfo.map(bi => bi.hash)].join("~"));
             if (blockJson["version"]) {
                 blockJson["version"] = `${blockJson["version"]}-${hashForVersion}`;
@@ -156,20 +156,20 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
             else {
                 blockJson["version"] = hashForVersion;
             }
-            PlainEntrypointsStyleBlockJSONPlugin.normalizeRenderTemplate(blockJson, pathsNeedRemapping, sourceDir, outputDir, compilation);
+            EnhancedBlockJSONPlugin.normalizeRenderTemplate(blockJson, pathsNeedRemapping, sourceDir, outputDir, compilation);
             const blockDirName = node_path_1.default.dirname(node_path_1.default.relative(this.dest.destination, blockJsonAssetName));
-            blockData[blockDirName] = PlainEntrypointsStyleBlockJSONPlugin
+            blockData[blockDirName] = EnhancedBlockJSONPlugin
                 .doFileOrHandleReplacements(compilation, Object.fromEntries(Object.entries(blockJson).filter(([k]) => k !== '$schema')), workableBlockEntrypointsInfo, epi => epi.handle);
-            compilation[blockJsonAssetName in compilation.assets ? 'updateAsset' : 'emitAsset'](blockJsonAssetName, new webpack_1.sources.RawSource(JSON.stringify(PlainEntrypointsStyleBlockJSONPlugin
+            compilation[blockJsonAssetName in compilation.assets ? 'updateAsset' : 'emitAsset'](blockJsonAssetName, new webpack_1.sources.RawSource(JSON.stringify(EnhancedBlockJSONPlugin
                 .doFileOrHandleReplacements(compilation, blockJson, workableBlockEntrypointsInfo, epi => "file:./" + node_path_1.default.relative(blockDirName, epi.outputPath)), undefined, "  ")));
         }
         return {
             __metadata: {
                 version: 3,
                 "wpml-config": emittingWpmlXml,
-                scriptHandles: Object.fromEntries(PlainEntrypointsStyleBlockJSONPlugin
+                scriptHandles: Object.fromEntries(EnhancedBlockJSONPlugin
                     .convertToScriptHandles(handleData.filter(hd => !(0, shared_1.isStyleField)(hd.entrypointField) && !(0, shared_1.isScriptModuleField)(hd.entrypointField)))),
-                scriptModuleHandles: Object.fromEntries(PlainEntrypointsStyleBlockJSONPlugin
+                scriptModuleHandles: Object.fromEntries(EnhancedBlockJSONPlugin
                     .convertToScriptHandles(handleData.filter(hd => !(0, shared_1.isStyleField)(hd.entrypointField) && (0, shared_1.isScriptModuleField)(hd.entrypointField)))),
                 styleHandles: Object.fromEntries(handleData.filter(hd => (0, shared_1.isStyleField)(hd.entrypointField))
                     .map(hd => {
@@ -250,7 +250,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
         });
     }
     static findRelativeRouteBetween(path1, path2) {
-        const commonAncestor = PlainEntrypointsStyleBlockJSONPlugin.findCommonAncestor(path1, path2);
+        const commonAncestor = EnhancedBlockJSONPlugin.findCommonAncestor(path1, path2);
         const route = Array(path1.split(node_path_1.default.sep).length - commonAncestor.length).fill("..");
         route.push(node_path_1.default.relative(commonAncestor.join(node_path_1.default.sep), path2));
         return route.join(node_path_1.default.sep);
@@ -286,11 +286,11 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
         }
         const mappedFiles = pathsNeedRemapping
             ? rawFiles
-                .map(p => node_path_1.default.normalize(node_path_1.default.join(sourceDir, PlainEntrypointsStyleBlockJSONPlugin.stripFilePrefix(p))))
+                .map(p => node_path_1.default.normalize(node_path_1.default.join(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p))))
                 .filter(p => node_fs_1.default.existsSync(p))
-                .map(p => `file:./${PlainEntrypointsStyleBlockJSONPlugin.findRelativeRouteBetween(outputDir, p)}`)
+                .map(p => `file:./${EnhancedBlockJSONPlugin.findRelativeRouteBetween(outputDir, p)}`)
             : rawFiles
-                .filter(p => node_fs_1.default.existsSync(node_path_1.default.normalize(node_path_1.default.join(sourceDir, PlainEntrypointsStyleBlockJSONPlugin.stripFilePrefix(p)))));
+                .filter(p => node_fs_1.default.existsSync(node_path_1.default.normalize(node_path_1.default.join(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p)))));
         if (mappedFiles.length === 0) {
             if (deleteOnEmpty && rawValue !== undefined) {
                 delete (inPlaudit ? blockJson["plaudit"] : blockJson)[key];
@@ -326,11 +326,11 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
             : [`${blockName.substring(blockName.indexOf('/') + 1)}.php`, "template.php", "template.twig"]);
         const renderTemplate = pathsNeedRemapping
             ? rawRenderTemplate
-                .map(p => node_path_1.default.normalize(node_path_1.default.join(sourceDir, PlainEntrypointsStyleBlockJSONPlugin.stripFilePrefix(p))))
+                .map(p => node_path_1.default.normalize(node_path_1.default.join(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p))))
                 .filter(p => node_fs_1.default.existsSync(p))
-                .map(p => `file:./${PlainEntrypointsStyleBlockJSONPlugin.findRelativeRouteBetween(outputDir, p)}`)
+                .map(p => `file:./${EnhancedBlockJSONPlugin.findRelativeRouteBetween(outputDir, p)}`)
             : rawRenderTemplate
-                .filter(p => node_fs_1.default.existsSync(node_path_1.default.normalize(node_path_1.default.join(sourceDir, PlainEntrypointsStyleBlockJSONPlugin.stripFilePrefix(p)))));
+                .filter(p => node_fs_1.default.existsSync(node_path_1.default.normalize(node_path_1.default.join(sourceDir, EnhancedBlockJSONPlugin.stripFilePrefix(p)))));
         if (renderTemplate.length === 0) {
             delete blockJson["render_template"];
             delete blockJson["render"];
@@ -359,7 +359,7 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
     }
     attachUniquePhase(compilation) {
         compilation.hooks.processAssets.tapPromise({ name: `${this.constructor.name}_CompileLoader`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT }, async () => {
-            const allSemaphoreData = (await PlainEntrypointsStyleBlockJSONPlugin.semaphore.wait())
+            const allSemaphoreData = (await EnhancedBlockJSONPlugin.semaphore.wait())
                 .reduce((acc, cur) => {
                 (acc[cur.blocksDest] ?? (acc[cur.blocksDest] = [])).push(cur);
                 return acc;
@@ -432,4 +432,4 @@ class PlainEntrypointsStyleBlockJSONPlugin extends AbstractBiPhasicGroupAndEntry
         }));
     }
 }
-exports.PlainEntrypointsStyleBlockJSONPlugin = PlainEntrypointsStyleBlockJSONPlugin;
+exports.EnhancedBlockJSONPlugin = EnhancedBlockJSONPlugin;

package/build/plugins/EnhancedDynamicEntryPlugin.d.ts

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

package/build/plugins/EnhancedDynamicEntryPlugin.js

@@ -7,6 +7,8 @@ class EnhancedDynamicEntryPlugin extends AbstractBiPhasicGroupAndEntryPlugin_1.A
         super(config, `enhanced-dynamic-entries`, [], context, entry);
     }
     attachUniquePhase() { }
-    processAssets() { }
+    processAssets(compilation, parsedAssetJsonProvider) {
+        this.extractRelevantAssetData(compilation, parsedAssetJsonProvider);
+    }
 }
 exports.EnhancedDynamicEntryPlugin = EnhancedDynamicEntryPlugin;

package/build/plugins/UnifiedLoaderGenerator.js

@@ -48,12 +48,13 @@ class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPha
             });
             const staticallyLoadedEntrypoints = new Set(groupedLoaderInfo.flatMap(lig => lig.staticallyLoadedEntrypoints));
             for (const [file, assetData] of Object.entries((0, shared_1.getAssetsJson)(compilation))) {
-                if (staticallyLoadedEntrypoints.has(file)) {
+                if (staticallyLoadedEntrypoints.has(file) || staticallyLoadedEntrypoints.has(file.replace(/\.css$/, '.js')) || staticallyLoadedEntrypoints.has(file.replace(/\.js$/, '.css'))) {
                     continue;
                 }
                 const parsedPath = node_path_1.default.parse(file);
                 const contents = `<?php return ${(0, php_writer_1.json2php)(assetData)};\n`;
-                compilation.emitAsset(node_path_1.default.join(parsedPath.dir, parsedPath.name) + ".asset.php", new webpack_1.sources.RawSource(contents), { size: Buffer.byteLength(contents) });
+                const assetName = node_path_1.default.join(parsedPath.dir, parsedPath.name) + ".asset.php";
+                compilation[assetName in compilation.assets ? 'updateAsset' : 'emitAsset'](assetName, new webpack_1.sources.RawSource(contents), { size: Buffer.byteLength(contents) });
             }
             if (this.config.useUnifiedLoader) {
                 compilation.hooks.afterProcessAssets.tap(this.constructor.name, () => {

package/build/wordpress-scripts-wrapper.js

@@ -16,7 +16,7 @@ const ExtensionsConfigFileGeneratorPluginV1_1 = require("./plugins/ExtensionsCon
 const MiniCSSExtractPluginErrorCleaner_1 = require("./plugins/MiniCSSExtractPluginErrorCleaner");
 const PackageConfigSanityChecker_1 = require("./plugins/PackageConfigSanityChecker");
 const PlainEntrypointsConfigFileGeneratorPlugin_1 = require("./plugins/PlainEntrypointsConfigFileGeneratorPlugin");
-const PlainEntrypointsStyleBlockJSONPlugin_1 = require("./plugins/PlainEntrypointsStyleBlockJSONPlugin");
+const EnhancedBlockJSONPlugin_1 = require("./plugins/EnhancedBlockJSONPlugin");
 const SpecialAssetHandlingPlugin_1 = require("./plugins/SpecialAssetHandlingPlugin");
 const VariablesJSMonitorPlugin_1 = require("./plugins/VariablesJSMonitorPlugin");
 const WPMLConfigBuilder_1 = require("./plugins/WPMLConfigBuilder");
@@ -479,7 +479,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources, canClean
                 if (!srcIsDirectory) {
                     continue;
                 }
-                plugin = new PlainEntrypointsStyleBlockJSONPlugin_1.PlainEntrypointsStyleBlockJSONPlugin(config, dest, removeEmptyScriptsPlugin, contextPath, (0, common_config_helpers_1.resolveEntryFromDirectory)(commonConfig, srcRoot, dest));
+                plugin = new EnhancedBlockJSONPlugin_1.EnhancedBlockJSONPlugin(config, dest, removeEmptyScriptsPlugin, contextPath, (0, common_config_helpers_1.resolveEntryFromDirectory)(commonConfig, srcRoot, dest));
                 plugins.push(plugin);
                 if (config.processTranslationConfigs && !processingModules) {
                     plugins.push(new WPMLConfigBuilder_1.WPMLConfigBuilderPlugin(dest.destination, plugin));

package/package.json

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