@lukoweb/apitogo 0.2.22 → 0.2.24

package/src/vite/plugin.ts

@@ -1,48 +1,48 @@
-import tailwindcss from "@tailwindcss/vite";
-import react from "@vitejs/plugin-react";
-import type { PluginOption } from "vite";
-import { vitePluginSsrCss } from "./css/plugin.js";
-import viteApiKeysPlugin from "./plugin-api-keys.js";
-import viteApiPlugin from "./plugin-api.js";
-import viteAuthPlugin from "./plugin-auth.js";
-import viteAliasPlugin from "./plugin-component.js";
-import { viteConfigReloadPlugin } from "./plugin-config-reload.js";
-import viteConfigPlugin from "./plugin-config.js";
-import viteCustomPagesPlugin from "./plugin-custom-pages.js";
-import { viteDocMetadataPlugin } from "./plugin-doc-metadata.js";
-import viteDocsPlugin from "./plugin-docs.js";
-import viteLocalManifestPlugin from "./plugin-local-manifest.js";
-import viteMarkdownExportPlugin from "./plugin-markdown-export.js";
-import viteMdxPlugin from "./plugin-mdx.js";
-import viteModulesPlugin from "./plugin-modules.js";
-import { viteNavigationPlugin } from "./plugin-navigation.js";
-import viteOffrootResolvePlugin from "./plugin-offroot-resolve.js";
-import { viteSearchPlugin } from "./plugin-search.js";
-import { viteShikiRegisterPlugin } from "./plugin-shiki-register.js";
-import { viteThemePlugin } from "./plugin-theme.js";
-
-export default function vitePlugin(): PluginOption {
-  return [
-    viteShikiRegisterPlugin(),
-    viteOffrootResolvePlugin(),
-    viteConfigReloadPlugin(),
-    viteLocalManifestPlugin(),
-    viteMdxPlugin(),
-    react({ include: /\.(mdx?|jsx?|tsx?)$/ }),
-    viteConfigPlugin(),
-    viteModulesPlugin(),
-    viteApiKeysPlugin(),
-    viteCustomPagesPlugin(),
-    viteAuthPlugin(),
-    viteDocsPlugin(),
-    viteDocMetadataPlugin(),
-    viteNavigationPlugin(),
-    viteApiPlugin(),
-    viteSearchPlugin(),
-    viteAliasPlugin(),
-    viteMarkdownExportPlugin(),
-    vitePluginSsrCss({ entries: ["@lukoweb/apitogo/app/entry.server.tsx"] }),
-    viteThemePlugin(),
-    tailwindcss(),
-  ];
-}
+import tailwindcss from "@tailwindcss/vite";
+import react from "@vitejs/plugin-react";
+import type { PluginOption } from "vite";
+import { vitePluginSsrCss } from "./css/plugin.js";
+import viteApiKeysPlugin from "./plugin-api-keys.js";
+import viteApiPlugin from "./plugin-api.js";
+import viteAuthPlugin from "./plugin-auth.js";
+import viteAliasPlugin from "./plugin-component.js";
+import { viteConfigReloadPlugin } from "./plugin-config-reload.js";
+import viteConfigPlugin from "./plugin-config.js";
+import viteCustomPagesPlugin from "./plugin-custom-pages.js";
+import { viteDocMetadataPlugin } from "./plugin-doc-metadata.js";
+import viteDocsPlugin from "./plugin-docs.js";
+import viteLocalManifestPlugin from "./plugin-local-manifest.js";
+import viteMarkdownExportPlugin from "./plugin-markdown-export.js";
+import viteMdxPlugin from "./plugin-mdx.js";
+import viteModulesPlugin from "./plugin-modules.js";
+import { viteNavigationPlugin } from "./plugin-navigation.js";
+import viteOffrootResolvePlugin from "./plugin-offroot-resolve.js";
+import { viteSearchPlugin } from "./plugin-search.js";
+import { viteShikiRegisterPlugin } from "./plugin-shiki-register.js";
+import { viteThemePlugin } from "./plugin-theme.js";
+
+export default function vitePlugin(): PluginOption {
+  return [
+    viteShikiRegisterPlugin(),
+    viteOffrootResolvePlugin(),
+    viteConfigReloadPlugin(),
+    viteLocalManifestPlugin(),
+    viteMdxPlugin(),
+    react({ include: /\.(mdx?|jsx?|tsx?)$/ }),
+    viteConfigPlugin(),
+    viteModulesPlugin(),
+    viteApiKeysPlugin(),
+    viteCustomPagesPlugin(),
+    viteAuthPlugin(),
+    viteDocsPlugin(),
+    viteDocMetadataPlugin(),
+    viteNavigationPlugin(),
+    viteApiPlugin(),
+    viteSearchPlugin(),
+    viteAliasPlugin(),
+    viteMarkdownExportPlugin(),
+    vitePluginSsrCss({ entries: ["@lukoweb/apitogo/app/entry.server.tsx"] }),
+    viteThemePlugin(),
+    tailwindcss(),
+  ];
+}

package/src/vite/prerender/prerender.ts

@@ -1,242 +1,242 @@
-import { readFile, rm } from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { pathToFileURL } from "node:url";
-import { createIndex, type PagefindIndex } from "pagefind";
-import colors from "picocolors";
-import PiscinaImport from "piscina";
-import type { getRoutesByConfig } from "../../app/main.js";
-import { logger } from "../../cli/common/logger.js";
-import { fileExists } from "../../config/file-exists.js";
-import { getBuildConfig } from "../../config/validators/BuildSchema.js";
-import type { ZudokuConfig } from "../../config/validators/ZudokuConfig.js";
-import { runPluginTransformConfig } from "../../lib/core/transform-config.js";
-import invariant from "../../lib/util/invariant.js";
-import { joinUrl } from "../../lib/util/joinUrl.js";
-import type { MarkdownFileInfo } from "../plugin-markdown-export.js";
-import { isTTY, throttle, writeLine } from "../reporter.js";
-import { generateSitemap } from "../sitemap.js";
-import { routesToPaths, routesToRewrites } from "./utils.js";
-import type { StaticWorkerData, WorkerData } from "./worker.js";
-
-const Piscina = PiscinaImport as unknown as typeof PiscinaImport.default;
-
-export type WorkerResult = {
-  outputPath: string;
-  html: string;
-  statusCode: number;
-  redirect?: { from: string; to: string };
-};
-
-export const getRedirectUrls = (
-  workerResults: WorkerResult[],
-  basePath: string | undefined,
-): Set<string> =>
-  new Set(
-    workerResults.flatMap((r) => {
-      if (!r.redirect) return [];
-      const from = r.redirect.from;
-      return [
-        basePath && from.startsWith(basePath)
-          ? from.slice(basePath.length) || "/"
-          : from,
-      ];
-    }),
-  );
-
-export const prerender = async ({
-  html,
-  dir,
-  basePath = "",
-  serverConfigFilename,
-  writeRedirects = true,
-}: {
-  html: string;
-  dir: string;
-  basePath?: string;
-  serverConfigFilename: string;
-  writeRedirects: boolean;
-}) => {
-  const distDir = path.join(dir, "dist", basePath);
-  const serverConfigPath = pathToFileURL(
-    path.join(distDir, "server", serverConfigFilename),
-  ).href;
-  const entryServerPath = pathToFileURL(
-    path.join(distDir, "server/entry.server.js"),
-  ).href;
-
-  const rawConfig: ZudokuConfig = await import(serverConfigPath).then(
-    (m) => m.default,
-  );
-  const config = await runPluginTransformConfig(rawConfig);
-
-  const buildConfig = await getBuildConfig();
-  const module = await import(entryServerPath);
-  const getRoutes = module.getRoutesByConfig as typeof getRoutesByConfig;
-
-  const routes = getRoutes(config);
-  const paths = routesToPaths(routes);
-  const rewrites = routesToRewrites(routes);
-
-  // Add redirect source paths so they get prerendered as redirects
-  if (config.redirects) {
-    for (const r of config.redirects) {
-      paths.push(joinUrl(r.from));
-    }
-  }
-  const maxThreads =
-    buildConfig?.prerender?.workers ?? Math.floor(os.cpus().length * 0.8);
-
-  const start = performance.now();
-  const LOG_INTERVAL_MS = 30_000; // Log every 30 seconds
-  let lastLogTime = start;
-
-  const quietDeployJson = process.env.APITOGO_JSON_ONLY === "1";
-
-  const writeProgress = throttle(
-    (count: number, total: number, urlPath: string) => {
-      if (quietDeployJson) return;
-      writeLine(`prerendering (${count}/${total}) ${colors.dim(urlPath)}`);
-    },
-  );
-
-  if (!isTTY() && !quietDeployJson) {
-    logger.info(
-      colors.dim(
-        `prerendering ${paths.length} routes using ${maxThreads} workers...`,
-      ),
-    );
-  }
-
-  let completedCount = 0;
-  let pagefindIndex: PagefindIndex | undefined;
-
-  if (config.search?.type === "pagefind") {
-    const { index, errors } = await createIndex();
-    invariant(
-      index,
-      `Failed to create pagefind index: ${JSON.stringify(errors)}`,
-    );
-    pagefindIndex = index;
-  }
-
-  const pool = new Piscina<WorkerData, WorkerResult>({
-    filename: new URL("./worker.js", import.meta.url).href,
-    idleTimeout: 5_000,
-    maxThreads,
-    workerData: {
-      template: html,
-      distDir,
-      serverConfigPath,
-      entryServerPath,
-      writeRedirects,
-    } satisfies StaticWorkerData,
-  });
-
-  const workerResults = await Promise.all(
-    paths.map(async (urlPath) => {
-      const result = await pool.run({ urlPath } satisfies WorkerData);
-
-      if (result.statusCode < 400) {
-        await pagefindIndex?.addHTMLFile({
-          url: urlPath,
-          content: result.html,
-        });
-      }
-
-      completedCount++;
-
-      if (quietDeployJson) {
-        // no progress output
-      } else if (isTTY()) {
-        writeProgress(completedCount, paths.length, urlPath);
-      } else {
-        const now = performance.now();
-        if (now - lastLogTime >= LOG_INTERVAL_MS) {
-          logger.info(
-            colors.blue(
-              `prerendered ${completedCount}/${paths.length} routes using ${maxThreads} workers`,
-            ),
-          );
-          lastLogTime = now;
-        }
-      }
-      return result;
-    }),
-  );
-
-  const pagefindWriteResult = await pagefindIndex?.writeFiles({
-    outputPath: path.join(distDir, "pagefind"),
-  });
-
-  const seconds = ((performance.now() - start) / 1000).toFixed(1);
-
-  const message = `✓ finished prerendering ${paths.length} routes in ${seconds} seconds using ${maxThreads} workers`;
-
-  if (!quietDeployJson) {
-    if (isTTY()) {
-      writeLine(colors.blue(`${message}\n`));
-    } else {
-      logger.info(colors.blue(message));
-    }
-    if (pagefindWriteResult?.outputPath) {
-      logger.info(
-        colors.blue(
-          `✓ pagefind index built: ${pagefindWriteResult.outputPath}`,
-        ),
-      );
-    }
-  }
-
-  const redirectUrls = getRedirectUrls(workerResults, config.basePath);
-
-  await generateSitemap({
-    basePath: config.basePath,
-    outputUrls: paths,
-    config: config.sitemap,
-    baseOutputDir: distDir,
-    redirectUrls,
-  });
-
-  // Generate llms.txt files if markdown export is enabled
-  if (config.docs) {
-    const { DocsConfigSchema } =
-      await import("../../config/validators/ZudokuConfig.js");
-    const { generateLlmsTxtFiles } = await import("../llms.js");
-
-    const docsConfig = DocsConfigSchema.parse(config.docs);
-    const llmsConfig = docsConfig.llms ?? {};
-
-    const markdownInfoPath = path.join(
-      dir,
-      "node_modules/.apitogo/markdown-info.json",
-    );
-    let markdownFileInfos: MarkdownFileInfo[] = [];
-
-    if (await fileExists(markdownInfoPath)) {
-      const markdownInfoContent = await readFile(markdownInfoPath, "utf-8");
-      markdownFileInfos = JSON.parse(markdownInfoContent);
-    }
-
-    if (llmsConfig.llmsTxt || llmsConfig.llmsTxtFull) {
-      await generateLlmsTxtFiles({
-        markdownFileInfos,
-        basePath: config.basePath,
-        outputUrls: paths,
-        baseOutputDir: distDir,
-        siteName: config.site?.title,
-        llmsTxt: llmsConfig.llmsTxt,
-        llmsTxtFull: llmsConfig.llmsTxtFull,
-        redirectUrls,
-      });
-    }
-
-    if (!docsConfig.publishMarkdown) {
-      await Promise.all(
-        markdownFileInfos.map((info) => rm(info.filePath).catch(() => {})),
-      );
-    }
-  }
-
-  return { workerResults, rewrites };
-};
+import { readFile, rm } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+import { createIndex, type PagefindIndex } from "pagefind";
+import colors from "picocolors";
+import PiscinaImport from "piscina";
+import type { getRoutesByConfig } from "../../app/main.js";
+import { logger } from "../../cli/common/logger.js";
+import { fileExists } from "../../config/file-exists.js";
+import { getBuildConfig } from "../../config/validators/BuildSchema.js";
+import type { ZudokuConfig } from "../../config/validators/ZudokuConfig.js";
+import { runPluginTransformConfig } from "../../lib/core/transform-config.js";
+import invariant from "../../lib/util/invariant.js";
+import { joinUrl } from "../../lib/util/joinUrl.js";
+import type { MarkdownFileInfo } from "../plugin-markdown-export.js";
+import { isTTY, throttle, writeLine } from "../reporter.js";
+import { generateSitemap } from "../sitemap.js";
+import { routesToPaths, routesToRewrites } from "./utils.js";
+import type { StaticWorkerData, WorkerData } from "./worker.js";
+
+const Piscina = PiscinaImport as unknown as typeof PiscinaImport.default;
+
+export type WorkerResult = {
+  outputPath: string;
+  html: string;
+  statusCode: number;
+  redirect?: { from: string; to: string };
+};
+
+export const getRedirectUrls = (
+  workerResults: WorkerResult[],
+  basePath: string | undefined,
+): Set<string> =>
+  new Set(
+    workerResults.flatMap((r) => {
+      if (!r.redirect) return [];
+      const from = r.redirect.from;
+      return [
+        basePath && from.startsWith(basePath)
+          ? from.slice(basePath.length) || "/"
+          : from,
+      ];
+    }),
+  );
+
+export const prerender = async ({
+  html,
+  dir,
+  basePath = "",
+  serverConfigFilename,
+  writeRedirects = true,
+}: {
+  html: string;
+  dir: string;
+  basePath?: string;
+  serverConfigFilename: string;
+  writeRedirects: boolean;
+}) => {
+  const distDir = path.join(dir, "dist", basePath);
+  const serverConfigPath = pathToFileURL(
+    path.join(distDir, "server", serverConfigFilename),
+  ).href;
+  const entryServerPath = pathToFileURL(
+    path.join(distDir, "server/entry.server.js"),
+  ).href;
+
+  const rawConfig: ZudokuConfig = await import(serverConfigPath).then(
+    (m) => m.default,
+  );
+  const config = await runPluginTransformConfig(rawConfig);
+
+  const buildConfig = await getBuildConfig();
+  const module = await import(entryServerPath);
+  const getRoutes = module.getRoutesByConfig as typeof getRoutesByConfig;
+
+  const routes = getRoutes(config);
+  const paths = routesToPaths(routes);
+  const rewrites = routesToRewrites(routes);
+
+  // Add redirect source paths so they get prerendered as redirects
+  if (config.redirects) {
+    for (const r of config.redirects) {
+      paths.push(joinUrl(r.from));
+    }
+  }
+  const maxThreads =
+    buildConfig?.prerender?.workers ?? Math.floor(os.cpus().length * 0.8);
+
+  const start = performance.now();
+  const LOG_INTERVAL_MS = 30_000; // Log every 30 seconds
+  let lastLogTime = start;
+
+  const quietDeployJson = process.env.APITOGO_JSON_ONLY === "1";
+
+  const writeProgress = throttle(
+    (count: number, total: number, urlPath: string) => {
+      if (quietDeployJson) return;
+      writeLine(`prerendering (${count}/${total}) ${colors.dim(urlPath)}`);
+    },
+  );
+
+  if (!isTTY() && !quietDeployJson) {
+    logger.info(
+      colors.dim(
+        `prerendering ${paths.length} routes using ${maxThreads} workers...`,
+      ),
+    );
+  }
+
+  let completedCount = 0;
+  let pagefindIndex: PagefindIndex | undefined;
+
+  if (config.search?.type === "pagefind") {
+    const { index, errors } = await createIndex();
+    invariant(
+      index,
+      `Failed to create pagefind index: ${JSON.stringify(errors)}`,
+    );
+    pagefindIndex = index;
+  }
+
+  const pool = new Piscina<WorkerData, WorkerResult>({
+    filename: new URL("./worker.js", import.meta.url).href,
+    idleTimeout: 5_000,
+    maxThreads,
+    workerData: {
+      template: html,
+      distDir,
+      serverConfigPath,
+      entryServerPath,
+      writeRedirects,
+    } satisfies StaticWorkerData,
+  });
+
+  const workerResults = await Promise.all(
+    paths.map(async (urlPath) => {
+      const result = await pool.run({ urlPath } satisfies WorkerData);
+
+      if (result.statusCode < 400) {
+        await pagefindIndex?.addHTMLFile({
+          url: urlPath,
+          content: result.html,
+        });
+      }
+
+      completedCount++;
+
+      if (quietDeployJson) {
+        // no progress output
+      } else if (isTTY()) {
+        writeProgress(completedCount, paths.length, urlPath);
+      } else {
+        const now = performance.now();
+        if (now - lastLogTime >= LOG_INTERVAL_MS) {
+          logger.info(
+            colors.blue(
+              `prerendered ${completedCount}/${paths.length} routes using ${maxThreads} workers`,
+            ),
+          );
+          lastLogTime = now;
+        }
+      }
+      return result;
+    }),
+  );
+
+  const pagefindWriteResult = await pagefindIndex?.writeFiles({
+    outputPath: path.join(distDir, "pagefind"),
+  });
+
+  const seconds = ((performance.now() - start) / 1000).toFixed(1);
+
+  const message = `✓ finished prerendering ${paths.length} routes in ${seconds} seconds using ${maxThreads} workers`;
+
+  if (!quietDeployJson) {
+    if (isTTY()) {
+      writeLine(colors.blue(`${message}\n`));
+    } else {
+      logger.info(colors.blue(message));
+    }
+    if (pagefindWriteResult?.outputPath) {
+      logger.info(
+        colors.blue(
+          `✓ pagefind index built: ${pagefindWriteResult.outputPath}`,
+        ),
+      );
+    }
+  }
+
+  const redirectUrls = getRedirectUrls(workerResults, config.basePath);
+
+  await generateSitemap({
+    basePath: config.basePath,
+    outputUrls: paths,
+    config: config.sitemap,
+    baseOutputDir: distDir,
+    redirectUrls,
+  });
+
+  // Generate llms.txt files if markdown export is enabled
+  if (config.docs) {
+    const { DocsConfigSchema } =
+      await import("../../config/validators/ZudokuConfig.js");
+    const { generateLlmsTxtFiles } = await import("../llms.js");
+
+    const docsConfig = DocsConfigSchema.parse(config.docs);
+    const llmsConfig = docsConfig.llms ?? {};
+
+    const markdownInfoPath = path.join(
+      dir,
+      "node_modules/.apitogo/markdown-info.json",
+    );
+    let markdownFileInfos: MarkdownFileInfo[] = [];
+
+    if (await fileExists(markdownInfoPath)) {
+      const markdownInfoContent = await readFile(markdownInfoPath, "utf-8");
+      markdownFileInfos = JSON.parse(markdownInfoContent);
+    }
+
+    if (llmsConfig.llmsTxt || llmsConfig.llmsTxtFull) {
+      await generateLlmsTxtFiles({
+        markdownFileInfos,
+        basePath: config.basePath,
+        outputUrls: paths,
+        baseOutputDir: distDir,
+        siteName: config.site?.title,
+        llmsTxt: llmsConfig.llmsTxt,
+        llmsTxtFull: llmsConfig.llmsTxtFull,
+        redirectUrls,
+      });
+    }
+
+    if (!docsConfig.publishMarkdown) {
+      await Promise.all(
+        markdownFileInfos.map((info) => rm(info.filePath).catch(() => {})),
+      );
+    }
+  }
+
+  return { workerResults, rewrites };
+};