@plaudit/webpack-extensions 2.31.2 → 2.33.0

package/build/wordpress-scripts-wrapper/BlockJSONManagingPlugin.d.ts

@@ -13,6 +13,7 @@ export default class BlockJSONManagingPlugin implements WebpackPluginInstance {
     static resolveDestinationBySourceExtension(srcPath: string, entrypoint: Compilation['asyncEntrypoints'][number]): string | undefined;
     static findCommonAncestor(...paths: string[]): string[];
     static findRelativeRouteBetween(path1: string, path2: string): string;
+    private static remapReferencedPHPFilesOnKey;
     private static hashThingForAsset;
     private static stripFilePrefix;
 }

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

@@ -121,32 +121,8 @@ class BlockJSONManagingPlugin {
                     }
                     const outputDir = node_path_1.default.join(compiler.outputPath, node_path_1.default.dirname(name));
                     const pathsNeedRemapping = !this.standaloneBlocks && json["plaudit"] !== "simple";
-                    const rawSetupFiles = json["plaudit"]?.["setup"]
-                        ? (typeof json["plaudit"]["setup"] === 'string' ? [json["plaudit"]["setup"]] : json["plaudit"]["setup"])
-                        : ["setup.php"];
-                    const setupFiles = pathsNeedRemapping
-                        ? rawSetupFiles
-                            .map(p => node_path_1.default.normalize(node_path_1.default.join(sourceDir, BlockJSONManagingPlugin.stripFilePrefix(p))))
-                            .filter(p => node_fs_1.default.existsSync(p))
-                            .map(p => `file:./${BlockJSONManagingPlugin.findRelativeRouteBetween(outputDir, p)}`)
-                        : rawSetupFiles
-                            .filter(p => node_fs_1.default.existsSync(node_path_1.default.normalize(node_path_1.default.join(sourceDir, BlockJSONManagingPlugin.stripFilePrefix(p)))));
-                    if (setupFiles.length === 0) {
-                        if (json["plaudit"]?.["setup"] !== undefined) {
-                            delete json["plaudit"]["setup"];
-                        }
-                    }
-                    else {
-                        if (typeof json["plaudit"] !== 'object') {
-                            if (json["plaudit"] === "native") {
-                                json["plaudit"] = { type: "native" };
-                            }
-                            else {
-                                json["plaudit"] = {};
-                            }
-                        }
-                        json["plaudit"]["setup"] = setupFiles.length === 1 ? setupFiles[0] : setupFiles;
-                    }
+                    BlockJSONManagingPlugin.remapReferencedPHPFilesOnKey(json, "setup", pathsNeedRemapping, sourceDir, outputDir, compilation, true);
+                    BlockJSONManagingPlugin.remapReferencedPHPFilesOnKey(json, "variations", pathsNeedRemapping, sourceDir, outputDir, compilation, false);
                     if (json["acf"]) {
                         if (json["acf"]["renderTemplate"]) {
                             json["render_template"] = json["acf"]["renderTemplate"];
@@ -232,6 +208,61 @@ class BlockJSONManagingPlugin {
         route.push(node_path_1.default.relative(commonAncestor.join(node_path_1.default.sep), path2));
         return route.join(node_path_1.default.sep);
     }
+    static remapReferencedPHPFilesOnKey(json, key, pathsNeedRemapping, sourceDir, outputDir, compilation, inPlaudit) {
+        const rawValue = (inPlaudit ? json["plaudit"] : json)?.[key];
+        let rawFiles;
+        let deleteOnEmpty = true;
+        if (typeof rawValue === 'string') {
+            rawFiles = [rawValue];
+        }
+        else if (Array.isArray(rawValue) && rawValue.length > 0) {
+            const fileReferences = rawValue.filter((value) => typeof value === 'string' && value.startsWith("file:./"));
+            if (fileReferences.length === rawValue.length) {
+                rawFiles = fileReferences;
+            }
+            else {
+                if (fileReferences.length !== 0) {
+                    const error = new webpack_1.WebpackError(`Encountered a block with a mixture of file-reference and non-file-reference elements in the "${inPlaudit ? 'plaudit.' : ''}${key}" property`);
+                    error.file = node_path_1.default.join(sourceDir, 'block.json');
+                    compilation.warnings.push(error);
+                    rawFiles = fileReferences;
+                }
+                else {
+                    rawFiles = [`${key}.php`]; // We want to emit an error if both an appropriately-named file AND an incompatible value exist, so we still need to do the check
+                }
+                deleteOnEmpty = false;
+            }
+        }
+        else {
+            if (rawValue && (!Array.isArray(rawValue) || rawValue.length === 0)) {
+                deleteOnEmpty = false;
+            }
+            rawFiles = [`${key}.php`];
+        }
+        const mappedFiles = pathsNeedRemapping
+            ? rawFiles
+                .map(p => node_path_1.default.normalize(node_path_1.default.join(sourceDir, BlockJSONManagingPlugin.stripFilePrefix(p))))
+                .filter(p => node_fs_1.default.existsSync(p))
+                .map(p => `file:./${BlockJSONManagingPlugin.findRelativeRouteBetween(outputDir, p)}`)
+            : rawFiles
+                .filter(p => node_fs_1.default.existsSync(node_path_1.default.normalize(node_path_1.default.join(sourceDir, BlockJSONManagingPlugin.stripFilePrefix(p)))));
+        if (mappedFiles.length === 0) {
+            if (deleteOnEmpty && rawValue !== undefined) {
+                delete (inPlaudit ? json["plaudit"] : json)[key];
+            }
+        }
+        else {
+            if (inPlaudit && typeof json["plaudit"] !== 'object') {
+                if (json["plaudit"] === "native") {
+                    json["plaudit"] = { type: "native" };
+                }
+                else {
+                    json["plaudit"] = {};
+                }
+            }
+            (inPlaudit ? json["plaudit"] : json)[key] = mappedFiles.length === 1 ? mappedFiles[0] : mappedFiles;
+        }
+    }
     static hashThingForAsset(thing) {
         return node_crypto_1.default.createHash('md5').update(thing).digest("hex").substring(0, 20).toLowerCase();
     }

package/build/wordpress-scripts-wrapper.d.ts

@@ -7,7 +7,7 @@ interface AdvancedOutputConfig {
     directoryLayout?: 'blocks' | 'extensions';
 }
 type IndividualExternalDepConfig = string | {
-    import: string | [string, ...string[]];
+    import?: string | [string, ...string[]];
     handle: string;
 };
 type Externals = {

package/build/wordpress-scripts-wrapper.js

@@ -236,11 +236,12 @@ function makeDependencyExtractionPlugin(externals) {
     const exactExternals = {};
     const suffixExternals = [];
     for (const [key, value] of Object.entries(externals)) {
+        const normalizedValue = typeof value !== 'string' && value.import === undefined ? { ...value, import: key } : value;
         if (key.startsWith("*/")) {
-            suffixExternals.push([key.substring(1), typeof value === 'string' ? { import: value, handle: key.substring(2) } : value]);
+            suffixExternals.push([key.substring(1), typeof normalizedValue === 'string' ? { import: normalizedValue, handle: key.substring(2) } : normalizedValue]);
         }
         else {
-            exactExternals[key] = value;
+            exactExternals[key] = normalizedValue;
         }
     }
     const resolvePossibleExternal = (request) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.31.2",
+  "version": "2.33.0",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",