@vistagenic/vista 0.2.6 → 0.2.8

package/dist/bin/build-rsc.js

@@ -28,6 +28,7 @@ const static_generator_1 = require("../server/static-generator");
 const structure_log_1 = require("../server/structure-log");
 const devtools_indicator_snippet_1 = require("./devtools-indicator-snippet");
 const dev_error_overlay_snippet_1 = require("./dev-error-overlay-snippet");
+const deploy_output_1 = require("./deploy-output");
 const _debug = !!process.env.VISTA_DEBUG;
 /**
  * Run PostCSS for CSS compilation
@@ -555,6 +556,11 @@ async function buildRSC(watch = false) {
         const prerenderManifestPath = path_1.default.join(vistaDirs.root, 'prerender-manifest.json');
         fs_1.default.writeFileSync(prerenderManifestPath, JSON.stringify(ssgResult.manifest, null, 2));
         console.log('[Vista JS RSC] Wrote prerender-manifest.json');
+        (0, deploy_output_1.generateDeploymentOutputs)({
+            cwd,
+            vistaDir: vistaDirs.root,
+            debug: _debug,
+        });
         console.log('');
         console.log('╔══════════════════════════════════════════════════════════════╗');
         console.log('║                    Build Complete! 🎉                        ║');

package/dist/bin/build.js

@@ -17,6 +17,7 @@ const structure_validator_1 = require("../server/structure-validator");
 const structure_log_1 = require("../server/structure-log");
 const devtools_indicator_snippet_1 = require("./devtools-indicator-snippet");
 const dev_error_overlay_snippet_1 = require("./dev-error-overlay-snippet");
+const deploy_output_1 = require("./deploy-output");
 const _debug = !!process.env.VISTA_DEBUG;
 // Helper to run PostCSS
 function runPostCSS(cwd, vistaDir) {
@@ -418,6 +419,11 @@ async function buildClient(watch = false, onRebuild) {
                 console.log(stats?.toString('minimal'));
                 // Build CSS
                 runPostCSS(cwd, vistaDir);
+                (0, deploy_output_1.generateDeploymentOutputs)({
+                    cwd,
+                    vistaDir,
+                    debug: _debug,
+                });
                 compiler.close((closeErr) => {
                     if (closeErr)
                         console.error('Error closing compiler:', closeErr);

package/dist/bin/deploy-output.d.ts

@@ -0,0 +1,7 @@
+interface DeployOutputOptions {
+    cwd: string;
+    vistaDir: string;
+    debug?: boolean;
+}
+export declare function generateDeploymentOutputs(options: DeployOutputOptions): void;
+export {};

package/dist/bin/deploy-output.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateDeploymentOutputs = generateDeploymentOutputs;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function isVercelBuildEnvironment() {
+    return process.env.VERCEL === '1' || process.env.NOW_REGION !== undefined;
+}
+function hasUserVercelConfig(cwd) {
+    return fs_1.default.existsSync(path_1.default.join(cwd, 'vercel.json'));
+}
+function copyDirectoryRecursive(sourceDir, targetDir) {
+    if (!fs_1.default.existsSync(sourceDir))
+        return;
+    fs_1.default.mkdirSync(targetDir, { recursive: true });
+    const entries = fs_1.default.readdirSync(sourceDir, { withFileTypes: true });
+    for (const entry of entries) {
+        const from = path_1.default.join(sourceDir, entry.name);
+        const to = path_1.default.join(targetDir, entry.name);
+        if (entry.isDirectory()) {
+            copyDirectoryRecursive(from, to);
+        }
+        else if (entry.isFile()) {
+            fs_1.default.copyFileSync(from, to);
+        }
+    }
+}
+function copyFileIfPresent(sourceFile, targetFile) {
+    if (!fs_1.default.existsSync(sourceFile))
+        return;
+    fs_1.default.mkdirSync(path_1.default.dirname(targetFile), { recursive: true });
+    fs_1.default.copyFileSync(sourceFile, targetFile);
+}
+function writeVercelBuildOutput(options) {
+    const { cwd, vistaDir, debug } = options;
+    if (!isVercelBuildEnvironment()) {
+        return;
+    }
+    if (hasUserVercelConfig(cwd)) {
+        if (debug) {
+            console.log('[vista:deploy] Found custom vercel.json, skipping internal Vercel output.');
+        }
+        return;
+    }
+    const vercelOutputDir = path_1.default.join(cwd, '.vercel', 'output');
+    const vercelStaticDir = path_1.default.join(vercelOutputDir, 'static');
+    fs_1.default.rmSync(vercelOutputDir, { recursive: true, force: true });
+    fs_1.default.mkdirSync(vercelStaticDir, { recursive: true });
+    // Public assets: /favicon.ico, /vista.svg, etc.
+    copyDirectoryRecursive(path_1.default.join(cwd, 'public'), vercelStaticDir);
+    // Vista static artifacts: /static/pages, /static/chunks, etc.
+    copyDirectoryRecursive(path_1.default.join(vistaDir, 'static'), path_1.default.join(vercelStaticDir, 'static'));
+    // Global CSS alias support (/styles.css and /client.css)
+    const clientCssPath = path_1.default.join(vistaDir, 'client.css');
+    copyFileIfPresent(clientCssPath, path_1.default.join(vercelStaticDir, 'client.css'));
+    copyFileIfPresent(clientCssPath, path_1.default.join(vercelStaticDir, 'styles.css'));
+    const config = {
+        version: 3,
+        routes: [
+            { handle: 'filesystem' },
+            { src: '^/_vista/(.*)$', dest: '/$1' },
+            { src: '^/(?:rsc|_rsc)/?$', dest: '/static/pages/index.rsc' },
+            { src: '^/(?:rsc|_rsc)/(.+)$', dest: '/static/pages/$1.rsc' },
+            { src: '^/$', dest: '/static/pages/index.html' },
+            { src: '^/(.+)$', dest: '/static/pages/$1.html' },
+        ],
+    };
+    fs_1.default.writeFileSync(path_1.default.join(vercelOutputDir, 'config.json'), JSON.stringify(config, null, 2));
+    if (debug) {
+        console.log('[vista:deploy] Generated internal Vercel Build Output at .vercel/output/');
+    }
+}
+function generateDeploymentOutputs(options) {
+    writeVercelBuildOutput(options);
+}

package/dist/build/manifest.d.ts

@@ -22,7 +22,7 @@ export interface VistaDirs {
 }
 /**
  * Create the .vista directory structure.
- * In legacy mode, only creates root + cache (no empty server/static dirs).
+ * In legacy mode, only creates root (no empty server/static dirs).
  * In RSC mode, creates the full structure for server/client bundles.
  */
 export declare function createVistaDirectories(cwd: string, mode?: 'legacy' | 'rsc'): VistaDirs;

package/dist/build/manifest.js

@@ -54,7 +54,7 @@ function getBuildId(vistaDir, forceNew = false) {
 }
 /**
  * Create the .vista directory structure.
- * In legacy mode, only creates root + cache (no empty server/static dirs).
+ * In legacy mode, only creates root (no empty server/static dirs).
  * In RSC mode, creates the full structure for server/client bundles.
  */
 function createVistaDirectories(cwd, mode = 'legacy') {
@@ -71,8 +71,10 @@ function createVistaDirectories(cwd, mode = 'legacy') {
     // Always create root
     fs_1.default.mkdirSync(root, { recursive: true });
     if (mode === 'rsc') {
-        // RSC mode: create full directory tree
-        Object.values(dirs).forEach((dir) => {
+        // RSC mode: create only currently-used directories.
+        // Keep css/media paths reserved in `dirs` for future use, but do not
+        // create empty folders unless the build actually emits files there.
+        [dirs.root, dirs.cache, dirs.server, dirs.static, dirs.chunks].forEach((dir) => {
             fs_1.default.mkdirSync(dir, { recursive: true });
         });
         // Cache subdirectories

package/dist/image/index.js

@@ -27,12 +27,11 @@ const wrapperStyle = {
 exports.Image = (0, react_1.forwardRef)((props, ref) => {
     const { placeholder, blurDataURL, onLoadingComplete, priority, ...restProps } = props;
     const [isLoaded, setIsLoaded] = (0, react_1.useState)(false);
-    const [isInView, setIsInView] = (0, react_1.useState)(priority || false);
-    const imgRef = (0, react_1.useRef)(null);
-    const observerRef = (0, react_1.useRef)(null);
     // Combine refs
     const setRefs = (0, react_1.useCallback)((node) => {
-        imgRef.current = node;
+        if (node && node.complete && node.naturalWidth > 0) {
+            setIsLoaded(true);
+        }
         if (typeof ref === 'function') {
             ref(node);
         }
@@ -40,31 +39,6 @@ exports.Image = (0, react_1.forwardRef)((props, ref) => {
             ref.current = node;
         }
     }, [ref]);
-    // IntersectionObserver for lazy loading
-    (0, react_1.useEffect)(() => {
-        if (priority) {
-            setIsInView(true);
-            return;
-        }
-        const element = imgRef.current;
-        if (!element)
-            return;
-        observerRef.current = new IntersectionObserver((entries) => {
-            entries.forEach((entry) => {
-                if (entry.isIntersecting) {
-                    setIsInView(true);
-                    observerRef.current?.disconnect();
-                }
-            });
-        }, {
-            rootMargin: '200px', // Start loading 200px before viewport
-            threshold: 0,
-        });
-        observerRef.current.observe(element);
-        return () => {
-            observerRef.current?.disconnect();
-        };
-    }, [priority]);
     // Handle image load complete
     const handleLoad = (0, react_1.useCallback)((event) => {
         const img = event.currentTarget;
@@ -88,9 +62,7 @@ exports.Image = (0, react_1.forwardRef)((props, ref) => {
                 opacity: isLoaded ? 1 : 0,
                 transition: 'opacity 0.5s ease-in-out'
             } : {}),
-        }, 
-        // Only set src when in view (lazy loading)
-        src: isInView ? imgProps.src : undefined, srcSet: isInView ? imgProps.srcSet : undefined, decoding: priority ? 'sync' : 'async', fetchPriority: priority ? 'high' : undefined }));
+        }, src: imgProps.src, srcSet: imgProps.srcSet, decoding: priority ? 'sync' : 'async', fetchPriority: priority ? 'high' : undefined }));
     // Wrap with blur placeholder if needed
     if (needsWrapper) {
         return ((0, jsx_runtime_1.jsxs)("span", { style: {

package/dist/server/rsc-engine.js

@@ -844,12 +844,14 @@ function startRSCServer(options = {}) {
     }
     let serverManifest = JSON.parse(fs_1.default.readFileSync(serverManifestPath, 'utf-8'));
     // ========================================================================
-    // Load pre-rendered static pages from disk into in-memory cache
+    // Load pre-rendered static pages from disk into in-memory cache (production)
     // ========================================================================
     const vistaDirRoot = path_1.default.join(cwd, constants_1.BUILD_DIR);
-    const loadedStaticPages = (0, static_cache_1.loadStaticPagesFromDisk)(vistaDirRoot);
-    if (loadedStaticPages > 0) {
-        (0, logger_1.logInfo)(`Loaded ${loadedStaticPages} pre-rendered page(s) from cache`);
+    if (!isDev) {
+        const loadedStaticPages = (0, static_cache_1.loadStaticPagesFromDisk)(vistaDirRoot);
+        if (loadedStaticPages > 0) {
+            (0, logger_1.logInfo)(`Loaded ${loadedStaticPages} pre-rendered page(s) from cache`);
+        }
     }
     const upstreamChild = spawnUpstream(cwd, upstreamPort);
     upstreamChild.stdout.setEncoding('utf8');
@@ -1254,7 +1256,7 @@ function startRSCServer(options = {}) {
         // For ISR pages whose revalidate window has expired, serve the stale
         // cached version immediately and kick off background revalidation.
         // ==================================================================
-        {
+        if (!isDev) {
             const cached = (0, static_cache_1.getCachedPage)(req.path);
             if (cached.page) {
                 if (cached.stale) {

package/dist/server/static-generator.js

@@ -16,6 +16,7 @@ exports.generateStaticPages = generateStaticPages;
 exports.revalidatePath = revalidatePath;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const child_process_1 = require("child_process");
 const constants_1 = require("../constants");
 const static_cache_1 = require("./static-cache");
 const CjsModule = require('module');
@@ -295,8 +296,149 @@ function getCSSLinks(cwd) {
     }
     return links.join('\n  ');
 }
+function getChunkScripts(cwd) {
+    const chunksDir = path_1.default.join(cwd, constants_1.BUILD_DIR, 'static', 'chunks');
+    try {
+        if (!fs_1.default.existsSync(chunksDir)) {
+            return '';
+        }
+        const files = fs_1.default
+            .readdirSync(chunksDir)
+            .filter((entry) => entry.endsWith('.js') && !entry.endsWith('.map') && !entry.includes('.hot-update.'));
+        const priority = ['webpack.js', 'framework.js', 'vendor.js'];
+        files.sort((a, b) => {
+            const ai = priority.indexOf(a);
+            const bi = priority.indexOf(b);
+            if (ai !== -1 && bi !== -1)
+                return ai - bi;
+            if (ai !== -1)
+                return -1;
+            if (bi !== -1)
+                return 1;
+            return a.localeCompare(b);
+        });
+        return files
+            .map((file) => `<script defer src="${constants_1.STATIC_CHUNKS_PATH}${file}"></script>`)
+            .join('\n  ');
+    }
+    catch {
+        // Ignore chunk discovery failures during static generation.
+        return '';
+    }
+}
+function resolveUpstreamScriptPath() {
+    const jsPath = path_1.default.join(__dirname, 'rsc-upstream.js');
+    if (fs_1.default.existsSync(jsPath)) {
+        return jsPath;
+    }
+    const tsPath = path_1.default.join(__dirname, 'rsc-upstream.ts');
+    if (fs_1.default.existsSync(tsPath)) {
+        return tsPath;
+    }
+    return null;
+}
+function waitForUpstreamReady(child, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        let logs = '';
+        const timer = setTimeout(() => {
+            cleanup();
+            reject(new Error(`[vista:ssg] Timed out waiting for RSC upstream readiness (${timeoutMs}ms)\n${logs}`));
+        }, timeoutMs);
+        const cleanup = () => {
+            clearTimeout(timer);
+            child.stdout.removeListener('data', onData);
+            child.stderr.removeListener('data', onData);
+            child.removeListener('exit', onExit);
+            child.removeListener('error', onError);
+        };
+        const onData = (chunk) => {
+            logs += chunk.toString();
+            if (logs.includes('Listening on')) {
+                cleanup();
+                resolve();
+            }
+        };
+        const onExit = (code) => {
+            cleanup();
+            reject(new Error(`[vista:ssg] RSC upstream exited before readiness (code: ${code ?? 'unknown'})`));
+        };
+        const onError = (error) => {
+            cleanup();
+            reject(error);
+        };
+        child.stdout.on('data', onData);
+        child.stderr.on('data', onData);
+        child.once('exit', onExit);
+        child.once('error', onError);
+    });
+}
+async function startStaticFlightUpstream(cwd) {
+    const upstreamScript = resolveUpstreamScriptPath();
+    if (!upstreamScript) {
+        return null;
+    }
+    const port = Number(process.env.VISTA_STATIC_RSC_PORT || 3181);
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        return null;
+    }
+    const child = (0, child_process_1.spawn)(process.execPath, ['--conditions', 'react-server', upstreamScript, '--port', String(port)], {
+        cwd,
+        env: {
+            ...process.env,
+            NODE_ENV: process.env.NODE_ENV || 'production',
+            RSC_UPSTREAM_PORT: String(port),
+        },
+        stdio: 'pipe',
+    });
+    await waitForUpstreamReady(child, 12000);
+    const close = async () => {
+        if (child.killed)
+            return;
+        await new Promise((resolve) => {
+            const timeout = setTimeout(() => {
+                try {
+                    child.kill('SIGKILL');
+                }
+                catch {
+                    // ignore force-kill failures
+                }
+            }, 2500);
+            child.once('exit', () => {
+                clearTimeout(timeout);
+                resolve();
+            });
+            try {
+                child.kill();
+            }
+            catch {
+                clearTimeout(timeout);
+                resolve();
+            }
+        });
+    };
+    return {
+        async fetchFlight(urlPath) {
+            const normalizedPath = urlPath === '/' ? '' : urlPath;
+            const flightUrl = `http://127.0.0.1:${port}/rsc${normalizedPath}`;
+            try {
+                const response = await fetch(flightUrl, {
+                    headers: { Accept: 'text/x-component' },
+                });
+                if (!response.ok) {
+                    return undefined;
+                }
+                return await response.text();
+            }
+            catch {
+                return undefined;
+            }
+        },
+        close,
+    };
+}
 function wrapInDocument(bodyHtml, _urlPath, metadataHtml, cwd) {
     const headInjection = `\n  <meta charset="utf-8" />\n  <meta name="viewport" content="width=device-width, initial-scale=1" />\n  ${metadataHtml}\n  ${getCSSLinks(cwd)}`;
+    const scripts = getChunkScripts(cwd);
     const hasDocumentMarkup = /<html(?:\s|>)/i.test(bodyHtml) && /<\/html>/i.test(bodyHtml);
     if (hasDocumentMarkup) {
         const htmlStart = bodyHtml.search(/<html(?:\s|>)/i);
@@ -305,6 +447,8 @@ function wrapInDocument(bodyHtml, _urlPath, metadataHtml, cwd) {
             html = `<!DOCTYPE html>\n${html}`;
         }
         html = injectBeforeClosingTag(html, 'head', headInjection);
+        const bodyInjection = `\n  <script>window.${constants_1.HYDRATE_DOCUMENT_FLAG} = true;</script>\n  ${scripts}`;
+        html = injectBeforeClosingTag(html, 'body', bodyInjection);
         return html;
     }
     return `<!DOCTYPE html>
@@ -313,7 +457,9 @@ function wrapInDocument(bodyHtml, _urlPath, metadataHtml, cwd) {
   ${headInjection}
 </head>
 <body>
+  <script>window.${constants_1.HYDRATE_DOCUMENT_FLAG} = false;</script>
   <div id="root">${bodyHtml}</div>
+  ${scripts}
 </body>
 </html>`;
 }
@@ -338,32 +484,26 @@ async function generateStaticPages(options) {
     }
     const staticRoutes = manifest.routes.filter((r) => r.renderMode === 'static' || r.renderMode === 'isr');
     console.log(`[vista:ssg] Found ${staticRoutes.length} routes eligible for static generation`);
-    for (const route of staticRoutes) {
-        if (route.type === 'static') {
-            // Simple static route — single URL
-            const urlPath = route.pattern;
-            const page = await prerenderPage(urlPath, route, undefined, cwd);
-            if (page) {
-                (0, static_cache_1.setCachedPage)(urlPath, page);
-                (0, static_cache_1.writeStaticPageToDisk)(vistaDirRoot, urlPath, page);
-                result.generatedPaths.push(urlPath);
-                result.pagesGenerated++;
-            }
-            else {
-                result.failedPaths.push({ path: urlPath, error: 'Prerender returned null' });
-            }
-        }
-        else if (route.hasGenerateStaticParams) {
-            // Dynamic route with generateStaticParams — expand to concrete URLs
-            const paramSets = await resolveStaticParams(route, cwd);
-            if (paramSets.length === 0) {
-                console.log(`[vista:ssg] No static params for ${route.pattern} — will render on demand`);
-                continue;
-            }
-            for (const params of paramSets) {
-                const urlPath = expandPattern(route.pattern, params);
-                const page = await prerenderPage(urlPath, route, params, cwd);
+    let flightUpstream = null;
+    try {
+        flightUpstream = await startStaticFlightUpstream(cwd);
+    }
+    catch (flightError) {
+        console.warn(`[vista:ssg] Flight payload pre-generation disabled: ${flightError.message}`);
+    }
+    try {
+        for (const route of staticRoutes) {
+            if (route.type === 'static') {
+                // Simple static route — single URL
+                const urlPath = route.pattern;
+                const page = await prerenderPage(urlPath, route, undefined, cwd);
                 if (page) {
+                    if (flightUpstream) {
+                        const flightData = await flightUpstream.fetchFlight(urlPath);
+                        if (flightData) {
+                            page.flightData = flightData;
+                        }
+                    }
                     (0, static_cache_1.setCachedPage)(urlPath, page);
                     (0, static_cache_1.writeStaticPageToDisk)(vistaDirRoot, urlPath, page);
                     result.generatedPaths.push(urlPath);
@@ -373,6 +513,38 @@ async function generateStaticPages(options) {
                     result.failedPaths.push({ path: urlPath, error: 'Prerender returned null' });
                 }
             }
+            else if (route.hasGenerateStaticParams) {
+                // Dynamic route with generateStaticParams — expand to concrete URLs
+                const paramSets = await resolveStaticParams(route, cwd);
+                if (paramSets.length === 0) {
+                    console.log(`[vista:ssg] No static params for ${route.pattern} — will render on demand`);
+                    continue;
+                }
+                for (const params of paramSets) {
+                    const urlPath = expandPattern(route.pattern, params);
+                    const page = await prerenderPage(urlPath, route, params, cwd);
+                    if (page) {
+                        if (flightUpstream) {
+                            const flightData = await flightUpstream.fetchFlight(urlPath);
+                            if (flightData) {
+                                page.flightData = flightData;
+                            }
+                        }
+                        (0, static_cache_1.setCachedPage)(urlPath, page);
+                        (0, static_cache_1.writeStaticPageToDisk)(vistaDirRoot, urlPath, page);
+                        result.generatedPaths.push(urlPath);
+                        result.pagesGenerated++;
+                    }
+                    else {
+                        result.failedPaths.push({ path: urlPath, error: 'Prerender returned null' });
+                    }
+                }
+            }
+        }
+    }
+    finally {
+        if (flightUpstream) {
+            await flightUpstream.close();
         }
     }
     // Generate prerender manifest

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vistagenic/vista",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "The React Framework for Visionaries - Rust-powered SSR with Server Components",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",