vinext 0.1.7 → 0.2.0

package/dist/config/next-config.js

@@ -72,6 +72,7 @@ const CONFIG_FILES = [
 	"next.config.cjs"
 ];
 const DEFAULT_EXPIRE_TIME = 31536e3;
+const DEFAULT_TRANSPILED_PACKAGES = ["geist"];
 /**
 * Default cap for the App Router preload `Link` header length, matching the
 * Next.js `defaultConfig.reactMaxHeadersLength`.
@@ -252,6 +253,31 @@ function findNextConfigPath(root) {
 	}
 	return null;
 }
+function hasConfigProperty(config, propertyPath) {
+	let current = config;
+	for (const property of propertyPath.split(".")) {
+		if (!isUnknownRecord(current) || current[property] === void 0) return false;
+		current = current[property];
+	}
+	return true;
+}
+const emittedConfigWarnings = /* @__PURE__ */ new Set();
+function warnConfigOnce(message) {
+	if (emittedConfigWarnings.has(message)) return;
+	emittedConfigWarnings.add(message);
+	console.warn(message);
+}
+function warnDeprecatedConfigOptions(config, root) {
+	const configFileName = path.basename(findNextConfigPath(root) ?? "next.config.js");
+	const warnings = [
+		["experimental.middlewarePrefetch", `\`experimental.middlewarePrefetch\` is deprecated. Please use \`experimental.proxyPrefetch\` instead in ${configFileName}.`],
+		["experimental.middlewareClientMaxBodySize", `\`experimental.middlewareClientMaxBodySize\` is deprecated. Please use \`experimental.proxyClientMaxBodySize\` instead in ${configFileName}.`],
+		["experimental.externalMiddlewareRewritesResolve", `\`experimental.externalMiddlewareRewritesResolve\` is deprecated. Please use \`experimental.externalProxyRewritesResolve\` instead in ${configFileName}.`],
+		["skipMiddlewareUrlNormalize", `\`skipMiddlewareUrlNormalize\` is deprecated. Please use \`skipProxyUrlNormalize\` instead in ${configFileName}.`],
+		["experimental.instrumentationHook", `\`experimental.instrumentationHook\` is no longer needed, because \`instrumentation.js\` is available by default. You can remove it from ${configFileName}.`]
+	];
+	for (const [propertyPath, warning] of warnings) if (hasConfigProperty(config, propertyPath)) warnConfigOnce(warning);
+}
 async function resolveNextConfigInput(config, phase = PHASE_DEVELOPMENT_SERVER) {
 	return await resolveConfigValue(config, phase);
 }
@@ -569,7 +595,10 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 			allowedDevOrigins: [],
 			serverActionsAllowedOrigins: [],
 			optimizePackageImports: [],
+			transpilePackages: [],
+			turbopackTranspilePackages: [...DEFAULT_TRANSPILED_PACKAGES],
 			inlineCss: false,
+			globalNotFound: false,
 			serverActionsBodySizeLimit: 1 * 1024 * 1024,
 			serverActionsBodySizeLimitLabel: "1 MB",
 			expireTime: DEFAULT_EXPIRE_TIME,
@@ -601,6 +630,7 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 		detectNextIntlConfig(root, resolved);
 		return resolved;
 	}
+	warnDeprecatedConfigOptions(config, root);
 	let redirects = [];
 	if (config.redirects) {
 		const result = await config.redirects();
@@ -652,6 +682,7 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 	const rawOptimize = experimental?.optimizePackageImports;
 	const optimizePackageImports = Array.isArray(rawOptimize) ? rawOptimize.filter((x) => typeof x === "string") : [];
 	const inlineCss = experimental?.inlineCss === true;
+	const globalNotFound = experimental?.globalNotFound === true;
 	const prefetchInlining = experimental?.prefetchInlining === true || isUnknownRecord(experimental?.prefetchInlining);
 	const appShells = experimental?.appShells === true;
 	if (appShells) {
@@ -666,6 +697,8 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 	const topLevelServerExternalPackages = Array.isArray(config.serverExternalPackages) ? readStringArray(config.serverExternalPackages) : void 0;
 	const legacyServerComponentsExternal = readStringArray(experimental?.serverComponentsExternalPackages);
 	const serverExternalPackages = topLevelServerExternalPackages ?? legacyServerComponentsExternal;
+	const transpilePackages = readStringArray(config.transpilePackages);
+	const turbopackTranspilePackages = [...transpilePackages, ...DEFAULT_TRANSPILED_PACKAGES];
 	if (experimental?.swcEnvOptions !== void 0) console.warn("[vinext] next.config option \"experimental.swcEnvOptions\" is not applicable and will be ignored (vinext uses Vite, not SWC). A Vite-compatible polyfill solution may be explored in the future.");
 	if (experimental?.rootParams !== void 0) console.warn("[vinext] `experimental.rootParams` is no longer needed, because `next/root-params` is available by default. You can remove it from next.config.(js|mjs|ts).");
 	const useLightningcss = experimental?.useLightningcss === true;
@@ -704,6 +737,16 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 			fallback: applyLocaleToRoutes(rewrites.fallback, i18n, "rewrite", opts)
 		};
 	}
+	const images = config.images ? {
+		...config.images,
+		remotePatterns: config.images.remotePatterns?.map((pattern) => pattern instanceof URL ? {
+			protocol: pattern.protocol.slice(0, -1),
+			hostname: pattern.hostname,
+			port: pattern.port,
+			pathname: pattern.pathname,
+			search: pattern.search
+		} : { ...pattern })
+	} : void 0;
 	const resolved = {
 		env: config.env ?? {},
 		basePath: config.basePath ?? "",
@@ -721,14 +764,17 @@ async function resolveNextConfig(config, root = process.cwd(), options = {}) {
 		redirects,
 		rewrites,
 		headers,
-		images: config.images,
+		images,
 		i18n,
 		mdx,
 		aliases,
 		allowedDevOrigins,
 		serverActionsAllowedOrigins,
 		optimizePackageImports,
+		transpilePackages,
+		turbopackTranspilePackages,
 		inlineCss,
+		globalNotFound,
 		serverActionsBodySizeLimit,
 		serverActionsBodySizeLimitLabel,
 		expireTime: typeof config.expireTime === "number" ? config.expireTime : DEFAULT_EXPIRE_TIME,

package/dist/config/prerender.d.ts

@@ -0,0 +1,34 @@
+import { PluginOption } from "vite";
+
+//#region src/config/prerender.d.ts
+type VinextPrerenderConfig = true | {
+  /**
+   * Routes to pre-render after the production build.
+   *
+   * Currently only `"*"` is supported, which pre-renders every discovered
+   * App Router and Pages Router route that vinext can statically render.
+   */
+  routes: "*";
+};
+type ResolvedVinextPrerenderConfig = {
+  routes: "*";
+};
+type VinextPrerenderDecisionReason = "flag" | "next-export" | "vinext-config";
+type VinextPrerenderDecision = ResolvedVinextPrerenderConfig & {
+  reason: VinextPrerenderDecisionReason;
+};
+declare const VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY = "__vinextPrerenderConfig";
+type ViteConfigLoader = {
+  loadConfigFromFile: typeof import("vite").loadConfigFromFile;
+};
+declare function normalizeVinextPrerenderConfig(config: VinextPrerenderConfig | undefined): ResolvedVinextPrerenderConfig | null;
+declare function findVinextPrerenderConfigInPlugins(plugins: PluginOption[] | undefined): ResolvedVinextPrerenderConfig | null;
+declare function loadVinextPrerenderConfigFromViteConfig(vite: ViteConfigLoader, root: string): Promise<ResolvedVinextPrerenderConfig | null>;
+declare function resolveVinextPrerenderDecision(options: {
+  prerenderAllFlag?: boolean;
+  vinextPrerenderConfig?: ResolvedVinextPrerenderConfig | null;
+  nextOutput?: string;
+}): VinextPrerenderDecision | null;
+declare function formatVinextPrerenderLabel(decision: VinextPrerenderDecision): string;
+//#endregion
+export { ResolvedVinextPrerenderConfig, VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VinextPrerenderConfig, VinextPrerenderDecision, VinextPrerenderDecisionReason, findVinextPrerenderConfigInPlugins, formatVinextPrerenderLabel, loadVinextPrerenderConfigFromViteConfig, normalizeVinextPrerenderConfig, resolveVinextPrerenderDecision };

package/dist/config/prerender.js

@@ -0,0 +1,55 @@
+import { isUnknownRecord } from "../utils/record.js";
+//#region src/config/prerender.ts
+const VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY = "__vinextPrerenderConfig";
+function normalizeVinextPrerenderConfig(config) {
+	if (config === void 0) return null;
+	if (config === true) return { routes: "*" };
+	if (!isUnknownRecord(config)) throw new Error("[vinext] Invalid `prerender` config. Use `true` or `{ routes: \"*\" }`.");
+	if (config.routes === "*") return { routes: "*" };
+	throw new Error("[vinext] Unsupported `prerender.routes` config. Currently only `routes: \"*\"` is supported.");
+}
+function flattenPluginOptions(value, target) {
+	if (Array.isArray(value)) {
+		for (const item of value) flattenPluginOptions(item, target);
+		return;
+	}
+	if (value) target.push(value);
+}
+function findVinextPrerenderConfigInPlugins(plugins) {
+	const flattened = [];
+	flattenPluginOptions(plugins, flattened);
+	for (const plugin of flattened) {
+		if (!isUnknownRecord(plugin)) continue;
+		const prerenderConfig = plugin[VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY];
+		if (prerenderConfig) return prerenderConfig;
+	}
+	return null;
+}
+async function loadVinextPrerenderConfigFromViteConfig(vite, root) {
+	return findVinextPrerenderConfigInPlugins((await vite.loadConfigFromFile({
+		command: "build",
+		mode: "production"
+	}, void 0, root))?.config.plugins);
+}
+function resolveVinextPrerenderDecision(options) {
+	if (options.prerenderAllFlag) return {
+		routes: "*",
+		reason: "flag"
+	};
+	if (options.nextOutput === "export") return {
+		routes: "*",
+		reason: "next-export"
+	};
+	if (options.vinextPrerenderConfig?.routes === "*") return {
+		routes: "*",
+		reason: "vinext-config"
+	};
+	return null;
+}
+function formatVinextPrerenderLabel(decision) {
+	if (decision.reason === "next-export") return "Pre-rendering all routes (output: 'export')...";
+	if (decision.reason === "vinext-config") return "Pre-rendering all routes (vinext prerender config)...";
+	return "Pre-rendering all routes...";
+}
+//#endregion
+export { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, findVinextPrerenderConfigInPlugins, formatVinextPrerenderLabel, loadVinextPrerenderConfigFromViteConfig, normalizeVinextPrerenderConfig, resolveVinextPrerenderDecision };

package/dist/config/server-external-packages.d.ts

@@ -0,0 +1,4 @@
+//#region src/config/server-external-packages.d.ts
+declare function mergeServerExternalPackages(userPackages?: readonly string[], transpilePackages?: readonly string[]): string[];
+//#endregion
+export { mergeServerExternalPackages };

package/dist/config/server-external-packages.js

@@ -0,0 +1,91 @@
+//#region src/config/server-external-packages.ts
+const DEFAULT_SERVER_EXTERNAL_PACKAGES = [
+	"@alinea/generated",
+	"@appsignal/nodejs",
+	"@aws-sdk/client-s3",
+	"@aws-sdk/s3-presigned-post",
+	"@blockfrost/blockfrost-js",
+	"@highlight-run/node",
+	"@huggingface/transformers",
+	"@jpg-store/lucid-cardano",
+	"@libsql/client",
+	"@mikro-orm/core",
+	"@mikro-orm/knex",
+	"@node-rs/argon2",
+	"@node-rs/bcrypt",
+	"@prisma/client",
+	"@react-pdf/renderer",
+	"@sentry/profiling-node",
+	"@sparticuz/chromium",
+	"@sparticuz/chromium-min",
+	"@statsig/statsig-node-core",
+	"@swc/core",
+	"@xenova/transformers",
+	"@zenstackhq/runtime",
+	"argon2",
+	"autoprefixer",
+	"aws-crt",
+	"bcrypt",
+	"better-sqlite3",
+	"canvas",
+	"chromadb-default-embed",
+	"config",
+	"cpu-features",
+	"cypress",
+	"dd-trace",
+	"eslint",
+	"express",
+	"firebase-admin",
+	"htmlrewriter",
+	"import-in-the-middle",
+	"isolated-vm",
+	"jest",
+	"jsdom",
+	"keyv",
+	"libsql",
+	"mdx-bundler",
+	"mongodb",
+	"mongoose",
+	"newrelic",
+	"next-mdx-remote",
+	"next-seo",
+	"node-cron",
+	"node-pty",
+	"node-web-audio-api",
+	"onnxruntime-node",
+	"oslo",
+	"pg",
+	"pino",
+	"pino-pretty",
+	"pino-roll",
+	"playwright",
+	"playwright-core",
+	"postcss",
+	"prettier",
+	"prisma",
+	"puppeteer",
+	"puppeteer-core",
+	"ravendb",
+	"require-in-the-middle",
+	"rimraf",
+	"sharp",
+	"shiki",
+	"sqlite3",
+	"thread-stream",
+	"ts-morph",
+	"ts-node",
+	"typescript",
+	"vscode-oniguruma",
+	"webpack",
+	"websocket",
+	"zeromq"
+];
+function mergeServerExternalPackages(userPackages = [], transpilePackages = []) {
+	const transpiled = new Set(transpilePackages);
+	const conflicts = userPackages.filter((name) => transpiled.has(name));
+	if (conflicts.length > 0) throw new Error(`The packages specified in the 'transpilePackages' conflict with the 'serverExternalPackages': ${conflicts.join(", ")}`);
+	const defaults = DEFAULT_SERVER_EXTERNAL_PACKAGES.filter((name) => !transpiled.has(name));
+	return [...new Set([...defaults, ...userPackages])];
+}
+//#endregion
+export { mergeServerExternalPackages };

package/dist/entries/app-rsc-entry.d.ts

@@ -43,7 +43,8 @@ type AppRouterConfig = {
    */
   reactMaxHeadersLength?: number; /** Maximum in-memory cache size in bytes. 0 disables the default memory cache. */
   cacheMaxMemorySize?: number; /** Inline app CSS into production HTML (from experimental.inlineCss). */
-  inlineCss?: boolean; /** Enables Next.js Cache Components semantics for App Router document HTML. */
+  inlineCss?: boolean; /** Enable standalone route-miss 404 handling (from experimental.globalNotFound). */
+  globalNotFound?: boolean; /** Enables Next.js Cache Components semantics for App Router document HTML. */
   cacheComponents?: boolean; /** Whether the RSC build discovered any server references. Defaults to true. */
   hasServerActions?: boolean; /** Internationalization routing config for middleware matcher locale handling. */
   i18n?: NextI18nConfig | null;

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

@@ -1,6 +1,7 @@
 import { normalizePathSeparators } from "../utils/path.js";
 import { resolveEntryPath } from "./runtime-entry-module.js";
 import { isProxyFile } from "../server/middleware.js";
+import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES } from "../server/image-optimization.js";
 import { buildAppRscManifestCode } from "./app-rsc-manifest.js";
 import { generateDevOriginCheckCode } from "../server/dev-origin-check.js";
 import { randomUUID } from "node:crypto";
@@ -16,7 +17,7 @@ import { randomUUID } from "node:crypto";
 */
 const DEFAULT_EXPIRE_TIME = 31536e3;
 const DEFAULT_REACT_MAX_HEADERS_LENGTH = 6e3;
-const middlewareRequestHeadersPath = resolveEntryPath("../server/middleware-request-headers.js", import.meta.url);
+const middlewareRequestHeadersPath = resolveEntryPath("../utils/middleware-request-headers.js", import.meta.url);
 const normalizePathModulePath = resolveEntryPath("../server/normalize-path.js", import.meta.url);
 const appRouteHandlerDispatchPath = resolveEntryPath("../server/app-route-handler-dispatch.js", import.meta.url);
 const appRouteHandlerResponsePath = resolveEntryPath("../server/app-route-handler-response.js", import.meta.url);
@@ -30,6 +31,8 @@ const appElementsPath = resolveEntryPath("../server/app-elements.js", import.met
 const appPageRouteWiringPath = resolveEntryPath("../server/app-page-route-wiring.js", import.meta.url);
 const appPageProbePath = resolveEntryPath("../server/app-page-probe.js", import.meta.url);
 const appPageDispatchPath = resolveEntryPath("../server/app-page-dispatch.js", import.meta.url);
+const appPagePprRuntimePath = resolveEntryPath("../server/app-page-ppr-runtime.js", import.meta.url);
+const fileBasedMetadataPath = resolveEntryPath("../server/file-based-metadata.js", import.meta.url);
 const appPageRequestPath = resolveEntryPath("../server/app-page-request.js", import.meta.url);
 const appSegmentConfigPath = resolveEntryPath("../server/app-segment-config.js", import.meta.url);
 const appRscRouteMatchingPath = resolveEntryPath("../server/app-rsc-route-matching.js", import.meta.url);
@@ -80,11 +83,19 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const hasPagesDir = config?.hasPagesDir ?? false;
 	const publicFiles = config?.publicFiles ?? [];
 	const draftModeSecret = config?.draftModeSecret ?? randomUUID();
+	const imageAllowedWidths = [...config?.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...config?.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES];
+	const imageConfig = {
+		qualities: config?.imageConfig?.qualities,
+		dangerouslyAllowSVG: config?.imageConfig?.dangerouslyAllowSVG,
+		dangerouslyAllowLocalIP: config?.imageConfig?.dangerouslyAllowLocalIP,
+		contentDispositionType: config?.imageConfig?.contentDispositionType,
+		contentSecurityPolicy: config?.imageConfig?.contentSecurityPolicy
+	};
 	const { imports, routeEntries, metaRouteEntries, generateStaticParamsEntries, rootParamNameEntries, rootNotFoundVar, rootForbiddenVar, rootUnauthorizedVar, rootLayoutVars, globalErrorVar, globalNotFoundImportSpecifier } = buildAppRscManifestCode({
 		routes,
 		metadataRoutes,
 		globalErrorPath,
-		globalNotFoundPath: config?.globalNotFoundPath ?? null
+		globalNotFoundPath: config?.globalNotFound === true ? config.globalNotFoundPath ?? null : null
 	});
 	const loadPrerenderPagesRoutesCode = hasPagesDir ? `
 async function __loadPrerenderPagesRoutes() {
@@ -121,6 +132,8 @@ ${instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(norm
 import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(instrumentationRuntimePath)};` : ""}
 import { createAppRscHandler } from "vinext/server/app-rsc-handler";
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
+import __pagesClientAssets from "virtual:vinext-pages-client-assets";
+import { setPagesClientAssets as __setPagesClientAssets } from "vinext/server/pages-client-assets";
 import { decodePathParams as __decodePathParams } from ${JSON.stringify(normalizePathModulePath)};
 import { buildRequestHeadersFromMiddlewareResponse as __buildRequestHeadersFromMiddlewareResponse } from ${JSON.stringify(middlewareRequestHeadersPath)};
 ${hasPagesDir ? `import {
@@ -129,6 +142,11 @@ ${hasPagesDir ? `import {
 const __loadAppRouteHandlerDispatch = () => import(${JSON.stringify(appRouteHandlerDispatchPath)});
 ${hasServerActions ? `const __loadAppServerActionExecution = () => import(${JSON.stringify(appServerActionExecutionPath)});` : ""}
 ${(metadataRoutes?.length ?? 0) > 0 ? `const __loadMetadataRouteResponse = () => import(${JSON.stringify(metadataRouteResponsePath)});` : ""}
+${(metadataRoutes?.length ?? 0) > 0 ? `const __loadFileBasedMetadata = () => import(${JSON.stringify(fileBasedMetadataPath)});
+async function __applyFileBasedMetadata(...args) {
+  const { applyFileBasedMetadata } = await __loadFileBasedMetadata();
+  return applyFileBasedMetadata(...args);
+}` : ""}
 import {
   sanitizeErrorForClient as __sanitizeErrorForClient,
 } from ${JSON.stringify(appRscErrorsPath)};
@@ -152,6 +170,10 @@ import { buildAppPageProbes as __buildAppPageProbes } from ${JSON.stringify(appP
 import {
   dispatchAppPage as __dispatchAppPage,
 } from ${JSON.stringify(appPageDispatchPath)};
+${cacheComponents ? `import {
+  appPagePprRuntime as __appPagePprRuntime,
+  createAppPprFallbackShells as __createAppPprFallbackShells,
+} from ${JSON.stringify(appPagePprRuntimePath)};` : ""}
 import {
   resolveAppPageGenerateStaticParamsSources as __resolveAppPageGenerateStaticParamsSources,
 } from ${JSON.stringify(appPageRequestPath)};
@@ -234,6 +256,11 @@ function __resolveRouteFetchCacheMode(route) {
   return __resolveAppPageFetchCacheMode({
     layouts: route.layouts,
     page: route.page,
+    parallelSegments: Object.values(route.slots ?? {}).flatMap((slot) => [
+      slot.layout,
+      ...(slot.configLayouts ?? []),
+      slot.page ?? slot.default,
+    ]),
   });
 }
 
@@ -241,6 +268,11 @@ function __resolveRouteDynamicConfig(route) {
   return __resolveAppPageSegmentConfig({
     layouts: route.layouts,
     page: route.page,
+    parallelSegments: Object.values(route.slots ?? {}).flatMap((slot) => [
+      slot.layout,
+      ...(slot.configLayouts ?? []),
+      slot.page ?? slot.default,
+    ]),
   }).dynamicConfig ?? null;
 }
 
@@ -248,6 +280,11 @@ function __resolveRouteRuntime(route) {
   return __resolveAppPageSegmentConfig({
     layouts: route.layouts,
     page: route.page,
+    parallelSegments: Object.values(route.slots ?? {}).flatMap((slot) => [
+      slot.layout,
+      ...(slot.configLayouts ?? []),
+      slot.page ?? slot.default,
+    ]),
   }).runtime ?? null;
 }
 
@@ -317,6 +354,7 @@ const createRscOnErrorHandler = (request, pathname, routePath) =>
   createAppRscOnErrorHandler(_reportRequestError, request, pathname, routePath);
 
 const __fallbackRenderer = __createAppFallbackRenderer({
+  ${(metadataRoutes?.length ?? 0) > 0 ? "applyFileBasedMetadata: __applyFileBasedMetadata," : ""}
   basePath: __basePath,
   trailingSlash: __trailingSlash,
   rootBoundaries: {
@@ -327,6 +365,7 @@ const __fallbackRenderer = __createAppFallbackRenderer({
   },
   globalErrorModule: ${globalErrorVar ? globalErrorVar : "null"},
   loadGlobalNotFoundModule: __loadGlobalNotFoundModule,
+  globalNotFoundEnabled: ${config?.globalNotFound === true},
   metadataRoutes,
   ssrLoader() {
     return import.meta.viteRsc.loadModule("ssr", "index");
@@ -366,6 +405,7 @@ async function buildPageElements(route, params, routePath, pageRequest, layoutPa
   // Hydrate lazy page/route-handler modules before any synchronous read.
   await __ensureRouteLoaded(route);
   return __buildPageElements({
+    ${(metadataRoutes?.length ?? 0) > 0 ? "applyFileBasedMetadata: __applyFileBasedMetadata," : ""}
     route,
     params,
     routePath,
@@ -387,7 +427,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 __runtimeImageConfig = ${JSON.stringify(config?.imageConfig)};
 const __publicFiles = new Set(${JSON.stringify(publicFiles)});
 const __allowedOrigins = ${JSON.stringify(allowedOrigins)};
 const __expireTime = ${JSON.stringify(expireTime)};
@@ -398,10 +438,11 @@ const __reactMaxHeadersLength = ${JSON.stringify(reactMaxHeadersLength)};
 // mirrors the embedded \`__basePath\` pattern (and Pages Router's
 // \`vinextConfig\` export). Empty string when unset.
 export const __assetPrefix = ${JSON.stringify(assetPrefix)};
+export const __imageAllowedWidths = ${JSON.stringify(imageAllowedWidths)};
+export const __imageConfig = ${JSON.stringify(imageConfig)};
 export const __inlineCss = ${JSON.stringify(inlineCss)};
 export const __hasPagesDir = ${JSON.stringify(hasPagesDir)};
 export const getRenderedConcreteUrlPathsForRoute = __getRenderedConcreteUrlPathsForRoute;
-const __cacheComponents = ${JSON.stringify(cacheComponents)};
 
 export async function seedMemoryCacheFromPrerender(serverDir) {
   const { seedMemoryCacheFromPrerender: __seedMemoryCacheFromPrerender } =
@@ -447,6 +488,7 @@ const rootParamNamesMap = {
 ${rootParamNameEntries.join("\n")}
 };
 
+__setPagesClientAssets(__pagesClientAssets);
 export default createAppRscHandler({
   basePath: __basePath,
   buildId: process.env.__VINEXT_BUILD_ID ?? null,
@@ -456,10 +498,12 @@ export default createAppRscHandler({
   },
   registerCacheAdapters: __registerConfiguredCacheAdapters,
   configHeaders: __configHeaders,
-  cacheComponents: __cacheComponents,
+  ${cacheComponents ? `createPprFallbackShells(route, params) {
+    return __createAppPprFallbackShells(route, params);
+  },` : ""}
   configRedirects: __configRedirects,
   configRewrites: __configRewrites,
-  imageConfig: __imageConfig,
+  imageConfig: __runtimeImageConfig,
   isDev: process.env.NODE_ENV !== "production",
   draftModeSecret: __draftModeSecret,
   dispatchMatchedPage({
@@ -491,13 +535,32 @@ export default createAppRscHandler({
     const PageComponent = route.page?.default;
     const __segmentConfig = __resolveAppPageSegmentConfig({
       layouts: route.layouts,
+      layoutTreePositions: route.layoutTreePositions,
       page: route.page,
-      parallelPages: Object.values(route.slots ?? {}).map((slot) => slot.page),
+      parallelBranches: Object.values(route.slots ?? {}).map((slot) => ({
+        layout: slot.layout,
+        configLayouts: slot.configLayouts,
+        configLayoutTreePositions: slot.configLayoutTreePositions,
+        page: slot.page ?? slot.default,
+        routeSegments: slot.routeSegments,
+      })),
+      parallelPages: Object.values(route.slots ?? {}).map((slot) => slot.page ?? slot.default),
+      routeSegments: route.routeSegments,
     });
     const __generateStaticParams = __resolveAppPageGenerateStaticParamsSources({
       layouts: route.layouts,
       layoutTreePositions: route.layoutTreePositions,
       page: route.page,
+      parallelBranches: Object.values(route.slots ?? {}).map((slot) => ({
+        layout: slot.layout,
+        configLayouts: slot.configLayouts,
+        configLayoutTreePositions: slot.configLayoutTreePositions,
+        page: slot.page ?? slot.default,
+        paramNames: slot.slotParamNames,
+        patternParts: slot.slotPatternParts,
+        routeSegments: slot.routeSegments,
+      })),
+      routePatternParts: route.patternParts,
       routeSegments: route.routeSegments,
     });
     const _asyncRouteParams = makeThenableParams(params);
@@ -506,7 +569,7 @@ export default createAppRscHandler({
       ensureRouteLoaded: __ensureRouteLoaded,
       clientTraceMetadata: __clientTraceMetadata,
       reactMaxHeadersLength: __reactMaxHeadersLength,
-      buildPageElement(targetRoute, targetParams, targetOpts, targetSearchParams, layoutParamAccess) {
+      buildPageElement(targetRoute, targetParams, targetOpts, targetSearchParams, layoutParamAccess, buildOptions) {
         return buildPageElements(targetRoute, targetParams, cleanPathname, {
           opts: targetOpts,
           searchParams: targetSearchParams,
@@ -514,6 +577,8 @@ export default createAppRscHandler({
           request,
           mountedSlotsHeader,
           renderMode,
+          observeMetadataSearchParamsAccess: buildOptions?.observeMetadataSearchParamsAccess === true,
+          observePageSearchParamsAccess: buildOptions?.observePageSearchParamsAccess === true,
         }, layoutParamAccess, displayPathname);
       },
       clientReuseManifest,
@@ -570,6 +635,7 @@ export default createAppRscHandler({
       params,
       pprFallbackCacheShells,
       pprFallbackShell,
+      pprRuntime: ${cacheComponents ? "__appPagePprRuntime" : "undefined"},
       renderedConcreteUrlPaths,
       skipStaticParamsValidation,
       staticParamsValidationParams,
@@ -583,7 +649,7 @@ export default createAppRscHandler({
           route,
         });
       },
-      async probePage() {
+      async probePage(probeSearchParams = searchParams) {
         const __probeIntercept = findIntercept(cleanPathname, interceptionContext);
         // The intercepting-route page module is lazy (page: null + __pageLoader).
         // Resolve it before probing so buildAppPageProbes inspects the real page
@@ -598,21 +664,21 @@ export default createAppRscHandler({
           route,
           pageComponent: PageComponent,
           asyncRouteParams: _asyncRouteParams,
-          searchParams,
+          searchParams: probeSearchParams,
           intercept: __probeIntercept,
           isRscRequest,
           matchedParams: params,
           makeThenableParams,
         }));
       },
-      renderErrorBoundaryPage(renderErr) {
+      renderErrorBoundaryPage(renderErr, errorOrigin) {
         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,
-        });
+        }, errorOrigin);
       },
       renderHttpAccessFallbackPage(statusCode, opts, currentMiddlewareContext) {
         const __activeIntercept = findIntercept(cleanPathname, interceptionContext);
@@ -762,7 +828,7 @@ export default createAppRscHandler({
     const __actionMatch = matchRoute(cleanPathname);
     if (__actionMatch) await __ensureRouteLoaded(__actionMatch.route);
     const __actionIsEdgeRuntime = __actionMatch
-      ? __isEdgeRuntime(__resolveAppPageSegmentConfig({ layouts: __actionMatch.route.layouts, page: __actionMatch.route.page }).runtime)
+      ? __isEdgeRuntime(__resolveRouteRuntime(__actionMatch.route))
       : false;
     return __handleServerActionRscRequest({
       actionId,
@@ -780,6 +846,8 @@ export default createAppRscHandler({
         request: actionRequest,
         mountedSlotsHeader: actionMountedSlotsHeader,
         renderMode: actionRenderMode,
+        observeMetadataSearchParamsAccess,
+        observePageSearchParamsAccess,
       }) {
         return buildPageElements(actionRoute, actionParams, actionCleanPathname, {
           opts: interceptOpts,
@@ -788,6 +856,8 @@ export default createAppRscHandler({
           request: actionRequest,
           mountedSlotsHeader: actionMountedSlotsHeader,
           renderMode: actionRenderMode,
+          observeMetadataSearchParamsAccess: observeMetadataSearchParamsAccess === true,
+          observePageSearchParamsAccess: observePageSearchParamsAccess === true,
         });
       },
       cleanPathname,
@@ -813,6 +883,7 @@ export default createAppRscHandler({
       },
       createTemporaryReferenceSet,
       decodeReply,
+      draftModeSecret: __draftModeSecret,
       findIntercept(pathnameToMatch) {
         return findIntercept(pathnameToMatch, interceptionContext);
       },
@@ -856,6 +927,8 @@ export default createAppRscHandler({
         return {
           interceptionContext,
           interceptLayouts: intercept.interceptLayouts,
+          interceptLayoutSegments: intercept.interceptLayoutSegments,
+          interceptBranchSegments: intercept.interceptBranchSegments,
           interceptSlotId: intercept.slotId,
           interceptSlotKey: intercept.slotKey,
           interceptSourceMatchedUrl: interceptionContext,
@@ -879,11 +952,12 @@ export default createAppRscHandler({
     });
   },` : ""}
   matchRoute,
-  ${middlewarePath ? `runMiddleware({ cleanPathname, context, isDataRequest, request }) {
+  ${middlewarePath ? `runMiddleware({ cleanPathname, context, hadBasePath, isDataRequest, request }) {
     return __applyAppMiddleware({
       basePath: __basePath,
       cleanPathname,
       context,
+      hadBasePath,
       filePath: ${JSON.stringify(middlewarePath ? normalizePathSeparators(middlewarePath) : "")},
       i18nConfig: __i18nConfig,
       isDataRequest,
@@ -895,7 +969,7 @@ export default createAppRscHandler({
   },` : ""}
   publicFiles: __publicFiles,
   renderNotFound({ isRscRequest, matchedParams, middlewareContext, request, route, scriptNonce }) {
-    const __isEdge = route ? __isEdgeRuntime(__resolveAppPageSegmentConfig({ layouts: route.layouts, page: route.page }).runtime) : false;
+    const __isEdge = route ? __isEdgeRuntime(__resolveRouteRuntime(route)) : false;
     return __fallbackRenderer.renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, { isEdgeRuntime: __isEdge });
   },
   ${hasPagesDir ? `async renderPagesFallback({ allowRscDocumentFallback, appRouteMatch, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, url }) {