@absolutejs/absolute 0.19.0-beta.170 → 0.19.0-beta.172

package/dist/cli/index.js

@@ -526,6 +526,105 @@ var init_devCert = __esm(() => {
   KEY_PATH = join3(CERT_DIR, "key.pem");
 });
 
+// src/core/prerender.ts
+var exports_prerender = {};
+__export(exports_prerender, {
+  prerenderWithServer: () => prerenderWithServer,
+  prerender: () => prerender
+});
+import { mkdirSync as mkdirSync3 } from "fs";
+import { join as join5 } from "path";
+var routeToFilename = (route) => route === "/" ? "index.html" : `${route.slice(1).replace(/\//g, "-")}.html`, crawlRoutes = async (baseUrl, log) => {
+  const visited = new Set;
+  const queue = ["/"];
+  const routes = [];
+  while (queue.length > 0) {
+    const path = queue.shift();
+    if (visited.has(path))
+      continue;
+    visited.add(path);
+    try {
+      const res = await fetch(`${baseUrl}${path}`);
+      if (!res.ok)
+        continue;
+      const contentType = res.headers.get("content-type") ?? "";
+      if (!contentType.includes("text/html"))
+        continue;
+      const html = await res.text();
+      routes.push(path);
+      const linkRegex = /href=["'](\/[^"']*?)["']/g;
+      let match;
+      while ((match = linkRegex.exec(html)) !== null) {
+        const href = match[1] ?? "";
+        if (!href || href.includes(".") || href.includes("#") || visited.has(href))
+          continue;
+        queue.push(href);
+      }
+    } catch {}
+  }
+  return routes;
+}, prerender = async (port, outDir, staticConfig, log) => {
+  const prerenderDir = join5(outDir, "_prerendered");
+  mkdirSync3(prerenderDir, { recursive: true });
+  const baseUrl = `http://localhost:${port}`;
+  let routes;
+  if (staticConfig.routes === "all") {
+    log?.("Crawling routes...");
+    routes = await crawlRoutes(baseUrl, log);
+  } else {
+    routes = staticConfig.routes;
+  }
+  const result = {
+    routes: new Map,
+    dir: prerenderDir
+  };
+  for (const route of routes) {
+    try {
+      const res = await fetch(`${baseUrl}${route}`);
+      if (!res.ok) {
+        log?.(`  Skipped ${route} (HTTP ${res.status})`);
+        continue;
+      }
+      const html = await res.text();
+      const fileName = routeToFilename(route);
+      const filePath = join5(prerenderDir, fileName);
+      await Bun.write(filePath, html);
+      result.routes.set(route, filePath);
+      log?.(`  Pre-rendered ${route} \u2192 ${fileName} (${html.length} bytes)`);
+    } catch {
+      log?.(`  Failed to pre-render ${route}`);
+    }
+  }
+  return result;
+}, prerenderWithServer = async (serverBundlePath, port, outDir, staticConfig, env2, log) => {
+  const serverProcess = Bun.spawn(["bun", "run", serverBundlePath], {
+    cwd: process.cwd(),
+    env: { ...process.env, ...env2, PORT: String(port) },
+    stdout: "pipe",
+    stderr: "pipe"
+  });
+  let ready = false;
+  for (let i = 0;i < 50; i++) {
+    try {
+      const res = await fetch(`http://localhost:${port}/`);
+      if (res.ok) {
+        ready = true;
+        break;
+      }
+    } catch {}
+    await Bun.sleep(100);
+  }
+  if (!ready) {
+    serverProcess.kill();
+    throw new Error("Server failed to start for pre-rendering");
+  }
+  const result = await prerender(port, outDir, staticConfig, log);
+  serverProcess.kill();
+  await serverProcess.exited;
+  return result;
+};
+var init_prerender = () => {};
+
 // src/cli/scripts/compile.ts
 var exports_compile = {};
 __export(exports_compile, {
@@ -534,16 +633,15 @@ __export(exports_compile, {
 var {env: env3 } = globalThis.Bun;
 import {
   existsSync as existsSync8,
-  mkdirSync as mkdirSync3,
   readdirSync,
   readFileSync as readFileSync7,
   unlinkSync
 } from "fs";
-import { basename as basename2, join as join5, relative, resolve as resolve6 } from "path";
+import { basename as basename3, join as join6, relative, resolve as resolve6 } from "path";
 var cliTag3 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[cli]\x1B[0m ${color}${message}\x1B[0m`, collectFiles2 = (dir) => {
   const results = [];
   for (const entry of readdirSync(dir, { withFileTypes: true })) {
-    const fullPath = join5(dir, entry.name);
+    const fullPath = join6(dir, entry.name);
     if (entry.isDirectory()) {
       results.push(...collectFiles2(fullPath));
     } else {
@@ -568,45 +666,9 @@ var cliTag3 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
     } catch {}
   }
   return;
-}, prerender = async (port, outDir) => {
-  const prerenderDir = join5(outDir, "_prerendered");
-  mkdirSync3(prerenderDir, { recursive: true });
-  const baseUrl = `http://localhost:${port}`;
-  const visited = new Set;
-  const queue = ["/"];
-  const savedFiles = [];
-  while (queue.length > 0) {
-    const path = queue.shift();
-    if (visited.has(path))
-      continue;
-    visited.add(path);
-    try {
-      const res = await fetch(`${baseUrl}${path}`);
-      if (!res.ok)
-        continue;
-      const contentType = res.headers.get("content-type") ?? "";
-      if (!contentType.includes("text/html"))
-        continue;
-      const html = await res.text();
-      const fileName = path === "/" ? "index.html" : `${path.slice(1).replace(/\//g, "-")}.html`;
-      const filePath = join5(prerenderDir, fileName);
-      await Bun.write(filePath, html);
-      savedFiles.push(filePath);
-      console.log(cliTag3("\x1B[36m", `  Pre-rendered ${path} \u2192 ${fileName} (${html.length} bytes)`));
-      const linkRegex = /href=["'](\/[^"']*?)["']/g;
-      let match;
-      while ((match = linkRegex.exec(html)) !== null) {
-        const href = match[1] ?? "";
-        if (!href || href.includes(".") || href.includes("#") || visited.has(href))
-          continue;
-        queue.push(href);
-      }
-    } catch {}
-  }
-  return savedFiles;
-}, generateEntrypoint = (distDir, serverEntry, prerenderMap) => {
+}, generateEntrypoint = (distDir, serverEntry, prerenderMap, version2) => {
   const allFiles = collectFiles2(distDir);
-  const serverBundleName = basename2(serverEntry).replace(/\.[^.]+$/, "") + ".js";
+  const serverBundleName = basename3(serverEntry).replace(/\.[^.]+$/, "") + ".js";
   const skip = new Set([
     serverBundleName,
     "manifest.json",
@@ -714,12 +776,11 @@ const app = new Elysia()
 const assetCount = Object.keys(ASSETS).length;
 const pageCount = Object.keys(PAGES).length;
 console.log(\`
-  \\x1b[36m\\x1b[1mABSOLUTEJS\\x1b[0m  \\x1b[2mcompiled executable\\x1b[0m
+  \\x1b[36m\\x1b[1mABSOLUTEJS\\x1b[0m \\x1b[2mv${version2}\\x1b[0m  \\x1b[2mcompiled executable\\x1b[0m
 
   \\x1b[32m\u279C\\x1b[0m  \\x1b[1mLocal:\\x1b[0m   http://localhost:\${port}/
 
   \\x1b[2m\${pageCount} pre-rendered pages, \${assetCount} embedded assets\\x1b[0m
-  \\x1b[2mNo external files needed\\x1b[0m
 \`);
 `;
 }, createStubPlugin = () => ({
@@ -776,7 +837,7 @@ console.log(\`
 }), FRAMEWORK_EXTERNALS, compile = async (serverEntry, outdir, outfile, configPath2) => {
   const prerenderPort = Number(env3.COMPILE_PORT) || Number(env3.PORT) || DEFAULT_PORT + 1;
   killStaleProcesses(prerenderPort);
-  const entryName = basename2(serverEntry).replace(/\.[^.]+$/, "");
+  const entryName = basename3(serverEntry).replace(/\.[^.]+$/, "");
   const resolvedOutdir = resolve6(outdir ?? "dist");
   const resolvedOutfile = resolve6(outfile ?? "compiled-server");
   const absoluteVersion = resolvePackageVersion2([
@@ -826,50 +887,20 @@ console.log(\`
   console.log(` \x1B[2m(${getDurationString(performance.now() - bundleStart)})\x1B[0m`);
   const prerenderStart = performance.now();
   console.log(cliTag3("\x1B[36m", "Pre-rendering pages..."));
-  const serverProcess = Bun.spawn(["bun", "run", outputPath], {
-    cwd: process.cwd(),
-    env: {
-      ...process.env,
-      ABSOLUTE_BUILD_DIR: resolvedOutdir,
-      ABSOLUTE_VERSION: absoluteVersion,
-      FORCE_COLOR: "0",
-      NODE_ENV: "production",
-      PORT: String(prerenderPort),
-      ...configPath2 ? { ABSOLUTE_CONFIG: configPath2 } : {}
-    },
-    stdout: "pipe",
-    stderr: "pipe"
-  });
-  let ready = false;
-  for (let i = 0;i < 50; i++) {
-    try {
-      const res = await fetch(`http://localhost:${prerenderPort}/`);
-      if (res.ok) {
-        ready = true;
-        break;
-      }
-    } catch {}
-    await Bun.sleep(100);
-  }
-  if (!ready) {
-    serverProcess.kill();
-    console.error(cliTag3("\x1B[31m", "Server failed to start for pre-rendering."));
-    process.exit(1);
-  }
-  const prerenderFiles = await prerender(prerenderPort, resolvedOutdir);
-  serverProcess.kill();
-  await serverProcess.exited;
-  const prerenderMap = new Map;
-  for (const filePath of prerenderFiles) {
-    const fileName = basename2(filePath, ".html");
-    const route = fileName === "index" ? "/" : `/${fileName}`;
-    prerenderMap.set(route, filePath);
-  }
+  const staticConfig = buildConfig.static ?? { routes: "all" };
+  const prerenderResult = await prerenderWithServer(outputPath, prerenderPort, resolvedOutdir, staticConfig, {
+    ABSOLUTE_BUILD_DIR: resolvedOutdir,
+    ABSOLUTE_VERSION: absoluteVersion,
+    FORCE_COLOR: "0",
+    NODE_ENV: "production",
+    ...configPath2 ? { ABSOLUTE_CONFIG: configPath2 } : {}
+  }, (msg) => console.log(cliTag3("\x1B[36m", msg)));
+  const prerenderMap = prerenderResult.routes;
   console.log(cliTag3("\x1B[36m", `Pre-rendered ${prerenderMap.size} pages (${getDurationString(performance.now() - prerenderStart)})`));
   const compileStart = performance.now();
   process.stdout.write(cliTag3("\x1B[36m", "Compiling standalone executable"));
-  const entrypointCode = generateEntrypoint(resolvedOutdir, serverEntry, prerenderMap);
-  const entrypointPath = join5(resolvedOutdir, "_compile_entrypoint.ts");
+  const entrypointCode = generateEntrypoint(resolvedOutdir, serverEntry, prerenderMap, absoluteVersion);
+  const entrypointPath = join6(resolvedOutdir, "_compile_entrypoint.ts");
   await Bun.write(entrypointPath, entrypointCode);
   const result = await Bun.build({
     entrypoints: [entrypointPath],
@@ -889,7 +920,7 @@ console.log(\`
   const size = (Bun.file(resolvedOutfile).size / 1048576).toFixed(0);
   const totalDuration = getDurationString(performance.now() - totalStart);
   console.log(cliTag3("\x1B[32m", `Compiled to ${resolvedOutfile} (${size}MB) in ${totalDuration}`));
-  console.log(cliTag3("\x1B[2m", `Run with: ./${basename2(resolvedOutfile)}`));
+  console.log(cliTag3("\x1B[2m", `Run with: ./${basename3(resolvedOutfile)}`));
   sendTelemetryEvent("compile:complete", {
     durationMs: Math.round(performance.now() - totalStart),
     entry: serverEntry,
@@ -898,6 +929,7 @@ console.log(\`
 };
 var init_compile = __esm(() => {
   init_constants();
+  init_prerender();
   init_getDurationString();
   init_loadConfig();
   init_startupBanner();
@@ -1771,7 +1803,7 @@ init_telemetryEvent();
 init_utils();
 var {env: env2 } = globalThis.Bun;
 import { existsSync as existsSync7, readFileSync as readFileSync6 } from "fs";
-import { basename, resolve as resolve5 } from "path";
+import { basename as basename2, resolve as resolve5 } from "path";
 var cliTag2 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[cli]\x1B[0m ${color}${message}\x1B[0m`;
 var resolvePackageVersion = (candidates) => {
   for (const candidate of candidates) {
@@ -1825,7 +1857,7 @@ var handleBundleFailure = (serverBundle, bundleStart, serverEntry) => {
 var start = async (serverEntry, outdir, configPath2) => {
   const port = Number(env2.PORT) || DEFAULT_PORT;
   killStaleProcesses(port);
-  const entryName = basename(serverEntry).replace(/\.[^.]+$/, "");
+  const entryName = basename2(serverEntry).replace(/\.[^.]+$/, "");
   const resolvedOutdir = resolve5(outdir ?? "dist");
   const absoluteVersion = resolvePackageVersion([
     resolve5(import.meta.dir, "..", "..", "..", "package.json"),
@@ -1955,6 +1987,27 @@ var start = async (serverEntry, outdir, configPath2) => {
     durationMs: bundleDurationMs,
     entry: serverEntry
   });
+  if (buildConfig.static) {
+    const prerenderStart = performance.now();
+    console.log(cliTag2("\x1B[36m", "Pre-rendering static pages..."));
+    const { prerenderWithServer: prerenderWithServer2 } = await Promise.resolve().then(() => (init_prerender(), exports_prerender));
+    const prerenderPort = port + 1;
+    try {
+      killStaleProcesses(prerenderPort);
+      const result = await prerenderWithServer2(outputPath, prerenderPort, resolvedOutdir, buildConfig.static, {
+        ABSOLUTE_BUILD_DIR: resolvedOutdir,
+        ABSOLUTE_VERSION: absoluteVersion,
+        FORCE_COLOR: "0",
+        NODE_ENV: "production",
+        ...configPath2 ? { ABSOLUTE_CONFIG: configPath2 } : {}
+      }, (msg) => console.log(cliTag2("\x1B[36m", msg)));
+      const prerenderDuration = getDurationString(performance.now() - prerenderStart);
+      console.log(cliTag2("\x1B[36m", `Pre-rendered ${result.routes.size} pages (${prerenderDuration})`));
+    } catch (err) {
+      console.error(cliTag2("\x1B[33m", "Pre-rendering failed, pages will use SSR."));
+      console.error(err);
+    }
+  }
   const usesDocker = existsSync7(resolve5(COMPOSE_PATH));
   const scripts = usesDocker ? await readDbScripts() : null;
   if (scripts)

package/dist/index.js

@@ -205641,7 +205641,7 @@ __export(exports_devCert, {
 });
 import { existsSync as existsSync17, mkdirSync as mkdirSync10, readFileSync as readFileSync11, rmSync as rmSync2 } from "fs";
 import { platform as platform3 } from "os";
-import { join as join17 } from "path";
+import { join as join18 } 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 = () => existsSync17(CERT_PATH) && existsSync17(KEY_PATH), isCertExpired = () => {
   try {
     const certPem = readFileSync11(CERT_PATH, "utf-8");
@@ -205847,9 +205847,9 @@ var CERT_DIR, CERT_PATH, KEY_PATH, CERT_VALIDITY_DAYS = 365, devLog = (msg) => c
   return true;
 };
 var init_devCert = __esm(() => {
-  CERT_DIR = join17(process.cwd(), ".absolutejs");
-  CERT_PATH = join17(CERT_DIR, "cert.pem");
-  KEY_PATH = join17(CERT_DIR, "key.pem");
+  CERT_DIR = join18(process.cwd(), ".absolutejs");
+  CERT_PATH = join18(CERT_DIR, "cert.pem");
+  KEY_PATH = join18(CERT_DIR, "key.pem");
 });
 // types/client.ts
 var hmrState = {
@@ -205876,8 +205876,8 @@ var {file } = globalThis.Bun;
 var handleHTMLPageRequest = (pagePath) => file(pagePath);
 var handleHTMXPageRequest = (pagePath) => file(pagePath);
 // src/core/prepare.ts
-import { existsSync as existsSync16, readFileSync as readFileSync10 } from "fs";
-import { relative as relative10, resolve as resolve23 } from "path";
+import { existsSync as existsSync16, readdirSync as readdirSync2, readFileSync as readFileSync10 } from "fs";
+import { basename as basename9, join as join17, relative as relative10, resolve as resolve23 } from "path";
 
 // src/utils/loadConfig.ts
 import { resolve } from "path";
@@ -206005,6 +206005,21 @@ var prepareDev = async (config, buildDir) => {
     absolutejs: (app) => hmrPlugin(app.use(staticPlugin({ assets: buildDir, prefix: "" })))
   };
 };
+var loadPrerenderMap = (prerenderDir) => {
+  const map = new Map;
+  if (!existsSync16(prerenderDir))
+    return map;
+  try {
+    for (const entry of readdirSync2(prerenderDir)) {
+      if (!entry.endsWith(".html"))
+        continue;
+      const name = basename9(entry, ".html");
+      const route = name === "index" ? "/" : `/${name}`;
+      map.set(route, join17(prerenderDir, entry));
+    }
+  } catch {}
+  return map;
+};
 var prepare = async (configOrPath) => {
   const config = await loadConfig(configOrPath);
   const nodeEnv = process.env["NODE_ENV"];
@@ -206014,8 +206029,24 @@ var prepare = async (configOrPath) => {
     return prepareDev(config, buildDir);
   const manifest = JSON.parse(readFileSync10(`${buildDir}/manifest.json`, "utf-8"));
   const { staticPlugin } = await import("@elysiajs/static");
-  const absolutejs = staticPlugin({ assets: buildDir, prefix: "" });
-  return { absolutejs, manifest };
+  const staticFiles = staticPlugin({ assets: buildDir, prefix: "" });
+  const prerenderDir = join17(buildDir, "_prerendered");
+  const prerenderMap = loadPrerenderMap(prerenderDir);
+  if (prerenderMap.size > 0) {
+    const { Elysia } = await import("elysia");
+    const prerenderPlugin = new Elysia({ name: "prerendered-pages" }).onRequest(({ request }) => {
+      const url = new URL(request.url);
+      const filePath = prerenderMap.get(url.pathname);
+      if (!filePath)
+        return;
+      return new Response(Bun.file(filePath), {
+        headers: { "content-type": "text/html; charset=utf-8" }
+      });
+    });
+    const absolutejs = (app) => app.use(prerenderPlugin).use(staticFiles);
+    return { absolutejs, manifest };
+  }
+  return { absolutejs: staticFiles, manifest };
 };
 // src/plugins/pageRouter.ts
 var pageRouterPlugin = () => {
@@ -206198,5 +206229,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=8D9238CCCF55663464756E2164756E21
+//# debugId=B51D68800393AB0664756E2164756E21
 //# sourceMappingURL=index.js.map