vinext 0.1.7 → 0.2.0

package/dist/index.js

@@ -1,32 +1,37 @@
-import { detectPackageManager } from "./utils/project.js";
-import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
+import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { escapeRegExp } from "./utils/regex.js";
+import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
-import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
+import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
+import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
 import { filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
+import { extractMiddlewareMatcherConfig } from "./build/report.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { isUnknownRecord } from "./utils/record.js";
 import { logRequest, now } from "./server/request-log.js";
+import { resolvePagesI18nRequest } from "./server/pages-i18n.js";
+import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
-import { scanMetadataFiles } from "./server/metadata-routes.js";
+import { invalidateMetadataFileCache, scanMetadataFiles } from "./server/metadata-routes.js";
 import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
 import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
+import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/image-adapters-virtual.js";
 import { generateBrowserEntry, isLinkPrefetchRoute, toDocumentOnlyAppRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
@@ -35,7 +40,7 @@ import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { getDepOptimizeNodeEnvOptions, getViteMajorVersion, serializeViteDefine } from "./utils/vite-version.js";
 import { createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
-import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
+import { mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
 import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
@@ -48,6 +53,7 @@ import { renderVinextBuiltUrl } from "./utils/built-asset-url.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
+import { createCssModuleImportCompatibilityPlugin } from "./plugins/css-module-imports.js";
 import { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
@@ -61,8 +67,8 @@ import { generateRouteTypes } from "./typegen.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
 import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
-import { buildRuntimeGlobalsScript, computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
-import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
+import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
+import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClientAssetsBuildMetadata, takePagesClientAssetsBuildMetadata, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassTildeImporter } from "./plugins/sass.js";
 import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
@@ -76,6 +82,8 @@ import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { getTypeofWindowReplacement, replaceTypeofWindow } from "./plugins/typeof-window.js";
 import { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
+import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
+import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
@@ -85,7 +93,6 @@ import { pathToFileURL } from "node:url";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
-import tsconfigPaths from "vite-tsconfig-paths";
 //#region src/index.ts
 installSocketErrorBackstop();
 function getCacheDirPrefix(cacheDir) {
@@ -138,6 +145,11 @@ function resolveOptionalDependency(projectRoot, specifier) {
 	} catch {}
 	return null;
 }
+async function loadVite7TsconfigPathsPlugin(projectRoot) {
+	const resolvedPath = resolveOptionalDependency(projectRoot, "vite-tsconfig-paths");
+	if (!resolvedPath) throw new Error("[vinext] Vite 7 requires the optional peer dependency vite-tsconfig-paths for tsconfig path alias support. Install vite-tsconfig-paths or upgrade to Vite 8.");
+	return (await import(pathToFileURL(resolvedPath).href)).default();
+}
 function resolveShimModulePath(shimsDir, moduleName) {
 	for (const ext of [
 		".ts",
@@ -230,6 +242,20 @@ function toViteAliasReplacement(absolutePath, projectRoot) {
 	}
 	return normalizedPath;
 }
+function resolveSwcHelpersAlias(root) {
+	const rootRequire = createRequire(path.join(root, "package.json"));
+	const resolvers = [];
+	try {
+		const nextPackageJson = rootRequire.resolve("next/package.json");
+		const realNextPackageJson = tryRealpathSync(nextPackageJson) ?? nextPackageJson;
+		resolvers.push(createRequire(realNextPackageJson));
+	} catch {}
+	resolvers.push(rootRequire, createRequire(import.meta.url));
+	for (const resolver of resolvers) try {
+		const packageJsonPath = resolver.resolve("@swc/helpers/package.json");
+		return normalizePathSeparators(path.join(path.dirname(packageJsonPath), "_"));
+	} catch {}
+}
 function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */ new Set()) {
 	const normalizedPath = tryRealpathSync(configPath) ?? configPath;
 	if (seen.has(normalizedPath)) return {};
@@ -293,19 +319,27 @@ function resolveTsconfigAliases(projectRoot) {
 	_tsconfigAliasCache.set(projectRoot, aliases);
 	return aliases;
 }
+const VIRTUAL_WORKER_ENTRY = "virtual:vinext-worker-entry";
+const RESOLVED_WORKER_ENTRY = "\0virtual:vinext-worker-entry";
 const VIRTUAL_SERVER_ENTRY = "virtual:vinext-server-entry";
 const RESOLVED_SERVER_ENTRY = "\0virtual:vinext-server-entry";
 const VIRTUAL_CLIENT_ENTRY = "virtual:vinext-client-entry";
 const RESOLVED_CLIENT_ENTRY = "\0virtual:vinext-client-entry";
+const VIRTUAL_PAGES_CLIENT_ASSETS = "virtual:vinext-pages-client-assets";
+const RESOLVED_PAGES_CLIENT_ASSETS = "\0virtual:vinext-pages-client-assets";
 const VIRTUAL_RSC_ENTRY = "virtual:vinext-rsc-entry";
 const RESOLVED_RSC_ENTRY = "\0virtual:vinext-rsc-entry";
 const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
 const RESOLVED_APP_SSR_ENTRY = "\0virtual:vinext-app-ssr-entry";
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
 const RESOLVED_APP_BROWSER_ENTRY = "\0virtual:vinext-app-browser-entry";
+const VIRTUAL_APP_CAPABILITIES = "virtual:vinext-app-capabilities";
+const RESOLVED_APP_CAPABILITIES = "\0virtual:vinext-app-capabilities";
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
 /** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
 const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
+/** Virtual module that registers the config-driven image optimizer (see VinextOptions.images). */
+const RESOLVED_IMAGE_ADAPTERS = "\0" + VIRTUAL_IMAGE_ADAPTERS;
 /** Virtual module for composed instrumentation-client bootstrap. */
 const VIRTUAL_INSTRUMENTATION_CLIENT = "private-next-instrumentation-client";
 const RESOLVED_INSTRUMENTATION_CLIENT = `${VIRTUAL_INSTRUMENTATION_CLIENT}.mjs`;
@@ -331,8 +365,11 @@ function createStaticImageAsset(imagePath) {
 * the `id.startsWith(_shimsDir)` checks would never match.
 */
 const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
+const _serverDir = normalizePathSeparators(path.resolve(__dirname, "server"));
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
-const _appRscHandlerPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-rsc-handler");
+const _appBrowserServerActionClientPath = resolveShimModulePath(_serverDir, "app-browser-server-action-client");
+const _appRscHandlerPath = resolveShimModulePath(_serverDir, "app-rsc-handler");
+const _pagesClientAssetsPath = resolveShimModulePath(_serverDir, "pages-client-assets");
 const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
@@ -432,6 +469,7 @@ function getClientOutputConfigForVite(viteMajorVersion, assetsDir, preserveAppRo
 	} : createClientOutputConfig(manualChunks, assetsDir);
 }
 function vinext(options = {}) {
+	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
 	const viteMajorVersion = getViteMajorVersion();
 	let root;
 	let pagesDir;
@@ -449,6 +487,8 @@ function vinext(options = {}) {
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
+	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
+	let pagesClientAssetsModule = null;
 	let rscCompatibilityId;
 	const draftModeSecret = randomUUID();
 	const sassComposesLoader = createSassAwareFileSystemLoader();
@@ -494,7 +534,9 @@ function vinext(options = {}) {
 		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => isLinkPrefetchRoute(route) ? toLinkPrefetchRoute(route) : toDocumentOnlyAppRoute(route)) : [];
 		return generateClientEntry(pagesDir, nextConfig, fileMatcher, {
 			appPrefetchRoutes,
-			instrumentationClientPath
+			instrumentationClientPath,
+			middlewareMatcher: middlewarePath ? extractMiddlewareMatcherConfig(middlewarePath) : void 0,
+			reactPreamble: options.react !== false
 		});
 	}
 	async function writeRouteTypes() {
@@ -531,6 +573,13 @@ function vinext(options = {}) {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
 		});
 	}
+	async function resolveHasServerActions(config) {
+		if (config.command !== "build" || !rscPluginModulePromise) return true;
+		const { getPluginApi } = await rscPluginModulePromise;
+		const pluginApi = getPluginApi(config);
+		if (!pluginApi || pluginApi.manager.isScanBuild) return true;
+		return Object.keys(pluginApi.manager.serverReferenceMetaMap).length > 0;
+	}
 	const reactOptions = options.react && options.react !== true ? options.react : void 0;
 	let reactPluginPromise = null;
 	if (options.react !== false) {
@@ -576,8 +625,9 @@ function vinext(options = {}) {
 		return mdxDelegatePromise;
 	}
 	const plugins = [
-		...viteMajorVersion >= 8 ? [] : [tsconfigPaths()],
+		...viteMajorVersion >= 8 ? [] : [loadVite7TsconfigPathsPlugin(earlyBaseDir)],
 		reactPluginPromise,
+		createIgnoreDynamicRequestsPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
 		commonjs(),
 		...viteMajorVersion >= 8 ? [{
 			name: "vinext:jsx-in-js",
@@ -606,17 +656,24 @@ function vinext(options = {}) {
 		createMiddlewareServerOnlyPlugin({
 			getMiddlewarePath: () => middlewarePath,
 			getCanonicalMiddlewarePath: () => middlewarePath ? tryRealpathSync(middlewarePath) ?? middlewarePath : null,
+			isNeutralServerModule: (id) => {
+				const canonicalId = canonicalizePageTransformPath(id);
+				return isWithinPagesDirectory(canonicalId) && isApiPage(canonicalId);
+			},
 			serverOnlyShimPath: resolveShimModulePath(shimsDir, "server-only")
 		}),
 		dataUrlCssPlugin(),
+		createCssModuleImportCompatibilityPlugin(),
 		{
 			name: "vinext:config",
 			enforce: "pre",
+			[VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY]: prerenderConfig,
 			async config(config, env) {
 				root = normalizePathSeparators(config.root ?? process.cwd());
 				const userResolve = config.resolve;
 				const shouldEnableNativeTsconfigPaths = viteMajorVersion >= 8 && userResolve?.tsconfigPaths === void 0;
 				const tsconfigPathAliases = resolveTsconfigAliases(root);
+				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
 				const dotenvVars = loadEnv(mode, config.envDir ?? root, "");
 				for (const [key, value] of Object.entries(dotenvVars)) if (process.env[key] === void 0) process.env[key] = value;
@@ -681,6 +738,8 @@ function vinext(options = {}) {
 					defines[`process.env.${key}`] = JSON.stringify(value);
 				}
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
+				defines["process.env.__VINEXT_HAS_PAGES_ROUTER"] = JSON.stringify(String(hasPagesDir));
+				defines["process.env.__NEXT_CLIENT_ROUTER_DYNAMIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.dynamic));
 				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
 				defines["process.env.__NEXT_GESTURE_TRANSITION"] = JSON.stringify(nextConfig.gestureTransition);
@@ -716,6 +775,7 @@ function vinext(options = {}) {
 				}
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_SVG"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowSVG ?? false));
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowLocalIP ?? false));
+				defines["process.env.__VINEXT_IMAGE_UNOPTIMIZED"] = JSON.stringify(String(nextConfig.images?.unoptimized === true));
 				defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
 				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
@@ -782,7 +842,7 @@ function vinext(options = {}) {
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
-					"vinext/dev-error-overlay": path.resolve(__dirname, "server", "dev-error-overlay"),
+					"vinext/dev-error-overlay": path.resolve(__dirname, "client", "dev-error-overlay"),
 					"vinext/html": path.resolve(__dirname, "server", "html"),
 					...clientInjectModule === null ? { "private-next-instrumentation-client": instrumentationClientPath ?? INSTRUMENTATION_CLIENT_EMPTY_MODULE } : {}
 				}).flatMap(([k, v]) => k.startsWith("next/") ? [[k, v], [`${k}.js`, v]] : [[k, v]]));
@@ -800,6 +860,8 @@ function vinext(options = {}) {
 				hasUserMdxPlugin = pluginsFlat.some((p) => p && typeof p === "object" && "name" in p && typeof p.name === "string" && (p.name === "@mdx-js/rollup" || p.name === "mdx"));
 				if (!hasUserMdxPlugin && hasMdxFiles(root, hasAppDir ? appDir : null, hasPagesDir ? pagesDir : null)) await ensureMdxDelegate("detected");
 				const isSSR = !!config.build?.ssr;
+				const serverTranspilePackages = [...nextConfig?.turbopackTranspilePackages ?? [], ...nextConfig?.optimizePackageImports ?? []];
+				const nextServerExternal = mergeServerExternalPackages(nextConfig?.serverExternalPackages, serverTranspilePackages);
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
 				const hasBuildInput = getBuildBundlerOptions(config.build)?.input !== void 0;
 				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput;
@@ -850,15 +912,19 @@ function vinext(options = {}) {
 							"react",
 							"react-dom",
 							"react-dom/server",
-							"ipaddr.js"
+							"ipaddr.js",
+							...Array.isArray(config.ssr?.external) ? config.ssr.external : [],
+							...nextServerExternal
 						],
 						noExternal: true
 					} },
 					resolve: {
 						alias: {
+							...swcHelpersAlias ? { "@swc/helpers/_": swcHelpersAlias } : {},
 							...tsconfigPathAliases,
 							...nextConfig.aliases,
-							...nextShimMap
+							...nextShimMap,
+							"vinext/server/pages-client-assets": _pagesClientAssetsPath
 						},
 						dedupe: [
 							"react",
@@ -895,7 +961,6 @@ function vinext(options = {}) {
 						...cssModulesOverride
 					}
 				};
-				const nextServerExternal = nextConfig?.serverExternalPackages ?? [];
 				const userSsrExternal = Array.isArray(config.ssr?.external) ? [...config.ssr.external, ...nextServerExternal] : config.ssr?.external === true ? true : nextServerExternal;
 				const externalizeSsrReactInDev = env.command === "serve" && !hasCloudflarePlugin && !hasNitroPlugin;
 				const incomingExclude = config.optimizeDeps?.exclude ?? [];
@@ -1031,7 +1096,8 @@ function vinext(options = {}) {
 								"react",
 								"react-dom",
 								"react-dom/server",
-								"ipaddr.js"
+								"ipaddr.js",
+								...nextServerExternal
 							],
 							noExternal: true
 						},
@@ -1102,7 +1168,7 @@ function vinext(options = {}) {
 			resolveId: {
 				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/app-rsc-handler)|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
 				handler(id, importer) {
-					const cleanId = id.startsWith("\0") ? id.slice(1) : id;
+					const cleanId = normalizePathSeparators(id.startsWith("\0") ? id.slice(1) : id);
 					if (cleanId === "vinext/server/app-rsc-handler") {
 						if (_canExternalizeAppRscHandler && this.environment?.name === "rsc" && this.environment.config?.command === "serve") return {
 							id: _appRscHandlerPath,
@@ -1112,20 +1178,24 @@ function vinext(options = {}) {
 					}
 					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
 					if (cleanId.startsWith("vinext/shims/")) return resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
+					if (cleanId === VIRTUAL_WORKER_ENTRY) return RESOLVED_WORKER_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-worker-entry")) return RESOLVED_WORKER_ENTRY;
 					if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
 					if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-server-entry") || cleanId.endsWith("\\virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-client-entry") || cleanId.endsWith("\\virtual:vinext-client-entry")) return RESOLVED_CLIENT_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-client-entry")) return RESOLVED_CLIENT_ENTRY;
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
 					if (cleanId === VIRTUAL_APP_SSR_ENTRY) return RESOLVED_APP_SSR_ENTRY;
 					if (cleanId === VIRTUAL_APP_BROWSER_ENTRY) return RESOLVED_APP_BROWSER_ENTRY;
+					if (cleanId === VIRTUAL_APP_CAPABILITIES) return RESOLVED_APP_CAPABILITIES;
 					if (cleanId === "next/root-params" || cleanId === "next/root-params.js") return RESOLVED_ROOT_PARAMS;
-					if (cleanId === "virtual:vinext-cache-adapters" || cleanId.endsWith("/virtual:vinext-cache-adapters") || cleanId.endsWith("\\virtual:vinext-cache-adapters")) return RESOLVED_CACHE_ADAPTERS;
+					if (cleanId === "virtual:vinext-cache-adapters" || cleanId.endsWith("/virtual:vinext-cache-adapters")) return RESOLVED_CACHE_ADAPTERS;
+					if (cleanId === "virtual:vinext-image-adapters" || cleanId.endsWith("/virtual:vinext-image-adapters")) return RESOLVED_IMAGE_ADAPTERS;
 					if (cleanId.startsWith("virtual:vinext-google-fonts?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(VIRTUAL_GOOGLE_FONTS.length);
-					if (cleanId.endsWith("/virtual:vinext-rsc-entry") || cleanId.endsWith("\\virtual:vinext-rsc-entry")) return RESOLVED_RSC_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-app-ssr-entry") || cleanId.endsWith("\\virtual:vinext-app-ssr-entry")) return RESOLVED_APP_SSR_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-app-browser-entry") || cleanId.endsWith("\\virtual:vinext-app-browser-entry")) return RESOLVED_APP_BROWSER_ENTRY;
-					if (cleanId.includes("/virtual:vinext-google-fonts?") || cleanId.includes("\\virtual:vinext-google-fonts?")) {
+					if (cleanId.endsWith("/virtual:vinext-rsc-entry")) return RESOLVED_RSC_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-app-ssr-entry")) return RESOLVED_APP_SSR_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-app-browser-entry")) return RESOLVED_APP_BROWSER_ENTRY;
+					if (cleanId.includes("/virtual:vinext-google-fonts?")) {
 						const queryIndex = cleanId.indexOf(VIRTUAL_GOOGLE_FONTS + "?");
 						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + VIRTUAL_GOOGLE_FONTS.length);
 					}
@@ -1134,19 +1204,16 @@ function vinext(options = {}) {
 				}
 			},
 			async load(id) {
+				if (id === RESOLVED_WORKER_ENTRY) return `export { default } from ${JSON.stringify(hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry")};`;
 				if (id === RESOLVED_SERVER_ENTRY) return await generateServerEntry$1();
 				if (id === RESOLVED_CLIENT_ENTRY) return await generateClientEntry$1();
+				if (id === RESOLVED_PAGES_CLIENT_ASSETS) return "export default { clientEntry: '/@id/__x00__virtual:vinext-client-entry' };";
 				if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
 					const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 					const metaRoutes = scanMetadataFiles(appDir);
-					let hasServerActions = true;
-					if (this.environment?.config.command === "build" && rscPluginModulePromise) {
-						const { getPluginApi } = await rscPluginModulePromise;
-						const pluginApi = getPluginApi(this.environment.config);
-						if (pluginApi && !pluginApi.manager.isScanBuild) hasServerActions = Object.keys(pluginApi.manager.serverReferenceMetaMap).length > 0;
-					}
+					const hasServerActions = await resolveHasServerActions(this.environment.config);
 					const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
-					const globalNotFoundPath = findFileWithExts(appDir, "global-not-found", fileMatcher);
+					const globalNotFoundPath = nextConfig?.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
 					rscClassificationManifest = collectRouteClassificationManifest(routes);
 					return generateRscEntry(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
 						redirects: nextConfig?.redirects,
@@ -1163,13 +1230,18 @@ function vinext(options = {}) {
 						reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 						inlineCss: nextConfig?.inlineCss,
+						globalNotFound: nextConfig?.globalNotFound,
 						cacheComponents: nextConfig?.cacheComponents,
 						hasServerActions,
 						i18n: nextConfig?.i18n,
 						imageConfig: {
 							deviceSizes: nextConfig?.images?.deviceSizes,
 							imageSizes: nextConfig?.images?.imageSizes,
-							qualities: nextConfig?.images?.qualities
+							qualities: nextConfig?.images?.qualities,
+							dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
+							dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
+							contentDispositionType: nextConfig?.images?.contentDispositionType,
+							contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
 						},
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root),
@@ -1179,6 +1251,7 @@ function vinext(options = {}) {
 				}
 				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
 				if (id === RESOLVED_CACHE_ADAPTERS) return generateCacheAdaptersModule(options.cache);
+				if (id === RESOLVED_IMAGE_ADAPTERS) return generateImageAdaptersModule(options.images);
 				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
 				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
 					const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
@@ -1194,6 +1267,13 @@ function vinext(options = {}) {
 					}))] : [];
 					return generateBrowserEntry(graph.routes, graph.routeManifest, pagesPrefetchRoutes, nextConfig.rewrites);
 				}
+				if (id === RESOLVED_APP_CAPABILITIES && hasAppDir) {
+					const hasServerActions = await resolveHasServerActions(this.environment.config);
+					return `
+export const hasServerActions = ${JSON.stringify(hasServerActions)};
+export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.stringify(_appBrowserServerActionClientPath)})` : "null"};
+`;
+				}
 				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			},
 			// @vitejs/plugin-rsc runs the RSC environment build in two phases:
@@ -1231,6 +1311,28 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		{
+			name: "vinext:pages-client-assets-resolver",
+			sharedDuringBuild: true,
+			resolveId: {
+				filter: { id: /virtual:vinext-pages-client-assets$/ },
+				handler(id) {
+					const cleanId = normalizePathSeparators(id.startsWith("\0") ? id.slice(1) : id);
+					if (cleanId !== VIRTUAL_PAGES_CLIENT_ASSETS && !cleanId.endsWith("/virtual:vinext-pages-client-assets")) return;
+					if (this.environment?.config.command !== "build") return RESOLVED_PAGES_CLIENT_ASSETS;
+					const buildRoot = this.environment.config.root ?? process.cwd();
+					const environmentOutDir = path.resolve(buildRoot, this.environment.config.build.outDir);
+					const sidecarDir = !hasAppDir && this.environment.name === "ssr" ? path.dirname(environmentOutDir) : environmentOutDir;
+					let externalId = normalizePathSeparators(path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE)));
+					if (!externalId.startsWith(".")) externalId = `./${externalId}`;
+					pagesClientAssetsOutputDirs.add(sidecarDir);
+					return {
+						id: externalId,
+						external: true
+					};
+				}
+			}
+		},
 		{
 			name: "vinext:css-url-assets-mark",
 			enforce: "pre",
@@ -1251,11 +1353,14 @@ function vinext(options = {}) {
 			}
 		},
 		{
-			name: "vinext:client-css-url-assets-defaults",
+			name: "vinext:css-url-assets-defaults",
 			apply: "build",
-			configEnvironment(name) {
-				if (name !== "client") return null;
-				return { build: { assetsInlineLimit: clientAssetsInlineLimit } };
+			configEnvironment(name, config) {
+				if (name === "client") return { build: { assetsInlineLimit: clientAssetsInlineLimit } };
+				if (!hasAppDir || name !== "rsc" && name !== "ssr") return null;
+				const output = getBuildBundlerOptions(config.build)?.output;
+				if (Array.isArray(output) || output?.assetFileNames !== void 0) return null;
+				return { build: { ...withBuildBundlerOptions(viteMajorVersion, { output: { assetFileNames: createClientAssetFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? "")) } }) } };
 			}
 		},
 		{
@@ -1338,6 +1443,7 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		createCssModuleImportCompatibilityPlugin({ compiledMdx: true }),
 		{
 			name: "vinext:react-canary",
 			enforce: "pre",
@@ -1427,6 +1533,7 @@ function vinext(options = {}) {
 				}
 				function invalidateAppRoutingModules() {
 					invalidateAppRouteCache();
+					invalidateMetadataFileCache();
 					invalidateRscEntryModule();
 					invalidateRootParamsModule();
 				}
@@ -1797,11 +1904,15 @@ function vinext(options = {}) {
 								hadBasePath: true,
 								isDataReq,
 								isDataRequest,
+								hasMiddleware: capturedMiddlewarePath !== null,
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
 								runMiddleware: devRunMiddlewareAdapter,
-								matchPageRoute: (resolvedPathname) => {
-									const m = matchRoute(resolvedPathname, devPageRoutes);
-									return m ? { route: { isDynamic: m.route.isDynamic } } : null;
+								matchPageRoute: (resolvedPathname, request) => {
+									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, new URL(request.url).hostname, bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
+									return m ? { route: {
+										isDynamic: m.route.isDynamic,
+										pattern: m.route.pattern
+									} } : null;
 								},
 								proxyExternal: async (currentRequest, externalUrl) => {
 									const externalMethod = req.method ?? "GET";
@@ -1988,7 +2099,7 @@ function vinext(options = {}) {
 				handler(code, id) {
 					const cacheDirPrefix = getCacheDirPrefix(this.environment.config.cacheDir);
 					if (normalizePathSeparators(id).startsWith(cacheDirPrefix)) return null;
-					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment));
+					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment), id);
 				}
 			}
 		},
@@ -2242,29 +2353,6 @@ function vinext(options = {}) {
 		createOgInlineFetchAssetsPlugin(),
 		createOgAssetsPlugin(),
 		createServerExternalsManifestPlugin(),
-		{
-			name: "vinext:image-config",
-			apply: "build",
-			enforce: "post",
-			writeBundle: {
-				sequential: true,
-				order: "post",
-				handler(options) {
-					if (this.environment?.name !== "rsc") return;
-					const outDir = options.dir;
-					if (!outDir) return;
-					const imageConfig = {
-						deviceSizes: nextConfig?.images?.deviceSizes,
-						imageSizes: nextConfig?.images?.imageSizes,
-						qualities: nextConfig?.images?.qualities,
-						dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
-						contentDispositionType: nextConfig?.images?.contentDispositionType,
-						contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
-					};
-					fs.writeFileSync(path.join(outDir, "image-config.json"), JSON.stringify(imageConfig));
-				}
-			}
-		},
 		(() => {
 			let buildIdWritten = false;
 			return {
@@ -2437,6 +2525,65 @@ function vinext(options = {}) {
 				}
 			};
 		})(),
+		{
+			name: "vinext:pages-client-assets",
+			apply: "build",
+			enforce: "post",
+			sharedDuringBuild: true,
+			closeBundle: {
+				sequential: true,
+				order: "post",
+				handler() {
+					const envConfig = this.environment.config;
+					if (this.environment.name === "client") {
+						const buildRoot = envConfig.root ?? process.cwd();
+						const clientDir = path.resolve(buildRoot, envConfig.build.outDir);
+						const runtimeMetadata = computeClientRuntimeMetadata({
+							clientDir,
+							assetBase: envConfig.base ?? "/",
+							assetPrefix: nextConfig.assetPrefix,
+							includeClientEntry: !hasAppDir ? true : hasPagesDir ? "pages-client-entry" : false
+						});
+						let ssrManifest;
+						const ssrManifestPath = path.join(clientDir, ".vite", "ssr-manifest.json");
+						if (fs.existsSync(ssrManifestPath)) try {
+							ssrManifest = JSON.parse(fs.readFileSync(ssrManifestPath, "utf-8"));
+						} catch {}
+						pagesClientAssetsModule = buildPagesClientAssetsModule({
+							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
+							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
+							ssrManifest,
+							lazyChunks: runtimeMetadata.lazyChunks ?? void 0,
+							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0
+						});
+						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
+						if (hasAppDir && hasPagesDir && buildSession) setPagesClientAssetsBuildMetadata(buildSession, pagesClientAssetsModule);
+					}
+					if (pagesClientAssetsModule === null) {
+						if (pagesClientAssetsOutputDirs.size === 0) return;
+						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
+						if (buildSession) pagesClientAssetsModule = takePagesClientAssetsBuildMetadata(buildSession);
+					}
+					if (pagesClientAssetsModule === null) {
+						const emptyModule = buildPagesClientAssetsModule({});
+						for (const outputDir of pagesClientAssetsOutputDirs) writePagesClientAssetsModuleIfMissing(outputDir, emptyModule);
+						return;
+					}
+					for (const outputDir of pagesClientAssetsOutputDirs) {
+						fs.mkdirSync(outputDir, { recursive: true });
+						fs.writeFileSync(path.join(outputDir, PAGES_CLIENT_ASSETS_MODULE), pagesClientAssetsModule);
+					}
+				}
+			},
+			buildApp() {
+				if (pagesClientAssetsModule === null) return Promise.resolve();
+				for (const outputDir of pagesClientAssetsOutputDirs) {
+					fs.mkdirSync(outputDir, { recursive: true });
+					fs.writeFileSync(path.join(outputDir, PAGES_CLIENT_ASSETS_MODULE), pagesClientAssetsModule);
+				}
+				return Promise.resolve();
+			}
+		},
 		{
 			name: "vinext:inline-css-manifest",
 			apply: "build",
@@ -2470,61 +2617,7 @@ function vinext(options = {}) {
 					const envConfig = this.environment?.config;
 					if (!envConfig) return;
 					const buildRoot = envConfig.root ?? process.cwd();
-					const distDir = path.resolve(buildRoot, "dist");
-					if (!fs.existsSync(distDir)) return;
-					const clientDir = path.resolve(buildRoot, "dist", "client");
-					const runtimeMetadata = computeClientRuntimeMetadata({
-						clientDir,
-						assetBase: envConfig.base ?? "/",
-						assetPrefix: nextConfig.assetPrefix,
-						includeClientEntry: !hasAppDir ? true : hasPagesDir ? "pages-client-entry" : false
-					});
-					const lazyChunksData = runtimeMetadata.lazyChunks ?? null;
-					const dynamicPreloadsData = runtimeMetadata.dynamicPreloads ?? null;
-					let clientEntryFile = runtimeMetadata.clientEntryFile ?? null;
-					let ssrManifestData = null;
-					const ssrManifestPath = path.join(clientDir, ".vite", "ssr-manifest.json");
-					if (fs.existsSync(ssrManifestPath)) try {
-						ssrManifestData = JSON.parse(fs.readFileSync(ssrManifestPath, "utf-8"));
-					} catch {}
-					if (hasAppDir) {
-						const workerEntry = path.resolve(distDir, "server", "index.js");
-						if (fs.existsSync(workerEntry)) {
-							const script = buildRuntimeGlobalsScript({
-								clientEntryFile,
-								ssrManifest: ssrManifestData,
-								lazyChunks: lazyChunksData,
-								dynamicPreloads: dynamicPreloadsData
-							});
-							if (script) {
-								const code = fs.readFileSync(workerEntry, "utf-8");
-								fs.writeFileSync(workerEntry, script + "\n" + code);
-							}
-						}
-					} else {
-						let workerOutDir = null;
-						for (const entry of fs.readdirSync(distDir)) {
-							const candidate = path.join(distDir, entry);
-							if (entry === "client") continue;
-							if (fs.statSync(candidate).isDirectory() && fs.existsSync(path.join(candidate, "wrangler.json"))) {
-								workerOutDir = candidate;
-								break;
-							}
-						}
-						if (!workerOutDir) return;
-						const workerEntry = path.join(workerOutDir, "index.js");
-						if (!fs.existsSync(workerEntry)) return;
-						const script = buildRuntimeGlobalsScript({
-							clientEntryFile,
-							ssrManifest: ssrManifestData,
-							lazyChunks: lazyChunksData,
-							dynamicPreloads: dynamicPreloadsData
-						});
-						if (script) {
-							const code = fs.readFileSync(workerEntry, "utf-8");
-							fs.writeFileSync(workerEntry, script + "\n" + code);
-						}
-					}
+					const clientDir = path.resolve(buildRoot, envConfig.build.outDir);
 					const headersPath = path.join(clientDir, "_headers");
 					if (!fs.existsSync(headersPath)) {
 						const headersContent = [