@vistagenic/vista 0.3.3 → 0.3.4

package/dist/bin/build-rsc.js

@@ -244,6 +244,14 @@ waitForInlineFlightPayload(4000).then(function (inlineFlight) {
     return;
   }
 
+  if (/(?:^|\\n)\\d+:E\\{/.test(inlineFlight)) {
+    reportDevRuntimeError(
+      'Hydration Error',
+      new Error('Inline Flight payload contains error rows. Keeping server HTML instead of hydrating the document.')
+    );
+    return;
+  }
+
   const initialResponse = createFromReadableStream(flightTextToReadableStream(inlineFlight), {
     callServer,
   }) as Promise<React.ReactNode>;
@@ -365,6 +373,14 @@ async function buildRSC(watch = false) {
     const engineVariant = (0, config_1.resolveAndApplyEngineVariant)(vistaConfig);
     const structureConfig = (0, config_1.resolveStructureValidationConfig)(vistaConfig);
     const cacheComponentsConfig = (0, config_1.resolveCacheComponentsConfig)(vistaConfig);
+    const deployConfig = (0, config_1.resolveDeployConfig)(vistaConfig);
+    const imagesUnoptimized = vistaConfig.images?.unoptimized === true || deployConfig.output === 'static';
+    if (imagesUnoptimized) {
+        process.env.VISTA_IMAGES_UNOPTIMIZED = '1';
+    }
+    if (deployConfig.output) {
+        process.env.VISTA_DEPLOY_OUTPUT = deployConfig.output;
+    }
     if (_debug)
         console.log(`[vista:build] Engine variant: ${engineVariant}`);
     if (structureConfig.enabled) {
@@ -487,6 +503,8 @@ async function buildRSC(watch = false) {
         buildId,
         engineVariant,
         clientReferenceFiles,
+        imagesUnoptimized,
+        deployOutput: deployConfig.output,
     };
     // Build CSS
     runPostCSS(cwd, vistaDirs.root);

package/dist/bin/build.js

@@ -279,6 +279,14 @@ async function buildClient(watch = false, onRebuild) {
     const engineVariant = (0, config_1.resolveAndApplyEngineVariant)(vistaConfig);
     const structureConfig = (0, config_1.resolveStructureValidationConfig)(vistaConfig);
     const cacheComponentsConfig = (0, config_1.resolveCacheComponentsConfig)(vistaConfig);
+    const deployConfig = (0, config_1.resolveDeployConfig)(vistaConfig);
+    const imagesUnoptimized = vistaConfig.images?.unoptimized === true || deployConfig.output === 'static';
+    if (imagesUnoptimized) {
+        process.env.VISTA_IMAGES_UNOPTIMIZED = '1';
+    }
+    if (deployConfig.output) {
+        process.env.VISTA_DEPLOY_OUTPUT = deployConfig.output;
+    }
     if (_debug)
         console.log(`[vista:build] Engine variant: ${engineVariant}`);
     if (structureConfig.enabled) {
@@ -383,6 +391,8 @@ async function buildClient(watch = false, onRebuild) {
         isDev: watch,
         engineVariant,
         cacheComponentsEnabled: cacheComponentsConfig.enabled,
+        imagesUnoptimized,
+        deployOutput: deployConfig.output,
     });
     // Create Webpack compiler
     exports.compiler = compiler = (0, webpack_1.default)(config);

package/dist/bin/webpack.config.d.ts

@@ -1,9 +1,11 @@
 import webpack from 'webpack';
-import type { VistaEngineVariant } from '../config';
+import type { DeployOutput, VistaEngineVariant } from '../config';
 export interface WebpackConfigOptions {
     cwd: string;
     isDev: boolean;
     engineVariant?: VistaEngineVariant;
     cacheComponentsEnabled?: boolean;
+    imagesUnoptimized?: boolean;
+    deployOutput?: DeployOutput;
 }
 export declare function createWebpackConfig(options: WebpackConfigOptions): webpack.Configuration;

package/dist/bin/webpack.config.js

@@ -13,7 +13,7 @@ const vista_flight_plugin_1 = require("../build/webpack/plugins/vista-flight-plu
 const constants_1 = require("../constants");
 const app_dir_1 = require("../server/app-dir");
 function createWebpackConfig(options) {
-    const { cwd, isDev, engineVariant = 'default', cacheComponentsEnabled = false } = options;
+    const { cwd, isDev, engineVariant = 'default', cacheComponentsEnabled = false, imagesUnoptimized = false, deployOutput, } = options;
     const vistaDir = path_1.default.join(cwd, constants_1.BUILD_DIR);
     const flashDir = path_1.default.join(cwd, constants_1.FLASH_DIR);
     const entryPoint = path_1.default.join(vistaDir, 'client.tsx');
@@ -166,6 +166,8 @@ function createWebpackConfig(options) {
                 'process.env.NODE_ENV': JSON.stringify(isDev ? 'development' : 'production'),
                 'process.env.VISTA_ENGINE': JSON.stringify(engineVariant),
                 'process.env.VISTA_ENGINE_VARIANT': JSON.stringify(engineVariant),
+                'process.env.VISTA_IMAGES_UNOPTIMIZED': JSON.stringify(imagesUnoptimized ? '1' : ''),
+                'process.env.VISTA_DEPLOY_OUTPUT': JSON.stringify(deployOutput || ''),
             }),
             new mini_css_extract_plugin_1.default({
                 filename: isDev ? 'modules.css' : 'modules-[contenthash:8].css',

package/dist/build/rsc/compiler.d.ts

@@ -7,7 +7,7 @@
  */
 import webpack from 'webpack';
 import { VistaDirs } from '../manifest';
-import type { VistaEngineVariant } from '../../config';
+import type { DeployOutput, VistaEngineVariant } from '../../config';
 export interface RSCCompilerOptions {
     cwd: string;
     isDev: boolean;
@@ -15,6 +15,8 @@ export interface RSCCompilerOptions {
     buildId: string;
     engineVariant?: VistaEngineVariant;
     clientReferenceFiles?: string[];
+    imagesUnoptimized?: boolean;
+    deployOutput?: DeployOutput;
 }
 /**
  * Create Server-Side Webpack Configuration

package/dist/build/rsc/compiler.js

@@ -61,7 +61,7 @@ function resolveFromWorkspace(specifier, cwd) {
  * Output goes to .vista/server/ and is NEVER sent to the client.
  */
 function createServerWebpackConfig(options) {
-    const { cwd, isDev, vistaDirs, buildId, engineVariant = 'default' } = options;
+    const { cwd, isDev, vistaDirs, buildId, engineVariant = 'default', imagesUnoptimized = false, deployOutput, } = options;
     const swcLoaderPath = resolveFromWorkspace('swc-loader', cwd);
     const nullLoaderPath = resolveFromWorkspace('null-loader', cwd);
     const cssLoaderPath = resolveFromWorkspace('css-loader', cwd);
@@ -181,6 +181,8 @@ function createServerWebpackConfig(options) {
                 'process.env.NODE_ENV': JSON.stringify(isDev ? 'development' : 'production'),
                 'process.env.VISTA_ENGINE': JSON.stringify(engineVariant),
                 'process.env.VISTA_ENGINE_VARIANT': JSON.stringify(engineVariant),
+                'process.env.VISTA_IMAGES_UNOPTIMIZED': JSON.stringify(imagesUnoptimized ? '1' : ''),
+                'process.env.VISTA_DEPLOY_OUTPUT': JSON.stringify(deployOutput || ''),
                 [constants_1.BUILD_ID_DEFINE]: JSON.stringify(buildId),
                 [constants_1.SERVER_DEFINE]: 'true',
             }),
@@ -196,7 +198,7 @@ function createServerWebpackConfig(options) {
  * Server components are replaced with client references.
  */
 function createClientWebpackConfig(options) {
-    const { cwd, isDev, vistaDirs, buildId, engineVariant = 'default', clientReferenceFiles = [] } = options;
+    const { cwd, isDev, vistaDirs, buildId, engineVariant = 'default', clientReferenceFiles = [], imagesUnoptimized = false, deployOutput, } = options;
     const swcLoaderPath = resolveFromWorkspace('swc-loader', cwd);
     const nullLoaderPath = resolveFromWorkspace('null-loader', cwd);
     const cssLoaderPath = resolveFromWorkspace('css-loader', cwd);
@@ -222,7 +224,7 @@ function createClientWebpackConfig(options) {
         entry: clientEntry,
         output: {
             path: vistaDirs.chunks,
-            filename: isDev ? '[name].js' : 'main-[contenthash:8].js',
+            filename: isDev ? '[name].js' : '[name]-[contenthash:8].js',
             chunkFilename: isDev ? '[name].js' : '[name]-[contenthash:8].js',
             publicPath: constants_1.STATIC_CHUNKS_PATH,
             clean: !isDev,
@@ -405,6 +407,8 @@ function createClientWebpackConfig(options) {
                 'process.env.NODE_ENV': JSON.stringify(isDev ? 'development' : 'production'),
                 'process.env.VISTA_ENGINE': JSON.stringify(engineVariant),
                 'process.env.VISTA_ENGINE_VARIANT': JSON.stringify(engineVariant),
+                'process.env.VISTA_IMAGES_UNOPTIMIZED': JSON.stringify(imagesUnoptimized ? '1' : ''),
+                'process.env.VISTA_DEPLOY_OUTPUT': JSON.stringify(deployOutput || ''),
                 [constants_1.BUILD_ID_DEFINE]: JSON.stringify(buildId),
                 [constants_1.SERVER_DEFINE]: 'false',
             }),

package/dist/build/rsc/react-client-reference-manifest.d.ts

@@ -18,6 +18,13 @@ export interface ReactServerConsumerManifest {
     moduleMap?: Record<string, Record<string, ReactServerConsumerManifestEntry>>;
     serverModuleMap?: Record<string, unknown>;
 }
+/**
+ * Flight encode looks up `file://...#ExportName`. Webpack may have keyed the
+ * same module under a standalone copy, a different drive-letter case, or a
+ * slightly different absolute prefix. Resolve those aliases at lookup time so
+ * missing keys do not serialize as Flight `E{"digest":""}` rows.
+ */
+export declare function resolveReactClientManifestEntry(manifest: ReactClientReferenceManifest, key: string): ReactClientReferenceManifestEntry | undefined;
 export declare function normalizeReactClientReferenceManifest(input: ReactClientReferenceManifest): ReactClientReferenceManifest;
 export declare function normalizeReactServerConsumerManifest(input: ReactServerConsumerManifest): ReactServerConsumerManifest;
 /**

package/dist/build/rsc/react-client-reference-manifest.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveReactClientManifestEntry = resolveReactClientManifestEntry;
 exports.normalizeReactClientReferenceManifest = normalizeReactClientReferenceManifest;
 exports.normalizeReactServerConsumerManifest = normalizeReactServerConsumerManifest;
 exports.createGuardedReactClientManifest = createGuardedReactClientManifest;
@@ -73,19 +74,36 @@ function addDriveLetterVariants(specifier, variants) {
     variants.add(specifier.replace(/^file:\/\/\/([A-Za-z]):/, `file:///${lowerDrive}:`));
     variants.add(specifier.replace(/^file:\/\/\/([A-Za-z]):/, `file:///${upperDrive}:`));
 }
+function addStandalonePathVariants(specifier, variants) {
+    addDriveLetterVariants(specifier, variants);
+    const standaloneProject = '/.vista/standalone/project';
+    const standaloneRuntime = '/.vista/standalone/runtime';
+    if (specifier.includes(standaloneProject)) {
+        addDriveLetterVariants(specifier.split(standaloneProject).join(''), variants);
+    }
+    if (specifier.includes(standaloneRuntime)) {
+        addDriveLetterVariants(specifier.split(standaloneRuntime).join(''), variants);
+    }
+    if (!specifier.includes('/.vista/standalone/') && specifier.startsWith('file://')) {
+        const inserted = specifier.replace(/^(file:\/\/\/(?:[A-Za-z]:)?(?:\/[^/]+)*)(\/(?:app|components|utils|lib|src|content|hooks)\/)/i, `$1${standaloneProject}$2`);
+        if (inserted !== specifier) {
+            addDriveLetterVariants(inserted, variants);
+        }
+    }
+}
 function buildSpecifierVariants(specifier) {
     const baseSpecifier = specifier.split('#', 1)[0];
     const variants = new Set();
-    addDriveLetterVariants(baseSpecifier, variants);
+    addStandalonePathVariants(baseSpecifier, variants);
     if (baseSpecifier.startsWith('file://')) {
         try {
-            addDriveLetterVariants(decodeURI(baseSpecifier), variants);
+            addStandalonePathVariants(decodeURI(baseSpecifier), variants);
         }
         catch {
             // ignore decode failures
         }
         try {
-            addDriveLetterVariants((0, url_1.pathToFileURL)((0, url_1.fileURLToPath)(baseSpecifier)).toString(), variants);
+            addStandalonePathVariants((0, url_1.pathToFileURL)((0, url_1.fileURLToPath)(baseSpecifier)).toString(), variants);
         }
         catch {
             // ignore encode failures
@@ -93,6 +111,106 @@ function buildSpecifierVariants(specifier) {
     }
     return Array.from(variants);
 }
+function splitManifestKey(key) {
+    const hashIdx = key.lastIndexOf('#');
+    if (hashIdx <= 0) {
+        return { specifier: key, exportName: null };
+    }
+    return {
+        specifier: key.slice(0, hashIdx),
+        exportName: key.slice(hashIdx + 1),
+    };
+}
+function normalizeManifestSpecifier(specifier) {
+    return specifier
+        .replace(/\\/g, '/')
+        .replace(/^file:\/\//i, '')
+        .replace(/^\/+/, '')
+        .replace(/\/\.vista\/standalone\/(?:project|runtime)/gi, '')
+        .toLowerCase();
+}
+function relativeClientPath(normalized) {
+    const markers = [
+        '/app/',
+        '/components/',
+        '/utils/',
+        '/lib/',
+        '/src/',
+        '/content/',
+        '/hooks/',
+        '/packages/vista/',
+    ];
+    let best = normalized;
+    for (const marker of markers) {
+        const idx = normalized.lastIndexOf(marker);
+        if (idx !== -1) {
+            const sliced = normalized.slice(idx);
+            if (sliced.length <= best.length) {
+                best = sliced;
+            }
+        }
+    }
+    return best.replace(/\.(tsx|ts|jsx|js|mjs|cjs)$/i, '');
+}
+function exportNamesCompatible(requested, existing) {
+    if (requested === null || existing === null)
+        return true;
+    if (requested === existing)
+        return true;
+    const aliases = new Set(['', '*', 'default']);
+    return aliases.has(requested) && aliases.has(existing);
+}
+/**
+ * Flight encode looks up `file://...#ExportName`. Webpack may have keyed the
+ * same module under a standalone copy, a different drive-letter case, or a
+ * slightly different absolute prefix. Resolve those aliases at lookup time so
+ * missing keys do not serialize as Flight `E{"digest":""}` rows.
+ */
+function resolveReactClientManifestEntry(manifest, key) {
+    if (Object.prototype.hasOwnProperty.call(manifest, key)) {
+        return manifest[key];
+    }
+    const { specifier, exportName } = splitManifestKey(key);
+    const candidates = [];
+    for (const variant of buildSpecifierVariants(specifier)) {
+        candidates.push(variant);
+        if (exportName !== null) {
+            candidates.push(`${variant}#${exportName}`);
+            candidates.push(`${variant}#`);
+            candidates.push(`${variant}#default`);
+            candidates.push(`${variant}#*`);
+        }
+    }
+    for (const candidate of candidates) {
+        if (Object.prototype.hasOwnProperty.call(manifest, candidate)) {
+            return manifest[candidate];
+        }
+    }
+    const needle = normalizeManifestSpecifier(specifier);
+    const needleFile = needle.split('/').pop() || needle;
+    let fuzzy;
+    for (const [existingKey, entry] of Object.entries(manifest)) {
+        if (!entry || typeof entry !== 'object')
+            continue;
+        const existing = splitManifestKey(existingKey);
+        const existingNorm = normalizeManifestSpecifier(existing.specifier);
+        const existingFile = existingNorm.split('/').pop() || existingNorm;
+        const existingStem = existingFile.replace(/\.(tsx|ts|jsx|js|mjs|cjs)$/i, '');
+        const needleStem = needleFile.replace(/\.(tsx|ts|jsx|js|mjs|cjs)$/i, '');
+        const genericStem = existingStem === 'index' || existingStem === 'page' || existingStem === 'layout';
+        const pathMatches = existingNorm === needle ||
+            relativeClientPath(existingNorm) === relativeClientPath(needle) ||
+            (Boolean(needleFile) && !genericStem && existingStem === needleStem);
+        if (!pathMatches || !exportNamesCompatible(exportName, existing.exportName)) {
+            continue;
+        }
+        if (existing.exportName === exportName) {
+            return entry;
+        }
+        fuzzy = entry;
+    }
+    return fuzzy;
+}
 function createAliasedEntry(entry, exportName) {
     if (exportName === '') {
         return {
@@ -226,9 +344,11 @@ function normalizeReactServerConsumerManifest(input) {
 function createGuardedReactClientManifest(manifest) {
     return new Proxy(manifest, {
         get(target, prop, receiver) {
-            if (typeof prop === 'string' &&
-                (prop.startsWith('file:') || prop.includes('#')) &&
-                !Object.prototype.hasOwnProperty.call(target, prop)) {
+            if (typeof prop === 'string' && (prop.startsWith('file:') || prop.includes('#'))) {
+                const resolved = resolveReactClientManifestEntry(target, prop);
+                if (resolved) {
+                    return resolved;
+                }
                 const fileHint = prop.split('#')[0];
                 throw new Error(`Could not find the module "${prop}" in the React Client Manifest. ` +
                     `Client Components need a 'use client' directive and must live under a scanned project directory ` +
@@ -236,5 +356,11 @@ function createGuardedReactClientManifest(manifest) {
             }
             return Reflect.get(target, prop, receiver);
         },
+        has(target, prop) {
+            if (typeof prop === 'string' && (prop.startsWith('file:') || prop.includes('#'))) {
+                return Boolean(resolveReactClientManifestEntry(target, prop));
+            }
+            return Reflect.has(target, prop);
+        },
     });
 }

package/dist/client/link.js

@@ -118,7 +118,7 @@ function resolvePrefetchBehavior(prefetch) {
 exports.Link = react_1.default.forwardRef(({ href, as, replace, scroll = true, shallow, passHref, prefetch = 'auto', legacyBehavior, children, onClick, onMouseEnter, onTouchStart, onNavigate, target, ...props }, ref) => {
     // Try the RSC router first — if we're inside an RSCRouter, use
     // Flight-based navigation. Otherwise fall back to the legacy router.
-    const rscRouter = (0, react_1.useContext)(rsc_router_1.RSCRouterContext);
+    const rscRouter = (0, rsc_router_1.useRSCRouter)();
     const legacyRouter = (0, react_1.useContext)(router_1.RouterContext);
     const fallbackPathname = (0, router_1.usePathname)();
     const pathname = rscRouter?.pathname ?? legacyRouter?.pathname ?? fallbackPathname;

package/dist/client/navigation.js

@@ -59,7 +59,7 @@ const rsc_router_1 = require("./rsc-router");
  * to popstate events.
  */
 function usePathname() {
-    const rscCtx = React.useContext(rsc_router_1.RSCRouterContext);
+    const rscCtx = (0, rsc_router_1.useRSCRouter)();
     if (rscCtx)
         return rscCtx.pathname;
     const [pathname, setPathname] = React.useState(() => typeof window !== 'undefined' ? window.location.pathname : '/');
@@ -77,7 +77,7 @@ function usePathname() {
  * Uses the RSC router context when available.
  */
 function useSearchParams() {
-    const rscCtx = React.useContext(rsc_router_1.RSCRouterContext);
+    const rscCtx = (0, rsc_router_1.useRSCRouter)();
     if (rscCtx)
         return rscCtx.searchParams;
     const [searchParams, setSearchParams] = React.useState(() => typeof window !== 'undefined'

package/dist/client/rsc-router.d.ts

@@ -57,9 +57,7 @@ declare global {
                 at: number;
             };
         };
-        __VISTA_RSC_ROUTER__?: {
-            refresh: () => void;
-            prefetch: (url: string) => void;
+        __VISTA_RSC_ROUTER__?: RSCNavigationState & {
             resume: (url: string) => void;
             getState: () => {
                 pathname: string;

package/dist/client/rsc-router.js

@@ -121,14 +121,36 @@ function getCallServer() {
     }
     return _callServer;
 }
-function fetchFlight(pathname, search) {
+function flightRequestUrl(pathname, search) {
+    const normalized = pathname === '/' ? '' : pathname.replace(/\/$/, '');
+    // Static CDNs rewrite `/rsc/docs` → `/rsc/docs.rsc`. Request the extensionless
+    // URL so that rewrite is not applied twice (`/rsc/docs.rsc` → `/rsc/docs.rsc.rsc`).
+    return `/rsc${normalized}${search}`;
+}
+function hardNavigate(url) {
+    if (typeof window === 'undefined')
+        return;
+    window.location.assign(url);
+}
+function fetchFlight(pathname, search, options = {}) {
     const key = cacheKey(pathname, search);
     const cached = flightCache.get(key);
     if (cached)
         return cached;
     const create = getCreateFromFetch();
-    const thenable = create(fetch(`/rsc${pathname}${search}`, {
+    const requestUrl = flightRequestUrl(pathname, search);
+    const hardFallback = options.hardFallback !== false;
+    const thenable = create(fetch(requestUrl, {
         headers: { Accept: 'text/x-component' },
+    }).then((response) => {
+        const contentType = response.headers.get('content-type') || '';
+        if (!response.ok || contentType.includes('text/html')) {
+            if (hardFallback) {
+                hardNavigate(`${pathname}${search}`);
+            }
+            throw new Error(`Flight request failed (${response.status}): ${requestUrl}`);
+        }
+        return response;
     }), { callServer: getCallServer() });
     // Evict oldest if over limit
     if (flightCache.size >= CACHE_MAX) {
@@ -148,8 +170,7 @@ function prefetchFlight(pathname, search) {
     const key = cacheKey(pathname, search);
     if (flightCache.has(key))
         return;
-    // Create the thenable which kicks off the fetch
-    fetchFlight(pathname, search);
+    fetchFlight(pathname, search, { hardFallback: false });
 }
 // ---------------------------------------------------------------------------
 // RSCRoot — reads the current Flight thenable
@@ -157,6 +178,26 @@ function prefetchFlight(pathname, search) {
 function RSCRoot({ response }) {
     return React.use(response);
 }
+class FlightNavigationErrorBoundary extends React.Component {
+    state = { failed: false };
+    static getDerivedStateFromError() {
+        return { failed: true };
+    }
+    componentDidCatch() {
+        hardNavigate(this.props.href);
+    }
+    componentDidUpdate(prevProps) {
+        if (prevProps.href !== this.props.href && this.state.failed) {
+            this.setState({ failed: false });
+        }
+    }
+    render() {
+        if (this.state.failed) {
+            return null;
+        }
+        return this.props.children;
+    }
+}
 function RSCRouter({ initialResponse, initialPathname }) {
     const [flightResponse, setFlightResponse] = React.useState(initialResponse);
     const [pathname, setPathname] = React.useState(initialPathname || (typeof window !== 'undefined' ? window.location.pathname : '/'));
@@ -164,6 +205,13 @@ function RSCRouter({ initialResponse, initialPathname }) {
         ? new URLSearchParams(window.location.search)
         : new URLSearchParams());
     const [isPending, startTransition] = React.useTransition();
+    const href = `${pathname}${searchParams.toString() ? `?${searchParams.toString()}` : ''}`;
+    React.useEffect(() => {
+        const initialKey = cacheKey(initialPathname || (typeof window !== 'undefined' ? window.location.pathname : '/'), typeof window !== 'undefined' ? window.location.search : '');
+        if (!flightCache.has(initialKey)) {
+            flightCache.set(initialKey, initialResponse);
+        }
+    }, [initialPathname, initialResponse]);
     // Handle browser back/forward
     React.useEffect(() => {
         const onPopState = () => {
@@ -214,6 +262,33 @@ function RSCRouter({ initialResponse, initialPathname }) {
             setFlightResponse(fetchFlight(curPath, curSearch));
         });
     }, []);
+    const resume = React.useCallback((url) => {
+        const parsed = new URL(url, window.location.origin);
+        const nextPath = parsed.pathname;
+        const nextSearch = parsed.search;
+        const nextUrl = `${nextPath}${nextSearch}`;
+        const nextResponse = fetchFlight(nextPath, nextSearch);
+        document.documentElement.setAttribute('data-vista-ppr', 'flight-resuming');
+        recordRuntimeTrace('rsc-resume-start', { url: nextUrl });
+        dispatchRuntimeEvent('vista:rsc-resume-start', { url: nextUrl });
+        startTransition(() => {
+            setPathname(nextPath);
+            setSearchParams(new URLSearchParams(nextSearch));
+            setFlightResponse(nextResponse);
+        });
+        Promise.resolve(nextResponse)
+            .then(() => {
+            recordRuntimeTrace('rsc-resume-complete', { url: nextUrl });
+            dispatchRuntimeEvent('vista:rsc-resume-complete', { url: nextUrl });
+        })
+            .catch((error) => {
+            const message = error && typeof error === 'object' && 'message' in error
+                ? String(error.message || error)
+                : String(error || 'Unknown RSC resume error');
+            recordRuntimeTrace('rsc-resume-error', { url: nextUrl, message });
+            dispatchRuntimeEvent('vista:rsc-resume-error', { url: nextUrl, message });
+        });
+    }, []);
     const contextValue = React.useMemo(() => ({
         pathname,
         searchParams,
@@ -225,59 +300,31 @@ function RSCRouter({ initialResponse, initialPathname }) {
         refresh,
         isPending,
     }), [pathname, searchParams, push, replace, back, forward, prefetch, refresh, isPending]);
-    React.useEffect(() => {
-        if (typeof window === 'undefined') {
-            return;
-        }
-        const bridge = {
-            refresh,
-            prefetch,
-            resume: (url) => {
-                const parsed = new URL(url, window.location.origin);
-                const nextPath = parsed.pathname;
-                const nextSearch = parsed.search;
-                const nextUrl = `${nextPath}${nextSearch}`;
-                const nextResponse = fetchFlight(nextPath, nextSearch);
-                document.documentElement.setAttribute('data-vista-ppr', 'flight-resuming');
-                recordRuntimeTrace('rsc-resume-start', { url: nextUrl });
-                dispatchRuntimeEvent('vista:rsc-resume-start', { url: nextUrl });
-                startTransition(() => {
-                    setPathname(nextPath);
-                    setSearchParams(new URLSearchParams(nextSearch));
-                    setFlightResponse(nextResponse);
-                });
-                Promise.resolve(nextResponse)
-                    .then(() => {
-                    recordRuntimeTrace('rsc-resume-complete', { url: nextUrl });
-                    dispatchRuntimeEvent('vista:rsc-resume-complete', { url: nextUrl });
-                })
-                    .catch((error) => {
-                    const message = error && typeof error === 'object' && 'message' in error
-                        ? String(error.message || error)
-                        : String(error || 'Unknown RSC resume error');
-                    recordRuntimeTrace('rsc-resume-error', { url: nextUrl, message });
-                    dispatchRuntimeEvent('vista:rsc-resume-error', { url: nextUrl, message });
-                });
-            },
+    if (typeof window !== 'undefined') {
+        window.__VISTA_RSC_ROUTER__ = {
+            ...contextValue,
+            resume,
             getState: () => ({
                 pathname,
                 search: searchParams.toString() ? `?${searchParams.toString()}` : '',
                 isPending,
             }),
         };
-        window.__VISTA_RSC_ROUTER__ = bridge;
+    }
+    React.useEffect(() => {
+        if (typeof window === 'undefined') {
+            return;
+        }
         recordRuntimeTrace('rsc-router-ready', {
             pathname,
             search: searchParams.toString() ? `?${searchParams.toString()}` : '',
         });
         document.dispatchEvent(new CustomEvent('vista:rsc-router-ready'));
         return () => {
-            if (window.__VISTA_RSC_ROUTER__ === bridge) {
-                delete window.__VISTA_RSC_ROUTER__;
-            }
+            delete window.__VISTA_RSC_ROUTER__;
         };
-    }, [pathname, searchParams, isPending, refresh, prefetch]);
-    return ((0, jsx_runtime_1.jsx)(exports.RSCRouterContext.Provider, { value: contextValue, children: (0, jsx_runtime_1.jsx)(RSCRoot, { response: flightResponse }) }));
+    }, []);
+    return ((0, jsx_runtime_1.jsx)(exports.RSCRouterContext.Provider, { value: contextValue, children: (0, jsx_runtime_1.jsx)(FlightNavigationErrorBoundary, { href: href, children: (0, jsx_runtime_1.jsx)(RSCRoot, { response: flightResponse }) }) }));
 }
 // ---------------------------------------------------------------------------
 // Hooks — unified versions that work in both RSC and legacy modes
@@ -287,5 +334,11 @@ function RSCRouter({ initialResponse, initialPathname }) {
  * otherwise falls back to null.
  */
 function useRSCRouter() {
-    return React.useContext(exports.RSCRouterContext);
+    const ctx = React.useContext(exports.RSCRouterContext);
+    if (ctx)
+        return ctx;
+    if (typeof window !== 'undefined' && typeof window.__VISTA_RSC_ROUTER__?.push === 'function') {
+        return window.__VISTA_RSC_ROUTER__;
+    }
+    return null;
 }

package/dist/deploy/adapters/cloudflare.js

@@ -25,28 +25,6 @@ pages_build_output_dir = "${relativeOutput}"
     (0, utils_1.writeFileIfAllowed)(targetFile, content, ctx.force);
     return targetFile;
 }
-function writeRoutesJson(outputDir) {
-    const routesPath = path_1.default.join(outputDir, '_routes.json');
-    const routes = {
-        version: 1,
-        include: ['/*'],
-        exclude: ['/static/*'],
-    };
-    fs_1.default.writeFileSync(routesPath, `${JSON.stringify(routes, null, 2)}\n`, 'utf8');
-    return routesPath;
-}
-function writeRedirects(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.cloudflareAdapter = {
     id: 'cloudflare',
     requiredOutput: 'standalone',
@@ -63,13 +41,12 @@ exports.cloudflareAdapter = {
         (0, utils_1.ensureDir)(outputDir);
         if ((0, runtime_pack_1.isStaticOnlyDeploy)(ctx)) {
             (0, utils_1.copyStaticHostAssets)(ctx.cwd, ctx.vistaDir, outputDir);
-            const routesPath = writeRoutesJson(outputDir);
-            const redirectsPath = writeRedirects(outputDir);
+            (0, utils_1.prepareStaticCdnOutput)(outputDir);
             const wranglerPath = writeStaticWranglerToml(ctx, outputDir);
             return {
                 status: 'emitted',
                 target: 'cloudflare',
-                artifactPaths: [outputDir, routesPath, redirectsPath, wranglerPath],
+                artifactPaths: [outputDir, wranglerPath],
                 instructions: [
                     'Static mode: Cloudflare Pages serves pre-rendered output.',
                     'For Flight SSR, omit deploy.output "static" and use Cloudflare Containers.',