vinext 0.1.4 → 0.1.5

package/dist/shims/navigation.js

@@ -1,25 +1,27 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER } from "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
-import { markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
+import { markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
 import { isAbsoluteOrProtocolRelativeUrl, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { retryScrollTo, scrollToHashTarget } from "./hash-scroll.js";
+import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
+import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
+import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
+import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent } from "./app-router-scroll-state.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam } from "../server/app-rsc-cache-busting.js";
 import { getNavigationRuntime, hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
-import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { PUBLIC_INITIAL_BFCACHE_ID } from "../server/app-bfcache-id.js";
-import { resolveManifestNavigationInterceptionContext } from "../server/app-browser-interception-context.js";
 import { createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata } from "../server/app-history-state.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam } from "../server/app-rsc-cache-busting.js";
+import { resolveManifestNavigationInterceptionContext } from "../server/app-browser-interception-context.js";
 import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navigation.js";
 import { navigationPlanner } from "../server/navigation-planner.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import { getPagesNavigationContext } from "./internal/pages-router-accessor.js";
-import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
 //#region src/shims/navigation.ts
@@ -30,39 +32,6 @@ import * as React$1 from "react";
 * Server-side: reads from a request context set by the RSC handler.
 * Client-side: reads from browser Location API and provides navigation.
 */
-const _LAYOUT_SEGMENT_CTX_KEY = Symbol.for("vinext.layoutSegmentContext");
-const _SERVER_INSERTED_HTML_CTX_KEY = Symbol.for("vinext.serverInsertedHTMLContext");
-const _BFCACHE_ID_MAP_CTX_KEY = Symbol.for("vinext.bfcacheIdMapContext");
-const _BFCACHE_SEGMENT_ID_CTX_KEY = Symbol.for("vinext.bfcacheSegmentIdContext");
-function getServerInsertedHTMLContext() {
-	if (typeof React$1.createContext !== "function") return null;
-	const globalState = globalThis;
-	if (!globalState[_SERVER_INSERTED_HTML_CTX_KEY]) globalState[_SERVER_INSERTED_HTML_CTX_KEY] = React$1.createContext(null);
-	return globalState[_SERVER_INSERTED_HTML_CTX_KEY] ?? null;
-}
-const ServerInsertedHTMLContext = getServerInsertedHTMLContext();
-/**
-* Get or create the layout segment context.
-* Returns null in the RSC environment (createContext unavailable).
-*/
-function getLayoutSegmentContext() {
-	if (typeof React$1.createContext !== "function") return null;
-	const globalState = globalThis;
-	if (!globalState[_LAYOUT_SEGMENT_CTX_KEY]) globalState[_LAYOUT_SEGMENT_CTX_KEY] = React$1.createContext({ children: [] });
-	return globalState[_LAYOUT_SEGMENT_CTX_KEY] ?? null;
-}
-function getBfcacheIdMapContext() {
-	if (typeof React$1.createContext !== "function") return null;
-	const globalState = globalThis;
-	if (!globalState[_BFCACHE_ID_MAP_CTX_KEY]) globalState[_BFCACHE_ID_MAP_CTX_KEY] = React$1.createContext(null);
-	return globalState[_BFCACHE_ID_MAP_CTX_KEY] ?? null;
-}
-function getBfcacheSegmentIdContext() {
-	if (typeof React$1.createContext !== "function") return null;
-	const globalState = globalThis;
-	if (!globalState[_BFCACHE_SEGMENT_ID_CTX_KEY]) globalState[_BFCACHE_SEGMENT_ID_CTX_KEY] = React$1.createContext(null);
-	return globalState[_BFCACHE_SEGMENT_ID_CTX_KEY] ?? null;
-}
 /**
 * Read the child segments for a parallel route below the current layout.
 * Returns [] if no context is available (RSC environment, outside React tree)
@@ -80,77 +49,7 @@ function useChildSegments(parallelRoutesKey = "children") {
 const _READONLY_SEARCH_PARAMS = Symbol("vinext.navigation.readonlySearchParams");
 const _READONLY_SEARCH_PARAMS_SOURCE = Symbol("vinext.navigation.readonlySearchParamsSource");
 const _READONLY_SEARCH_PARAMS_SOURCE_KEY = Symbol("vinext.navigation.readonlySearchParamsSourceKey");
-const GLOBAL_ACCESSORS_KEY = Symbol.for("vinext.navigation.globalAccessors");
-const _GLOBAL_ACCESSORS_KEY = GLOBAL_ACCESSORS_KEY;
-const _GLOBAL_HYDRATION_CONTEXT_KEY = Symbol.for("vinext.navigation.clientHydrationContext");
-function _getGlobalAccessors() {
-	return globalThis[_GLOBAL_ACCESSORS_KEY];
-}
-function _getClientHydrationContext() {
-	const globalState = globalThis;
-	if (Object.prototype.hasOwnProperty.call(globalState, _GLOBAL_HYDRATION_CONTEXT_KEY)) return globalState[_GLOBAL_HYDRATION_CONTEXT_KEY] ?? null;
-}
-function _setClientHydrationContext(ctx) {
-	globalThis[_GLOBAL_HYDRATION_CONTEXT_KEY] = ctx;
-}
-function clearClientHydrationContext() {
-	if (typeof window !== "undefined") _setClientHydrationContext(null);
-}
-let _serverContext = null;
-let _serverInsertedHTMLCallbacks = [];
-let _getServerContext = () => {
-	if (typeof window !== "undefined") {
-		const hydrationContext = _getClientHydrationContext();
-		return hydrationContext !== void 0 ? hydrationContext : _serverContext;
-	}
-	const g = _getGlobalAccessors();
-	return g ? g.getServerContext() : _serverContext;
-};
-let _setServerContext = (ctx) => {
-	if (typeof window !== "undefined") {
-		_serverContext = ctx;
-		_setClientHydrationContext(ctx);
-		return;
-	}
-	const g = _getGlobalAccessors();
-	if (g) g.setServerContext(ctx);
-	else _serverContext = ctx;
-};
-let _getInsertedHTMLCallbacks = () => {
-	const g = _getGlobalAccessors();
-	return g ? g.getInsertedHTMLCallbacks() : _serverInsertedHTMLCallbacks;
-};
-let _clearInsertedHTMLCallbacks = () => {
-	const g = _getGlobalAccessors();
-	if (g) g.clearInsertedHTMLCallbacks();
-	else _serverInsertedHTMLCallbacks = [];
-};
-/**
-* Register ALS-backed state accessors. Called by navigation-state.ts on import.
-* @internal
-*/
-function _registerStateAccessors(accessors) {
-	_getServerContext = accessors.getServerContext;
-	_setServerContext = accessors.setServerContext;
-	_getInsertedHTMLCallbacks = accessors.getInsertedHTMLCallbacks;
-	_clearInsertedHTMLCallbacks = accessors.clearInsertedHTMLCallbacks;
-}
 const PAGES_NAVIGATION_NOTIFY_KEY = Symbol.for("vinext.navigation.pagesNavigationNotify");
-/**
-* Get the navigation context for the current SSR/RSC render.
-* Reads from AsyncLocalStorage when available (concurrent-safe),
-* otherwise falls back to module-level state.
-*/
-function getNavigationContext() {
-	return _getServerContext();
-}
-/**
-* Set the navigation context for the current SSR/RSC render.
-* Called by the framework entry before rendering each request.
-*/
-function setNavigationContext(ctx) {
-	_setServerContext(ctx);
-}
 const isServer = typeof window === "undefined";
 /** basePath from next.config.js, injected by the plugin at build time */
 const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
@@ -625,7 +524,7 @@ let _cachedEmptyClientSearchParams = null;
 * be visible until the next commit.
 */
 function getSearchParamsSnapshot() {
-	if (_getServerContext()) return getServerSearchParamsSnapshot();
+	if (getNavigationContext()) return getServerSearchParamsSnapshot();
 	const pagesCtx = getPagesNavigationContext();
 	if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
 	const cached = getClientNavigationState()?.cachedReadonlySearchParams;
@@ -651,7 +550,7 @@ function syncCommittedUrlStateFromLocation() {
 	return changed;
 }
 function getServerSearchParamsSnapshot() {
-	const ctx = _getServerContext();
+	const ctx = getNavigationContext();
 	if (!ctx) {
 		const pagesCtx = getPagesNavigationContext();
 		if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
@@ -776,14 +675,14 @@ function clearPendingPathname(navId) {
 }
 function getClientParamsSnapshot() {
 	const state = getClientNavigationState();
-	const ctx = _getServerContext();
+	const ctx = getNavigationContext();
 	if (ctx) return ctx.params;
 	const pagesCtx = getPagesNavigationContext();
 	if (pagesCtx) return pagesCtx.params;
 	return state?.clientParams ?? _EMPTY_PARAMS;
 }
 function getServerParamsSnapshot() {
-	const ctx = _getServerContext();
+	const ctx = getNavigationContext();
 	if (ctx) return ctx.params;
 	const pagesCtx = getPagesNavigationContext();
 	if (pagesCtx) return pagesCtx.params;
@@ -804,14 +703,14 @@ function subscribeToNavigation(cb) {
 function usePathname() {
 	if (isServer) {
 		markPprFallbackShellDynamicBoundary();
-		const ctx = _getServerContext();
+		const ctx = getNavigationContext();
 		if (ctx) return ctx.pathname;
 		const pagesCtx = getPagesNavigationContext();
 		return pagesCtx ? pagesCtx.pathname : "/";
 	}
 	const renderSnapshot = useClientNavigationRenderSnapshot();
 	const pathname = React$1.useSyncExternalStore(subscribeToNavigation, getPathnameSnapshot, () => {
-		const ctx = _getServerContext();
+		const ctx = getNavigationContext();
 		if (ctx) return ctx.pathname;
 		const pagesCtx = getPagesNavigationContext();
 		return pagesCtx ? pagesCtx.pathname : "/";
@@ -1272,337 +1171,7 @@ function useSelectedLayoutSegments(parallelRoutesKey) {
 */
 function useServerInsertedHTML(callback) {
 	if (typeof document !== "undefined") return;
-	_getInsertedHTMLCallbacks().push(callback);
-}
-/**
-* Flush all collected useServerInsertedHTML callbacks.
-* Returns an array of results (React elements or strings).
-* Clears the callback list so the next render starts fresh.
-*
-* Called by the SSR entry after renderToReadableStream completes.
-*/
-function flushServerInsertedHTML() {
-	const callbacks = _getInsertedHTMLCallbacks();
-	const results = [];
-	for (const cb of callbacks) try {
-		const result = cb();
-		if (result != null) results.push(result);
-	} catch {}
-	callbacks.length = 0;
-	return results;
-}
-/**
-* Render collected useServerInsertedHTML callbacks without unregistering them.
-*
-* Streaming SSR needs to invoke the same style-registry callbacks after each
-* Fizz flush. Libraries such as styled-components and Emotion clear their own
-* per-flush buffers inside the callback; the registration itself must survive
-* until the request stream is closed.
-*/
-function renderServerInsertedHTML() {
-	const callbacks = _getInsertedHTMLCallbacks();
-	const results = [];
-	for (const cb of callbacks) try {
-		const result = cb();
-		if (result != null) results.push(result);
-	} catch {}
-	return results;
-}
-/**
-* Clear all collected useServerInsertedHTML callbacks without flushing.
-* Used for cleanup between requests.
-*/
-function clearServerInsertedHTML() {
-	_clearInsertedHTMLCallbacks();
-}
-/**
-* HTTP Access Fallback error code — shared prefix for notFound/forbidden/unauthorized.
-* Matches Next.js 16's unified error handling approach.
-*/
-const HTTP_ERROR_FALLBACK_ERROR_CODE = "NEXT_HTTP_ERROR_FALLBACK";
-/**
-* Check if an error is an HTTP Access Fallback error (notFound, forbidden, unauthorized).
-*/
-function isHTTPAccessFallbackError(error) {
-	if (error && typeof error === "object" && "digest" in error) {
-		const digest = String(error.digest);
-		return digest === "NEXT_NOT_FOUND" || digest.startsWith(`NEXT_HTTP_ERROR_FALLBACK;`);
-	}
-	return false;
-}
-/**
-* Extract the HTTP status code from an HTTP Access Fallback error.
-* Returns 404 for legacy NEXT_NOT_FOUND errors.
-*/
-function getAccessFallbackHTTPStatus(error) {
-	if (error && typeof error === "object" && "digest" in error) {
-		const digest = String(error.digest);
-		if (digest === "NEXT_NOT_FOUND") return 404;
-		if (digest.startsWith(`NEXT_HTTP_ERROR_FALLBACK;`)) return parseInt(digest.split(";")[1], 10);
-	}
-	return 404;
-}
-/**
-* Enum matching Next.js RedirectType for type-safe redirect calls.
-*/
-let RedirectType = /* @__PURE__ */ function(RedirectType) {
-	RedirectType["push"] = "push";
-	RedirectType["replace"] = "replace";
-	return RedirectType;
-}({});
-/**
-* Internal error class used by redirect/notFound/forbidden/unauthorized.
-* The `digest` field is the serialised control-flow signal read by the
-* framework's error boundary and server-side request handlers.
-*/
-var VinextNavigationError = class extends Error {
-	digest;
-	constructor(message, digest) {
-		super(message);
-		this.digest = digest;
-	}
-};
-/**
-* Throw a redirect. Caught by the framework to send a redirect response.
-*
-* When `type` is omitted, the digest carries an empty sentinel so the
-* catch site can resolve the default based on context:
-* - Server Action context → "push"  (Back button works after form submission)
-* - SSR render context    → "replace"
-*
-* This matches Next.js behavior where `redirect()` checks
-* `actionAsyncStorage.getStore()?.isAction` at call time.
-*
-* @see https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/redirect.ts
-*/
-function redirect(url, type) {
-	throw new VinextNavigationError(`NEXT_REDIRECT:${url}`, `NEXT_REDIRECT;${type ?? ""};${encodeURIComponent(url)}`);
-}
-/**
-* Trigger a permanent redirect (308).
-*
-* Accepts an optional `type` parameter matching Next.js's signature.
-* Defaults to "replace" (not context-dependent like `redirect()`).
-*
-* @see https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/redirect.ts
-*/
-function permanentRedirect(url, type = "replace") {
-	throw new VinextNavigationError(`NEXT_REDIRECT:${url}`, `NEXT_REDIRECT;${type};${encodeURIComponent(url)};308`);
-}
-/**
-* Trigger a not-found response (404). Caught by the framework.
-*/
-function notFound() {
-	throw new VinextNavigationError("NEXT_NOT_FOUND", `${HTTP_ERROR_FALLBACK_ERROR_CODE};404`);
-}
-/**
-* Trigger a forbidden response (403). Caught by the framework.
-* In Next.js, this is gated behind experimental.authInterrupts — we
-* support it unconditionally for maximum compatibility.
-*/
-function forbidden() {
-	throw new VinextNavigationError("NEXT_FORBIDDEN", `${HTTP_ERROR_FALLBACK_ERROR_CODE};403`);
-}
-/**
-* Trigger an unauthorized response (401). Caught by the framework.
-* In Next.js, this is gated behind experimental.authInterrupts — we
-* support it unconditionally for maximum compatibility.
-*/
-function unauthorized() {
-	throw new VinextNavigationError("NEXT_UNAUTHORIZED", `${HTTP_ERROR_FALLBACK_ERROR_CODE};401`);
-}
-/**
-* Check whether an error was produced by `redirect()` or `permanentRedirect()`.
-*
-* **Note on vinext public surface:** Next.js does NOT expose `isRedirectError`
-* from `next/navigation` — it's an internal predicate. vinext exposes it for
-* symmetry with the already-public `isHTTPAccessFallbackError` and because
-* `unstable_rethrow` consumers benefit from being able to narrow types.
-* Treat it as a vinext-only extension.
-*
-* **Divergence from Next.js:** Next.js's internal `isRedirectError` performs
-* full 4-segment validation — it splits the digest on `;`, checks `type` ∈
-* {push, replace}, requires a non-empty destination, and validates the
-* status code (303, 307, 308). See:
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/redirect-error.ts
-*
-* vinext instead uses a simple prefix check (`startsWith("NEXT_REDIRECT;")`).
-* Reasons:
-*   1. vinext emits two digest shapes — 3-part for `redirect()`
-*      (`NEXT_REDIRECT;{type};{encoded-url}`) and 4-part for
-*      `permanentRedirect()` (`NEXT_REDIRECT;{type};{encoded-url};308`).
-*      Strict validation would have to special-case both, and Next.js's
-*      validator (tuned to its 5-part canary digests) rejects them.
-*   2. The `type` field is sometimes empty in vinext's redirect digests
-*      (context-dependent resolution; see `redirect()` above), which the
-*      strict check disallows.
-*
-* **Consequence:** A malformed digest such as `"NEXT_REDIRECT;garbage"`
-* returns `true` here, whereas Next.js would return `false`. In practice,
-* the only callers of this predicate are vinext-internal code paths
-* (`unstable_rethrow`, `unstable_catchError`, the redirect error boundary)
-* that see digests vinext itself emits — so the divergence does not surface
-* in normal use. Maintainers extending the prefix logic should keep this
-* predicate in lockstep with the corresponding `decode*` helpers in
-* `shims/error-boundary.tsx`.
-*/
-function isRedirectError(error) {
-	if (!error || typeof error !== "object") return false;
-	if (!("digest" in error)) return false;
-	if (typeof error.digest !== "string") return false;
-	return error.digest.startsWith("NEXT_REDIRECT;");
-}
-/**
-* Parse a redirect error digest into its URL and type components.
-*
-* Supports two formats:
-*   - vinext's 3-part: `NEXT_REDIRECT;{type};{encoded-url}`
-*   - Next.js's 5-part: `NEXT_REDIRECT;{type};{url};{status};{isClient}`
-*
-* The URL segment is always percent-encoded on the write side
-* (encodeURIComponent is used), so re-joining with ";" for the 5-part
-* format is defensive — it correctly handles any unencoded ";" that
-* might appear in an externally-sourced digest.
-*
-* Returns null for malformed digests that have an empty URL segment, or
-* when the URL contains invalid percent-encoding.
-*/
-function decodeRedirectError(digest) {
-	if (!digest.startsWith("NEXT_REDIRECT;")) return null;
-	const parts = digest.split(";");
-	const encodedTarget = parts.length >= 5 ? parts.slice(2, -2).join(";") : parts[2];
-	if (!encodedTarget) return null;
-	let url;
-	try {
-		url = decodeURIComponent(encodedTarget);
-	} catch {
-		return null;
-	}
-	const type = parts[1] === "push" ? "push" : "replace";
-	return {
-		url,
-		type
-	};
-}
-/**
-* Returns true if the error is a Next.js navigation signal — either a redirect
-* or an HTTP access fallback (notFound / forbidden / unauthorized).
-*
-* **Note on vinext public surface:** Like `isRedirectError`, Next.js does NOT
-* expose this from `next/navigation`. vinext exposes it for symmetry — treat
-* it as a vinext-only extension.
-*
-* Ported from Next.js:
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/is-next-router-error.ts
-*/
-function isNextRouterError(error) {
-	return isRedirectError(error) || isHTTPAccessFallbackError(error);
-}
-const _BAILOUT_TO_CSR_DIGEST = "BAILOUT_TO_CLIENT_SIDE_RENDERING";
-/**
-* Error thrown to bail out of server rendering and fall back to client-side
-* rendering. Used by `next/dynamic` with `ssr: false`.
-*
-* vinext does not yet emit this error itself — it's exposed so user code and
-* third-party libraries that mimic `next/dynamic`'s bailout semantics can
-* construct an error with the canonical digest that `unstable_rethrow`
-* recognises.
-*
-* Ported 1:1 from Next.js:
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/lazy-dynamic/bailout-to-csr.ts
-*/
-var BailoutToCSRError = class extends Error {
-	digest = _BAILOUT_TO_CSR_DIGEST;
-	reason;
-	constructor(reason) {
-		super(`Bail out to client-side rendering: ${reason}`);
-		this.reason = reason;
-	}
-};
-/**
-* Returns true if the error is a `BailoutToCSRError`. Matches Next.js's
-* digest-based predicate, so any error from a foreign module instance of
-* the class (or constructed manually with the canonical digest) is also
-* detected.
-*
-* **Note on vinext public surface:** Next.js does NOT expose this from
-* `next/navigation`. vinext exposes it for symmetry with `isRedirectError`
-* — treat it as a vinext-only extension. The matching producer
-* (`BailoutToCSRError`) is the public detection contract; Next.js exposes
-* neither.
-*
-* Ported from Next.js:
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/lazy-dynamic/bailout-to-csr.ts
-*/
-function isBailoutToCSRError(error) {
-	if (!error || typeof error !== "object" || !("digest" in error)) return false;
-	return error.digest === _BAILOUT_TO_CSR_DIGEST;
-}
-const _DYNAMIC_SERVER_USAGE_DIGEST = "DYNAMIC_SERVER_USAGE";
-/**
-* Error thrown when dynamic server APIs (`cookies()`, `headers()`, etc.) are
-* used inside a static/prerender context. Carries the `DYNAMIC_SERVER_USAGE`
-* digest so `unstable_rethrow` can recognise and propagate it.
-*
-* vinext does not construct this error itself — exposed for the same
-* "stable detection contract" reason as `BailoutToCSRError` above.
-*
-* Ported 1:1 from Next.js:
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/hooks-server-context.ts
-*/
-var DynamicServerError = class extends Error {
-	digest = _DYNAMIC_SERVER_USAGE_DIGEST;
-	description;
-	constructor(description) {
-		super(`Dynamic server usage: ${description}`);
-		this.description = description;
-	}
-};
-/**
-* Returns true if the error is a `DynamicServerError` (or any error with the
-* canonical `DYNAMIC_SERVER_USAGE` digest).
-*
-* **Note on vinext public surface:** Next.js does NOT expose this from
-* `next/navigation`. vinext exposes it for symmetry — treat it as a
-* vinext-only extension.
-*
-* Ported from Next.js:
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/hooks-server-context.ts
-*/
-function isDynamicServerError(error) {
-	if (!error || typeof error !== "object" || !("digest" in error)) return false;
-	return error.digest === _DYNAMIC_SERVER_USAGE_DIGEST;
-}
-/**
-* Rethrow internal Next.js errors so they're handled by the framework.
-*
-* When wrapping an API that uses errors for control flow (redirect, notFound,
-* cookies in static render, `next/dynamic` SSR bailout, etc.), call this
-* inside `catch` blocks before doing your own error handling. If the error
-* is a Next.js internal error, it's rethrown; otherwise this is a no-op
-* (apart from recursing through `error.cause`).
-*
-* Recognises (matches Next.js's browser build + the subset of the server
-* build that vinext can realistically encounter):
-*   - `isNextRouterError`: redirect / notFound / forbidden / unauthorized
-*   - `isBailoutToCSRError`: `next/dynamic` `ssr: false` bailout
-*   - `isDynamicServerError`: dynamic API used in static render
-*
-* vinext does not yet recognise four additional server-only Next.js
-* categories — `isDynamicPostpone`, `isPostpone`,
-* `isHangingPromiseRejectionError`, `isPrerenderInterruptedError` — because
-* they signal PPR / prerender-controller events that vinext's render
-* pipeline does not generate. User code cannot construct these in normal
-* use; they will be added if/when vinext grows PPR support.
-*
-* Ported from Next.js:
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/unstable-rethrow.ts
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/unstable-rethrow.server.ts
-*   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/unstable-rethrow.browser.ts
-*/
-function unstable_rethrow(error) {
-	if (isNextRouterError(error) || isBailoutToCSRError(error) || isDynamicServerError(error)) throw error;
-	if (error instanceof Error && "cause" in error) unstable_rethrow(error.cause);
+	registerServerInsertedHTMLCallback(callback);
 }
 if (!isServer) {
 	const state = getClientNavigationState();

package/dist/shims/navigation.react-server.d.ts

@@ -1,6 +1,6 @@
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
-import { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, NavigationContext, RedirectType, SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_rethrow } from "./navigation.js";
-
+import { GLOBAL_ACCESSORS_KEY, NavigationContext, SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
+import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 //#region src/shims/navigation.react-server.d.ts
 declare function usePathname(): never;
 declare function useSearchParams(): never;

package/dist/shims/navigation.react-server.js

@@ -1,5 +1,7 @@
+import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
+import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
+import "./navigation-server.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
-import { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_rethrow } from "./navigation.js";
 import { throwClientHookError } from "./client-hook-error.js";
 //#region src/shims/navigation.react-server.ts
 function usePathname() {

package/dist/shims/request-state-types.d.ts

@@ -1,11 +1,11 @@
-import { PrivateCacheState } from "./cache-runtime.js";
+import { CacheLifeConfig, CacheState } from "./cache-request-state.js";
 import { ExecutionContextLike } from "./request-context.js";
-import { CacheLifeConfig, CacheState } from "./cache.js";
-import { NavigationContext } from "./navigation.js";
+import { NavigationContext } from "./navigation-context-state.js";
 import { RootParamsState } from "./root-params.js";
 import { FetchCacheState } from "./fetch-cache.js";
 import { HeadersAccessPhase, HeadersContext, VinextHeadersShimState } from "./headers.js";
 import { RouterState, SSRContext } from "./router-state.js";
+import { PrivateCacheState } from "./cache-runtime.js";
 import { HeadState } from "./head-state.js";
 import { I18nState } from "./i18n-state.js";
 import { NavigationState } from "./navigation-state.js";

package/dist/shims/script.js

@@ -1,7 +1,7 @@
 "use client";
 import { escapeInlineContent } from "./head.js";
-import { hasAppNavigationRuntimeBootstrap } from "../client/navigation-runtime.js";
 import { useScriptNonce } from "./script-nonce-context.js";
+import { hasAppNavigationRuntimeBootstrap } from "../client/navigation-runtime.js";
 import { useBeforeInteractiveRegister } from "./before-interactive-context.js";
 import React, { useEffect, useRef } from "react";
 import * as ReactDOM from "react-dom";

package/dist/shims/slot.js

@@ -1,7 +1,9 @@
 "use client";
 import { AppElementsWire, UNMATCHED_SLOT } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
-import { getBfcacheIdMapContext, getBfcacheSegmentIdContext, notFound } from "./navigation.js";
+import { getBfcacheIdMapContext, getBfcacheSegmentIdContext } from "./navigation-context-state.js";
+import { notFound } from "./navigation-errors.js";
+import "./navigation-server.js";
 import * as React$1 from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 //#region src/shims/slot.tsx

package/dist/shims/unified-request-context.d.ts

@@ -1,10 +1,10 @@
-import { PrivateCacheState } from "./cache-runtime.js";
+import { CacheState } from "./cache-request-state.js";
 import { ExecutionContextLike } from "./request-context.js";
-import { CacheState } from "./cache.js";
 import { RootParamsState } from "./root-params.js";
 import { FetchCacheState } from "./fetch-cache.js";
 import { VinextHeadersShimState } from "./headers.js";
 import { RouterState } from "./router-state.js";
+import { PrivateCacheState } from "./cache-runtime.js";
 import { HeadState } from "./head-state.js";
 import { I18nState } from "./i18n-state.js";
 import { NavigationState } from "./navigation-state.js";

package/dist/utils/virtual-module.d.ts

@@ -0,0 +1,5 @@
+//#region src/utils/virtual-module.d.ts
+declare const VIRTUAL_PREFIX = "\0";
+declare const VIRTUAL_MODULE_ID_RE: RegExp;
+//#endregion
+export { VIRTUAL_MODULE_ID_RE, VIRTUAL_PREFIX };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {
@@ -57,6 +57,10 @@
       "types": "./dist/server/app-router-entry.d.ts",
       "import": "./dist/server/app-router-entry.js"
     },
+    "./server/app-rsc-handler": {
+      "types": "./dist/server/app-rsc-handler.d.ts",
+      "import": "./dist/server/app-rsc-handler.js"
+    },
     "./config/config-matchers": {
       "types": "./dist/config/config-matchers.d.ts",
       "import": "./dist/config/config-matchers.js"