@absolutejs/absolute 0.19.0-beta.111 → 0.19.0-beta.113

package/dist/cli/index.js

@@ -43,7 +43,8 @@ __export(exports_devCert, {
   hasMkcert: () => hasMkcert,
   ensureDevCert: () => ensureDevCert
 });
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4 } from "fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4, rmSync } from "fs";
+import { platform as platform2 } from "os";
 import { join as join3 } from "path";
 var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => console.log(`\x1B[2m${new Date().toLocaleTimeString()}\x1B[0m \x1B[36m[dev]\x1B[0m ${msg}`), devWarn = (msg) => console.log(`\x1B[2m${new Date().toLocaleTimeString()}\x1B[0m \x1B[33m[dev]\x1B[0m \x1B[33m${msg}\x1B[0m`), certFilesExist = () => existsSync4(CERT_PATH) && existsSync4(KEY_PATH), isCertExpired = () => {
   try {
@@ -112,10 +113,8 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
     throw new Error(`openssl failed: ${err}`);
   }
   devLog("HTTPS enabled with self-signed certificate");
-  devLog("For a trusted certificate (no browser warning), install mkcert:");
-  devLog("  brew install mkcert && mkcert -install  (macOS)");
-  devLog("  sudo apt install mkcert && mkcert -install  (Linux)");
-  devLog("Then restart the dev server.");
+  devLog("Browser will show a one-time security warning \u2014 click Advanced \u2192 Proceed");
+  devLog('Run "absolute mkcert" anytime to switch to a trusted certificate');
 }, ensureDevCert = () => {
   mkdirSync2(CERT_DIR, { recursive: true });
   if (certFilesExist() && !isCertExpired()) {
@@ -152,18 +151,96 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
   } catch {
     return null;
   }
+}, commandExists = (cmd) => {
+  try {
+    const check = platform2() === "win32" ? ["where", cmd] : ["command", "-v", cmd];
+    const result = Bun.spawnSync(check, {
+      stderr: "pipe",
+      stdout: "pipe"
+    });
+    return result.exitCode === 0;
+  } catch {
+    return false;
+  }
+}, installMkcert = () => {
+  const os = platform2();
+  if (os === "darwin") {
+    if (commandExists("brew")) {
+      devLog("Installing mkcert with Homebrew...");
+      const r = Bun.spawnSync(["brew", "install", "mkcert"], {
+        stderr: "pipe",
+        stdout: "pipe"
+      });
+      if (r.exitCode === 0)
+        return true;
+    }
+    devWarn("Install Homebrew first: https://brew.sh");
+    return false;
+  }
+  if (os === "linux") {
+    if (commandExists("apt-get")) {
+      devLog("Installing mkcert with apt...");
+      const r = Bun.spawnSync(["sudo", "apt-get", "install", "-y", "mkcert"], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    if (commandExists("dnf")) {
+      devLog("Installing mkcert with dnf...");
+      const r = Bun.spawnSync(["sudo", "dnf", "install", "-y", "mkcert"], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    if (commandExists("pacman")) {
+      devLog("Installing mkcert with pacman...");
+      const r = Bun.spawnSync(["sudo", "pacman", "-S", "--noconfirm", "mkcert"], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    if (commandExists("go")) {
+      devLog("Installing mkcert with go install...");
+      const r = Bun.spawnSync([
+        "go",
+        "install",
+        "filippo.io/mkcert@latest"
+      ], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    devWarn("Could not install mkcert automatically.");
+    console.log("  See: https://github.com/FiloSottile/mkcert#installation");
+    return false;
+  }
+  if (os === "win32") {
+    if (commandExists("choco")) {
+      devLog("Installing mkcert with Chocolatey...");
+      const r = Bun.spawnSync(["choco", "install", "-y", "mkcert"], {
+        stderr: "pipe",
+        stdout: "pipe"
+      });
+      if (r.exitCode === 0)
+        return true;
+    }
+    if (commandExists("winget")) {
+      devLog("Installing mkcert with winget...");
+      const r = Bun.spawnSync(["winget", "install", "--id", "FiloSottile.mkcert", "-e"], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    devWarn("Could not install mkcert automatically.");
+    console.log("  See: https://github.com/FiloSottile/mkcert#installation");
+    return false;
+  }
+  return false;
 }, setupMkcert = () => {
   devLog("Setting up mkcert for locally-trusted HTTPS...");
   if (!hasMkcert()) {
-    devWarn("mkcert is not installed.");
-    console.log("");
-    console.log("  Install it first:");
-    console.log("    macOS:  brew install mkcert");
-    console.log("    Linux:  sudo apt install mkcert");
-    console.log("    Windows: choco install mkcert");
-    console.log("");
-    console.log("  Then run: absolute mkcert");
-    return false;
+    devLog("mkcert not found \u2014 installing...");
+    if (!installMkcert())
+      return false;
+    if (!hasMkcert()) {
+      devWarn("mkcert installed but not found in PATH. Restart your terminal and try again.");
+      return false;
+    }
   }
   devLog("Installing local certificate authority...");
   const installResult = Bun.spawnSync(["mkcert", "-install"], {
@@ -174,11 +251,8 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
     devWarn("Failed to install CA: " + new TextDecoder().decode(installResult.stderr));
     return false;
   }
-  try {
-    const { rmSync } = __require("fs");
-    rmSync(CERT_PATH, { force: true });
-    rmSync(KEY_PATH, { force: true });
-  } catch {}
+  rmSync(CERT_PATH, { force: true });
+  rmSync(KEY_PATH, { force: true });
   mkdirSync2(CERT_DIR, { recursive: true });
   generateWithMkcert();
   console.log("");
@@ -760,8 +834,27 @@ var dev = async (serverEntry, configPath2) => {
     const config = await loadConfig2(configPath2);
     httpsEnabled = config?.dev?.https === true;
     if (httpsEnabled) {
-      const { ensureDevCert: ensureDevCert2 } = await Promise.resolve().then(() => (init_devCert(), exports_devCert));
-      ensureDevCert2();
+      const { hasMkcert: hasMkcert2, ensureDevCert: ensureDevCert2, setupMkcert: setupMkcert2 } = await Promise.resolve().then(() => (init_devCert(), exports_devCert));
+      if (!hasMkcert2()) {
+        const readline = await import("readline");
+        const rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+        const answer = await new Promise((res) => {
+          rl.question("\x1B[36m[dev]\x1B[0m Install mkcert for trusted HTTPS (no browser warning)? [Y/n] ", (a) => {
+            rl.close();
+            res(a.trim().toLowerCase());
+          });
+        });
+        if (answer === "" || answer === "y" || answer === "yes") {
+          setupMkcert2();
+        } else {
+          ensureDevCert2();
+        }
+      } else {
+        ensureDevCert2();
+      }
     }
   } catch {}
   const usesDocker = existsSync5(resolve3(COMPOSE_PATH));
@@ -940,14 +1033,14 @@ var dev = async (serverEntry, configPath2) => {
   };
   const openInBrowser = async () => {
     const url = `http://localhost:${port}`;
-    const { platform: platform2 } = process;
-    const isWSL = platform2 === "linux" && isWSLEnvironment();
+    const { platform: platform3 } = process;
+    const isWSL = platform3 === "linux" && isWSLEnvironment();
     let cmd;
     if (isWSL) {
       cmd = "cmd.exe";
-    } else if (platform2 === "darwin") {
+    } else if (platform3 === "darwin") {
       cmd = "open";
-    } else if (platform2 === "win32") {
+    } else if (platform3 === "win32") {
       cmd = "start";
     } else {
       cmd = "xdg-open";
@@ -1034,7 +1127,7 @@ var eslint = async (args) => {
 // src/cli/scripts/info.ts
 import { execSync as execSync2 } from "child_process";
 import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
-import { arch as arch2, cpus, platform as platform2, totalmem, version } from "os";
+import { arch as arch2, cpus, platform as platform3, totalmem, version } from "os";
 import { resolve as resolve4 } from "path";
 var __dirname = "/home/alexkahn/abs/absolutejs/src/cli/scripts";
 var bold = (str) => `\x1B[1m${str}\x1B[0m`;
@@ -1108,7 +1201,7 @@ var isDockerEnvironment = () => {
 };
 var getMemoryMB = () => Math.round(totalmem() / BYTES_PER_KILOBYTE / BYTES_PER_KILOBYTE);
 var getGlibcVersion = () => {
-  if (platform2() !== "linux")
+  if (platform3() !== "linux")
     return null;
   try {
     const output = execSync2("ldd --version 2>&1 || true", {
@@ -1130,7 +1223,7 @@ var info = () => {
     lines.push(`  ${key}: ${val}`);
   };
   section("Operating System:");
-  field("Platform", platform2());
+  field("Platform", platform3());
   field("Arch", arch2());
   field("Version", version());
   field("Available memory (MB)", String(getMemoryMB()));

package/dist/index.js

@@ -205043,7 +205043,8 @@ __export(exports_devCert, {
   hasMkcert: () => hasMkcert,
   ensureDevCert: () => ensureDevCert
 });
-import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync11, rmSync as rmSync2 } from "fs";
+import { platform as platform3 } from "os";
 import { join as join17 } from "path";
 var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => console.log(`\x1B[2m${new Date().toLocaleTimeString()}\x1B[0m \x1B[36m[dev]\x1B[0m ${msg}`), devWarn = (msg) => console.log(`\x1B[2m${new Date().toLocaleTimeString()}\x1B[0m \x1B[33m[dev]\x1B[0m \x1B[33m${msg}\x1B[0m`), certFilesExist = () => existsSync15(CERT_PATH) && existsSync15(KEY_PATH), isCertExpired = () => {
   try {
@@ -205112,10 +205113,8 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
     throw new Error(`openssl failed: ${err}`);
   }
   devLog("HTTPS enabled with self-signed certificate");
-  devLog("For a trusted certificate (no browser warning), install mkcert:");
-  devLog("  brew install mkcert && mkcert -install  (macOS)");
-  devLog("  sudo apt install mkcert && mkcert -install  (Linux)");
-  devLog("Then restart the dev server.");
+  devLog("Browser will show a one-time security warning \u2014 click Advanced \u2192 Proceed");
+  devLog('Run "absolute mkcert" anytime to switch to a trusted certificate');
 }, ensureDevCert = () => {
   mkdirSync10(CERT_DIR, { recursive: true });
   if (certFilesExist() && !isCertExpired()) {
@@ -205152,18 +205151,96 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
   } catch {
     return null;
   }
+}, commandExists = (cmd) => {
+  try {
+    const check = platform3() === "win32" ? ["where", cmd] : ["command", "-v", cmd];
+    const result = Bun.spawnSync(check, {
+      stderr: "pipe",
+      stdout: "pipe"
+    });
+    return result.exitCode === 0;
+  } catch {
+    return false;
+  }
+}, installMkcert = () => {
+  const os2 = platform3();
+  if (os2 === "darwin") {
+    if (commandExists("brew")) {
+      devLog("Installing mkcert with Homebrew...");
+      const r = Bun.spawnSync(["brew", "install", "mkcert"], {
+        stderr: "pipe",
+        stdout: "pipe"
+      });
+      if (r.exitCode === 0)
+        return true;
+    }
+    devWarn("Install Homebrew first: https://brew.sh");
+    return false;
+  }
+  if (os2 === "linux") {
+    if (commandExists("apt-get")) {
+      devLog("Installing mkcert with apt...");
+      const r = Bun.spawnSync(["sudo", "apt-get", "install", "-y", "mkcert"], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    if (commandExists("dnf")) {
+      devLog("Installing mkcert with dnf...");
+      const r = Bun.spawnSync(["sudo", "dnf", "install", "-y", "mkcert"], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    if (commandExists("pacman")) {
+      devLog("Installing mkcert with pacman...");
+      const r = Bun.spawnSync(["sudo", "pacman", "-S", "--noconfirm", "mkcert"], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    if (commandExists("go")) {
+      devLog("Installing mkcert with go install...");
+      const r = Bun.spawnSync([
+        "go",
+        "install",
+        "filippo.io/mkcert@latest"
+      ], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    devWarn("Could not install mkcert automatically.");
+    console.log("  See: https://github.com/FiloSottile/mkcert#installation");
+    return false;
+  }
+  if (os2 === "win32") {
+    if (commandExists("choco")) {
+      devLog("Installing mkcert with Chocolatey...");
+      const r = Bun.spawnSync(["choco", "install", "-y", "mkcert"], {
+        stderr: "pipe",
+        stdout: "pipe"
+      });
+      if (r.exitCode === 0)
+        return true;
+    }
+    if (commandExists("winget")) {
+      devLog("Installing mkcert with winget...");
+      const r = Bun.spawnSync(["winget", "install", "--id", "FiloSottile.mkcert", "-e"], { stderr: "pipe", stdout: "pipe" });
+      if (r.exitCode === 0)
+        return true;
+    }
+    devWarn("Could not install mkcert automatically.");
+    console.log("  See: https://github.com/FiloSottile/mkcert#installation");
+    return false;
+  }
+  return false;
 }, setupMkcert = () => {
   devLog("Setting up mkcert for locally-trusted HTTPS...");
   if (!hasMkcert()) {
-    devWarn("mkcert is not installed.");
-    console.log("");
-    console.log("  Install it first:");
-    console.log("    macOS:  brew install mkcert");
-    console.log("    Linux:  sudo apt install mkcert");
-    console.log("    Windows: choco install mkcert");
-    console.log("");
-    console.log("  Then run: absolute mkcert");
-    return false;
+    devLog("mkcert not found \u2014 installing...");
+    if (!installMkcert())
+      return false;
+    if (!hasMkcert()) {
+      devWarn("mkcert installed but not found in PATH. Restart your terminal and try again.");
+      return false;
+    }
   }
   devLog("Installing local certificate authority...");
   const installResult = Bun.spawnSync(["mkcert", "-install"], {
@@ -205174,11 +205251,8 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
     devWarn("Failed to install CA: " + new TextDecoder().decode(installResult.stderr));
     return false;
   }
-  try {
-    const { rmSync: rmSync2 } = __require("fs");
-    rmSync2(CERT_PATH, { force: true });
-    rmSync2(KEY_PATH, { force: true });
-  } catch {}
+  rmSync2(CERT_PATH, { force: true });
+  rmSync2(KEY_PATH, { force: true });
   mkdirSync10(CERT_DIR, { recursive: true });
   generateWithMkcert();
   console.log("");
@@ -205524,5 +205598,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=97674176A38B7A0F64756E2164756E21
+//# debugId=F5DFB6DFD539854B64756E2164756E21
 //# sourceMappingURL=index.js.map