vinext 1.0.0-beta.9 → 1.0.1

package/dist/shims/constants.d.ts

@@ -5,20 +5,20 @@
  * Provides build/runtime phase constants used by next.config.js
  * and some third-party libraries.
  */
-declare const MODERN_BROWSERSLIST_TARGET: string[];
-type ValueOf<T> = Required<T>[keyof T];
-declare const COMPILER_NAMES: {
+export declare const MODERN_BROWSERSLIST_TARGET: string[];
+export type ValueOf<T> = Required<T>[keyof T];
+export declare const COMPILER_NAMES: {
   readonly client: "client";
   readonly server: "server";
   readonly edgeServer: "edge-server";
 };
-type CompilerNameValues = ValueOf<typeof COMPILER_NAMES>;
-declare const COMPILER_INDEXES: { [compilerKey in CompilerNameValues]: number; };
-declare const UNDERSCORE_NOT_FOUND_ROUTE = "/_not-found";
-declare const UNDERSCORE_NOT_FOUND_ROUTE_ENTRY = "/_not-found/page";
-declare const UNDERSCORE_GLOBAL_ERROR_ROUTE = "/_global-error";
-declare const UNDERSCORE_GLOBAL_ERROR_ROUTE_ENTRY = "/_global-error/page";
-declare enum AdapterOutputType {
+export type CompilerNameValues = ValueOf<typeof COMPILER_NAMES>;
+export declare const COMPILER_INDEXES: { [compilerKey in CompilerNameValues]: number; };
+export declare const UNDERSCORE_NOT_FOUND_ROUTE = "/_not-found";
+export declare const UNDERSCORE_NOT_FOUND_ROUTE_ENTRY = "/_not-found/page";
+export declare const UNDERSCORE_GLOBAL_ERROR_ROUTE = "/_global-error";
+export declare const UNDERSCORE_GLOBAL_ERROR_ROUTE_ENTRY = "/_global-error/page";
+export declare enum AdapterOutputType {
   /**
    * `PAGES` represents all the React pages that are under `pages/`.
    */
@@ -51,80 +51,79 @@ declare enum AdapterOutputType {
    */
   MIDDLEWARE = "MIDDLEWARE"
 }
-declare const PHASE_EXPORT = "phase-export";
-declare const PHASE_ANALYZE = "phase-analyze";
-declare const PHASE_PRODUCTION_BUILD = "phase-production-build";
-declare const PHASE_PRODUCTION_SERVER = "phase-production-server";
-declare const PHASE_DEVELOPMENT_SERVER = "phase-development-server";
-declare const PHASE_TEST = "phase-test";
-declare const PHASE_INFO = "phase-info";
-type PHASE_TYPE = typeof PHASE_INFO | typeof PHASE_TEST | typeof PHASE_EXPORT | typeof PHASE_ANALYZE | typeof PHASE_PRODUCTION_BUILD | typeof PHASE_PRODUCTION_SERVER | typeof PHASE_DEVELOPMENT_SERVER;
-declare const PAGES_MANIFEST = "pages-manifest.json";
-declare const APP_PATHS_MANIFEST = "app-paths-manifest.json";
-declare const APP_PATH_ROUTES_MANIFEST = "app-path-routes-manifest.json";
-declare const BUILD_MANIFEST = "build-manifest.json";
-declare const FUNCTIONS_CONFIG_MANIFEST = "functions-config-manifest.json";
-declare const SUBRESOURCE_INTEGRITY_MANIFEST = "subresource-integrity-manifest";
-declare const NEXT_FONT_MANIFEST = "next-font-manifest";
-declare const EXPORT_MARKER = "export-marker.json";
-declare const EXPORT_DETAIL = "export-detail.json";
-declare const PREFETCH_HINTS = "prefetch-hints.json";
-declare const PRERENDER_MANIFEST = "prerender-manifest.json";
-declare const ROUTES_MANIFEST = "routes-manifest.json";
-declare const IMAGES_MANIFEST = "images-manifest.json";
-declare const SERVER_FILES_MANIFEST = "required-server-files";
-declare const DEV_CLIENT_PAGES_MANIFEST = "_devPagesManifest.json";
-declare const MIDDLEWARE_MANIFEST = "middleware-manifest.json";
-declare const TURBOPACK_CLIENT_MIDDLEWARE_MANIFEST = "_clientMiddlewareManifest.js";
-declare const TURBOPACK_CLIENT_BUILD_MANIFEST = "client-build-manifest.json";
-declare const DEV_CLIENT_MIDDLEWARE_MANIFEST = "_devMiddlewareManifest.json";
-declare const REACT_LOADABLE_MANIFEST = "react-loadable-manifest.json";
-declare const SERVER_DIRECTORY = "server";
-declare const CONFIG_FILES: string[];
-declare const BUILD_ID_FILE = "BUILD_ID";
-declare const BLOCKED_PAGES: string[];
-declare const CLIENT_PUBLIC_FILES_PATH = "public";
-declare const CLIENT_STATIC_FILES_PATH = "static";
-declare const STRING_LITERAL_DROP_BUNDLE = "__NEXT_DROP_CLIENT_FILE__";
-declare const NEXT_BUILTIN_DOCUMENT = "__NEXT_BUILTIN_DOCUMENT__";
-declare const BARREL_OPTIMIZATION_PREFIX = "__barrel_optimize__";
-declare const CLIENT_REFERENCE_MANIFEST = "client-reference-manifest";
-declare const SERVER_REFERENCE_MANIFEST = "server-reference-manifest";
-declare const MIDDLEWARE_BUILD_MANIFEST = "middleware-build-manifest";
-declare const MIDDLEWARE_REACT_LOADABLE_MANIFEST = "middleware-react-loadable-manifest";
-declare const INTERCEPTION_ROUTE_REWRITE_MANIFEST = "interception-route-rewrite-manifest";
-declare const DYNAMIC_CSS_MANIFEST = "dynamic-css-manifest";
-declare const CLIENT_STATIC_FILES_RUNTIME_MAIN = "main";
-declare const CLIENT_STATIC_FILES_RUNTIME_MAIN_APP = "main-app";
-declare const APP_CLIENT_INTERNALS = "app-pages-internals";
-declare const CLIENT_STATIC_FILES_RUNTIME_REACT_REFRESH = "react-refresh";
-declare const CLIENT_STATIC_FILES_RUNTIME_WEBPACK = "webpack";
-declare const CLIENT_STATIC_FILES_RUNTIME_POLYFILLS = "polyfills";
-declare const CLIENT_STATIC_FILES_RUNTIME_POLYFILLS_SYMBOL: unique symbol;
-declare const DEFAULT_RUNTIME_WEBPACK = "webpack-runtime";
-declare const EDGE_RUNTIME_WEBPACK = "edge-runtime-webpack";
-declare const STATIC_PROPS_ID = "__N_SSG";
-declare const SERVER_PROPS_ID = "__N_SSP";
-declare const DEFAULT_SERIF_FONT: {
+export declare const PHASE_EXPORT = "phase-export";
+export declare const PHASE_ANALYZE = "phase-analyze";
+export declare const PHASE_PRODUCTION_BUILD = "phase-production-build";
+export declare const PHASE_PRODUCTION_SERVER = "phase-production-server";
+export declare const PHASE_DEVELOPMENT_SERVER = "phase-development-server";
+export declare const PHASE_TEST = "phase-test";
+export declare const PHASE_INFO = "phase-info";
+export type PHASE_TYPE = typeof PHASE_INFO | typeof PHASE_TEST | typeof PHASE_EXPORT | typeof PHASE_ANALYZE | typeof PHASE_PRODUCTION_BUILD | typeof PHASE_PRODUCTION_SERVER | typeof PHASE_DEVELOPMENT_SERVER;
+export declare const PAGES_MANIFEST = "pages-manifest.json";
+export declare const APP_PATHS_MANIFEST = "app-paths-manifest.json";
+export declare const APP_PATH_ROUTES_MANIFEST = "app-path-routes-manifest.json";
+export declare const BUILD_MANIFEST = "build-manifest.json";
+export declare const FUNCTIONS_CONFIG_MANIFEST = "functions-config-manifest.json";
+export declare const SUBRESOURCE_INTEGRITY_MANIFEST = "subresource-integrity-manifest";
+export declare const NEXT_FONT_MANIFEST = "next-font-manifest";
+export declare const EXPORT_MARKER = "export-marker.json";
+export declare const EXPORT_DETAIL = "export-detail.json";
+export declare const PREFETCH_HINTS = "prefetch-hints.json";
+export declare const PRERENDER_MANIFEST = "prerender-manifest.json";
+export declare const ROUTES_MANIFEST = "routes-manifest.json";
+export declare const IMAGES_MANIFEST = "images-manifest.json";
+export declare const SERVER_FILES_MANIFEST = "required-server-files";
+export declare const DEV_CLIENT_PAGES_MANIFEST = "_devPagesManifest.json";
+export declare const MIDDLEWARE_MANIFEST = "middleware-manifest.json";
+export declare const TURBOPACK_CLIENT_MIDDLEWARE_MANIFEST = "_clientMiddlewareManifest.js";
+export declare const TURBOPACK_CLIENT_BUILD_MANIFEST = "client-build-manifest.json";
+export declare const DEV_CLIENT_MIDDLEWARE_MANIFEST = "_devMiddlewareManifest.json";
+export declare const REACT_LOADABLE_MANIFEST = "react-loadable-manifest.json";
+export declare const SERVER_DIRECTORY = "server";
+export declare const CONFIG_FILES: string[];
+export declare const BUILD_ID_FILE = "BUILD_ID";
+export declare const BLOCKED_PAGES: string[];
+export declare const CLIENT_PUBLIC_FILES_PATH = "public";
+export declare const CLIENT_STATIC_FILES_PATH = "static";
+export declare const STRING_LITERAL_DROP_BUNDLE = "__NEXT_DROP_CLIENT_FILE__";
+export declare const NEXT_BUILTIN_DOCUMENT = "__NEXT_BUILTIN_DOCUMENT__";
+export declare const BARREL_OPTIMIZATION_PREFIX = "__barrel_optimize__";
+export declare const CLIENT_REFERENCE_MANIFEST = "client-reference-manifest";
+export declare const SERVER_REFERENCE_MANIFEST = "server-reference-manifest";
+export declare const MIDDLEWARE_BUILD_MANIFEST = "middleware-build-manifest";
+export declare const MIDDLEWARE_REACT_LOADABLE_MANIFEST = "middleware-react-loadable-manifest";
+export declare const INTERCEPTION_ROUTE_REWRITE_MANIFEST = "interception-route-rewrite-manifest";
+export declare const DYNAMIC_CSS_MANIFEST = "dynamic-css-manifest";
+export declare const CLIENT_STATIC_FILES_RUNTIME_MAIN = "main";
+export declare const CLIENT_STATIC_FILES_RUNTIME_MAIN_APP = "main-app";
+export declare const APP_CLIENT_INTERNALS = "app-pages-internals";
+export declare const CLIENT_STATIC_FILES_RUNTIME_REACT_REFRESH = "react-refresh";
+export declare const CLIENT_STATIC_FILES_RUNTIME_WEBPACK = "webpack";
+export declare const CLIENT_STATIC_FILES_RUNTIME_POLYFILLS = "polyfills";
+export declare const CLIENT_STATIC_FILES_RUNTIME_POLYFILLS_SYMBOL: unique symbol;
+export declare const DEFAULT_RUNTIME_WEBPACK = "webpack-runtime";
+export declare const EDGE_RUNTIME_WEBPACK = "edge-runtime-webpack";
+export declare const STATIC_PROPS_ID = "__N_SSG";
+export declare const SERVER_PROPS_ID = "__N_SSP";
+export declare const DEFAULT_SERIF_FONT: {
   name: string;
   xAvgCharWidth: number;
   azAvgWidth: number;
   unitsPerEm: number;
 };
-declare const DEFAULT_SANS_SERIF_FONT: {
+export declare const DEFAULT_SANS_SERIF_FONT: {
   name: string;
   xAvgCharWidth: number;
   azAvgWidth: number;
   unitsPerEm: number;
 };
-declare const STATIC_STATUS_PAGES: string[];
-declare const TRACE_OUTPUT_VERSION = 1;
-declare const TURBO_TRACE_DEFAULT_MEMORY_LIMIT = 6000;
-declare const RSC_MODULE_TYPES: {
+export declare const STATIC_STATUS_PAGES: string[];
+export declare const TRACE_OUTPUT_VERSION = 1;
+export declare const TURBO_TRACE_DEFAULT_MEMORY_LIMIT = 6000;
+export declare const RSC_MODULE_TYPES: {
   readonly client: "client";
   readonly server: "server";
 };
-declare const EDGE_UNSUPPORTED_NODE_APIS: string[];
-declare const SYSTEM_ENTRYPOINTS: Set<string>;
-//#endregion
-export { APP_CLIENT_INTERNALS, APP_PATHS_MANIFEST, APP_PATH_ROUTES_MANIFEST, AdapterOutputType, BARREL_OPTIMIZATION_PREFIX, BLOCKED_PAGES, BUILD_ID_FILE, BUILD_MANIFEST, CLIENT_PUBLIC_FILES_PATH, CLIENT_REFERENCE_MANIFEST, CLIENT_STATIC_FILES_PATH, CLIENT_STATIC_FILES_RUNTIME_MAIN, CLIENT_STATIC_FILES_RUNTIME_MAIN_APP, CLIENT_STATIC_FILES_RUNTIME_POLYFILLS, CLIENT_STATIC_FILES_RUNTIME_POLYFILLS_SYMBOL, CLIENT_STATIC_FILES_RUNTIME_REACT_REFRESH, CLIENT_STATIC_FILES_RUNTIME_WEBPACK, COMPILER_INDEXES, COMPILER_NAMES, CONFIG_FILES, CompilerNameValues, DEFAULT_RUNTIME_WEBPACK, DEFAULT_SANS_SERIF_FONT, DEFAULT_SERIF_FONT, DEV_CLIENT_MIDDLEWARE_MANIFEST, DEV_CLIENT_PAGES_MANIFEST, DYNAMIC_CSS_MANIFEST, EDGE_RUNTIME_WEBPACK, EDGE_UNSUPPORTED_NODE_APIS, EXPORT_DETAIL, EXPORT_MARKER, FUNCTIONS_CONFIG_MANIFEST, IMAGES_MANIFEST, INTERCEPTION_ROUTE_REWRITE_MANIFEST, MIDDLEWARE_BUILD_MANIFEST, MIDDLEWARE_MANIFEST, MIDDLEWARE_REACT_LOADABLE_MANIFEST, MODERN_BROWSERSLIST_TARGET, NEXT_BUILTIN_DOCUMENT, NEXT_FONT_MANIFEST, PAGES_MANIFEST, PHASE_ANALYZE, PHASE_DEVELOPMENT_SERVER, PHASE_EXPORT, PHASE_INFO, PHASE_PRODUCTION_BUILD, PHASE_PRODUCTION_SERVER, PHASE_TEST, PHASE_TYPE, PREFETCH_HINTS, PRERENDER_MANIFEST, REACT_LOADABLE_MANIFEST, ROUTES_MANIFEST, RSC_MODULE_TYPES, SERVER_DIRECTORY, SERVER_FILES_MANIFEST, SERVER_PROPS_ID, SERVER_REFERENCE_MANIFEST, STATIC_PROPS_ID, STATIC_STATUS_PAGES, STRING_LITERAL_DROP_BUNDLE, SUBRESOURCE_INTEGRITY_MANIFEST, SYSTEM_ENTRYPOINTS, TRACE_OUTPUT_VERSION, TURBOPACK_CLIENT_BUILD_MANIFEST, TURBOPACK_CLIENT_MIDDLEWARE_MANIFEST, TURBO_TRACE_DEFAULT_MEMORY_LIMIT, UNDERSCORE_GLOBAL_ERROR_ROUTE, UNDERSCORE_GLOBAL_ERROR_ROUTE_ENTRY, UNDERSCORE_NOT_FOUND_ROUTE, UNDERSCORE_NOT_FOUND_ROUTE_ENTRY, ValueOf };
+export declare const EDGE_UNSUPPORTED_NODE_APIS: string[];
+export declare const SYSTEM_ENTRYPOINTS: Set<string>;
+//#endregion

package/dist/shims/constants.js

@@ -91,7 +91,7 @@ const CONFIG_FILES = [
 	"next.config.js",
 	"next.config.mjs",
 	"next.config.ts",
-	...process?.features?.typescript ? ["next.config.mts"] : []
+	...typeof process !== "undefined" && process.features?.typescript ? ["next.config.mts"] : []
 ];
 const BUILD_ID_FILE = "BUILD_ID";
 const BLOCKED_PAGES = [

package/dist/shims/default-not-found.d.ts

@@ -5,6 +5,5 @@ import React from "react";
  * from Next.js. Kept in sync with the upstream component's structure so HTML
  * snapshot diffs between Next.js and vinext stay minimal.
  */
-declare function DefaultNotFound(): React.ReactElement;
-//#endregion
-export { DefaultNotFound as default };
+export default function DefaultNotFound(): React.ReactElement;
+//#endregion

package/dist/shims/document.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 import { DocumentContext, DocumentInitialProps, DocumentProps } from "@vinext/types/next/upstream/dist/shared/lib/utils";
 import { HtmlProps } from "@vinext/types/next/upstream/dist/shared/lib/html-context.shared-runtime";
 //#region src/shims/document.d.ts
-type OriginProps = {
+export type OriginProps = {
   nonce?: string;
   crossOrigin?: "anonymous" | "use-credentials" | "" | undefined;
   children?: React.ReactNode;
@@ -13,11 +13,11 @@ type DocumentFiles = {
   allFiles: readonly string[];
 };
 type HeadProps = OriginProps & React.ComponentPropsWithoutRef<"head">;
-declare function Html(props: React.DetailedHTMLProps<React.HtmlHTMLAttributes<HTMLHtmlElement>, HTMLHtmlElement>): React.ReactElement;
-interface Head {
+export declare function Html(props: React.DetailedHTMLProps<React.HtmlHTMLAttributes<HTMLHtmlElement>, HTMLHtmlElement>): React.ReactElement;
+export interface Head {
   context: HtmlProps;
 }
-declare class Head extends React.Component<HeadProps> {
+export declare class Head extends React.Component<HeadProps> {
   static contextType: React.Context<HtmlProps | undefined>;
   getCssLinks(_files: DocumentFiles): React.ReactElement[] | null;
   getPreloadDynamicChunks(): Array<React.ReactElement | null>;
@@ -29,11 +29,11 @@ declare class Head extends React.Component<HeadProps> {
   getPolyfillScripts(): React.ReactElement[];
   render(): React.ReactElement;
 }
-declare function Main(): React.ReactElement;
-interface NextScript {
+export declare function Main(): React.ReactElement;
+export interface NextScript {
   context: HtmlProps;
 }
-declare class NextScript extends React.Component<OriginProps> {
+export declare class NextScript extends React.Component<OriginProps> {
   static contextType: React.Context<HtmlProps | undefined>;
   getDynamicChunks(_files: DocumentFiles): Array<React.ReactElement | null>;
   getPreNextScripts(): React.ReactElement;
@@ -42,9 +42,9 @@ declare class NextScript extends React.Component<OriginProps> {
   static getInlineScriptSource(context: Readonly<HtmlProps>): string;
   render(): React.ReactElement;
 }
-declare class Document<P = {}> extends React.Component<DocumentProps & P> {
+export default class Document<P = {}> extends React.Component<DocumentProps & P> {
   static getInitialProps(ctx: DocumentContext): Promise<DocumentInitialProps>;
   render(): React.ReactElement;
 }
 //#endregion
-export { type DocumentContext, type DocumentInitialProps, type DocumentProps, Head, Html, Main, NextScript, OriginProps, Document as default };
+export type { DocumentContext, DocumentInitialProps, DocumentProps };

package/dist/shims/dynamic-preload-chunks.d.ts

@@ -1,7 +1,6 @@
 import React from "react";
 //#region src/shims/dynamic-preload-chunks.d.ts
-declare function DynamicPreloadChunks(props: {
+export declare function DynamicPreloadChunks(props: {
   moduleIds?: readonly string[];
 }): React.FunctionComponentElement<React.FragmentProps> | null;
-//#endregion
-export { DynamicPreloadChunks };
+//#endregion

package/dist/shims/dynamic-preload-chunks.js

@@ -1,8 +1,7 @@
 "use client";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
-import { useScriptNonce } from "./script-nonce-context.js";
+import { useInitialStylesheetHrefs, useScriptNonce } from "./script-nonce-context.js";
 import React from "react";
-import * as ReactDOM from "react-dom";
 import { getPagesClientAssets } from "vinext/server/pages-client-assets";
 //#region src/shims/dynamic-preload-chunks.tsx
 /**
@@ -48,33 +47,38 @@ function resolveDynamicPreloadFiles(moduleIds) {
 }
 function DynamicPreloadChunks(props) {
 	const nonce = useScriptNonce();
+	const initialStylesheetHrefs = useInitialStylesheetHrefs();
 	if (typeof window !== "undefined") return null;
 	const files = resolveDynamicPreloadFiles(props.moduleIds);
 	if (files.length === 0) return null;
-	const stylesheets = [];
+	const crossOrigin = getPagesClientAssets().crossOrigin ?? "";
+	const preloadLinks = [];
 	for (const file of files) {
 		const assetHref = dynamicPreloadHref(file);
 		if (assetHref.endsWith(".css")) {
 			const href = appendAssetDeploymentIdQuery(assetHref);
-			stylesheets.push(React.createElement("link", {
+			if (initialStylesheetHrefs?.has(href)) continue;
+			preloadLinks.push(React.createElement("link", {
 				key: href,
 				rel: "stylesheet",
 				href,
+				crossOrigin,
 				nonce,
 				precedence: "dynamic"
 			}));
 			continue;
 		}
-		if (assetHref.endsWith(".js") && typeof ReactDOM.preload === "function") {
-			const preloadOptions = {
-				as: "script",
-				fetchPriority: "low",
-				nonce
-			};
-			ReactDOM.preload(assetHref, preloadOptions);
-		}
+		if (assetHref.endsWith(".js")) preloadLinks.push(React.createElement("link", {
+			key: assetHref,
+			rel: "modulepreload",
+			href: assetHref,
+			as: "script",
+			crossOrigin,
+			fetchPriority: "low",
+			nonce
+		}));
 	}
-	return stylesheets.length > 0 ? React.createElement(React.Fragment, null, ...stylesheets) : null;
+	return preloadLinks.length > 0 ? React.createElement(React.Fragment, null, ...preloadLinks) : null;
 }
 //#endregion
 export { DynamicPreloadChunks };

package/dist/shims/dynamic.d.ts

@@ -7,8 +7,8 @@ type DynamicInput<P> = DynamicOptions<P> | Loader<P>;
  * rendering. Dynamic imports now use React.lazy + Suspense, so there is no
  * separate preload work to await.
  */
-declare function flushPreloads(): Promise<void[]>;
+export declare function flushPreloads(): Promise<void[]>;
 declare function dynamic<P = {}>(dynamicInput: DynamicInput<P>, options?: DynamicOptions<P>): ComponentType<P>;
-declare function noSSR<P = {}>(LoadableInitializer: LoadableFn<P>, loadableOptions: DynamicOptions<P>): React.ComponentType<P>;
+export declare function noSSR<P = {}>(LoadableInitializer: LoadableFn<P>, loadableOptions: DynamicOptions<P>): React.ComponentType<P>;
 //#endregion
-export { type DynamicOptions, type DynamicOptionsLoadingProps, type LoadableComponent, type LoadableFn, type LoadableGeneratedOptions, type LoadableOptions, type Loader, type LoaderComponent, type LoaderMap, dynamic as default, flushPreloads, noSSR };
+export { type DynamicOptions, type DynamicOptionsLoadingProps, type LoadableComponent, type LoadableFn, type LoadableGeneratedOptions, type LoadableOptions, type Loader, type LoaderComponent, type LoaderMap, dynamic as default };

package/dist/shims/error-boundary-navigation.d.ts

@@ -1,6 +1,5 @@
 import { AppRouterInstance } from "./internal/app-router-context.js";
 //#region src/shims/error-boundary-navigation.d.ts
-declare function useErrorBoundaryPathname(): string;
-declare function useErrorBoundaryRouter(): AppRouterInstance;
-//#endregion
-export { useErrorBoundaryPathname, useErrorBoundaryRouter };
+export declare function useErrorBoundaryPathname(): string;
+export declare function useErrorBoundaryRouter(): AppRouterInstance;
+//#endregion

package/dist/shims/error-boundary.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 //#region src/shims/error-boundary.d.ts
-type ErrorBoundaryProps = {
+export type ErrorBoundaryProps = {
   fallback: React.ComponentType<{
     error: unknown;
     reset: () => void;
@@ -8,13 +8,13 @@ type ErrorBoundaryProps = {
   children: React.ReactNode;
   resetKey?: string | null;
 };
-type SerializedBoundaryError = {
+export type SerializedBoundaryError = {
   digest?: string;
   message: string;
   name?: string;
   stack?: string;
 };
-declare function SerializedErrorBoundary({ fallback: Fallback, error }: {
+export declare function SerializedErrorBoundary({ fallback: Fallback, error }: {
   fallback: React.ComponentType<{
     error: Error & {
       digest?: string;
@@ -34,12 +34,12 @@ type ErrorBoundaryInnerProps = {
   isImplicitRootErrorBoundary?: boolean;
   pathname: string | null;
 } & ErrorBoundaryProps;
-type ErrorBoundaryState = {
+export type ErrorBoundaryState = {
   error: CapturedError | null;
   previousPathname: string | null;
   previousResetKey: string | null;
 };
-declare class RedirectErrorBoundary extends React.Component<{
+export declare class RedirectErrorBoundary extends React.Component<{
   children?: React.ReactNode;
 }, RedirectBoundaryState> {
   constructor(props: {
@@ -48,7 +48,7 @@ declare class RedirectErrorBoundary extends React.Component<{
   static getDerivedStateFromError(error: unknown): RedirectBoundaryState;
   render(): string | number | bigint | boolean | React.JSX.Element | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | Iterable<React.ReactNode> | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | React.ReactPortal | null | undefined> | null | undefined;
 }
-declare function RedirectBoundary({ children }: {
+export declare function RedirectBoundary({ children }: {
   children?: React.ReactNode;
 }): React.JSX.Element;
 /**
@@ -56,7 +56,7 @@ declare function RedirectBoundary({ children }: {
  * This must be a client component since error boundaries use
  * componentDidCatch / getDerivedStateFromError.
  */
-declare class ErrorBoundaryInner extends React.Component<ErrorBoundaryInnerProps, ErrorBoundaryState> {
+export declare class ErrorBoundaryInner extends React.Component<ErrorBoundaryInnerProps, ErrorBoundaryState> {
   constructor(props: ErrorBoundaryInnerProps);
   static getDerivedStateFromProps(props: ErrorBoundaryInnerProps, state: ErrorBoundaryState): ErrorBoundaryState | null;
   static getDerivedStateFromError(error: unknown): Partial<ErrorBoundaryState>;
@@ -66,8 +66,8 @@ declare class ErrorBoundaryInner extends React.Component<ErrorBoundaryInnerProps
   reset: () => void;
   render(): string | number | bigint | boolean | React.JSX.Element | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | Iterable<React.ReactNode> | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | React.ReactPortal | null | undefined> | null | undefined;
 }
-declare function ErrorBoundary({ fallback, children, resetKey }: ErrorBoundaryProps): React.JSX.Element;
-declare function GlobalErrorBoundary({ fallback, children }: {
+export declare function ErrorBoundary({ fallback, children, resetKey }: ErrorBoundaryProps): React.JSX.Element;
+export declare function GlobalErrorBoundary({ fallback, children }: {
   fallback: React.ComponentType<{
     error: unknown;
     reset: () => void;
@@ -83,7 +83,7 @@ type NotFoundBoundaryProps = {
  * Wrapper that reads the current pathname and passes it to the inner class
  * component. Segment reset keys own App Router remount semantics when present.
  */
-declare function NotFoundBoundary({ fallback, children, resetKey }: NotFoundBoundaryProps): React.JSX.Element;
+export declare function NotFoundBoundary({ fallback, children, resetKey }: NotFoundBoundaryProps): React.JSX.Element;
 type ForbiddenBoundaryProps = {
   fallback: React.ReactNode;
   children: React.ReactNode;
@@ -97,13 +97,13 @@ type ForbiddenBoundaryState = {
   previousPathname: string | null;
   previousResetKey: string | null;
 };
-declare class ForbiddenBoundaryInner extends React.Component<ForbiddenBoundaryInnerProps, ForbiddenBoundaryState> {
+export declare class ForbiddenBoundaryInner extends React.Component<ForbiddenBoundaryInnerProps, ForbiddenBoundaryState> {
   constructor(props: ForbiddenBoundaryInnerProps);
   static getDerivedStateFromProps(props: ForbiddenBoundaryInnerProps, state: ForbiddenBoundaryState): ForbiddenBoundaryState | null;
   static getDerivedStateFromError(error: unknown): Partial<ForbiddenBoundaryState>;
   render(): string | number | bigint | boolean | React.JSX.Element | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | Iterable<React.ReactNode> | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | React.ReactPortal | null | undefined> | null | undefined;
 }
-declare function ForbiddenBoundary({ fallback, children, resetKey }: ForbiddenBoundaryProps): React.JSX.Element;
+export declare function ForbiddenBoundary({ fallback, children, resetKey }: ForbiddenBoundaryProps): React.JSX.Element;
 type UnauthorizedBoundaryProps = {
   fallback: React.ReactNode;
   children: React.ReactNode;
@@ -117,14 +117,14 @@ type UnauthorizedBoundaryState = {
   previousPathname: string | null;
   previousResetKey: string | null;
 };
-declare class UnauthorizedBoundaryInner extends React.Component<UnauthorizedBoundaryInnerProps, UnauthorizedBoundaryState> {
+export declare class UnauthorizedBoundaryInner extends React.Component<UnauthorizedBoundaryInnerProps, UnauthorizedBoundaryState> {
   constructor(props: UnauthorizedBoundaryInnerProps);
   static getDerivedStateFromProps(props: UnauthorizedBoundaryInnerProps, state: UnauthorizedBoundaryState): UnauthorizedBoundaryState | null;
   static getDerivedStateFromError(error: unknown): Partial<UnauthorizedBoundaryState>;
   render(): string | number | bigint | boolean | React.JSX.Element | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | Iterable<React.ReactNode> | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | React.ReactPortal | null | undefined> | null | undefined;
 }
-declare function UnauthorizedBoundary({ fallback, children, resetKey }: UnauthorizedBoundaryProps): React.JSX.Element;
-type DevRecoveryBoundaryProps = {
+export declare function UnauthorizedBoundary({ fallback, children, resetKey }: UnauthorizedBoundaryProps): React.JSX.Element;
+export type DevRecoveryBoundaryProps = {
   isImplicitRootErrorBoundary?: boolean;
   resetKey: number;
   onCatch?: (resetKey: number) => void;
@@ -134,7 +134,7 @@ type DevRecoveryBoundaryState = {
   error: CapturedError | null;
   previousResetKey: number;
 };
-declare class DevRecoveryBoundary extends React.Component<DevRecoveryBoundaryProps, DevRecoveryBoundaryState> {
+export declare class DevRecoveryBoundary extends React.Component<DevRecoveryBoundaryProps, DevRecoveryBoundaryState> {
   constructor(props: DevRecoveryBoundaryProps);
   static getDerivedStateFromProps(props: DevRecoveryBoundaryProps, state: DevRecoveryBoundaryState): DevRecoveryBoundaryState | null;
   static getDerivedStateFromError(error: unknown): Partial<DevRecoveryBoundaryState>;
@@ -144,5 +144,4 @@ declare class DevRecoveryBoundary extends React.Component<DevRecoveryBoundaryPro
   componentDidCatch(): void;
   render(): React.ReactNode;
 }
-//#endregion
-export { DevRecoveryBoundary, DevRecoveryBoundaryProps, ErrorBoundary, ErrorBoundaryInner, ErrorBoundaryProps, ErrorBoundaryState, ForbiddenBoundary, ForbiddenBoundaryInner, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, RedirectErrorBoundary, SerializedBoundaryError, SerializedErrorBoundary, UnauthorizedBoundary, UnauthorizedBoundaryInner };
+//#endregion

package/dist/shims/error-boundary.js

@@ -1,21 +1,22 @@
 "use client";
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { decodeRedirectError, isRedirectError } from "./navigation-errors.js";
 import "./navigation-server.js";
 import { useErrorBoundaryPathname, useErrorBoundaryRouter } from "./error-boundary-navigation.js";
 import DefaultGlobalError from "./default-global-error.js";
 import { handleAppNavigationFailure } from "../client/app-nav-failure-handler.js";
 import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
-import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import React from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/shims/error-boundary.tsx
 function SerializedErrorBoundary({ fallback: Fallback, error }) {
+	const reconstructedError = Object.assign(new Error(error.message), {
+		digest: error.digest,
+		name: error.name ?? "Error",
+		stack: error.stack
+	});
 	return /* @__PURE__ */ jsx(Fallback, {
-		error: Object.assign(new Error(error.message), {
-			digest: error.digest,
-			name: error.name ?? "Error",
-			stack: error.stack
-		}),
+		error: reconstructedError,
 		reset: () => globalThis.location?.reload()
 	});
 }
@@ -157,16 +158,18 @@ var ErrorBoundaryInner = class extends React.Component {
 	}
 };
 function ErrorBoundary({ fallback, children, resetKey }) {
+	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
-		pathname: useErrorBoundaryPathname(),
+		pathname,
 		resetKey,
 		fallback,
 		children
 	});
 }
 function GlobalErrorBoundary({ fallback, children }) {
+	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
-		pathname: useErrorBoundaryPathname(),
+		pathname,
 		fallback,
 		isImplicitRootErrorBoundary: fallback === DefaultGlobalError,
 		children
@@ -219,8 +222,9 @@ var NotFoundBoundaryInner = class extends React.Component {
 * component. Segment reset keys own App Router remount semantics when present.
 */
 function NotFoundBoundary({ fallback, children, resetKey }) {
+	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(NotFoundBoundaryInner, {
-		pathname: useErrorBoundaryPathname(),
+		pathname,
 		resetKey,
 		fallback,
 		children
@@ -260,8 +264,9 @@ var ForbiddenBoundaryInner = class extends React.Component {
 	}
 };
 function ForbiddenBoundary({ fallback, children, resetKey }) {
+	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(ForbiddenBoundaryInner, {
-		pathname: useErrorBoundaryPathname(),
+		pathname,
 		resetKey,
 		fallback,
 		children
@@ -301,8 +306,9 @@ var UnauthorizedBoundaryInner = class extends React.Component {
 	}
 };
 function UnauthorizedBoundary({ fallback, children, resetKey }) {
+	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(UnauthorizedBoundaryInner, {
-		pathname: useErrorBoundaryPathname(),
+		pathname,
 		resetKey,
 		fallback,
 		children

package/dist/shims/error.d.ts

@@ -1,7 +1,8 @@
 import React from "react";
 import { IncomingMessage, ServerResponse } from "node:http";
+import { ErrorInfo, catchError as catchError$1, unstable_catchError as unstable_catchError$1 } from "@vinext/types/next/vinext/error";
 //#region src/shims/error.d.ts
-type ErrorProps = {
+export type ErrorProps = {
   statusCode: number;
   hostname?: string;
   title?: string;
@@ -21,22 +22,7 @@ declare class ErrorComponent<P = {}> extends React.Component<P & ErrorProps> {
   static origGetInitialProps: typeof getErrorInitialProps;
   render(): React.ReactElement;
 }
-type ErrorInfo = {
-  error: Error;
-  reset: () => void;
-  unstable_retry: () => void;
-};
-type _UserProps = Record<string, unknown>;
-/**
- * Wrap a fallback render function in a Component-level error boundary.
- * Returns a Component that renders `children` and, on error, renders the
- * supplied fallback with an `ErrorInfo` value.
- *
- * Ported from Next.js:
- *   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/catch-error.tsx
- */
-declare function unstable_catchError<P extends _UserProps>(fallback: (props: P, errorInfo: ErrorInfo) => React.ReactNode): React.ComponentType<P & {
-  children?: React.ReactNode;
-}>;
+export declare const catchError: typeof catchError$1;
+export declare const unstable_catchError: typeof unstable_catchError$1;
 //#endregion
-export { ErrorInfo, ErrorProps, ErrorComponent as default, unstable_catchError };
+export { type ErrorInfo, ErrorComponent as default };