@vistagenic/vista 0.3.3 → 0.3.4

package/dist/deploy/adapters/netlify.js

@@ -55,18 +55,6 @@ function writeFullRuntimeNetlifyToml(ctx) {
     (0, utils_1.writeFileIfAllowed)(targetFile, content, ctx.force);
     return targetFile;
 }
-function writeStaticRedirects(outputDir) {
-    const redirectsPath = path_1.default.join(outputDir, '_redirects');
-    const lines = [
-        '/_vista/* /:splat 200',
-        '/ /static/pages/index.html 200',
-        '/rsc /static/pages/index.rsc 200',
-        '/_rsc/* /static/pages/:splat.rsc 200',
-        '/* /static/pages/:splat.html 200',
-    ];
-    fs_1.default.writeFileSync(redirectsPath, `${lines.join('\n')}\n`, 'utf8');
-    return redirectsPath;
-}
 exports.netlifyAdapter = {
     id: 'netlify',
     requiredOutput: 'standalone',
@@ -83,12 +71,12 @@ exports.netlifyAdapter = {
         (0, utils_1.ensureDir)(outputDir);
         if ((0, runtime_pack_1.isStaticOnlyDeploy)(ctx)) {
             (0, utils_1.copyStaticHostAssets)(ctx.cwd, ctx.vistaDir, outputDir);
-            const redirectsPath = writeStaticRedirects(outputDir);
+            (0, utils_1.prepareStaticCdnOutput)(outputDir);
             const netlifyTomlPath = writeStaticNetlifyToml(ctx);
             return {
                 status: 'emitted',
                 target: 'netlify',
-                artifactPaths: [outputDir, redirectsPath, netlifyTomlPath],
+                artifactPaths: [outputDir, netlifyTomlPath],
                 instructions: ['Static mode: Netlify serves pre-rendered pages only.'],
             };
         }

package/dist/deploy/utils.d.ts

@@ -15,4 +15,10 @@ export declare const STATIC_HOST_ROUTE_RULES: ({
     dest: string;
     handle?: undefined;
 })[];
+/** Lift `.vista/static/pages/*.html` to pretty CDN paths (`docs/foo/index.html`). */
+export declare function flattenPrerenderedPages(pagesDir: string, targetDir: string): void;
+/** Serve Flight files at `/rsc/*.rsc` (extension avoids file/directory collisions). */
+export declare function flattenPrerenderedFlight(pagesDir: string, targetDir: string): void;
+/** Copy webpack assets to `/_vista/static` and flatten HTML + Flight for file-based CDNs. */
+export declare function prepareStaticCdnOutput(targetDir: string): void;
 export declare function copyStaticHostAssets(cwd: string, vistaDir: string, targetDir: string): void;

package/dist/deploy/utils.js

@@ -9,6 +9,9 @@ exports.copyDirectoryRecursive = copyDirectoryRecursive;
 exports.copyFileIfPresent = copyFileIfPresent;
 exports.writeFileIfAllowed = writeFileIfAllowed;
 exports.readJsonSafe = readJsonSafe;
+exports.flattenPrerenderedPages = flattenPrerenderedPages;
+exports.flattenPrerenderedFlight = flattenPrerenderedFlight;
+exports.prepareStaticCdnOutput = prepareStaticCdnOutput;
 exports.copyStaticHostAssets = copyStaticHostAssets;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -84,15 +87,75 @@ function readJsonSafe(absolutePath) {
 }
 exports.STATIC_HOST_ROUTE_RULES = [
     { handle: 'filesystem' },
-    { src: '^/_vista/(.*)$', dest: '/$1' },
+    { src: '^/_vista/static/(.*)$', dest: '/static/$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' },
 ];
+function walkFiles(dir, visitor, prefix = '') {
+    if (!fs_1.default.existsSync(dir))
+        return;
+    const entries = fs_1.default.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+        const relativePath = prefix ? `${prefix}/${entry.name}` : entry.name;
+        const absolutePath = path_1.default.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            walkFiles(absolutePath, visitor, relativePath);
+        }
+        else if (entry.isFile()) {
+            visitor(absolutePath, relativePath);
+        }
+    }
+}
+/** Lift `.vista/static/pages/*.html` to pretty CDN paths (`docs/foo/index.html`). */
+function flattenPrerenderedPages(pagesDir, targetDir) {
+    walkFiles(pagesDir, (absolutePath, relativePath) => {
+        const posix = relativePath.replace(/\\/g, '/');
+        if (!posix.endsWith('.html') || posix.endsWith('.shell.html'))
+            return;
+        const destRel = posix === 'index.html' || posix.endsWith('/index.html')
+            ? posix
+            : posix.replace(/\.html$/, '/index.html');
+        const dest = path_1.default.join(targetDir, destRel.split('/').join(path_1.default.sep));
+        ensureDir(path_1.default.dirname(dest));
+        fs_1.default.copyFileSync(absolutePath, dest);
+    });
+}
+/** Serve Flight files at `/rsc/*.rsc` (extension avoids file/directory collisions). */
+function flattenPrerenderedFlight(pagesDir, targetDir) {
+    walkFiles(pagesDir, (absolutePath, relativePath) => {
+        const posix = relativePath.replace(/\\/g, '/');
+        if (!posix.endsWith('.rsc'))
+            return;
+        const destRel = `rsc/${posix}`;
+        const dest = path_1.default.join(targetDir, destRel.split('/').join(path_1.default.sep));
+        ensureDir(path_1.default.dirname(dest));
+        fs_1.default.copyFileSync(absolutePath, dest);
+    });
+}
+function writeStaticRscRedirects(targetDir) {
+    const redirectsPath = path_1.default.join(targetDir, '_redirects');
+    const lines = [
+        '/rsc /rsc/index.rsc 200',
+        '/rsc/ /rsc/index.rsc 200',
+        '/rsc/*.rsc /rsc/:splat.rsc 200',
+        '/rsc/* /rsc/:splat.rsc 200',
+    ];
+    fs_1.default.writeFileSync(redirectsPath, `${lines.join('\n')}\n`, 'utf8');
+}
+/** Copy webpack assets to `/_vista/static` and flatten HTML + Flight for file-based CDNs. */
+function prepareStaticCdnOutput(targetDir) {
+    const staticDir = path_1.default.join(targetDir, 'static');
+    copyDirectoryRecursive(staticDir, path_1.default.join(targetDir, '_vista', 'static'));
+    flattenPrerenderedPages(path_1.default.join(staticDir, 'pages'), targetDir);
+    flattenPrerenderedFlight(path_1.default.join(staticDir, 'pages'), targetDir);
+    writeStaticRscRedirects(targetDir);
+}
 function copyStaticHostAssets(cwd, vistaDir, targetDir) {
     copyDirectoryRecursive(path_1.default.join(cwd, 'public'), targetDir);
     copyDirectoryRecursive(path_1.default.join(vistaDir, 'static'), path_1.default.join(targetDir, 'static'));
+    copyDirectoryRecursive(path_1.default.join(vistaDir, 'static'), path_1.default.join(targetDir, '_vista', 'static'));
     const clientCssPath = path_1.default.join(vistaDir, 'client.css');
     copyFileIfPresent(clientCssPath, path_1.default.join(targetDir, 'client.css'));
     copyFileIfPresent(clientCssPath, path_1.default.join(targetDir, 'styles.css'));

package/dist/image/get-img-props.js

@@ -3,22 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getImgProps = getImgProps;
 const image_config_1 = require("./image-config");
 // Helper: Generate srcSet
-function generateSrcSet(src, width, loader, config, unoptimized) {
+function generateSrcSet(src, _width, loader, config, unoptimized, quality) {
     if (unoptimized)
         return undefined;
     const { deviceSizes, imageSizes } = config;
     const sizes = [...deviceSizes, ...imageSizes].sort((a, b) => a - b);
-    // If width is known, only generate sizes up to that width (plus maybe 2x/3x for density)
-    // For simplicity MVP, we'll generate device sizes.
     return sizes
         .map((size) => {
-        const url = loader({ src, width: size });
+        const url = loader({ src, width: size, quality });
         return `${url} ${size}w`;
     })
         .join(', ');
 }
 function getImgProps(props, config = image_config_1.imageConfigDefault, defaultLoader) {
-    const { src, alt, width, height, fill, loader = defaultLoader, quality, priority, unoptimized, style, sizes, className, loading, placeholder, blurDataURL, onLoadingComplete, ...rest } = props;
+    const { src, alt, width, height, fill, loader = defaultLoader, quality, priority, unoptimized, style, sizes, className, loading, placeholder: _placeholder, blurDataURL: _blurDataURL, onLoadingComplete: _onLoadingComplete, ...rest } = props;
     const imgStyle = { ...style };
     // Handle Fill Mode
     if (fill) {
@@ -29,15 +27,27 @@ function getImgProps(props, config = image_config_1.imageConfigDefault, defaultL
         imgStyle.objectFit = 'cover'; // Default to cover for bg images
     }
     // Handle Dimensions
-    let widthInt = width ? Number(width) : undefined;
-    let heightInt = height ? Number(height) : undefined;
+    const widthInt = width ? Number(width) : undefined;
+    const heightInt = height ? Number(height) : undefined;
     const vercelStaticBuild = typeof window === 'undefined' &&
         (process.env.VERCEL === '1' || typeof process.env.VERCEL_URL === 'string');
-    // Disable optimizer when explicitly requested, configured globally,
-    // or when building for Vercel static output (no /_vista/image endpoint).
-    const disableOptimization = !!unoptimized || !!config.unoptimized || vercelStaticBuild;
+    const srcPath = String(src || '')
+        .split('?')[0]
+        .toLowerCase();
+    const passthroughSrc = srcPath.startsWith('data:') ||
+        srcPath.startsWith('blob:') ||
+        srcPath.endsWith('.svg') ||
+        srcPath.endsWith('.gif') ||
+        srcPath.endsWith('.ico');
+    const staticHost = process.env.VISTA_DEPLOY_OUTPUT === 'static' ||
+        process.env.VISTA_IMAGES_UNOPTIMIZED === '1' ||
+        process.env.CF_PAGES === '1' ||
+        process.env.NETLIFY === 'true';
+    // Skip /_vista/image when the optimizer is unavailable (static CDN hosts)
+    // or the format cannot be resized (SVG/GIF/ICO).
+    const disableOptimization = !!unoptimized || !!config.unoptimized || passthroughSrc || staticHost || vercelStaticBuild;
     // Generate SrcSet
-    const srcSet = generateSrcSet(src, widthInt, loader, config, disableOptimization);
+    const srcSet = generateSrcSet(src, widthInt, loader, config, disableOptimization, quality ? Number(quality) : undefined);
     return {
         ...rest,
         src,

package/dist/image/image-config.d.ts

@@ -14,6 +14,8 @@ export declare const imageConfigDefault: {
     remotePatterns: any[];
     unoptimized: boolean;
 };
+/** Merge defaults with build-time env (`VISTA_IMAGES_UNOPTIMIZED`, static deploy). */
+export declare function resolveRuntimeImageConfig(overrides?: ImageConfig): ImageConfigComplete;
 export type ImageConfigComplete = typeof imageConfigDefault;
 export type ImageConfig = Partial<ImageConfigComplete>;
 export declare const VALID_LOADERS: readonly ["default", "imgix", "cloudinary", "akamai", "custom"];

package/dist/image/image-config.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VALID_LOADERS = exports.imageConfigDefault = void 0;
+exports.resolveRuntimeImageConfig = resolveRuntimeImageConfig;
 const constants_1 = require("../constants");
 exports.imageConfigDefault = {
     deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -18,4 +19,20 @@ exports.imageConfigDefault = {
     remotePatterns: [],
     unoptimized: false,
 };
+function envDisablesImageOptimization() {
+    return (process.env.VISTA_IMAGES_UNOPTIMIZED === '1' ||
+        process.env.VISTA_DEPLOY_OUTPUT === 'static' ||
+        process.env.CF_PAGES === '1' ||
+        process.env.NETLIFY === 'true');
+}
+/** Merge defaults with build-time env (`VISTA_IMAGES_UNOPTIMIZED`, static deploy). */
+function resolveRuntimeImageConfig(overrides) {
+    return {
+        ...exports.imageConfigDefault,
+        ...overrides,
+        unoptimized: overrides?.unoptimized === true ||
+            exports.imageConfigDefault.unoptimized ||
+            envDisablesImageOptimization(),
+    };
+}
 exports.VALID_LOADERS = ['default', 'imgix', 'cloudinary', 'akamai', 'custom'];

package/dist/image/index.d.ts

@@ -1,6 +1,21 @@
 import React from 'react';
 import { ImageProps } from './get-img-props';
-export interface EnhancedImageProps extends ImageProps {
-}
-export declare const Image: React.ForwardRefExoticComponent<EnhancedImageProps & React.RefAttributes<HTMLImageElement>>;
+export type EnhancedImageProps = ImageProps;
+export declare const Image: React.ForwardRefExoticComponent<React.ImgHTMLAttributes<HTMLImageElement> & {
+    src: string;
+    alt: string;
+    width?: number | string;
+    height?: number | string;
+    fill?: boolean;
+    loader?: import("./image-loader").ImageLoader;
+    quality?: number | string;
+    priority?: boolean;
+    unoptimized?: boolean;
+    placeholder?: import("./get-img-props").PlaceholderValue;
+    blurDataURL?: string;
+    onLoadingComplete?: (result: {
+        naturalWidth: number;
+        naturalHeight: number;
+    }) => void;
+} & React.RefAttributes<HTMLImageElement>>;
 export default Image;

package/dist/image/index.js

@@ -61,7 +61,7 @@ exports.Image = (0, react_1.forwardRef)((props, ref) => {
         }
     }, [onError, useDirectSrc]);
     // Get processed img props
-    const imgProps = (0, get_img_props_1.getImgProps)({ ...restProps, priority, unoptimized: useDirectSrc || restProps.unoptimized }, image_config_1.imageConfigDefault, image_loader_1.defaultLoader);
+    const imgProps = (0, get_img_props_1.getImgProps)({ ...restProps, priority, unoptimized: useDirectSrc || restProps.unoptimized }, (0, image_config_1.resolveRuntimeImageConfig)(), image_loader_1.defaultLoader);
     const fallbackSrc = String(restProps.src || '');
     const effectiveSrc = useDirectSrc ? fallbackSrc : imgProps.src;
     const effectiveSrcSet = useDirectSrc ? undefined : imgProps.srcSet;

package/dist/image/react-server.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { type ImageProps } from './get-img-props';
-export interface EnhancedImageProps extends ImageProps {
-}
+export type EnhancedImageProps = ImageProps;
 /**
  * React-server safe Image component.
  *

package/dist/image/react-server.js

@@ -12,7 +12,7 @@ const image_loader_1 = require("./image-loader");
  * react-server condition uses a plain SSR-friendly <img> wrapper.
  */
 function Image(props) {
-    const imgProps = (0, get_img_props_1.getImgProps)(props, image_config_1.imageConfigDefault, image_loader_1.defaultLoader);
+    const imgProps = (0, get_img_props_1.getImgProps)(props, (0, image_config_1.resolveRuntimeImageConfig)(), image_loader_1.defaultLoader);
     return ((0, jsx_runtime_1.jsx)("img", { ...imgProps, decoding: props.priority ? 'sync' : 'async', fetchPriority: props.priority ? 'high' : undefined }));
 }
 exports.default = Image;

package/dist/server/app-router-runtime.d.ts

@@ -21,6 +21,7 @@ export declare function resolveParallelSlotMatches(input: {
     layoutPath: string;
     pathname: string;
 }): ParallelSlotMatch[];
+export declare function isPathInside(parent: string, child: string): boolean;
 export declare function resolveDirectoryChain(rootDir: string, entryFilePath: string): string[];
 export declare function resolveNearestSegmentNotFoundPath(appDir: string, startDir: string): string | null;
 export {};

package/dist/server/app-router-runtime.js

@@ -9,6 +9,7 @@ exports.isInterceptionRouteSegment = isInterceptionRouteSegment;
 exports.isRouteGroupSegment = isRouteGroupSegment;
 exports.isParallelRouteSegment = isParallelRouteSegment;
 exports.resolveParallelSlotMatches = resolveParallelSlotMatches;
+exports.isPathInside = isPathInside;
 exports.resolveDirectoryChain = resolveDirectoryChain;
 exports.resolveNearestSegmentNotFoundPath = resolveNearestSegmentNotFoundPath;
 const fs_1 = __importDefault(require("fs"));
@@ -284,17 +285,41 @@ function resolveParallelSlotMatches(input) {
     }
     return matches;
 }
+function canonicalizeExistingPath(input) {
+    const resolved = path_1.default.resolve(input);
+    try {
+        return fs_1.default.realpathSync.native(resolved);
+    }
+    catch {
+        return resolved;
+    }
+}
+function posixPath(input) {
+    return input.replace(/\\/g, '/');
+}
+function isPathInside(parent, child) {
+    const root = posixPath(canonicalizeExistingPath(parent));
+    const target = posixPath(canonicalizeExistingPath(child));
+    const normalize = (value) => process.platform === 'win32' ? value.toLowerCase() : value;
+    const a = normalize(root);
+    const b = normalize(target);
+    return b === a || b.startsWith(a.endsWith('/') ? a : `${a}/`);
+}
 function resolveDirectoryChain(rootDir, entryFilePath) {
-    const resolvedRootDir = path_1.default.resolve(rootDir);
-    const resolvedEntryDir = path_1.default.resolve(path_1.default.dirname(entryFilePath));
-    if (!resolvedEntryDir.startsWith(resolvedRootDir)) {
+    const resolvedRootDir = canonicalizeExistingPath(rootDir);
+    const resolvedEntryDir = canonicalizeExistingPath(path_1.default.dirname(entryFilePath));
+    if (!isPathInside(resolvedRootDir, resolvedEntryDir)) {
         return [resolvedEntryDir];
     }
-    const relativeSegments = path_1.default
-        .relative(resolvedRootDir, resolvedEntryDir)
-        .replace(/\\/g, '/')
-        .split('/')
-        .filter(Boolean);
+    let relativePath = path_1.default.relative(resolvedRootDir, resolvedEntryDir).replace(/\\/g, '/');
+    if (relativePath.startsWith('..')) {
+        const rootPosix = posixPath(resolvedRootDir);
+        const entryPosix = posixPath(resolvedEntryDir);
+        const rootKey = process.platform === 'win32' ? rootPosix.toLowerCase() : rootPosix;
+        const entryKey = process.platform === 'win32' ? entryPosix.toLowerCase() : entryPosix;
+        relativePath = entryKey.slice(rootKey.length).replace(/^\//, '');
+    }
+    const relativeSegments = relativePath.split('/').filter((segment) => segment && segment !== '.');
     const chain = [resolvedRootDir];
     let currentDir = resolvedRootDir;
     for (const segment of relativeSegments) {
@@ -306,7 +331,7 @@ function resolveDirectoryChain(rootDir, entryFilePath) {
 function resolveNearestSegmentNotFoundPath(appDir, startDir) {
     let currentDir = path_1.default.resolve(startDir);
     const resolvedAppDir = path_1.default.resolve(appDir);
-    while (currentDir.startsWith(resolvedAppDir)) {
+    while (isPathInside(resolvedAppDir, currentDir)) {
         const notFoundPath = resolveConventionModule(currentDir, 'not-found');
         if (notFoundPath) {
             return notFoundPath;

package/dist/server/hydration-chunks.d.ts

@@ -0,0 +1,7 @@
+export declare function isBootstrapChunkFile(filename: string): boolean;
+export declare function sortHydrationChunkFiles(files: string[]): string[];
+/**
+ * Script tags that must be in the HTML document. Async `clientN-*.js`
+ * chunks are loaded by the webpack runtime, matching Next.js.
+ */
+export declare function listHydrationChunkFiles(cwd: string, isDev?: boolean): string[];

package/dist/server/hydration-chunks.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBootstrapChunkFile = isBootstrapChunkFile;
+exports.sortHydrationChunkFiles = sortHydrationChunkFiles;
+exports.listHydrationChunkFiles = listHydrationChunkFiles;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const constants_1 = require("../constants");
+const BOOTSTRAP_CHUNK_RE = /^(webpack|framework|vendor|main|runtime)(?:-[a-z0-9]+)?\.js$/i;
+const BOOTSTRAP_PRIORITY = ['webpack', 'framework', 'vendor', 'runtime', 'main'];
+function isBootstrapChunkFile(filename) {
+    const base = filename.split(/[/\\]/).pop() || filename;
+    return BOOTSTRAP_CHUNK_RE.test(base);
+}
+function bootstrapRank(filename) {
+    const base = (filename.split(/[/\\]/).pop() || filename).replace(/(?:-[a-z0-9]+)?\.js$/i, '');
+    const index = BOOTSTRAP_PRIORITY.indexOf(base.toLowerCase());
+    return index === -1 ? BOOTSTRAP_PRIORITY.length : index;
+}
+function sortHydrationChunkFiles(files) {
+    return [...files].sort((a, b) => {
+        const rankDelta = bootstrapRank(a) - bootstrapRank(b);
+        if (rankDelta !== 0)
+            return rankDelta;
+        return a.localeCompare(b);
+    });
+}
+/**
+ * Script tags that must be in the HTML document. Async `clientN-*.js`
+ * chunks are loaded by the webpack runtime, matching Next.js.
+ */
+function listHydrationChunkFiles(cwd, isDev = false) {
+    const chunksDir = path_1.default.join(cwd, constants_1.BUILD_DIR, 'static', 'chunks');
+    if (!fs_1.default.existsSync(chunksDir))
+        return [];
+    const files = fs_1.default
+        .readdirSync(chunksDir)
+        .filter((name) => name.endsWith('.js') &&
+        !name.endsWith('.map') &&
+        !name.includes('.hot-update.') &&
+        isBootstrapChunkFile(name));
+    const normalizedFiles = isDev
+        ? files.filter((name) => !/-[0-9a-f]{8,}\.js$/i.test(name))
+        : files;
+    return sortHydrationChunkFiles(normalizedFiles);
+}

package/dist/server/module-compile-hook.js

@@ -641,11 +641,22 @@ function transpileProjectSource(source, filename, fallback) {
         return fallback;
     }
 }
+function extraCompileRootsFromStandalone(cwd) {
+    const resolved = path_1.default.resolve(cwd);
+    const normalized = resolved.replace(/\\/g, '/');
+    const marker = '/.vista/standalone/project';
+    const idx = normalized.toLowerCase().lastIndexOf(marker);
+    if (idx === -1) {
+        return [];
+    }
+    return [path_1.default.resolve(resolved.slice(0, idx))];
+}
 function installModuleCompileHook(options) {
     const vistaRuntimeDir = path_1.default.resolve(__dirname, '..');
     const vistaPackageRoot = path_1.default.resolve(__dirname, '..', '..');
     activeCompileRoots = Array.from(new Set([
         options.cwd,
+        ...extraCompileRootsFromStandalone(options.cwd),
         vistaRuntimeDir,
         vistaPackageRoot,
         path_1.default.join(vistaPackageRoot, 'src'),

package/dist/server/rsc-engine.js

@@ -24,7 +24,7 @@ const server_1 = require("react-dom/server");
 const webpack_dev_middleware_1 = __importDefault(require("webpack-dev-middleware"));
 const stream_1 = require("stream");
 const child_process_1 = require("child_process");
-const url_1 = require("url");
+const ssr_webpack_shim_1 = require("./ssr-webpack-shim");
 const middleware_runner_1 = require("./middleware-runner");
 const image_optimizer_1 = require("./image-optimizer");
 const ppr_1 = require("./ppr");
@@ -33,39 +33,10 @@ const logger_1 = require("./logger");
 const not_found_page_1 = require("./not-found-page");
 const static_cache_1 = require("./static-cache");
 const static_generator_1 = require("./static-generator");
+const hydration_chunks_1 = require("./hydration-chunks");
 const react_client_reference_manifest_1 = require("../build/rsc/react-client-reference-manifest");
 const constants_1 = require("../constants");
 const CjsModule = require('module');
-// ---------------------------------------------------------------------------
-// SSR Webpack Shim
-// ---------------------------------------------------------------------------
-// The Flight SSR decoder (react-server-dom-webpack/client.node) calls
-// __webpack_require__(specifier) to load client components during SSR.
-// In Vista the SSR process runs in plain Node.js (not through webpack),
-// so we provide a shim that converts file:// URLs to absolute paths and
-// delegates to Node's require().
-// ---------------------------------------------------------------------------
-function installSSRWebpackShim() {
-    if (typeof globalThis.__webpack_require__ === 'function')
-        return;
-    globalThis.__webpack_require__ = function ssrWebpackRequire(specifier) {
-        let modulePath = specifier;
-        // Convert file:// URLs to absolute paths
-        if (specifier.startsWith('file://')) {
-            try {
-                modulePath = (0, url_1.fileURLToPath)(specifier);
-            }
-            catch {
-                modulePath = specifier;
-            }
-        }
-        return require(modulePath);
-    };
-    // Chunk loading is a no-op on the server — all code is already local.
-    globalThis.__webpack_chunk_load__ = function ssrChunkLoad(_chunkId) {
-        return Promise.resolve();
-    };
-}
 const config_1 = require("../config");
 const dev_error_1 = require("../dev-error");
 const artifact_validator_1 = require("./artifact-validator");
@@ -338,32 +309,7 @@ function cleanHotUpdateFiles(cwd) {
     }
 }
 function findChunkFiles(cwd, isDev) {
-    const chunksDir = path_1.default.join(cwd, constants_1.BUILD_DIR, 'static', 'chunks');
-    if (!fs_1.default.existsSync(chunksDir))
-        return [];
-    const files = fs_1.default
-        .readdirSync(chunksDir)
-        .filter((name) => name.endsWith('.js') && !name.endsWith('.map') && !name.includes('.hot-update.'));
-    // In dev, avoid loading stale production artifacts left from a previous build.
-    // Production chunks end with a hash suffix like `main-1a2b3c4d.js`.
-    const normalizedFiles = isDev
-        ? files.filter((name) => !/-[0-9a-f]{8,}\.js$/i.test(name))
-        : files;
-    // Load webpack runtime first, then framework, then the rest alphabetically.
-    // This ensures the chunk registry (__webpack_require__) is available before
-    // any deferred chunk tries to self-register.
-    const priority = ['webpack.js', 'framework.js', 'vendor.js'];
-    return normalizedFiles.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 (0, hydration_chunks_1.listHydrationChunkFiles)(cwd, isDev);
 }
 function normalizeSSRManifest(manifest) {
     if (!manifest || !manifest.moduleMap) {
@@ -616,9 +562,15 @@ async function renderAppSubtreeElement(input) {
     });
     const directoryChain = (0, app_router_runtime_1.resolveDirectoryChain)(input.subtreeRootDir, input.entryFilePath);
     for (let i = directoryChain.length - 1; i >= 0; i--) {
-        const dir = directoryChain[i];
-        element = applySegmentBoundaries(dir, element);
-        const layoutPath = (0, app_router_runtime_1.resolveConventionModule)(dir, 'root') ?? (0, app_router_runtime_1.resolveConventionModule)(dir, 'layout');
+        element = applySegmentBoundaries(directoryChain[i], element);
+    }
+    const layoutPaths = input.layoutPaths && input.layoutPaths.length > 0
+        ? input.layoutPaths
+        : directoryChain
+            .map((dir) => (0, app_router_runtime_1.resolveConventionModule)(dir, 'root') ?? (0, app_router_runtime_1.resolveConventionModule)(dir, 'layout'))
+            .filter((layoutPath) => Boolean(layoutPath));
+    for (let i = layoutPaths.length - 1; i >= 0; i--) {
+        const layoutPath = layoutPaths[i];
         if (!layoutPath || path_1.default.resolve(layoutPath) === path_1.default.resolve(input.entryFilePath)) {
             continue;
         }
@@ -682,6 +634,7 @@ async function createRouteElement(route, context, isDev, rootLayout, runtimeRoot
         cwd: runtimeRoot,
         evaluateLeafMetadata: false,
         disableParallelSlots: options.disableParallelSlots,
+        layoutPaths: route.layoutPaths,
     });
     return { element, metadata, rootMode: rootLayout.mode };
 }
@@ -1017,7 +970,7 @@ function startRSCServer(options = {}) {
         cacheComponentsEnabled: cacheComponentsConfig.enabled,
     });
     (0, fetch_policy_1.installSegmentFetchPolicyShim)();
-    installSSRWebpackShim();
+    (0, ssr_webpack_shim_1.installSSRWebpackShim)();
     const serverManifestPath = path_1.default.join(cwd, constants_1.BUILD_DIR, 'server', 'server-manifest.json');
     if (!fs_1.default.existsSync(serverManifestPath)) {
         failRSCStartup(`[vista:rsc] Missing server manifest at ${serverManifestPath}. Run "vista build --rsc" first.`, shouldListen);

package/dist/server/rsc-upstream.js

@@ -390,9 +390,15 @@ async function renderAppSubtreeElement(input) {
     });
     const directoryChain = (0, app_router_runtime_1.resolveDirectoryChain)(input.subtreeRootDir, input.entryFilePath);
     for (let i = directoryChain.length - 1; i >= 0; i--) {
-        const dir = directoryChain[i];
-        element = applySegmentBoundaries(dir, element);
-        const layoutPath = (0, app_router_runtime_1.resolveConventionModule)(dir, 'root') ?? (0, app_router_runtime_1.resolveConventionModule)(dir, 'layout');
+        element = applySegmentBoundaries(directoryChain[i], element);
+    }
+    const layoutPaths = input.layoutPaths && input.layoutPaths.length > 0
+        ? input.layoutPaths
+        : directoryChain
+            .map((dir) => (0, app_router_runtime_1.resolveConventionModule)(dir, 'root') ?? (0, app_router_runtime_1.resolveConventionModule)(dir, 'layout'))
+            .filter((layoutPath) => Boolean(layoutPath));
+    for (let i = layoutPaths.length - 1; i >= 0; i--) {
+        const layoutPath = layoutPaths[i];
         if (!layoutPath || path_1.default.resolve(layoutPath) === path_1.default.resolve(input.entryFilePath)) {
             continue;
         }
@@ -447,6 +453,7 @@ async function createRouteElement(route, context, isDev, runtimeRoot, options =
         cwd: runtimeRoot,
         evaluateLeafMetadata: true,
         disableParallelSlots: options.disableParallelSlots,
+        layoutPaths: route.layoutPaths,
     });
 }
 async function readRawRequestBody(req) {

package/dist/server/ssr-webpack-shim.d.ts

@@ -0,0 +1,6 @@
+/**
+ * react-server-dom-webpack/client.node calls __webpack_require__ while decoding
+ * Flight into a React tree. Vista SSR/SSG run in plain Node, so this shim maps
+ * webpack specifiers (including file:// URLs) onto require().
+ */
+export declare function installSSRWebpackShim(): void;

package/dist/server/ssr-webpack-shim.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installSSRWebpackShim = installSSRWebpackShim;
+const url_1 = require("url");
+/**
+ * react-server-dom-webpack/client.node calls __webpack_require__ while decoding
+ * Flight into a React tree. Vista SSR/SSG run in plain Node, so this shim maps
+ * webpack specifiers (including file:// URLs) onto require().
+ */
+function installSSRWebpackShim() {
+    if (typeof globalThis.__webpack_require__ === 'function') {
+        return;
+    }
+    globalThis.__webpack_require__ = function ssrWebpackRequire(specifier) {
+        let modulePath = specifier;
+        if (specifier.startsWith('file://')) {
+            try {
+                modulePath = (0, url_1.fileURLToPath)(specifier);
+            }
+            catch {
+                modulePath = specifier;
+            }
+        }
+        return require(modulePath);
+    };
+    globalThis.__webpack_chunk_load__ = function ssrChunkLoad(_chunkId) {
+        return Promise.resolve();
+    };
+}

package/dist/server/static-generator.d.ts

@@ -34,6 +34,8 @@ export interface StaticGeneratorResult {
     /** The prerender manifest */
     manifest: PrerenderManifest;
 }
+/** Embed Flight on SSG HTML so the client can hydrate without a live /rsc server. */
+export declare function injectInlineFlightBootstrap(html: string, flightText: string): string;
 /**
  * Run static generation for all eligible routes.
  */