@plaudit/webpack-extensions 2.58.4 → 2.59.0

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/package.json

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