@vistagenic/vista 0.3.2 → 0.3.4

package/dist/server/root-resolver.js

@@ -9,6 +9,7 @@ exports.resolveNotFoundComponent = resolveNotFoundComponent;
 exports.resolveLayoutChain = resolveLayoutChain;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const app_dir_1 = require("./app-dir");
 const FILE_EXTENSIONS = ['.tsx', '.ts', '.jsx', '.js'];
 let hasWarnedLayoutFallback = false;
 function resolveAppModuleByStem(appDir, stem) {
@@ -42,12 +43,12 @@ function detectRootMode(rootPath) {
     return 'legacy';
 }
 function resolveRootLayout(cwd, isDev) {
-    const appDir = path_1.default.join(cwd, 'app');
+    const appDir = (0, app_dir_1.resolveAppDir)(cwd);
     const rootPath = resolveAppModuleByStem(appDir, 'root');
     const layoutPath = resolveAppModuleByStem(appDir, 'layout');
     const selectedPath = rootPath ?? layoutPath;
     if (!selectedPath) {
-        throw new Error('Missing app/root.(tsx|ts|jsx|js). Add app/root.tsx (canonical) or app/layout.tsx (fallback).');
+        throw new Error('Missing app/root.(tsx|ts|jsx|js). Add app/root.tsx or src/app/root.tsx (canonical), or app/layout.tsx / src/app/layout.tsx (fallback).');
     }
     const usedLayoutFallback = !rootPath && !!layoutPath;
     if (usedLayoutFallback && !hasWarnedLayoutFallback) {
@@ -80,7 +81,7 @@ function resolveRootLayout(cwd, isDev) {
     };
 }
 function resolveRoutePagePath(cwd, routePath) {
-    const appDir = path_1.default.join(cwd, 'app');
+    const appDir = (0, app_dir_1.resolveAppDir)(cwd);
     const normalizedRoute = normalizeNotFoundRoute(routePath);
     if (normalizedRoute === '/' || normalizedRoute === '/index') {
         for (const ext of FILE_EXTENSIONS) {
@@ -111,7 +112,7 @@ function resolveRoutePagePath(cwd, routePath) {
     return null;
 }
 function resolveNotFoundComponent(cwd, rootLayout, isDev) {
-    const appDir = path_1.default.join(cwd, 'app');
+    const appDir = (0, app_dir_1.resolveAppDir)(cwd);
     const candidates = [];
     // 1. Explicit notFoundRoute (highest priority)
     if (rootLayout.notFoundRoute) {
@@ -177,7 +178,7 @@ function resolveNotFoundComponent(cwd, rootLayout, isDev) {
  * @param isDev   Bust require-cache in development
  */
 function resolveLayoutChain(cwd, pageDir, isDev) {
-    const appDir = path_1.default.join(cwd, 'app');
+    const appDir = (0, app_dir_1.resolveAppDir)(cwd);
     const chain = [];
     // Walk from app/ root down to the page's directory, collecting layouts
     // Normalise both to forward-slash for reliable prefix comparison

package/dist/server/rsc-engine-flashpack.d.ts

@@ -1,4 +1,6 @@
+import type { Express } from 'express';
 import { type RSCEngineOptions } from './rsc-engine';
-export declare function startFlashpackRSCServer(options?: RSCEngineOptions): void;
+export declare function createRSCApp(options?: RSCEngineOptions): Express;
+export declare function startFlashpackRSCServer(options?: RSCEngineOptions): Express;
 export declare const startRSCServer: typeof startFlashpackRSCServer;
 export { startFlashpackRSCServer as default };

package/dist/server/rsc-engine-flashpack.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startRSCServer = void 0;
+exports.createRSCApp = createRSCApp;
 exports.startFlashpackRSCServer = startFlashpackRSCServer;
 exports.default = startFlashpackRSCServer;
 const runtime_1 = require("../flashpack/runtime");
@@ -8,6 +9,9 @@ const rsc_engine_1 = require("./rsc-engine");
 function resolveMode() {
     return process.env.NODE_ENV === 'development' ? 'development' : 'production';
 }
+function createRSCApp(options = {}) {
+    return startFlashpackRSCServer({ ...options, listen: false });
+}
 function startFlashpackRSCServer(options = {}) {
     const cwd = process.cwd();
     const mode = resolveMode();
@@ -19,9 +23,16 @@ function startFlashpackRSCServer(options = {}) {
         mode,
         allowFallback: !strict,
     });
+    if (!prepared.rustPipelineUsed) {
+        if (strict) {
+            throw new Error('[flashpack] Rust pipeline did not run. Refusing to start Flight SSR without Flashpack prep (set VISTA_FLASHPACK_STRICT=false for an explicit non-Rust fallback).');
+        }
+        console.warn('[flashpack] WARNING: Rust pipeline skipped — serving via webpack Flight SSR fallback (not a silent renderToString path).');
+    }
     if (process.env.VISTA_DEBUG) {
         console.log(`[flashpack] server runtime prepared (rust=${prepared.rustPipelineUsed ? 'on' : 'fallback'}) at ${prepared.flashDir}`);
     }
-    (0, rsc_engine_1.startRSCServer)(options);
+    // Same Flight SSR contract as webpack: inline Flight, React.use streaming, fail-closed.
+    return (0, rsc_engine_1.startRSCServer)(options);
 }
 exports.startRSCServer = startFlashpackRSCServer;

package/dist/server/rsc-engine.d.ts

@@ -7,12 +7,17 @@
  * SSR renders Flight streams into HTML using renderToPipeableStream,
  * with a shim __webpack_require__ to resolve client modules during SSR.
  */
+import express from 'express';
 import webpack from 'webpack';
 export interface RSCEngineOptions {
     port?: number;
     compiler?: webpack.Compiler | null;
     projectRoot?: string;
     runtimeRoot?: string;
+    /** When false, return the Express app without binding a port (serverless). */
+    listen?: boolean;
 }
-export declare function startRSCServer(options?: RSCEngineOptions): void;
+export declare function createRSCApp(options?: RSCEngineOptions): express.Express;
+export declare function getRSCRequestListener(options?: RSCEngineOptions): express.Express;
+export declare function startRSCServer(options?: RSCEngineOptions): express.Express;
 export { startRSCServer as default };