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

package/dist/cli/index.js

@@ -41,6 +41,7 @@ __export(exports_devCert, {
   setupMkcert: () => setupMkcert,
   loadDevCert: () => loadDevCert,
   hasMkcert: () => hasMkcert,
+  hasCert: () => hasCert,
   ensureDevCert: () => ensureDevCert
 });
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4, rmSync } from "fs";
@@ -115,18 +116,13 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
   devLog("HTTPS enabled with self-signed certificate");
   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 = () => {
+}, hasCert = () => certFilesExist() && !isCertExpired(), ensureDevCert = () => {
   mkdirSync2(CERT_DIR, { recursive: true });
-  if (certFilesExist() && !isCertExpired()) {
-    if (hasMkcert()) {
-      devLog("HTTPS enabled with locally-trusted certificate (mkcert)");
-    } else {
-      devLog("HTTPS enabled with self-signed certificate");
-    }
+  if (hasCert()) {
     return { cert: CERT_PATH, key: KEY_PATH };
   }
   if (certFilesExist()) {
-    devWarn("Dev certificate expired, regenerating...");
+    devLog("Certificate expired, regenerating...");
   }
   try {
     if (hasMkcert()) {
@@ -825,6 +821,39 @@ var timed = async (label, task) => {
 
 // src/cli/scripts/dev.ts
 var cliTag = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[cli]\x1B[0m ${color}${message}\x1B[0m`;
+var confirmPrompt = (message, defaultYes = true) => new Promise((res) => {
+  let selected = defaultYes;
+  const render = () => {
+    const yes = selected ? "\x1B[36m\u25CF Yes\x1B[0m" : "\x1B[2m\u25CB Yes\x1B[0m";
+    const no = !selected ? "\x1B[36m\u25CF No\x1B[0m" : "\x1B[2m\u25CB No\x1B[0m";
+    process.stdout.write(`\x1B[2K\x1B[36m\u25C6\x1B[0m ${message}
+\x1B[2K  ${yes}  ${no}\x1B[A\r`);
+  };
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  render();
+  const onData = (data) => {
+    const key = data.toString();
+    if (key === "\x1B[D" || key === "\x1B[C" || key === "\t") {
+      selected = !selected;
+      render();
+    } else if (key === "\r" || key === `
+`) {
+      process.stdin.setRawMode(false);
+      process.stdin.pause();
+      process.stdin.removeListener("data", onData);
+      const label = selected ? "Yes" : "No";
+      process.stdout.write(`\x1B[2K\x1B[32m\u25C7\x1B[0m ${message}
+\x1B[2K  \x1B[2m${label}\x1B[0m
+`);
+      res(selected);
+    } else if (key === "\x03") {
+      process.stdin.setRawMode(false);
+      process.exit(0);
+    }
+  };
+  process.stdin.on("data", onData);
+});
 var dev = async (serverEntry, configPath2) => {
   const port = Number(env.PORT) || DEFAULT_PORT;
   killStaleProcesses(port);
@@ -834,21 +863,15 @@ var dev = async (serverEntry, configPath2) => {
     const config = await loadConfig2(configPath2);
     httpsEnabled = config?.dev?.https === true;
     if (httpsEnabled) {
-      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();
+      const { hasCert: hasCert2, hasMkcert: hasMkcert2, ensureDevCert: ensureDevCert2, setupMkcert: setupMkcert2 } = await Promise.resolve().then(() => (init_devCert(), exports_devCert));
+      if (!hasCert2()) {
+        if (!hasMkcert2()) {
+          const install = await confirmPrompt("Install mkcert for trusted HTTPS? (no browser warning)");
+          if (install) {
+            setupMkcert2();
+          } else {
+            ensureDevCert2();
+          }
         } else {
           ensureDevCert2();
         }

package/dist/index.js

@@ -205041,6 +205041,7 @@ __export(exports_devCert, {
   setupMkcert: () => setupMkcert,
   loadDevCert: () => loadDevCert,
   hasMkcert: () => hasMkcert,
+  hasCert: () => hasCert,
   ensureDevCert: () => ensureDevCert
 });
 import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync11, rmSync as rmSync2 } from "fs";
@@ -205115,18 +205116,13 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
   devLog("HTTPS enabled with self-signed certificate");
   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 = () => {
+}, hasCert = () => certFilesExist() && !isCertExpired(), ensureDevCert = () => {
   mkdirSync10(CERT_DIR, { recursive: true });
-  if (certFilesExist() && !isCertExpired()) {
-    if (hasMkcert()) {
-      devLog("HTTPS enabled with locally-trusted certificate (mkcert)");
-    } else {
-      devLog("HTTPS enabled with self-signed certificate");
-    }
+  if (hasCert()) {
     return { cert: CERT_PATH, key: KEY_PATH };
   }
   if (certFilesExist()) {
-    devWarn("Dev certificate expired, regenerating...");
+    devLog("Certificate expired, regenerating...");
   }
   try {
     if (hasMkcert()) {
@@ -205598,5 +205594,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=F5DFB6DFD539854B64756E2164756E21
+//# debugId=707D0EFBD46DA89F64756E2164756E21
 //# sourceMappingURL=index.js.map