fix: address 6 bugs found in code review

1. Remove App Router pre-rendered HTML shortcut — was bypassing RSC
   streaming and middleware/auth pipeline
2. Move Pages Router pre-rendered check after middleware/basePath/
   redirects/rewrites pipeline (step 7b instead of 1b)
3. Skip ISR pages (revalidate != false) in collectStaticRoutes()
   to prevent freezing dynamic content as static HTML
4. basePath handling covered by fix #2 (uses resolvedPathname)
5. Temp Vite servers now check for project vite.config and use it
   when present, so user plugins/aliases are available
6. vinext start guard now checks config.output directly instead of
   relying on out/ directory existence heuristic

Author: NathanDrake2406

packages/vinext/src/build/static-export.ts

@@ -815,16 +815,31 @@ export async function runStaticExport(
   }
 
   // 3. Start a temporary Vite dev server
-  const { default: vinextPlugin } = await import("../index.js");
   const vite = await import("vite");
-  const server = await vite.createServer({
-    root,
-    configFile: false,
-    plugins: [vinextPlugin({ appDir: root })],
-    optimizeDeps: { holdUntilCrawlEnd: true },
-    server: { port: 0, cors: false },
-    logLevel: "silent",
-  });
+  const hasViteConfig = ["vite.config.ts", "vite.config.js", "vite.config.mjs"]
+    .some((f) => fs.existsSync(path.join(root, f)));
+
+  let serverConfig: Record<string, unknown>;
+  if (hasViteConfig) {
+    // Use the project's vite config so user plugins/aliases/transforms are available
+    serverConfig = {
+      root,
+      optimizeDeps: { holdUntilCrawlEnd: true },
+      server: { port: 0, cors: false },
+      logLevel: "silent",
+    };
+  } else {
+    const { default: vinextPlugin } = await import("../index.js");
+    serverConfig = {
+      root,
+      configFile: false,
+      plugins: [vinextPlugin({ appDir: root })],
+      optimizeDeps: { holdUntilCrawlEnd: true },
+      server: { port: 0, cors: false },
+      logLevel: "silent",
+    };
+  }
+  const server = await vite.createServer(serverConfig);
   await server.listen();
 
   try {
@@ -1000,16 +1015,30 @@ async function collectStaticRoutes(root: string, isAppRouter: boolean): Promise<
   if (!isAppRouter && !pagesDir) return [];
 
   // Start a temporary Vite dev server for module inspection
-  const { default: vinextPlugin } = await import("../index.js");
   const vite = await import("vite");
-  const server = await vite.createServer({
-    root,
-    configFile: false,
-    plugins: [vinextPlugin({ appDir: root })],
-    optimizeDeps: { holdUntilCrawlEnd: true },
-    server: { port: 0, cors: false },
-    logLevel: "silent",
-  });
+  const hasViteConfig = ["vite.config.ts", "vite.config.js", "vite.config.mjs"]
+    .some((f) => fs.existsSync(path.join(root, f)));
+
+  let serverConfig: Record<string, unknown>;
+  if (hasViteConfig) {
+    serverConfig = {
+      root,
+      optimizeDeps: { holdUntilCrawlEnd: true },
+      server: { port: 0, cors: false },
+      logLevel: "silent",
+    };
+  } else {
+    const { default: vinextPlugin } = await import("../index.js");
+    serverConfig = {
+      root,
+      configFile: false,
+      plugins: [vinextPlugin({ appDir: root })],
+      optimizeDeps: { holdUntilCrawlEnd: true },
+      server: { port: 0, cors: false },
+      logLevel: "silent",
+    };
+  }
+  const server = await vite.createServer(serverConfig);
   await server.listen();
 
   try {
@@ -1025,8 +1054,9 @@ async function collectStaticRoutes(root: string, isAppRouter: boolean): Promise<
         try {
           const pageModule = await server.ssrLoadModule(route.pagePath);
 
-          // Skip force-dynamic pages
+          // Skip dynamic/request-dependent pages
           if (pageModule.dynamic === "force-dynamic") continue;
+          if (pageModule.revalidate !== undefined && pageModule.revalidate !== false) continue;
 
           if (route.isDynamic) {
             // Need generateStaticParams to expand
@@ -1074,6 +1104,16 @@ async function collectStaticRoutes(root: string, isAppRouter: boolean): Promise<
           // Skip pages with getServerSideProps
           if (typeof pageModule.getServerSideProps === "function") continue;
 
+          // Skip ISR pages (getStaticProps with revalidate)
+          if (typeof pageModule.getStaticProps === "function") {
+            try {
+              const propsResult = await pageModule.getStaticProps({});
+              if (propsResult?.revalidate) continue;
+            } catch {
+              continue; // Skip if getStaticProps fails
+            }
+          }
+
           if (route.isDynamic) {
             // Need getStaticPaths with fallback: false
             if (typeof pageModule.getStaticPaths !== "function") continue;

packages/vinext/src/cli.ts

@@ -337,12 +337,12 @@ async function start() {
   });
 
   // Reject static export builds — they don't need a production server
-  const outExportDir = path.resolve(process.cwd(), "out");
-  const distServerDir = path.resolve(process.cwd(), "dist", "server");
-  if (
-    fs.existsSync(path.join(outExportDir, "index.html")) &&
-    !fs.existsSync(distServerDir)
-  ) {
+  const { loadNextConfig, resolveNextConfig } = await import(
+    /* @vite-ignore */ "./config/next-config.js"
+  );
+  const startRawConfig = await loadNextConfig(process.cwd());
+  const startResolvedConfig = await resolveNextConfig(startRawConfig);
+  if (startResolvedConfig.output === "export") {
     console.error(
       '\n  "vinext start" does not work with "output: export" configuration.',
     );

packages/vinext/src/server/prod-server.ts

@@ -576,15 +576,6 @@ async function startAppRouterServer(options: AppRouterServerOptions) {
       return;
     }
 
-    // Pre-rendered HTML — serve build-time rendered pages before hitting RSC/SSR
-    const appPrerenderedDir = path.join(path.dirname(rscEntryPath), "pages");
-    const appPrerenderedFile = resolvePrerenderedHtml(appPrerenderedDir, pathname);
-    if (appPrerenderedFile) {
-      const html = fs.readFileSync(appPrerenderedFile, "utf-8");
-      sendCompressed(req, res, html, "text/html; charset=utf-8", 200, {}, compress);
-      return;
-    }
-
     try {
       // Convert Node.js request to Web Request and call the RSC handler
       const request = nodeToWebRequest(req);
@@ -751,17 +742,6 @@ async function startPagesRouterServer(options: PagesRouterServerOptions) {
       return;
     }
 
-    // ── 1b. Pre-rendered HTML ──────────────────────────────────
-    // Check if a pre-rendered HTML file exists for this pathname.
-    // These are generated during `vinext build` for static pages.
-    const pagesPrerenderedDir = path.join(path.dirname(serverEntryPath), "pages");
-    const pagesPrerenderedFile = resolvePrerenderedHtml(pagesPrerenderedDir, pathname);
-    if (pagesPrerenderedFile) {
-      const html = fs.readFileSync(pagesPrerenderedFile, "utf-8");
-      sendCompressed(req, res, html, "text/html; charset=utf-8", 200, {}, compress);
-      return;
-    }
-
     try {
       // ── 2. Strip basePath ─────────────────────────────────────────
       if (basePath && pathname.startsWith(basePath)) {
@@ -930,6 +910,18 @@ async function startPagesRouterServer(options: PagesRouterServerOptions) {
         }
       }
 
+      // ── 7b. Pre-rendered HTML ─────────────────────────────────────
+      // Serve build-time rendered static pages. Placed after middleware,
+      // basePath stripping, redirects, and rewrites so those all run first.
+      const pagesPrerenderedDir = path.join(path.dirname(serverEntryPath), "pages");
+      const pagesPrerenderedFile = resolvePrerenderedHtml(pagesPrerenderedDir, resolvedPathname);
+      if (pagesPrerenderedFile) {
+        const html = fs.readFileSync(pagesPrerenderedFile, "utf-8");
+        const prerenderedHeaders: Record<string, string> = { ...middlewareHeaders };
+        sendCompressed(req, res, html, "text/html; charset=utf-8", 200, prerenderedHeaders, compress);
+        return;
+      }
+
       // ── 8. API routes ─────────────────────────────────────────────
       if (resolvedPathname.startsWith("/api/") || resolvedPathname === "/api") {
         let response: Response;