vinext 0.0.50 → 0.0.52

package/dist/index.js

@@ -1,19 +1,21 @@
 import { detectPackageManager } from "./utils/project.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { createValidFileMatcher } from "./routing/file-matcher.js";
-import { hasBasePath, removeTrailingSlash } from "./utils/base-path.js";
+import { hasBasePath } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-request-headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { isExternalUrl, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.js";
-import { filterInternalHeaders, isOpenRedirectShaped } from "./server/request-pipeline.js";
+import { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { mergeRewriteQuery } from "./utils/query.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
-import { appRouter, invalidateAppRouteCache } from "./routing/app-router.js";
+import { appRouteGraph, appRouter, invalidateAppRouteCache } from "./routing/app-router.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { logRequest, now } from "./server/request-log.js";
+import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
@@ -27,21 +29,27 @@ import { generateBrowserEntry } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
+import { ASSET_PREFIX_URL_DIR, resolveAssetUrlPrefix, resolveAssetsDir } from "./utils/asset-prefix.js";
+import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
 import { manifestFileWithBase, manifestFilesWithBase } from "./utils/manifest-paths.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 { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
+import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.js";
+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 { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { computeLazyChunks } from "./utils/lazy-chunks.js";
 import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
+import { buildSassPreprocessorOptions } from "./plugins/sass.js";
 import { createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { stripServerExports } from "./plugins/strip-server-exports.js";
@@ -53,12 +61,16 @@ import fs from "node:fs";
 import path from "node:path";
 import { loadEnv, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
-import { randomBytes } from "node:crypto";
+import { randomBytes, randomUUID } from "node:crypto";
+import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
 import tsconfigPaths from "vite-tsconfig-paths";
-import commonjs from "vite-plugin-commonjs";
 //#region src/index.ts
 installSocketErrorBackstop();
+function createRscCompatibilityId(nextConfig) {
+	if (nextConfig.deploymentId) return nextConfig.deploymentId;
+	return randomUUID();
+}
 const __dirname = import.meta.dirname;
 function resolveOptionalDependency(projectRoot, specifier) {
 	try {
@@ -70,12 +82,24 @@ function resolveOptionalDependency(projectRoot, specifier) {
 	return null;
 }
 function resolveShimModulePath(shimsDir, moduleName) {
-	for (const ext of [".ts", ".js"]) {
+	for (const ext of [
+		".ts",
+		".tsx",
+		".js"
+	]) {
 		const candidate = path.join(shimsDir, `${moduleName}${ext}`);
 		if (fs.existsSync(candidate)) return candidate;
 	}
 	return path.join(shimsDir, `${moduleName}.js`);
 }
+function isVercelOgImport(id) {
+	return id === "@vercel/og" || id === "@vercel/og.js";
+}
+function isVinextOgShimImporter(importer) {
+	if (!importer) return false;
+	const normalizedImporter = (importer.startsWith("\0") ? importer.slice(1) : importer).split("?")[0].replace(/\\/g, "/");
+	return normalizedImporter.endsWith("/shims/og.tsx") || normalizedImporter.endsWith("/shims/og.js") || normalizedImporter.endsWith("/dist/shims/og.js");
+}
 function toRelativeFileEntry(root, absPath) {
 	return path.relative(root, absPath).split(path.sep).join("/");
 }
@@ -240,6 +264,51 @@ const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
 }
+/**
+* Returns true when `code` starts with a React `"use client"` or `"use server"`
+* directive (after stripping leading comments, hashbang, and whitespace).
+*
+* Used by `vinext:jsx-in-js` to opt `.js` files inside `node_modules` into the
+* JSX transform. We mirror `@vitejs/plugin-rsc`'s detection by looking at the
+* directive prologue rather than scanning the whole file — `code.includes`
+* alone would match incidental occurrences in template literals or comments.
+*/
+function hasReactDirective(code) {
+	let i = 0;
+	const len = code.length;
+	if (code.charCodeAt(0) === 65279) i = 1;
+	if (code[i] === "#" && code[i + 1] === "!") {
+		const nl = code.indexOf("\n", i);
+		if (nl === -1) return false;
+		i = nl + 1;
+	}
+	while (i < len) {
+		while (i < len && /\s/.test(code[i] ?? "")) i++;
+		if (i >= len) return false;
+		if (code[i] === "/" && code[i + 1] === "/") {
+			const nl = code.indexOf("\n", i + 2);
+			if (nl === -1) return false;
+			i = nl + 1;
+			continue;
+		}
+		if (code[i] === "/" && code[i + 1] === "*") {
+			const end = code.indexOf("*/", i + 2);
+			if (end === -1) return false;
+			i = end + 2;
+			continue;
+		}
+		const quote = code[i];
+		if (quote !== "\"" && quote !== "'") return false;
+		const closing = code.indexOf(quote, i + 1);
+		if (closing === -1) return false;
+		const directive = code.slice(i + 1, closing);
+		if (directive === "use client" || directive === "use server") return true;
+		i = closing + 1;
+		while (i < len && (code[i] === ";" || code[i] === " " || code[i] === "	")) i++;
+		if (code[i] === "\n") i++;
+	}
+	return false;
+}
 function generateRootParamsModule(rootParamNames) {
 	const names = Array.from(new Set(rootParamNames)).filter(isValidExportIdentifier).sort();
 	if (names.length === 0) return "export {};\n";
@@ -287,6 +356,7 @@ function vinext(options = {}) {
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
+	let rscCompatibilityId;
 	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => tryRealpathSync(p) ?? p;
@@ -314,6 +384,14 @@ function vinext(options = {}) {
 	async function generateClientEntry$1() {
 		return generateClientEntry(pagesDir, nextConfig, fileMatcher);
 	}
+	async function writeRouteTypes() {
+		if (!hasAppDir) return;
+		await generateRouteTypes({
+			root,
+			appDir,
+			pageExtensions: nextConfig.pageExtensions
+		});
+	}
 	const autoRsc = options.rsc !== false;
 	const earlyBaseDir = options.appDir ?? process.cwd();
 	const earlyAppDirExists = !options.disableAppRouter && (fs.existsSync(path.join(earlyBaseDir, "app")) || fs.existsSync(path.join(earlyBaseDir, "src", "app")));
@@ -388,7 +466,10 @@ function vinext(options = {}) {
 			async transform(code, id) {
 				const cleanId = id.split("?")[0];
 				if (!/\.(m?js)$/.test(cleanId)) return;
-				if (cleanId.includes("/node_modules/")) return;
+				if (cleanId.includes("/node_modules/")) {
+					if (!code.includes("use client") && !code.includes("use server")) return;
+					if (!hasReactDirective(code)) return;
+				}
 				const result = await transformWithOxc(code, id, {
 					lang: "jsx",
 					jsx: { runtime: "automatic" },
@@ -400,6 +481,12 @@ function vinext(options = {}) {
 				};
 			}
 		}] : [],
+		createMiddlewareServerOnlyPlugin({
+			getMiddlewarePath: () => middlewarePath,
+			getCanonicalMiddlewarePath: () => middlewarePath ? tryRealpathSync(middlewarePath) ?? middlewarePath : null,
+			serverOnlyShimPath: resolveShimModulePath(shimsDir, "server-only")
+		}),
+		dataUrlCssPlugin(),
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -444,10 +531,12 @@ function vinext(options = {}) {
 					} else rawConfig = await loadNextConfig(root, phase);
 					nextConfig = await resolveNextConfig(rawConfig, root);
 				}
+				rscCompatibilityId ??= createRscCompatibilityId(nextConfig);
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				middlewarePath = findMiddlewareFile(root, fileMatcher);
+				if (env?.command === "build") await writeRouteTypes();
 				const defines = getNextPublicEnvDefines();
 				if (!config.define || typeof config.define !== "object" || !("process.env.NODE_ENV" in config.define)) defines["process.env.NODE_ENV"] = JSON.stringify(resolvedNodeEnv);
 				for (const [key, value] of Object.entries(nextConfig.env)) {
@@ -455,6 +544,7 @@ function vinext(options = {}) {
 					defines[`process.env.${key}`] = JSON.stringify(value);
 				}
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
+				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
 				{
@@ -485,8 +575,10 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowLocalIP ?? false));
 				defines["process.env.__VINEXT_DRAFT_SECRET"] = JSON.stringify(crypto.randomUUID());
 				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 ?? "");
 				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
+				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(false);
 				nextShimMap = Object.fromEntries(Object.entries({
 					"next/link": path.join(shimsDir, "link"),
 					"next/head": path.join(shimsDir, "head"),
@@ -533,6 +625,7 @@ function vinext(options = {}) {
 					"vinext/cache-runtime": path.join(shimsDir, "cache-runtime"),
 					"vinext/navigation-state": path.join(shimsDir, "navigation-state"),
 					"vinext/unified-request-context": path.join(shimsDir, "unified-request-context"),
+					"vinext/pages-router-runtime": path.join(shimsDir, "pages-router-runtime"),
 					"vinext/router-state": path.join(shimsDir, "router-state"),
 					"vinext/head-state": path.join(shimsDir, "head-state"),
 					"vinext/i18n-state": path.join(shimsDir, "i18n-state"),
@@ -553,26 +646,37 @@ function vinext(options = {}) {
 				hasNitroPlugin = pluginsFlat.some((p) => p && typeof p === "object" && "name" in p && typeof p.name === "string" && (p.name === "nitro" || p.name.startsWith("nitro:")));
 				let postcssOverride;
 				if (!config.css?.postcss || typeof config.css.postcss === "string") postcssOverride = await resolvePostcssStringPlugins(root);
+				const sassPreprocessorOptions = buildSassPreprocessorOptions(nextConfig.sassOptions);
 				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 isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
 				const viteConfig = {
 					appType: "custom",
-					build: { ...withBuildBundlerOptions(viteMajorVersion, {
-						onwarn: (() => {
-							const userOnwarn = getBuildBundlerOptions(config.build)?.onwarn;
-							return (warning, defaultHandler) => {
-								if (warning.code === "MODULE_LEVEL_DIRECTIVE" && (warning.message?.includes("\"use client\"") || warning.message?.includes("\"use server\""))) return;
-								if (warning.code === "IMPORT_IS_UNDEFINED" && warning.message?.includes("generateStaticParams")) return;
-								if (warning.code === "IMPORT_IS_UNDEFINED" && /Import `(?:default|proxy|middleware)` will always be undefined/.test(warning.message ?? "") && /\b(?:proxy|middleware)\.\w+\b/.test(warning.message ?? "") && (warning.message?.includes("virtual:vinext-rsc-entry") || warning.message?.includes("virtual:vinext-server-entry"))) return;
-								if (userOnwarn) userOnwarn(warning, defaultHandler);
-								else defaultHandler(warning);
-							};
-						})(),
-						...!isSSR && !isMultiEnv ? { treeshake: getClientTreeshakeConfigForVite(viteMajorVersion) } : {},
-						...!isSSR && !isMultiEnv ? { output: getClientOutputConfigForVite(viteMajorVersion) } : {}
-					}) },
+					build: {
+						ssrEmitAssets: true,
+						cssTarget: [
+							"chrome111",
+							"edge111",
+							"firefox114",
+							"safari15"
+						],
+						assetsDir: resolveAssetsDir(nextConfig.assetPrefix ?? ""),
+						...withBuildBundlerOptions(viteMajorVersion, {
+							onwarn: (() => {
+								const userOnwarn = getBuildBundlerOptions(config.build)?.onwarn;
+								return (warning, defaultHandler) => {
+									if (warning.code === "MODULE_LEVEL_DIRECTIVE" && (warning.message?.includes("\"use client\"") || warning.message?.includes("\"use server\""))) return;
+									if (warning.code === "IMPORT_IS_UNDEFINED" && warning.message?.includes("generateStaticParams")) return;
+									if (warning.code === "IMPORT_IS_UNDEFINED" && /Import `(?:default|proxy|middleware)` will always be undefined/.test(warning.message ?? "") && /\b(?:proxy|middleware)\.\w+\b/.test(warning.message ?? "") && (warning.message?.includes("virtual:vinext-rsc-entry") || warning.message?.includes("virtual:vinext-server-entry"))) return;
+									if (userOnwarn) userOnwarn(warning, defaultHandler);
+									else defaultHandler(warning);
+								};
+							})(),
+							...!isSSR && !isMultiEnv ? { treeshake: getClientTreeshakeConfigForVite(viteMajorVersion) } : {},
+							...!isSSR && !isMultiEnv ? { output: getClientOutputConfigForVite(viteMajorVersion) } : {}
+						})
+					},
 					server: { cors: {
 						preflightContinue: true,
 						origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/
@@ -603,7 +707,18 @@ function vinext(options = {}) {
 					...viteMajorVersion >= 8 ? { oxc: { jsx: { runtime: "automatic" } } } : { esbuild: { jsx: "automatic" } },
 					define: defines,
 					...nextConfig.basePath ? { base: nextConfig.basePath + "/" } : {},
-					...postcssOverride ? { css: { postcss: postcssOverride } } : {}
+					...nextConfig.assetPrefix ? { experimental: { renderBuiltUrl: (filename) => {
+						const urlPrefix = resolveAssetUrlPrefix(nextConfig.assetPrefix);
+						const dirPrefix = resolveAssetsDir(nextConfig.assetPrefix) + "/";
+						return urlPrefix + (filename.startsWith(dirPrefix) ? filename.slice(dirPrefix.length) : filename.startsWith(`_next/static/`) ? filename.slice(ASSET_PREFIX_URL_DIR.length + 1) : filename);
+					} } } : {},
+					...postcssOverride || sassPreprocessorOptions ? { css: {
+						...postcssOverride ? { postcss: postcssOverride } : {},
+						...sassPreprocessorOptions ? { preprocessorOptions: {
+							scss: sassPreprocessorOptions,
+							sass: sassPreprocessorOptions
+						} } : {}
+					} } : {}
 				};
 				const nextServerExternal = nextConfig?.serverExternalPackages ?? [];
 				const userSsrExternal = Array.isArray(config.ssr?.external) ? [...config.ssr.external, ...nextServerExternal] : config.ssr?.external === true ? true : nextServerExternal;
@@ -652,7 +767,7 @@ function vinext(options = {}) {
 								...userSsrExternal === true ? {} : { noExternal: true }
 							} },
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, userSsrExternal === true ? SSR_EXTERNAL_REACT_ENTRIES : []),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true ? SSR_EXTERNAL_REACT_ENTRIES : []),
 								entries: optimizeEntries
 							},
 							build: {
@@ -722,6 +837,7 @@ function vinext(options = {}) {
 							],
 							noExternal: true
 						},
+						optimizeDeps: { exclude: ["ipaddr.js"] },
 						build: {
 							outDir: "dist/server",
 							...withBuildBundlerOptions(viteMajorVersion, {
@@ -759,9 +875,10 @@ function vinext(options = {}) {
 				}));
 			},
 			resolveId: {
-				filter: { id: /(?:next\/|virtual:vinext-)/ },
-				handler(id) {
+				filter: { id: /(?:next\/|virtual:vinext-|^@vercel\/og(?:\.js)?$)/ },
+				handler(id, importer) {
 					const cleanId = id.startsWith("\0") ? id.slice(1) : id;
+					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
 					if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
 					if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
 					if (cleanId.endsWith("/" + VIRTUAL_SERVER_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_SERVER_ENTRY)) return RESOLVED_SERVER_ENTRY;
@@ -789,6 +906,7 @@ function vinext(options = {}) {
 					const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 					const metaRoutes = scanMetadataFiles(appDir);
 					const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
+					const globalNotFoundPath = findFileWithExts(appDir, "global-not-found", fileMatcher);
 					rscClassificationManifest = collectRouteClassificationManifest(routes);
 					return generateRscEntry(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
 						redirects: nextConfig?.redirects,
@@ -797,15 +915,20 @@ function vinext(options = {}) {
 						allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+						assetPrefix: nextConfig?.assetPrefix,
 						expireTime: nextConfig?.expireTime,
 						i18n: nextConfig?.i18n,
 						hasPagesDir,
-						publicFiles: scanPublicFileRoutes(root)
+						publicFiles: scanPublicFileRoutes(root),
+						globalNotFoundPath
 					}, instrumentationPath);
 				}
 				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
 				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
-				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) return generateBrowserEntry(await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher));
+				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
+					const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
+					return generateBrowserEntry(graph.routes, graph.routeManifest);
+				}
 				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			},
 			// @vitejs/plugin-rsc runs the RSC environment build in two phases:
@@ -942,16 +1065,46 @@ function vinext(options = {}) {
 					invalidateRscEntryModule();
 					invalidateRootParamsModule();
 				}
+				let appRouteTypeGeneration = null;
+				let appRouteTypeGenerationPending = false;
+				function warnRouteTypeGenerationFailure(error) {
+					server.config.logger.warn(`[vinext] Failed to regenerate route types: ${error instanceof Error ? error.message : String(error)}`);
+				}
+				async function drainAppRouteTypeGeneration() {
+					while (appRouteTypeGenerationPending) {
+						appRouteTypeGenerationPending = false;
+						try {
+							await writeRouteTypes();
+						} catch (error) {
+							warnRouteTypeGenerationFailure(error);
+						}
+					}
+				}
+				function regenerateAppRouteTypes() {
+					appRouteTypeGenerationPending = true;
+					if (appRouteTypeGeneration) return;
+					appRouteTypeGeneration = drainAppRouteTypeGeneration().finally(() => {
+						appRouteTypeGeneration = null;
+						if (appRouteTypeGenerationPending) regenerateAppRouteTypes();
+					});
+				}
+				regenerateAppRouteTypes();
 				server.httpServer?.on("connection", (socket) => {
 					socket.on("error", () => {});
 				});
 				server.watcher.on("add", (filePath) => {
 					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) invalidateRouteCache(pagesDir);
-					if (hasAppDir && shouldInvalidateAppRouteFile(appDir, filePath, fileMatcher)) invalidateAppRoutingModules();
+					if (hasAppDir && shouldInvalidateAppRouteFile(appDir, filePath, fileMatcher)) {
+						invalidateAppRoutingModules();
+						regenerateAppRouteTypes();
+					}
 				});
 				server.watcher.on("unlink", (filePath) => {
 					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) invalidateRouteCache(pagesDir);
-					if (hasAppDir && shouldInvalidateAppRouteFile(appDir, filePath, fileMatcher)) invalidateAppRoutingModules();
+					if (hasAppDir && shouldInvalidateAppRouteFile(appDir, filePath, fileMatcher)) {
+						invalidateAppRoutingModules();
+						regenerateAppRouteTypes();
+					}
 				});
 				server.middlewares.use((req, res, next) => {
 					const blockReason = validateDevRequest({
@@ -1065,10 +1218,9 @@ function vinext(options = {}) {
 							if (rawPathname.endsWith("/index.html")) url = url.replace("/index.html", "/");
 							else if (rawPathname.endsWith(".html")) url = url.replace(/\.html(?=\?|$)/, "");
 							let pathname = url.split("?")[0];
-							if (pathname.includes(".") && !pathname.endsWith(".html")) return next();
 							if (isOpenRedirectShaped(pathname)) {
 								res.writeHead(404);
-								res.end("404 Not Found");
+								res.end("This page could not be found");
 								return;
 							}
 							pathname = pathname.replaceAll("\\", "/");
@@ -1085,30 +1237,45 @@ function vinext(options = {}) {
 								url = stripped + (url.includes("?") ? url.slice(url.indexOf("?")) : "");
 								pathname = stripped;
 							}
-							if (nextConfig && pathname !== "/" && pathname !== "/api" && !pathname.startsWith("/api/")) {
-								const hasTrailing = pathname.endsWith("/");
-								if (nextConfig.trailingSlash && !hasTrailing) {
-									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-									const dest = bp + pathname + "/" + qs;
-									res.writeHead(308, { Location: dest });
+							if (nextConfig) {
+								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
+								const trailingSlashRedirect = normalizeTrailingSlash(pathname, bp, nextConfig.trailingSlash, qs);
+								if (trailingSlashRedirect) {
+									const location = trailingSlashRedirect.headers.get("Location");
+									res.writeHead(trailingSlashRedirect.status, location ? { Location: location } : void 0);
 									res.end();
 									return;
-								} else if (!nextConfig.trailingSlash && hasTrailing) {
+								}
+							}
+							let isDataReq = false;
+							if (isNextDataPathname(pathname)) {
+								const devBuildId = nextConfig?.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development";
+								const dataMatch = parseNextDataPathname(pathname, devBuildId);
+								if (dataMatch) {
+									isDataReq = true;
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-									const dest = bp + removeTrailingSlash(pathname) + qs;
-									res.writeHead(308, { Location: dest });
-									res.end();
+									url = dataMatch.pagePathname + qs;
+									pathname = dataMatch.pagePathname;
+									req.url = url;
+								} else {
+									res.writeHead(404, { "Content-Type": "application/json" });
+									res.end("{}");
 									return;
 								}
 							}
+							if (pathname.includes(".") && !pathname.endsWith(".html")) return next();
 							if (hasCloudflarePlugin) return next();
-							const nodeRequestHeaders = filterInternalHeaders(new Headers(Object.fromEntries(Object.entries(req.headers).filter(([, v]) => v !== void 0).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)]))));
+							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([, v]) => v !== void 0).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
+							const isDataRequest = rawHeaders.get("x-nextjs-data") === "1";
+							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							const requestOrigin = `http://${req.headers.host || "localhost"}`;
 							const preMiddlewareReqUrl = new URL(url, requestOrigin);
 							const preMiddlewareReqCtx = requestContextFromRequest(new Request(preMiddlewareReqUrl, { headers: nodeRequestHeaders }));
+							const matchPathname = nextConfig?.i18n ? normalizeDefaultLocalePathname(pathname, nextConfig.i18n, { hostname: preMiddlewareReqUrl.hostname }) : pathname;
+							const matchResolvedPathname = (p) => nextConfig?.i18n ? normalizeDefaultLocalePathname(p, nextConfig.i18n, { hostname: preMiddlewareReqUrl.hostname }) : p;
 							if (nextConfig?.redirects.length) {
-								if (applyRedirects(pathname, res, nextConfig.redirects, preMiddlewareReqCtx, nextConfig.basePath ?? "")) return;
+								if (applyRedirects(matchPathname, res, nextConfig.redirects, preMiddlewareReqCtx, nextConfig.basePath ?? "")) return;
 							}
 							const applyRequestHeadersToNodeRequest = (nextRequestHeaders) => {
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
@@ -1130,7 +1297,7 @@ function vinext(options = {}) {
 									method: req.method,
 									headers: nodeRequestHeaders
 								});
-								const result = await runMiddleware(getPagesRunner(), middlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath);
+								const result = await runMiddleware(getPagesRunner(), middlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, isDataRequest);
 								if (result.waitUntilPromises?.length) Promise.allSettled(result.waitUntilPromises);
 								if (!result.continue) {
 									if (result.redirectUrl) {
@@ -1184,23 +1351,27 @@ function vinext(options = {}) {
 							}
 							const reqUrl = new URL(url, requestOrigin);
 							const reqCtx = requestContextFromRequest(new Request(reqUrl, { headers: middlewareRequestHeaders ?? nodeRequestHeaders }));
-							if (nextConfig?.headers.length) applyHeaders(pathname, res, nextConfig.headers, preMiddlewareReqCtx);
+							if (nextConfig?.headers.length) applyHeaders(matchPathname, res, nextConfig.headers, preMiddlewareReqCtx, bp);
 							let resolvedUrl = url;
-							if (nextConfig?.rewrites.beforeFiles.length) resolvedUrl = applyRewrites(pathname, nextConfig.rewrites.beforeFiles, reqCtx) ?? url;
+							if (nextConfig?.rewrites.beforeFiles.length) {
+								const rewritten = applyRewrites(matchPathname, nextConfig.rewrites.beforeFiles, reqCtx, bp);
+								if (rewritten) resolvedUrl = mergeRewriteQuery(url, rewritten);
+							}
 							if (isExternalUrl(resolvedUrl)) {
 								applyDeferredMwHeaders();
 								applyMwRequestHeadersForExternalProxy();
 								await proxyExternalRewriteNode(req, res, resolvedUrl);
 								return;
 							}
-							const resolvedPathname = resolvedUrl.split("?")[0];
+							const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, nextConfig?.i18n);
+							const resolvedPathname = apiLookupUrl.split("?")[0];
 							if (resolvedPathname.startsWith("/api/") || resolvedPathname === "/api") {
 								const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-								if (matchRoute(resolvedUrl, apiRoutes)) {
+								if (matchRoute(apiLookupUrl, apiRoutes)) {
 									applyDeferredMwHeaders();
 									if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
 								}
-								if (await handleApiRoute(getPagesRunner(), req, res, resolvedUrl, apiRoutes)) return;
+								if (await handleApiRoute(getPagesRunner(), req, res, apiLookupUrl, apiRoutes)) return;
 								if (hasAppDir) return next();
 								res.statusCode = 404;
 								res.end("404 - API route not found");
@@ -1209,9 +1380,9 @@ function vinext(options = {}) {
 							const routes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 							let match = matchRoute(resolvedUrl.split("?")[0], routes);
 							if ((!match || match.route.isDynamic) && nextConfig?.rewrites.afterFiles.length) {
-								const afterRewrite = applyRewrites(resolvedUrl.split("?")[0], nextConfig.rewrites.afterFiles, reqCtx);
+								const afterRewrite = applyRewrites(matchResolvedPathname(resolvedUrl.split("?")[0]), nextConfig.rewrites.afterFiles, reqCtx, bp);
 								if (afterRewrite) {
-									resolvedUrl = afterRewrite;
+									resolvedUrl = mergeRewriteQuery(resolvedUrl, afterRewrite);
 									match = matchRoute(resolvedUrl.split("?")[0], routes);
 								}
 							}
@@ -1226,11 +1397,11 @@ function vinext(options = {}) {
 							if (match) {
 								applyDeferredMwHeaders();
 								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-								await handler(req, res, resolvedUrl, mwStatus);
+								await handler(req, res, resolvedUrl, mwStatus, isDataReq);
 								return;
 							}
 							if (nextConfig?.rewrites.fallback.length) {
-								const fallbackRewrite = applyRewrites(resolvedUrl.split("?")[0], nextConfig.rewrites.fallback, reqCtx);
+								const fallbackRewrite = applyRewrites(matchResolvedPathname(resolvedUrl.split("?")[0]), nextConfig.rewrites.fallback, reqCtx, bp);
 								if (fallbackRewrite) {
 									if (isExternalUrl(fallbackRewrite)) {
 										applyDeferredMwHeaders();
@@ -1241,12 +1412,12 @@ function vinext(options = {}) {
 									if (!matchRoute(fallbackRewrite.split("?")[0], routes) && hasAppDir) return next();
 									applyDeferredMwHeaders();
 									if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-									await handler(req, res, fallbackRewrite, mwStatus);
+									await handler(req, res, fallbackRewrite, mwStatus, isDataReq);
 									return;
 								}
 							}
 							if (hasAppDir) return next();
-							await handler(req, res, resolvedUrl, mwStatus);
+							await handler(req, res, resolvedUrl, mwStatus, isDataReq);
 						} catch (e) {
 							next(e);
 						}
@@ -1574,22 +1745,26 @@ function vinext(options = {}) {
 						if (!options.precompress && process.env.VINEXT_PRECOMPRESS !== "1") return;
 						const outDir = outputOptions.dir;
 						if (!outDir) return;
-						const assetsDir = path.join(outDir, "assets");
+						const assetsSubdir = resolveAssetsDir(nextConfig.assetPrefix);
+						const assetsDir = path.join(outDir, assetsSubdir);
 						if (!fs.existsSync(assetsDir)) return;
 						const isTTY = process.stderr.isTTY;
 						let lastLineLen = 0;
 						pendingPrecompressError = null;
 						pendingPrecompress = (async () => {
-							const result = await precompressAssets(outDir, (completed, total, file) => {
-								if (!isTTY) return;
-								const pct = total > 0 ? Math.floor(completed / total * 100) : 0;
-								const bar = `[${"█".repeat(Math.floor(pct / 5))}${" ".repeat(20 - Math.floor(pct / 5))}]`;
-								const maxFile = 30;
-								const fileLabel = file.length > maxFile ? "…" + file.slice(-(maxFile - 1)) : file;
-								const line = `Compressing assets... ${bar} ${String(completed).padStart(String(total).length)}/${total} ${fileLabel}`;
-								const padded = line.padEnd(lastLineLen);
-								lastLineLen = line.length;
-								process.stderr.write(`\r${padded}`);
+							const result = await precompressAssets(outDir, {
+								assetsDir: assetsSubdir,
+								onProgress: (completed, total, file) => {
+									if (!isTTY) return;
+									const pct = total > 0 ? Math.floor(completed / total * 100) : 0;
+									const bar = `[${"█".repeat(Math.floor(pct / 5))}${" ".repeat(20 - Math.floor(pct / 5))}]`;
+									const maxFile = 30;
+									const fileLabel = file.length > maxFile ? "…" + file.slice(-(maxFile - 1)) : file;
+									const line = `Compressing assets... ${bar} ${String(completed).padStart(String(total).length)}/${total} ${fileLabel}`;
+									const padded = line.padEnd(lastLineLen);
+									lastLineLen = line.length;
+									process.stderr.write(`\r${padded}`);
+								}
 							});
 							if (isTTY) process.stderr.write(`\r${" ".repeat(lastLineLen)}\r`);
 							if (result.filesCompressed > 0) {
@@ -1679,10 +1854,11 @@ function vinext(options = {}) {
 						const workerEntry = path.join(workerOutDir, "index.js");
 						if (!fs.existsSync(workerEntry)) return;
 						if (!clientEntryFile) {
-							const assetsDir = path.join(clientDir, "assets");
+							const assetsSubdir = resolveAssetsDir(nextConfig?.assetPrefix);
+							const assetsDir = path.join(clientDir, assetsSubdir);
 							if (fs.existsSync(assetsDir)) {
 								const entry = fs.readdirSync(assetsDir).find((f) => (f.includes("vinext-client-entry") || f.includes("vinext-app-browser-entry")) && f.endsWith(".js"));
-								if (entry) clientEntryFile = manifestFileWithBase("assets/" + entry, clientBase);
+								if (entry) clientEntryFile = manifestFileWithBase(`${assetsSubdir}/${entry}`, clientBase);
 							}
 						}
 						if (clientEntryFile || ssrManifestData || lazyChunksData) {
@@ -1699,7 +1875,7 @@ function vinext(options = {}) {
 					if (!fs.existsSync(headersPath)) {
 						const headersContent = [
 							"# Cache content-hashed assets immutably (generated by vinext)",
-							`/${envConfig.build?.assetsDir ?? "assets"}/*`,
+							`/${envConfig.build?.assetsDir ?? "_next/static"}/*`,
 							"  Cache-Control: public, max-age=31536000, immutable",
 							""
 						].join("\n");
@@ -1779,7 +1955,10 @@ function getNextPublicEnvDefines() {
 * Returns true if a redirect was applied.
 */
 function applyRedirects(pathname, res, redirects, ctx, basePath = "") {
-	const result = matchRedirect(pathname, redirects, ctx);
+	const result = matchRedirect(pathname, redirects, ctx, {
+		basePath,
+		hadBasePath: true
+	});
 	if (result) {
 		const dest = sanitizeDestination(basePath && !isExternalUrl(result.destination) && !hasBasePath(result.destination, basePath) ? basePath + result.destination : result.destination);
 		res.writeHead(result.permanent ? 308 : 307, { Location: dest });
@@ -1826,8 +2005,11 @@ async function proxyExternalRewriteNode(req, res, externalUrl) {
 * Apply rewrite rules from next.config.js.
 * Returns the rewritten URL or null if no rewrite matched.
 */
-function applyRewrites(pathname, rewrites, ctx) {
-	const dest = matchRewrite(pathname, rewrites, ctx);
+function applyRewrites(pathname, rewrites, ctx, basePath = "") {
+	const dest = matchRewrite(pathname, rewrites, ctx, {
+		basePath,
+		hadBasePath: true
+	});
 	if (dest) return sanitizeDestination(dest);
 	return null;
 }
@@ -1836,8 +2018,11 @@ function applyRewrites(pathname, rewrites, ctx) {
 * Middleware headers take precedence: if a header key was already set on the
 * response (by middleware), the config value is skipped for that key.
 */
-function applyHeaders(pathname, res, headers, ctx) {
-	const matched = matchHeaders(pathname, headers, ctx);
+function applyHeaders(pathname, res, headers, ctx, basePath = "") {
+	const matched = matchHeaders(pathname, headers, ctx, {
+		basePath,
+		hadBasePath: true
+	});
 	for (const header of matched) {
 		const lk = header.key.toLowerCase();
 		if (lk === "set-cookie") {