vinext 1.0.0-beta.4 → 1.0.0-beta.5

package/dist/build/static-export.d.ts

@@ -1,24 +1,32 @@
 import { ResolvedNextConfig } from "../config/next-config.js";
 import { Route } from "../routing/pages-router.js";
 import { AppRoute } from "../routing/app-route-graph.js";
-
 //#region src/build/static-export.d.ts
 type StaticExportOptions = {
   /**
    * Absolute path to the pre-built Pages Router server bundle
    * (e.g. `dist/server/entry.js`).
    */
-  pagesBundlePath: string; /** Discovered page routes (excludes API routes) */
-  routes: Route[]; /** Discovered API routes */
-  apiRoutes: Route[]; /** Pages directory path */
-  pagesDir: string; /** Output directory for static files */
-  outDir: string; /** Resolved next.config.js */
+  pagesBundlePath: string;
+  /** Discovered page routes (excludes API routes) */
+  routes: Route[];
+  /** Discovered API routes */
+  apiRoutes: Route[];
+  /** Pages directory path */
+  pagesDir: string;
+  /** Output directory for static files */
+  outDir: string;
+  /** Resolved next.config.js */
   config: ResolvedNextConfig;
 };
 type StaticExportResult = {
-  /** Number of HTML files generated */pageCount: number; /** Generated file paths (relative to outDir) */
-  files: string[]; /** Warnings encountered */
-  warnings: string[]; /** Errors encountered (non-fatal, specific pages) */
+  /** Number of HTML files generated */
+  pageCount: number;
+  /** Generated file paths (relative to outDir) */
+  files: string[];
+  /** Warnings encountered */
+  warnings: string[];
+  /** Errors encountered (non-fatal, specific pages) */
   errors: Array<{
     route: string;
     error: string;
@@ -31,7 +39,8 @@ type StaticExportResult = {
  */
 declare function staticExportPages(options: StaticExportOptions): Promise<StaticExportResult>;
 type AppStaticExportOptions = {
-  /** Discovered app routes */routes: AppRoute[];
+  /** Discovered app routes */
+  routes: AppRoute[];
   /**
    * App directory path. When provided, static export scans it for file-based
    * metadata assets such as icon.png and sitemap.xml.
@@ -41,8 +50,10 @@ type AppStaticExportOptions = {
    * Absolute path to the pre-built RSC handler bundle
    * (e.g. `dist/server/index.js`).
    */
-  rscBundlePath: string; /** Output directory */
-  outDir: string; /** Resolved next.config.js */
+  rscBundlePath: string;
+  /** Output directory */
+  outDir: string;
+  /** Resolved next.config.js */
   config: ResolvedNextConfig;
 };
 /**

package/dist/cache/cache-adapters-virtual.d.ts

@@ -11,7 +11,8 @@ type CacheAdapterDescriptor<O extends Record<string, unknown> = Record<string, u
    * Module specifier (or absolute path, e.g. from `require.resolve(...)`) whose
    * default export is a cache adapter factory.
    */
-  adapter: string; /** JSON-serializable options forwarded to the factory at runtime. */
+  adapter: string;
+  /** JSON-serializable options forwarded to the factory at runtime. */
   options?: O;
 };
 /**
@@ -20,7 +21,9 @@ type CacheAdapterDescriptor<O extends Record<string, unknown> = Record<string, u
  * from a worker entry.
  */
 type VinextCacheConfig = {
-  /** Page-level ISR serving strategy (CDN cache adapter). */cdn?: CacheAdapterDescriptor; /** Data cache (fetch / `"use cache"` / `unstable_cache`) handler. */
+  /** Page-level ISR serving strategy (CDN cache adapter). */
+  cdn?: CacheAdapterDescriptor;
+  /** Data cache (fetch / `"use cache"` / `unstable_cache`) handler. */
   data?: CacheAdapterDescriptor;
 };
 /** Public virtual module id imported by the server entries. */

package/dist/check.js

@@ -295,12 +295,12 @@ const CONFIG_SUPPORT = {
 		detail: "not recognized; instrumentation files are enabled automatically"
 	},
 	skipMiddlewareUrlNormalize: {
-		status: "unsupported",
-		detail: "not recognized; use of this option is ignored"
+		status: "partial",
+		detail: "preserves raw Pages Router _next/data URLs passed to middleware"
 	},
 	skipProxyUrlNormalize: {
-		status: "unsupported",
-		detail: "not recognized; use of this option is ignored"
+		status: "partial",
+		detail: "preserves raw Pages Router _next/data URLs passed to proxy"
 	},
 	"i18n.domains": {
 		status: "partial",

package/dist/cli-dev-config.d.ts

@@ -1,5 +1,4 @@
 import { Plugin, ServerOptions } from "vite";
-
 //#region src/cli-dev-config.d.ts
 type DevServerCliOptions = {
   port?: number;

package/dist/cli.d.ts

@@ -1 +1 @@
-export { };
+export {}

package/dist/client/client-rewrite-matcher.d.ts

@@ -0,0 +1,12 @@
+import { RequestContext } from "../config/request-context.js";
+import { BasePathMatchState } from "../config/config-matchers.js";
+import { ClientRewrite } from "./client-rewrites.js";
+//#region src/client/client-rewrite-matcher.d.ts
+declare function matchClientRewrite(pathname: string, rewrite: ClientRewrite, context: RequestContext, basePathState: BasePathMatchState): {
+  kind: "rewrite";
+  destination: string;
+} | {
+  kind: "server";
+} | null;
+//#endregion
+export { matchClientRewrite };

package/dist/client/client-rewrite-matcher.js

@@ -0,0 +1,20 @@
+import { isExternalUrl } from "../utils/external-url.js";
+import { matchRewrite } from "../config/config-matchers.js";
+//#region src/client/client-rewrite-matcher.ts
+function matchClientRewrite(pathname, rewrite, context, basePathState) {
+	const destination = matchRewrite(pathname, [{
+		source: rewrite.source,
+		destination: rewrite.destination ?? "/",
+		has: rewrite.has,
+		locale: rewrite.locale,
+		basePath: rewrite.basePath
+	}], context, basePathState);
+	if (destination === null) return null;
+	if (rewrite.requiresServerEvaluation || isExternalUrl(destination)) return { kind: "server" };
+	return {
+		kind: "rewrite",
+		destination
+	};
+}
+//#endregion
+export { matchClientRewrite };

package/dist/client/client-rewrites.d.ts

@@ -0,0 +1,31 @@
+import { HasCondition, NextRewrite, ResolvedNextConfig } from "../config/next-config.js";
+//#region src/client/client-rewrites.d.ts
+type ClientHasCondition = Omit<HasCondition, "type"> & {
+  type: "host" | "query";
+};
+type ClientRewriteFields = Pick<NextRewrite, "basePath" | "locale" | "source"> & {
+  has?: ClientHasCondition[];
+};
+/**
+ * Rewrite data that is safe to publish in a browser bundle.
+ *
+ * Rules that require server-only data deliberately omit both the destination
+ * and the data that made server evaluation necessary. The client can still
+ * use browser-authoritative conditions as a prefilter before handing the
+ * navigation to the server.
+ */
+type ClientRewrite = (ClientRewriteFields & {
+  destination: string;
+  requiresServerEvaluation?: never;
+}) | (ClientRewriteFields & {
+  destination?: never;
+  requiresServerEvaluation: true;
+});
+type ClientRewrites = {
+  afterFiles: ClientRewrite[];
+  beforeFiles: ClientRewrite[];
+  fallback: ClientRewrite[];
+};
+declare function toClientRewrites(rewrites: ResolvedNextConfig["rewrites"]): ClientRewrites;
+//#endregion
+export { ClientRewrite, ClientRewrites, toClientRewrites };

package/dist/client/client-rewrites.js

@@ -0,0 +1,41 @@
+import { isExternalUrl } from "../utils/external-url.js";
+//#region src/client/client-rewrites.ts
+function isClientHasCondition(condition) {
+	switch (condition.type) {
+		case "host":
+		case "query": return true;
+		case "cookie":
+		case "header": return false;
+		default: return false;
+	}
+}
+function toClientRewrite(rewrite) {
+	const clientHas = rewrite.has?.filter(isClientHasCondition);
+	const hasServerOnlyCondition = rewrite.has?.some((condition) => !isClientHasCondition(condition)) ?? false;
+	const common = {
+		source: rewrite.source,
+		has: clientHas?.length ? clientHas : void 0,
+		locale: rewrite.locale,
+		basePath: rewrite.basePath
+	};
+	if (isExternalUrl(rewrite.destination) || (rewrite.missing?.length ?? 0) > 0 || hasServerOnlyCondition) return {
+		...common,
+		requiresServerEvaluation: true
+	};
+	return {
+		source: rewrite.source,
+		destination: rewrite.destination,
+		has: common.has,
+		locale: rewrite.locale,
+		basePath: rewrite.basePath
+	};
+}
+function toClientRewrites(rewrites) {
+	return {
+		beforeFiles: rewrites.beforeFiles.map(toClientRewrite),
+		afterFiles: rewrites.afterFiles.map(toClientRewrite),
+		fallback: rewrites.fallback.map(toClientRewrite)
+	};
+}
+//#endregion
+export { toClientRewrites };

package/dist/client/dev-error-overlay.d.ts

@@ -1,5 +1,4 @@
 import { ReportedError, dismissOverlay } from "./dev-error-overlay-store.js";
-
 //#region src/client/dev-error-overlay.d.ts
 declare const DEV_ERROR_OVERLAY_HOST_ID = "__vinext_dev_error_overlay_root";
 declare const DEV_ERROR_OVERLAY_MOUNT_ID = "__vinext_dev_error_overlay_mount";

package/dist/client/empty-module.d.ts

@@ -1 +1 @@
-export { };
+export {}

package/dist/client/index.d.ts

@@ -0,0 +1,2 @@
+import { getVinextReact } from "./react-instance.js";
+export { getVinextReact };

package/dist/client/index.js

@@ -0,0 +1,2 @@
+import { getVinextReact } from "./react-instance.js";
+export { getVinextReact };

package/dist/client/instrumentation-client-state.d.ts

@@ -1,5 +1,4 @@
 import { ClientInstrumentationHooks } from "./instrumentation-client.js";
-
 //#region src/client/instrumentation-client-state.d.ts
 declare function normalizeClientInstrumentationHooks(hooks: ClientInstrumentationHooks): ClientInstrumentationHooks | null;
 declare function setClientInstrumentationHooks(hooks: ClientInstrumentationHooks | null): ClientInstrumentationHooks | null;

package/dist/client/navigation-runtime.d.ts

@@ -1,6 +1,5 @@
 import { RouteManifest } from "../routing/app-route-graph.js";
 import { AppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-
 //#region src/client/navigation-runtime.d.ts
 type NavigationRuntimeSnapshot = {
   pathname: string;
@@ -14,6 +13,12 @@ type NavigationRuntimeRscBootstrap = {
   nav?: NavigationRuntimeSnapshot;
   params?: Record<string, string | string[]>;
   rsc: NavigationRuntimeRscChunk[];
+  /**
+   * Client reuse bound in seconds resolved from the initial render's completed
+   * `cacheLife` — the done-script sibling of `dynamicStaleTimeSeconds`, which
+   * carries the `experimental.staleTimes` config value instead.
+   */
+  staleTimeSeconds?: number;
 };
 type NavigationRuntimeKind = "navigate" | "traverse" | "refresh";
 type NavigationRuntimeHistoryUpdateMode = "push" | "replace";

package/dist/client/navigation-runtime.js

@@ -55,7 +55,11 @@ function isNavigationRuntimeRscBootstrap(value) {
 	const nav = Reflect.get(value, "nav");
 	const params = Reflect.get(value, "params");
 	const rsc = Reflect.get(value, "rsc");
-	return (done === void 0 || typeof done === "boolean") && (dynamicStaleTimeSeconds === void 0 || typeof dynamicStaleTimeSeconds === "number" && Number.isFinite(dynamicStaleTimeSeconds) && dynamicStaleTimeSeconds >= 0) && (initialCacheKind === void 0 || initialCacheKind === "dynamic" || initialCacheKind === "static") && (nav === void 0 || isNavigationRuntimeSnapshot(nav)) && (params === void 0 || isNavigationRuntimeParams(params)) && Array.isArray(rsc) && rsc.every(isNavigationRuntimeRscChunk);
+	const staleTimeSeconds = Reflect.get(value, "staleTimeSeconds");
+	return (done === void 0 || typeof done === "boolean") && isOptionalStaleTimeSeconds(dynamicStaleTimeSeconds) && (initialCacheKind === void 0 || initialCacheKind === "dynamic" || initialCacheKind === "static") && (nav === void 0 || isNavigationRuntimeSnapshot(nav)) && (params === void 0 || isNavigationRuntimeParams(params)) && Array.isArray(rsc) && rsc.every(isNavigationRuntimeRscChunk) && isOptionalStaleTimeSeconds(staleTimeSeconds);
+}
+function isOptionalStaleTimeSeconds(value) {
+	return value === void 0 || typeof value === "number" && Number.isFinite(value) && value >= 0;
 }
 function isReadonlyStringArray(value) {
 	return Array.isArray(value) && value.every((entry) => typeof entry === "string");

package/dist/client/pages-router-link-navigation.d.ts

@@ -26,32 +26,14 @@ type PagesRouterLinkNavigation = {
   locale?: string | false;
   interpolateDynamicRoute?: boolean;
 };
-declare function resolvePagesRouterQueryOnlyHref(href: string, {
-  asPath,
-  basePath,
-  fallbackHref,
-  locales
-}: {
+declare function resolvePagesRouterQueryOnlyHref(href: string, { asPath, basePath, fallbackHref, locales }: {
   asPath?: string;
   basePath: string;
   fallbackHref: string;
   locales?: readonly string[];
 }): string;
-declare function navigatePagesRouterLink(router: PagesRouterLinkRuntime, {
-  href,
-  as,
-  replace,
-  scroll,
-  shallow,
-  locale,
-  interpolateDynamicRoute
-}: PagesRouterLinkNavigation): Promise<void>;
-declare function navigatePagesRouterLinkWithFallback({
-  router,
-  loadRouter,
-  navigation,
-  fallback
-}: {
+declare function navigatePagesRouterLink(router: PagesRouterLinkRuntime, { href, as, replace, scroll, shallow, locale, interpolateDynamicRoute }: PagesRouterLinkNavigation): Promise<void>;
+declare function navigatePagesRouterLinkWithFallback({ router, loadRouter, navigation, fallback }: {
   router?: PagesRouterLinkRuntime;
   loadRouter: () => Promise<PagesRouterLinkRuntime | undefined>;
   navigation: PagesRouterLinkNavigation;

package/dist/client/react-instance-bootstrap.d.ts

@@ -0,0 +1 @@
+export {}

package/dist/client/react-instance-bootstrap.js

@@ -0,0 +1,7 @@
+"use client";
+import { getVinextReact } from "./react-instance.js";
+import * as React$1 from "react";
+//#region src/client/react-instance-bootstrap.ts
+getVinextReact(React$1);
+//#endregion
+export {};

package/dist/client/react-instance.d.ts

@@ -0,0 +1,13 @@
+//#region src/client/react-instance.d.ts
+/**
+ * Return the React instance registered by the vinext browser entry.
+ *
+ * Module Federation remotes can call this with their local React namespace to
+ * reuse the host instance. The first browser registration wins so evaluating
+ * another copy of this module (for example after HMR) cannot replace it.
+ * Server and RSC environments always keep their condition-specific React
+ * instance local.
+ */
+declare function getVinextReact(reactInstance: typeof import("react")): typeof import("react");
+//#endregion
+export { getVinextReact };

package/dist/client/react-instance.js

@@ -0,0 +1,20 @@
+//#region src/client/react-instance.ts
+const VINEXT_CLIENT_REACT = Symbol.for("vinext.client.react");
+/**
+* Return the React instance registered by the vinext browser entry.
+*
+* Module Federation remotes can call this with their local React namespace to
+* reuse the host instance. The first browser registration wins so evaluating
+* another copy of this module (for example after HMR) cannot replace it.
+* Server and RSC environments always keep their condition-specific React
+* instance local.
+*/
+function getVinextReact(reactInstance) {
+	if (typeof window === "undefined") return reactInstance;
+	const registeredReact = Reflect.get(globalThis, VINEXT_CLIENT_REACT);
+	if (registeredReact !== void 0) return registeredReact;
+	Reflect.set(globalThis, VINEXT_CLIENT_REACT, reactInstance);
+	return reactInstance;
+}
+//#endregion
+export { getVinextReact };

package/dist/client/vinext-next-data.d.ts

@@ -1,5 +1,4 @@
 import { NEXT_DATA } from "../shims/internal/utils.js";
-
 //#region src/client/vinext-next-data.d.ts
 type VinextLinkPrefetchRoute = {
   canPrefetchLoadingShell: boolean;
@@ -26,11 +25,17 @@ type VinextPagesLinkPrefetchRoute = {
   requiresDynamicNavigationRequest?: boolean;
 };
 type VinextNextData = {
-  /** vinext-specific additions (not part of Next.js upstream). */__vinext?: {
-    /** Absolute URL of the page module for dynamic import. */pageModuleUrl?: string; /** Absolute URL of the `_app` module for dynamic import. */
-    appModuleUrl?: string; /** True when the Pages Router server has middleware/proxy configured. */
-    hasMiddleware?: boolean; /** True when build-time rewrites can affect the initial Pages Router ready state. */
-    hasRewrites?: boolean; /** Server-resolved Pages route URL used to hydrate fallback shells behind rewrites. */
+  /** vinext-specific additions (not part of Next.js upstream). */
+  __vinext?: {
+    /** Absolute URL of the page module for dynamic import. */
+    pageModuleUrl?: string;
+    /** Absolute URL of the `_app` module for dynamic import. */
+    appModuleUrl?: string;
+    /** True when the Pages Router server has middleware/proxy configured. */
+    hasMiddleware?: boolean;
+    /** True when build-time rewrites can affect the initial Pages Router ready state. */
+    hasRewrites?: boolean;
+    /** Server-resolved Pages route URL used to hydrate fallback shells behind rewrites. */
     routeUrl?: string;
   };
 } & NEXT_DATA;

package/dist/client/window-next.d.ts

@@ -55,11 +55,13 @@ type AppRouterPublicInstance = {
   forward: () => void;
   refresh: () => void;
   prefetch: (href: string, options?: {
+    kind?: "auto" | "full";
     onInvalidate?: () => void;
   }) => void;
   experimental_gesturePush?: (href: string, options?: {
     scroll?: boolean;
-  }) => void; /** Default placeholder, matches Next.js. */
+  }) => void;
+  /** Default placeholder, matches Next.js. */
   bfcacheId?: string;
 };
 /**
@@ -97,7 +99,8 @@ type PagesRouterPublicInstance = {
    * prefetch — App Router targets land here as `{ __appRouter: true }`.
    * See: `packages/next/src/shared/lib/router/router.ts:2525`.
    */
-  components: Record<string, unknown>; /** Persistent Pages Router static-data cache, matching Next.js `Router.sdc`. */
+  components: Record<string, unknown>;
+  /** Persistent Pages Router static-data cache, matching Next.js `Router.sdc`. */
   sdc: Record<string, Promise<Response>>;
 };
 declare global {

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

@@ -1,7 +1,6 @@
 import { HasCondition, NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "./next-config.js";
 import { RequestContext, normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
-
 //#region src/config/config-matchers.d.ts
 /**
  * Detect regex patterns vulnerable to catastrophic backtracking (ReDoS).
@@ -44,7 +43,8 @@ declare function escapeHeaderSource(source: string): string;
  * @see .nextjs-ref/packages/next/src/lib/load-custom-routes.ts:198-220
  */
 type BasePathMatchState = {
-  /** Configured `basePath` (without trailing slash) or "" when unset. */basePath: string;
+  /** Configured `basePath` (without trailing slash) or "" when unset. */
+  basePath: string;
   /**
    * True when the inbound request was originally under `basePath` (i.e.
    * the prod-server/handler stripped the prefix before the matcher runs).
@@ -69,9 +69,7 @@ type BasePathMatchState = {
  * individual header values), so the wider `string | string[]` type of
  * `middlewareHeaders` is safe to cast here.
  */
-declare function applyMiddlewareRequestHeaders(middlewareHeaders: Record<string, string | string[]>, request: Request, options?: {
-  preserveCredentialHeaders?: boolean;
-}): {
+declare function applyMiddlewareRequestHeaders(middlewareHeaders: Record<string, string | string[]>, request: Request): {
   request: Request;
   postMwReqCtx: RequestContext;
 };

package/dist/config/config-matchers.js

@@ -1,7 +1,7 @@
+import { normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
 import { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
+import { buildRequestHeadersFromMiddlewareResponse, getUnconsumedMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
 import { analyzeRegexSafety } from "../utils/regex-safety.js";
-import { normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
 //#region src/config/config-matchers.ts
 /**
@@ -301,9 +301,10 @@ function shouldEvaluateRule(ruleBasePath, state) {
 * individual header values), so the wider `string | string[]` type of
 * `middlewareHeaders` is safe to cast here.
 */
-function applyMiddlewareRequestHeaders(middlewareHeaders, request, options = {}) {
-	const nextHeaders = buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders, options);
-	for (const key of Object.keys(middlewareHeaders)) if (key.startsWith("x-middleware-") && key !== "x-middleware-cache") delete middlewareHeaders[key];
+function applyMiddlewareRequestHeaders(middlewareHeaders, request) {
+	const nextHeaders = buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders);
+	const unconsumedRequestHeaders = getUnconsumedMiddlewareRequestHeaders(middlewareHeaders);
+	for (const key of Object.keys(middlewareHeaders)) if (key.startsWith("x-middleware-") && key !== "x-middleware-cache" && !unconsumedRequestHeaders.has(key)) delete middlewareHeaders[key];
 	if (nextHeaders) request = new Request(request.url, {
 		method: request.method,
 		headers: nextHeaders,
@@ -831,7 +832,7 @@ async function proxyExternalRequest(request, externalUrl) {
 	headers.set("host", targetUrl.host);
 	stripHopByHopRequestHeaders(headers);
 	const keysToDelete = [];
-	for (const key of headers.keys()) if (key.startsWith("x-middleware-")) keysToDelete.push(key);
+	for (const key of headers.keys()) if (key.startsWith("x-middleware-") && !key.startsWith("x-middleware-request-")) keysToDelete.push(key);
 	for (const key of keysToDelete) headers.delete(key);
 	headers.delete(VINEXT_PRERENDER_SECRET_HEADER);
 	headers.delete(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER);

package/dist/config/dotenv.d.ts

@@ -46,10 +46,6 @@ declare function getDotenvFiles(mode: string): string[];
  * pass is effectively a no-op for overlapping keys. For `start` and `deploy`
  * commands (which don't go through Vite at all), this is the only loading.
  */
-declare function loadDotenv({
-  root,
-  mode,
-  processEnv
-}: LoadDotenvOptions): LoadDotenvResult;
+declare function loadDotenv({ root, mode, processEnv }: LoadDotenvOptions): LoadDotenvResult;
 //#endregion
 export { getDotenvFiles, loadDotenv };