vinext 0.1.2 → 0.1.3

package/dist/entries/app-rsc-entry.js

@@ -42,6 +42,7 @@ const appRequestContextPath = resolveEntryPath("../server/app-request-context.js
 const appRouteModuleLoaderPath = resolveEntryPath("../server/app-route-module-loader.js", import.meta.url);
 const appPrerenderStaticParamsPath = resolveEntryPath("../server/app-prerender-static-params.js", import.meta.url);
 const seedCachePath = resolveEntryPath("../server/seed-cache.js", import.meta.url);
+const pregeneratedConcretePathsPath = resolveEntryPath("../server/pregenerated-concrete-paths.js", import.meta.url);
 const appHookWarningSuppressionPath = resolveEntryPath("../server/app-hook-warning-suppression.js", import.meta.url);
 const serverGlobalsPath = resolveEntryPath("../server/server-globals.js", import.meta.url);
 const appPagesBridgePath = resolveEntryPath("../server/app-pages-bridge.js", import.meta.url);
@@ -72,6 +73,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const reactMaxHeadersLength = config?.reactMaxHeadersLength ?? DEFAULT_REACT_MAX_HEADERS_LENGTH;
 	const cacheMaxMemorySize = config?.cacheMaxMemorySize;
 	const inlineCss = config?.inlineCss === true;
+	const cacheComponents = config?.cacheComponents === true;
 	const i18nConfig = config?.i18n ?? null;
 	const hasPagesDir = config?.hasPagesDir ?? false;
 	const publicFiles = config?.publicFiles ?? [];
@@ -98,9 +100,14 @@ import {
   loadServerAction,
   createTemporaryReferenceSet,
 } from "@vitejs/plugin-rsc/rsc";
-import { createRscRenderer } from ${JSON.stringify(rscStreamHintsPath)};
+import { createClientManifest as _createClientManifest } from "@vitejs/plugin-rsc/core/rsc";
+import { prerender as _prerender } from "@vitejs/plugin-rsc/vendor/react-server-dom/static.edge";
+import { createRscPrerenderer, createRscRenderer } from ${JSON.stringify(rscStreamHintsPath)};
 
 const renderToReadableStream = createRscRenderer(_renderToReadableStream);
+const prerenderToReadableStream = createRscPrerenderer(async (model, options) =>
+  _prerender(model, _createClientManifest(), options),
+);
 import { createElement } from "react";
 import { getNavigationContext as _getNavigationContext } from "next/navigation";
 import { configureMemoryCacheHandler as __configureMemoryCacheHandler } from "next/cache";
@@ -160,6 +167,7 @@ import {
 import { makeThenableParams } from ${JSON.stringify(thenableParamsShimPath)};
 import {
   createAppRscRouteMatcher as __createAppRscRouteMatcher,
+  SIBLING_PAGE_INTERCEPT_SLOT_KEY as __SIBLING_PAGE_INTERCEPT_SLOT_KEY,
 } from ${JSON.stringify(appRscRouteMatchingPath)};
 import {
   appIsrHtmlKey as __isrHtmlKey,
@@ -191,9 +199,15 @@ __configureMemoryCacheHandler({ cacheMaxMemorySize: ${JSON.stringify(cacheMaxMem
 import { createAppPrerenderStaticParamsResolver as __createAppPrerenderStaticParamsResolver } from ${JSON.stringify(appPrerenderStaticParamsPath)};
 import { ensureAppRouteModulesLoaded as __ensureRouteLoaded } from ${JSON.stringify(appRouteModuleLoaderPath)};
 import { seedMemoryCacheFromPrerender as __seedMemoryCacheFromPrerender } from ${JSON.stringify(seedCachePath)};
+import {
+  getRenderedConcreteUrlPathsForRoute as __getRenderedConcreteUrlPathsForRoute,
+  initPregeneratedPathsFromGlobals as __initPregeneratedPathsFromGlobals,
+} from ${JSON.stringify(pregeneratedConcretePathsPath)};
 
 const __draftModeSecret = ${JSON.stringify(draftModeSecret)};
 
+__initPregeneratedPathsFromGlobals();
+
 // Note: cache entries are written with \`headers: undefined\`. Next.js stores
 // response headers (e.g. set-cookie from cookies().set() during render) in the
 // cache entry so they can be replayed on HIT. We don't do this because:
@@ -228,6 +242,13 @@ function __resolveRouteFetchCacheMode(route) {
   });
 }
 
+function __resolveRouteDynamicConfig(route) {
+  return __resolveAppPageSegmentConfig({
+    layouts: route.layouts,
+    page: route.page,
+  }).dynamicConfig ?? null;
+}
+
 function __resolveRouteRuntime(route) {
   return __resolveAppPageSegmentConfig({
     layouts: route.layouts,
@@ -371,6 +392,7 @@ const __i18nConfig = ${JSON.stringify(i18nConfig)};
 const __configRedirects = ${JSON.stringify(redirects)};
 const __configRewrites = ${JSON.stringify(rewrites)};
 const __configHeaders = ${JSON.stringify(headers)};
+const __imageConfig = ${JSON.stringify(config?.imageConfig)};
 const __publicFiles = new Set(${JSON.stringify(publicFiles)});
 const __allowedOrigins = ${JSON.stringify(allowedOrigins)};
 const __expireTime = ${JSON.stringify(expireTime)};
@@ -383,6 +405,8 @@ const __reactMaxHeadersLength = ${JSON.stringify(reactMaxHeadersLength)};
 export const __assetPrefix = ${JSON.stringify(assetPrefix)};
 export const __inlineCss = ${JSON.stringify(inlineCss)};
 export const __hasPagesDir = ${JSON.stringify(hasPagesDir)};
+export const getRenderedConcreteUrlPathsForRoute = __getRenderedConcreteUrlPathsForRoute;
+const __cacheComponents = ${JSON.stringify(cacheComponents)};
 
 export function seedMemoryCacheFromPrerender(serverDir) {
   return __seedMemoryCacheFromPrerender(serverDir, {
@@ -434,8 +458,11 @@ export default __createAppRscHandler({
   },
   registerCacheAdapters: __registerConfiguredCacheAdapters,
   configHeaders: __configHeaders,
+  cacheComponents: __cacheComponents,
   configRedirects: __configRedirects,
   configRewrites: __configRewrites,
+  imageConfig: __imageConfig,
+  isDev: process.env.NODE_ENV !== "production",
   draftModeSecret: __draftModeSecret,
   dispatchMatchedPage({
     clientReuseManifest,
@@ -451,6 +478,10 @@ export default __createAppRscHandler({
     middlewareContext,
     mountedSlotsHeader,
     params,
+    pprFallbackCacheShells,
+    pprFallbackShell,
+    renderedConcreteUrlPaths,
+    skipStaticParamsValidation,
     staticParamsValidationParams,
     rootParams,
     request,
@@ -514,6 +545,7 @@ export default __createAppRscHandler({
       getSourceRoute(sourceRouteIndex) {
         return routes[sourceRouteIndex];
       },
+      hasCustomGlobalError: ${globalErrorVar ? `Boolean(${globalErrorVar}?.default)` : "false"},
       hasGenerateStaticParams: __generateStaticParams.length > 0,
       hasPageDefaultExport: !!PageComponent,
       hasPageModule: !!route.page,
@@ -538,6 +570,10 @@ export default __createAppRscHandler({
       middlewareContext,
       mountedSlotsHeader,
       params,
+      pprFallbackCacheShells,
+      pprFallbackShell,
+      renderedConcreteUrlPaths,
+      skipStaticParamsValidation,
       staticParamsValidationParams,
       rootParams,
       probeLayoutAt(li, layoutParamAccess) {
@@ -572,17 +608,33 @@ export default __createAppRscHandler({
         }));
       },
       renderErrorBoundaryPage(renderErr) {
-        return __fallbackRenderer.renderErrorBoundary(route, renderErr, isRscRequest, request, params, scriptNonce, middlewareContext, { isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime) });
+        const __activeIntercept = findIntercept(cleanPathname, interceptionContext);
+        return __fallbackRenderer.renderErrorBoundary(route, renderErr, isRscRequest, request, params, scriptNonce, middlewareContext, {
+          isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
+          sourcePageSegments: __activeIntercept?.slotKey === __SIBLING_PAGE_INTERCEPT_SLOT_KEY
+            ? __activeIntercept.sourcePageSegments
+            : null,
+        });
       },
       renderHttpAccessFallbackPage(statusCode, opts, currentMiddlewareContext) {
-        return __fallbackRenderer.renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, currentMiddlewareContext, { isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime) });
+        const __activeIntercept = findIntercept(cleanPathname, interceptionContext);
+        return __fallbackRenderer.renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, currentMiddlewareContext, {
+          isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
+          sourcePageSegments: __activeIntercept?.slotKey === __SIBLING_PAGE_INTERCEPT_SLOT_KEY
+            ? __activeIntercept.sourcePageSegments
+            : null,
+        });
       },
       renderToReadableStream,
+      prerenderToReadableStream,
       request,
       revalidateSeconds: __segmentConfig.revalidateSeconds,
       resolveRouteFetchCacheMode(targetRoute) {
         return __resolveRouteFetchCacheMode(targetRoute);
       },
+      resolveRouteDynamicConfig(targetRoute) {
+        return __resolveRouteDynamicConfig(targetRoute);
+      },
       rootForbiddenModule,
       rootNotFoundModule,
       rootUnauthorizedModule,
@@ -775,6 +827,12 @@ export default __createAppRscHandler({
       readFormDataWithLimit: __readFormDataWithLimit,
       renderToReadableStream,
       reportRequestError: _reportRequestError,
+      resolveRouteFetchCacheMode(targetRoute) {
+        return __resolveRouteFetchCacheMode(targetRoute);
+      },
+      resolveRouteDynamicConfig(targetRoute) {
+        return __resolveRouteDynamicConfig(targetRoute);
+      },
       resolveRouteRuntime: __resolveRouteRuntime,
       request,
       sanitizeErrorForClient(error) {
@@ -790,6 +848,7 @@ export default __createAppRscHandler({
           interceptSlotId: intercept.slotId,
           interceptSlotKey: intercept.slotKey,
           interceptSourceMatchedUrl: interceptionContext,
+          interceptSourcePageSegments: intercept.sourcePageSegments,
           interceptPage: intercept.page,
           interceptParams: intercept.matchedParams,
         };
@@ -808,9 +867,9 @@ export default __createAppRscHandler({
     const __isEdge = route ? __isEdgeRuntime(__resolveAppPageSegmentConfig({ layouts: route.layouts, page: route.page }).runtime) : false;
     return __fallbackRenderer.renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, { isEdgeRuntime: __isEdge });
   },
-  ${hasPagesDir ? `async renderPagesFallback({ isRscRequest, middlewareContext, request, url }) {
+  ${hasPagesDir ? `async renderPagesFallback({ allowRscDocumentFallback, appRouteMatch, isRscRequest, matchKind, middlewareContext, pathname, request, url }) {
     return __renderPagesFallback(
-      { isRscRequest, middlewareContext, request, url },
+      { allowRscDocumentFallback, appRouteMatch, isRscRequest, matchKind, middlewareContext, pathname, request, url },
       {
         loadPagesEntry() {
           return import.meta.viteRsc.loadModule("ssr", "index");

package/dist/entries/app-rsc-manifest.js

@@ -99,6 +99,7 @@ function buildRouteEntries(routes, imports) {
       convention: ${JSON.stringify(ir.convention)},
       targetPattern: ${JSON.stringify(ir.targetPattern)},
       sourceMatchPattern: ${JSON.stringify(ir.sourceMatchPattern)},
+      sourcePageSegments: ${JSON.stringify(ir.sourcePageSegments)},
       slotId: ${JSON.stringify(ir.slotId ?? null)},
       interceptLayouts: [${ir.layoutPaths.map((l) => imports.getImportVar(l)).join(", ")}],
       page: null,
@@ -110,6 +111,7 @@ function buildRouteEntries(routes, imports) {
           convention: ${JSON.stringify(ir.convention)},
           targetPattern: ${JSON.stringify(ir.targetPattern)},
           sourceMatchPattern: ${JSON.stringify(ir.sourceMatchPattern)},
+          sourcePageSegments: ${JSON.stringify(ir.sourcePageSegments)},
           interceptLayouts: [${ir.layoutPaths.map((layoutPath) => imports.getImportVar(layoutPath)).join(", ")}],
           page: null,
           __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},

package/dist/entries/app-ssr-entry.js

@@ -17,7 +17,7 @@ function generateSsrEntry(hasPagesDir = false) {
 export * from ${JSON.stringify(entryPath)};
 export { default } from ${JSON.stringify(entryPath)};
 ${hasPagesDir ? `
-export { handleApiRoute, pageRoutes, renderPage } from "virtual:vinext-server-entry";
+export { handleApiRoute, matchApiRoute, matchPageRoute, pageRoutes, renderPage } from "virtual:vinext-server-entry";
 ` : ""}`;
 }
 //#endregion

package/dist/entries/pages-client-entry.js

@@ -1,7 +1,7 @@
 import { normalizePathSeparators } from "../utils/path.js";
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
-import { pagesRouter } from "../routing/pages-router.js";
+import { apiRouter, pagesRouter } from "../routing/pages-router.js";
 //#region src/entries/pages-client-entry.ts
 /**
 * Pages Router client hydration entry generator.
@@ -14,11 +14,31 @@ import { pagesRouter } from "../routing/pages-router.js";
 *
 * Extracted from index.ts.
 */
+/**
+* Project a Pages `Route` down to the public `VinextPagesLinkPrefetchRoute`
+* shape used for client-side hybrid ownership decisions. Mirrors
+* `toLinkPrefetchRoute` in `app-browser-entry.ts`.
+*
+* Lives here (not in `routing/pages-router.ts`) so the routing module
+* stays free of `vitext/client` type imports.
+*/
+function toPagesLinkPrefetchRoute(route) {
+	return {
+		canPrefetchLoadingShell: false,
+		isDynamic: route.isDynamic,
+		patternParts: [...route.patternParts]
+	};
+}
 async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options = {}) {
 	const pageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+	const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 	const hasApp = appFilePath !== null;
 	const appPrefetchRoutes = options.appPrefetchRoutes ?? [];
+	const pagesPrefetchRoutes = [...pageRoutes.map(toPagesLinkPrefetchRoute), ...apiRoutes.map((route) => ({
+		...toPagesLinkPrefetchRoute(route),
+		documentOnly: true
+	}))];
 	const instrumentationClientPath = options.instrumentationClientPath ?? null;
 	const loaderEntries = pageRoutes.map((r) => {
 		const absPath = normalizePathSeparators(r.filePath);
@@ -30,7 +50,6 @@ async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options =
 import "vinext/instrumentation-client";
 import React from "react";
 import { hydrateRoot } from "react-dom/client";
-import { installPagesRouterRuntime } from "vinext/pages-router-runtime";
 // Statically import next/router as the very first vinext shim so that
 // (a) installWindowNext runs at top-level — \`window.next.router\` is
 //     available to test harnesses and third-party scripts BEFORE
@@ -43,7 +62,7 @@ import { installPagesRouterRuntime } from "vinext/pages-router-runtime";
 // Mirrors Next.js's bootstrap order: client/next.ts statically imports
 // from './' before calling initialize/hydrate, so window.next is set up
 // before any async work.
-import { wrapWithRouterContext } from "next/router";
+import Router, { wrapWithRouterContext } from "next/router";
 
 const pageLoaders = {
 ${loaderEntries.join(",\n")}
@@ -64,7 +83,7 @@ const appLoader = undefined;
 // Object.keys(pageLoaders), exposed separately so navigateClient() can iterate
 // it without re-keying the map. Ordering is the insertion order of pageRoutes,
 // which pagesRouter() has already sorted by specificity (static → dynamic →
-// catch-all → optional catch-all) via compareRoutes — so matchPagesPattern()
+// catch-all → optional catch-all) via sortRoutes — so matchPagesPattern()
 // can iterate in order and trust the first match.
 window.__VINEXT_PAGE_LOADERS__ = pageLoaders;
 window.__VINEXT_PAGE_PATTERNS__ = Object.keys(pageLoaders);
@@ -84,6 +103,12 @@ window.__VINEXT_APP_LOADER__ = appLoader;
 // when the user lands on an App Router page (see app-browser-entry.ts) — the
 // two writes do not race because only one entry executes per page load.
 window.__VINEXT_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(appPrefetchRoutes)};
+// Pages route manifest, exposed so the App Router runtime can decide when
+// a soft-navigated URL is actually owned by Pages (and must hard-navigate
+// instead of issuing an RSC request). Set here AND in app-browser-entry.ts
+// so whichever entry runs first emits the Pages manifest.
+window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(pagesPrefetchRoutes)};
+window.__VINEXT_CLIENT_REWRITES__ = ${JSON.stringify(nextConfig.rewrites)};
 
 async function hydrate() {
   const nextData = window.__NEXT_DATA__;
@@ -104,7 +129,9 @@ async function hydrate() {
     };
   }
 
-  const { pageProps } = nextData.props;
+  const props = nextData.props && typeof nextData.props === "object" ? nextData.props : {};
+  const rawPageProps = props.pageProps;
+  const pageProps = rawPageProps && typeof rawPageProps === "object" ? rawPageProps : {};
   const loader = pageLoaders[nextData.page];
   if (!loader) {
     console.error("[vinext] No page loader for route:", nextData.page);
@@ -124,7 +151,12 @@ async function hydrate() {
     const appModule = await appLoader();
     const AppComponent = appModule.default;
     window.__VINEXT_APP__ = AppComponent;
-    element = React.createElement(AppComponent, { Component: PageComponent, pageProps });
+    element = React.createElement(AppComponent, {
+      ...props,
+      Component: PageComponent,
+      pageProps: rawPageProps,
+      router: Router,
+    });
   } catch {
     element = React.createElement(PageComponent, pageProps);
   }
@@ -132,8 +164,13 @@ async function hydrate() {
   element = React.createElement(PageComponent, pageProps);
   `}
 
+  let resolveHydrationCommit;
+  const hydrationCommitted = new Promise((resolve) => {
+    resolveHydrationCommit = resolve;
+  });
+
   // Wrap with RouterContext.Provider so next/router and next/compat/router work during hydration.
-  element = wrapWithRouterContext(element);
+  element = wrapWithRouterContext(element, resolveHydrationCommit);
 
   const container = document.getElementById("__next");
   if (!container) {
@@ -143,12 +180,20 @@ async function hydrate() {
 
   const root = hydrateRoot(container, element, hydrateRootOptions);
   window.__VINEXT_ROOT__ = root;
-  installPagesRouterRuntime();
+  await hydrationCommitted;
   const hydratedAt = performance.now();
   window.__VINEXT_HYDRATED_AT = hydratedAt;
   window.__NEXT_HYDRATED = true;
   window.__NEXT_HYDRATED_AT = hydratedAt;
   window.__NEXT_HYDRATED_CB?.();
+
+  if (nextData.isFallback) {
+    await Router.replace(
+      window.location.pathname + window.location.search + window.location.hash,
+      undefined,
+      { _h: 1, scroll: false },
+    );
+  }
 }
 
 hydrate();

package/dist/entries/pages-server-entry.js

@@ -71,12 +71,14 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		headers: nextConfig?.headers ?? [],
 		expireTime: nextConfig?.expireTime,
 		cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
+		htmlLimitedBots: nextConfig?.htmlLimitedBots,
 		i18n: nextConfig?.i18n ?? null,
 		disableOptimizedLoading: nextConfig?.disableOptimizedLoading === true,
 		clientTraceMetadata: nextConfig?.clientTraceMetadata,
 		images: {
 			deviceSizes: nextConfig?.images?.deviceSizes,
 			imageSizes: nextConfig?.images?.imageSizes,
+			qualities: nextConfig?.images?.qualities,
 			dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 			dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
 			contentDispositionType: nextConfig?.images?.contentDispositionType,
@@ -143,7 +145,7 @@ import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
 import { resetSSRHead, getSSRHeadHTML, setDocumentInitialHead } from "next/head";
 import { flushPreloads } from "next/dynamic";
-import { setSSRContext, wrapWithRouterContext, getPagesNavigationIsReadyFromSerializedState } from "next/router";
+import Router, { setSSRContext, wrapWithRouterContext, getPagesNavigationIsReadyFromSerializedState } from "next/router";
 import { _runWithCacheState, configureMemoryCacheHandler as __configureMemoryCacheHandler } from "next/cache";
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 import { runWithPrivateCache } from "vinext/cache-runtime";
@@ -267,6 +269,20 @@ export function matchPageRoute(url, request) {
   return matchRoute(routeUrl, pageRoutes);
 }
 
+export function matchApiRoute(url, request) {
+  const routeUrl = i18nConfig && request
+    ? resolvePagesI18nRequest(
+        url,
+        i18nConfig,
+        request.headers,
+        new URL(request.url).hostname,
+        vinextConfig.basePath,
+        vinextConfig.trailingSlash,
+      ).url
+    : url;
+  return matchRoute(routeUrl, apiRoutes);
+}
+
 // ── Pages render orchestrator — delegates to server/pages-page-handler.ts ──
 //
 // All next/*-derived values are passed as closures so the handler module
@@ -282,6 +298,7 @@ const _renderPage = __createPagesPageHandler({
     assetPrefix: vinextConfig.assetPrefix,
     trailingSlash: vinextConfig.trailingSlash,
     expireTime: vinextConfig.expireTime,
+    htmlLimitedBots: vinextConfig.htmlLimitedBots,
     clientTraceMetadata: vinextConfig.clientTraceMetadata,
     disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
   },
@@ -328,18 +345,36 @@ const _renderPage = __createPagesPageHandler({
   renderIsrPassToStringAsync: _renderIsrPassToStringAsync,
   safeJsonStringify,
   sanitizeDestination: sanitizeDestinationLocal,
-  createPageElement(PageComponent, AppComponent, pageProps) {
+  createPageElement(PageComponent, AppComponent, props) {
+    const rawPageProps = props?.pageProps;
+    const pageProps = rawPageProps && typeof rawPageProps === "object"
+      ? props.pageProps
+      : {};
     return AppComponent
-      ? React.createElement(AppComponent, { Component: PageComponent, pageProps })
+      ? React.createElement(AppComponent, {
+          ...props,
+          Component: PageComponent,
+          pageProps: rawPageProps,
+          router: Router,
+        })
       : React.createElement(PageComponent, pageProps);
   },
-  enhancePageElement(PageComponent, AppComponent, pageProps, opts) {
+  enhancePageElement(PageComponent, AppComponent, props, opts) {
+    const rawPageProps = props?.pageProps;
+    const pageProps = rawPageProps && typeof rawPageProps === "object"
+      ? props.pageProps
+      : {};
     let FinalApp = AppComponent;
     let FinalComp = PageComponent;
     if (opts && typeof opts.enhanceApp === "function" && FinalApp) FinalApp = opts.enhanceApp(FinalApp);
     if (opts && typeof opts.enhanceComponent === "function") FinalComp = opts.enhanceComponent(FinalComp);
     return FinalApp
-      ? React.createElement(FinalApp, { Component: FinalComp, pageProps })
+      ? React.createElement(FinalApp, {
+          ...props,
+          Component: FinalComp,
+          pageProps: rawPageProps,
+          router: Router,
+        })
       : React.createElement(FinalComp, pageProps);
   },
   AppComponent,
@@ -360,6 +395,7 @@ export async function handleApiRoute(request, url, ctx) {
   return __handlePagesApiRoute({
     ctx,
     match,
+    nextConfig: vinextConfig,
     request,
     url,
     reportRequestError(error, routePattern) {