@plaudit/webpack-extensions 2.45.0 → 2.46.0

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

@@ -404,7 +404,7 @@ class BlockJSONManagingPlugin {
                             if (Array.isArray(cfg)) {
                                 for (let i = 0; i < cfg.length; i++) {
                                     const assetDetails = BlockJSONManagingPlugin
-                                        .getAssetDetails(blockFolder, cfg[i], rawAssetData, derivedFilesMap, mappableKey, usedHandles);
+                                        .getAssetDetails(blockFolder, config["name"], cfg[i], rawAssetData, derivedFilesMap, mappableKey, usedHandles);
                                     if (assetDetails) {
                                         (assetDetails.isCss ? styleHandles : scriptHandles)[assetDetails.handle] = assetDetails.handleData;
                                         cfg[i] = assetDetails.handle;
@@ -413,7 +413,7 @@ class BlockJSONManagingPlugin {
                             }
                             else {
                                 const assetDetails = BlockJSONManagingPlugin
-                                    .getAssetDetails(blockFolder, cfg, rawAssetData, derivedFilesMap, mappableKey, usedHandles);
+                                    .getAssetDetails(blockFolder, config["name"], cfg, rawAssetData, derivedFilesMap, mappableKey, usedHandles);
                                 if (assetDetails) {
                                     (assetDetails.isCss ? styleHandles : scriptHandles)[assetDetails.handle] = assetDetails.handleData;
                                     config[mappableKey] = assetDetails.handle;
@@ -509,7 +509,7 @@ class BlockJSONManagingPlugin {
         });
         return res;
     }
-    static getAssetDetails(blockFolder, asset, rawAssetData, derivedFilesMap, mappableKey, usedHandles) {
+    static getAssetDetails(blockFolder, blockName, asset, rawAssetData, derivedFilesMap, mappableKey, usedHandles) {
         if (!asset.startsWith("file:./")) {
             return undefined;
         }
@@ -541,6 +541,9 @@ class BlockJSONManagingPlugin {
             return undefined;
         }
         let handle = src.substring(0, src.length - (isCss ? 4 : 3));
+        if (blockName && handle.startsWith(blockName.substring(blockName.indexOf("/") + 1) + "/")) {
+            handle = blockName + handle.substring(handle.indexOf("/"));
+        }
         if (usedHandles[isCss ? 'css' : 'js'][handle] !== undefined) {
             handle += "-" + (++usedHandles[isCss ? 'css' : 'js'][handle]);
         }

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

@@ -29,40 +29,18 @@ class ExtensionsConfigFileGeneratorPlugin {
             await Promise.all(emissionPromises);
         });
         compiler.hooks.thisCompilation.tap(this.constructor.name, compilation => {
-            compilation.hooks.processAssets.tap({
-                name: `${this.constructor.name}_ProcessAssets`,
-                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ANALYSE
-            }, compilationAssets => {
-                const stats = compilation.getStats().toJson({
-                    hash: true,
-                    publicPath: true,
-                    assets: true,
-                    chunks: true,
-                    modules: true,
-                    source: true,
-                    errorDetails: false,
-                    timings: false
-                });
-                if (!stats.assets) {
-                    throw new Error("Stats did not include assets despite them being requested");
-                }
-                if (!stats.modules) {
-                    throw new Error("Stats did not include modules despite them being requested");
-                }
+            compilation.hooks.afterProcessAssets.tap(`${this.constructor.name}_ProcessAssets`, compilationAssets => {
                 const regex = /^(.+?)-((?:editor-|view-|)(?:style|script|script-module))\.(?:css|m?js)$/i;
                 const mapping = {};
-                for (const asset of stats.assets) {
-                    if ((asset.chunks?.length ?? -1) > 1 || !asset.size) {
-                        continue;
-                    }
+                for (const asset of Object.keys(compilationAssets)) {
                     let match;
-                    if ((match = /^(.+?)-setup.php$/i.exec(asset.name)) && match[1]) {
-                        (mapping[match[1]] ?? (mapping[match[1]] = [{}]))[1] = `${asset.name}`;
+                    if ((match = /^(.+?)-setup.php$/i.exec(asset)) && match[1]) {
+                        (mapping[match[1]] ?? (mapping[match[1]] = [{}]))[1] = `${asset}`;
                     }
-                    else if ((match = regex.exec(asset.name)) && match[1] && match[2]) {
+                    else if ((match = regex.exec(asset)) && match[1] && match[2]) {
                         const resourceInfo = (mapping[match[1]] ?? (mapping[match[1]] = [{}]))[0];
                         const key = match[2].replace(/-[sm]/gi, chars => chars.substring(1).toUpperCase());
-                        (resourceInfo[key] ?? (resourceInfo[key] = [])).push([`plaudit_block-extension_${match[1]}-${match[2]}`, asset.name]);
+                        (resourceInfo[key] ?? (resourceInfo[key] = [])).push([`plaudit_block-extension_${match[1]}-${match[2]}`, asset]);
                     }
                 }
                 compilation.emitAsset("mapping.config", new webpack_1.sources.RawSource((0, php_serializer_1.default)(mapping)));

package/build/wordpress-scripts-wrapper.js

@@ -538,7 +538,9 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
                             name(_, chunks, cacheGroupKey) {
                                 const chunkName = chunks.find(chunk => chunk.name)?.name;
                                 // We use "__${cacheGroupKey}__" instead of "${cacheGroupKey}-" to make it easier to remove when generating the filename
-                                return `${node_path_1.default.dirname(chunkName)}/__${cacheGroupKey}__${node_path_1.default.basename(chunkName)}`;
+                                const filename = `__${cacheGroupKey}__${node_path_1.default.basename(chunkName)}`;
+                                const dirname = node_path_1.default.dirname(chunkName);
+                                return dirname === '.' ? filename : `${dirname}/${filename}`;
                             }
                         },
                         default: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.45.0",
+  "version": "2.46.0",
   "license": "UNLICENSED",
   "files": [
     "/build"
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@plaudit/gutenberg-api-extensions": "^2.66.1",
     "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/node": "^22.14.1",
+    "@types/node": "^22.15.3",
     "@types/postcss-functions": "^4.0.4",
     "@types/tapable": "^2.2.7",
     "@types/webpack": "^5.28.5",
@@ -62,7 +62,7 @@
     "postcss-url": "^10.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "webpack": "^5.99.6",
+    "webpack": "^5.99.7",
     "webpack-remove-empty-scripts": "^1.0.4",
     "xml-formatter": "^3.6.5"
   },