@plaudit/webpack-extensions 2.58.3 → 2.59.0

package/build/plugins/BlockJSONManagingPlugin.js

@@ -323,6 +323,7 @@ class BlockJSONManagingPlugin {
         compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
             UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, {
                 group: `block-json-${this.blocksDest}`,
+                requiresBaseURI: false,
                 action: writer => {
                     writer
                         .use("Plaudit\\Common\\ACF\\BlockManager")

package/build/plugins/BrowserSyncPlugin.d.ts

@@ -21,4 +21,5 @@ export declare class BrowserSyncPlugin implements WebpackPluginInstance {
     private static loadEnvFile;
     apply(compiler: Compiler): void;
     private getCssOnlyEmittedAssetsNames;
+    private static getSiteUrls;
 }

package/build/plugins/BrowserSyncPlugin.js

@@ -26,10 +26,8 @@ class BrowserSyncPlugin {
     static getBrowserSyncPluginOptions() {
         return BrowserSyncPlugin.browserSyncPluginOptions ?? (BrowserSyncPlugin.browserSyncPluginOptions = new Promise(resolve => {
             const envFile = BrowserSyncPlugin.loadEnvFile();
-            const prefixes = node_child_process_1.default.spawnSync("theapp", ["info", "--for-browsersync"], {
-                encoding: "utf-8",
-                stdio: ["ignore", "pipe", "inherit"]
-            }).stdout.split(/\r?\n/g).map(url => url.trim()).filter(url => url.length > 0).map(url => url.substring(url.indexOf("://") + 3));
+            //docker container inspect "$(docker compose ps --format=json | jq '. | select(. | contains({"Service": "wordpress"})) | .ID' -r)" | jq '.[].Config.Env'
+            const prefixes = BrowserSyncPlugin.getSiteUrls();
             const targetPort = envFile.match(/WEB_PORT_SSL=(\d+)/i)?.[1] ?? "8443";
             const targetHost = targetPort === "443" ? "localhost" : `localhost:${targetPort}`;
             if (prefixes.length === 0 || prefixes.every(prefix => prefix.startsWith("localhost"))) {
@@ -49,7 +47,7 @@ class BrowserSyncPlugin {
                         callbacks: {
                             ready(err, bsi) {
                                 // This ensures that the opened URL is actually a valid one
-                                (0, open_1.default)(`https://${prefixes[0]}:${bsi.getOption("port") ?? 3000}`);
+                                (0, open_1.default)(`https://${prefixes[0]?.replace(/:\d{2,4}/, "")}:${bsi.getOption("port") ?? 3000}`);
                             }
                         }
                     }, {
@@ -173,5 +171,33 @@ class BrowserSyncPlugin {
         }
         return changedFilenames;
     }
+    static getSiteUrls() {
+        //docker container inspect "$(docker compose ps --format=json | jq '. | select(. | contains({"Service": "wordpress"})) | .ID' -r)" | jq '.[].Config.Env'
+        const serviceId = node_child_process_1.default.spawnSync("docker", ["compose", "ps", "--format=json"], { encoding: "utf-8", stdio: ["ignore", "pipe", "inherit"] })
+            .stdout.trim().split("\n").map(item => JSON.parse(item.trim())).find(item => item.Service === "wordpress")?.ID;
+        if (serviceId === undefined) {
+            return ["localhost"]; // This will only happen for Tomcat or misconfigured containers, both of which should use localhost
+        }
+        const inspectionResult = node_child_process_1.default.spawnSync("docker", ["container", "inspect", "--format=json", serviceId], { encoding: "utf-8", stdio: ["ignore", "pipe", "inherit"] })
+            .stdout.trim();
+        const containerEnv = Object.fromEntries(JSON.parse(inspectionResult)[0]?.Config.Env.map((envEntry) => {
+            const equalSignIndex = envEntry.indexOf('=');
+            return [envEntry.substring(0, equalSignIndex), envEntry.substring(equalSignIndex + 1)];
+        }));
+        if (containerEnv['WORDPRESS_MAPPED_DOMAINS'] !== '1') {
+            return ["localhost:8443"]; //This will only happen for legacy WordPress sites
+        }
+        let siteUrls;
+        const multisiteUrlsProcess = node_child_process_1.default.spawnSync("docker", ["compose", "exec", "--user=www-data", "wordpress", "wp", "site", "list", "--field=url", "--quiet"], { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }); // We're forced to mute stderr here because it is otherwise almost guaranteed to print
+        if (!multisiteUrlsProcess.error && !multisiteUrlsProcess.status && !multisiteUrlsProcess.signal) {
+            siteUrls = multisiteUrlsProcess.stdout.split("\n").map(line => line.trim()).filter(line => line.length > 0);
+        }
+        else {
+            siteUrls = [node_child_process_1.default.spawnSync("docker", ["compose", "exec", "--user=www-data", "wordpress", "wp", "option", "get", "siteurl"], { encoding: "utf-8", stdio: ["ignore", "pipe", "inherit"] }).stdout.trim()];
+        }
+        // Because mapped domain sites that are using my mapping scheme hyphenate instances of "www.", this is an effective test for whether it is in use.
+        // If the URL still has the "www.", then it is using David's mapping scheme and should be accessed via localhost
+        return siteUrls.map(siteUrl => siteUrl.includes("www.") ? "localhost" : siteUrl).map(siteUrl => siteUrl.replace(/^https?:\/\//i, ""));
+    }
 }
 exports.BrowserSyncPlugin = BrowserSyncPlugin;

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.js

@@ -96,7 +96,8 @@ class ExtensionsConfigFileGeneratorPlugin {
                         compilation.deleteAsset("assets.json");
                         ExtensionsConfigFileGeneratorPlugin.semaphore.resolve(this.id, myCacheData);
                         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, myCacheData.setupFiles.length > 0 || myCacheData.assets.length > 0 ? {
-                            group: 'extensions-config-v2',
+                            group: `extensions-config-v2-${this.extensionsDest}`,
+                            requiresBaseURI: true,
                             action: writer => {
                                 let finalExtensionsDest = this.extensionsDest.endsWith("/") ? this.extensionsDest : this.extensionsDest + "/";
                                 if (!finalExtensionsDest.startsWith("/")) {
@@ -131,7 +132,7 @@ class ExtensionsConfigFileGeneratorPlugin {
             compiler.hooks.thisCompilation.tap(this.constructor.name, compilation => {
                 UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reset(this.id);
                 compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
-                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, { group: 'extensions-config-v1', action: writer => {
+                    UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, { group: `extensions-config-v1-${this.extensionsDest}`, requiresBaseURI: false, action: writer => {
                             writer
                                 .use("Plaudit\\Base\\API\\ThemeUtils")
                                 .call("ThemeUtils::installExtensionSupport", [new php_writer_1.Expr(`__DIR__.${php_writer_1.Expr.convertJsonToPHP(this.extensionsDest)}`)]);

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -104,7 +104,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
                     compilation.deleteAsset("assets.json");
                     PlainEntrypointsConfigFileGeneratorPlugin.semaphore.resolve(this.id, myAssetHandles);
                     UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, myAssetHandles.length
-                        ? { group: 'plain-entrypoints-v2', action: writer => writer.append("require_once __DIR__.'/plain-entrypoints-loader.php';") }
+                        ? { group: 'plain-entrypoints-v2', requiresBaseURI: true, action: writer => writer.append("require_once __DIR__.'/plain-entrypoints-loader.php';") }
                         : undefined);
                 }
                 catch (e) {

package/build/plugins/SpecialAssetHandlingPlugin.js

@@ -65,7 +65,7 @@ class SpecialAssetHandlingPlugin {
                     }
                     SpecialAssetHandlingPlugin.semaphore.resolve(this.id, specialAssetData);
                     UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, Object.keys(specialAssetData).length > 0
-                        ? { group: 'special-assets', action: writer => writer.append("require_once __DIR__.'/special-assets.php';") }
+                        ? { group: 'special-assets', requiresBaseURI: true, action: writer => writer.append("require_once __DIR__.'/special-assets.php';") }
                         : undefined);
                 }
                 catch (e) {

package/build/plugins/UnifiedLoaderGenerator.d.ts

@@ -4,6 +4,7 @@ import { Compiler, WebpackPluginInstance } from "webpack";
 type LoaderInfo = {
     group: string;
     action(writer: PHPWriter): void;
+    requiresBaseURI: boolean;
     priority?: number;
 };
 export declare class UnifiedLoaderGenerator implements WebpackPluginInstance {

package/build/plugins/UnifiedLoaderGenerator.js

@@ -30,14 +30,15 @@ class UnifiedLoaderGenerator {
                             const ap = a.priority ?? 0, bp = b.priority ?? 0;
                             return ap === bp ? a.group.localeCompare(b.group) : bp - ap;
                         })
-                            .filter(a => !alreadyAllocatedGroups.has(a.group) && alreadyAllocatedGroups.add(a.group))
-                            .map(a => a.action);
+                            .filter(a => !alreadyAllocatedGroups.has(a.group) && alreadyAllocatedGroups.add(a.group));
                         if (writerCallbacks.length > 0) {
                             compilation.hooks.afterProcessAssets.tap(this.constructor.name, () => {
                                 const writer = new php_writer_1.PHPWriter();
-                                PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+                                if (writerCallbacks.some(wc => wc.requiresBaseURI)) {
+                                    PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+                                }
                                 for (const writerCallback of writerCallbacks) {
-                                    writerCallback(writer);
+                                    writerCallback.action(writer);
                                 }
                                 writer.emitAsset(compilation, "unified-loader.php");
                             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.58.3",
+  "version": "2.59.0",
   "license": "UNLICENSED",
   "files": [
     "/build"