@plaudit/webpack-extensions 2.44.4 → 2.44.5

package/build/wordpress-scripts-wrapper/BlockJSONManagingPlugin.js

@@ -294,19 +294,30 @@ class BlockJSONManagingPlugin {
                         continue;
                     }
                     const entrypointChunk = entrypoint.getEntrypointChunk();
-                    const additionalFiles = [];
-                    for (const entrypointChunkFile of entrypointChunk.files) {
-                        if (!entrypointChunkFile.endsWith(".asset.php") && entrypointChunkFile !== destPath) {
-                            additionalFiles.push(entrypointChunkFile);
+                    const runtimeName = entrypointChunk.name;
+                    let additionalFiles;
+                    if (runtimeName) {
+                        additionalFiles = new Set([...compilation.chunks]
+                            .filter(chunk => typeof chunk.runtime === 'string' ? chunk.runtime === entrypointChunk.name : chunk.runtime?.has(runtimeName))
+                            .flatMap(chunk => [...chunk.files])
+                            .filter(file => !file.endsWith(".asset.php")));
+                        additionalFiles.delete(destPath);
+                    }
+                    else {
+                        additionalFiles = new Set();
+                        for (const entrypointChunkFile of entrypointChunk.files) {
+                            if (!entrypointChunkFile.endsWith(".asset.php") && entrypointChunkFile !== destPath) {
+                                additionalFiles.add(entrypointChunkFile);
+                            }
                         }
                     }
                     const entryMeta = { hash: entrypointChunk.hash ?? destPath, path: destPath };
                     const currentEntrypoints = BlockJSONManagingPlugin.blockJsonToEntrypointsMap.get(name);
                     if (currentEntrypoints) {
-                        currentEntrypoints.set(srcPath, { output: entryMeta, additionalFiles });
+                        currentEntrypoints.set(srcPath, { output: entryMeta, additionalFiles: [...additionalFiles] });
                     }
                     else {
-                        BlockJSONManagingPlugin.blockJsonToEntrypointsMap.set(name, new Map([[srcPath, { output: entryMeta, additionalFiles }]]));
+                        BlockJSONManagingPlugin.blockJsonToEntrypointsMap.set(name, new Map([[srcPath, { output: entryMeta, additionalFiles: [...additionalFiles] }]]));
                     }
                 }
             }
@@ -388,6 +399,14 @@ class BlockJSONManagingPlugin {
                 }) // Flatten the per-entrypoint [additionalFile, progenitor] pairs into a single array
                 );
                 const rawAssetData = JSON.parse(rawAssetDataSource);
+                for (const chunk of compilation.chunks) {
+                    if (compilation.chunkGraph.getChunkModulesIterableBySourceType(chunk, 'css/mini-extract')) {
+                        const output = [...chunk.files].find(f => f.endsWith(".css"));
+                        if (output) {
+                            rawAssetData[output] = { dependencies: [], version: chunk.contentHash['css/mini-extract'] ?? chunk.hash ?? "" };
+                        }
+                    }
+                }
                 const usedHandles = {};
                 for (const [blockFolder, config] of blockDirConfigs) {
                     for (const mappableKey of BlockJSONManagingPlugin.mappableKeys) {
@@ -508,13 +527,18 @@ function getAssetDetails(blockFolder, asset, rawAssetData, additionalFilesMap, m
     const src = `${blockFolder}/${asset.substring(7)}`;
     const isCss = src.endsWith(".css");
     let assetData;
-    const lookupSrc = additionalFilesMap.get(src);
-    if (lookupSrc) {
-        const tempAssetData = getAssetDataAccountingForCSS(lookupSrc, rawAssetData);
-        assetData = tempAssetData ? { ...tempAssetData, dependencies: [] } : undefined;
+    if (rawAssetData[src]) {
+        assetData = rawAssetData[src];
     }
     else {
-        assetData = getAssetDataAccountingForCSS(src, rawAssetData);
+        const lookupSrc = additionalFilesMap.get(src);
+        if (lookupSrc) {
+            const tempAssetData = getAssetDataAccountingForCSS(lookupSrc, rawAssetData);
+            assetData = tempAssetData ? { ...tempAssetData, dependencies: [] } : undefined;
+        }
+        else {
+            assetData = getAssetDataAccountingForCSS(src, rawAssetData);
+        }
     }
     if (!assetData) {
         return undefined;

package/build/wordpress-scripts-wrapper.js

@@ -513,6 +513,24 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
                 publicPath: publicPath,
                 library: outputLibrary
             },
+            optimization: {
+                ...webpackConfig.optimization,
+                splitChunks: {
+                    cacheGroups: {
+                        style: {
+                            // This is a flagrant abuse of cache groups, but it fixes a persistent problem wherein the dependencies and versions of scripts and styles were bleeding into each-other
+                            type: 'css/mini-extract',
+                            chunks: 'all',
+                            enforce: true,
+                            name(_, chunks, cacheGroupKey) {
+                                const chunkName = chunks.find(chunk => chunk.name)?.name;
+                                return chunkName.includes("script") ? `${node_path_1.default.dirname(chunkName)}/${cacheGroupKey}-${node_path_1.default.basename(chunkName)}` : chunkName;
+                            },
+                        },
+                        default: false,
+                    },
+                }
+            },
             module: {
                 ...webpackConfig.module,
                 rules: fixedRules

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@plaudit/webpack-extensions",
-	"version": "2.44.4",
+	"version": "2.44.5",
 	"license": "UNLICENSED",
 	"scripts": {
 		"prepublishOnly": "rm -rf build && mkdir build && tsc",