vinext 0.0.51 → 0.0.53

package/dist/index.js

@@ -1,21 +1,24 @@
 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 { INTERNAL_HEADERS, VINEXT_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 { 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 { isImageOptimizationPath } from "./server/image-optimization.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
 import { scanMetadataFiles } from "./server/metadata-routes.js";
 import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
@@ -27,17 +30,22 @@ 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 { ASSET_PREFIX_URL_DIR, resolveAssetUrlPrefix, resolveAssetsDir } from "./utils/asset-prefix.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 { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.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 { computeLazyChunks } from "./utils/lazy-chunks.js";
@@ -76,12 +84,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("/");
 }
@@ -237,6 +257,9 @@ const RESOLVED_APP_SSR_ENTRY = "\0" + VIRTUAL_APP_SSR_ENTRY;
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
 const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
+/** Virtual module for composed instrumentation-client bootstrap. */
+const VIRTUAL_INSTRUMENTATION_CLIENT = "private-next-instrumentation-client";
+const RESOLVED_INSTRUMENTATION_CLIENT = `\0${VIRTUAL_INSTRUMENTATION_CLIENT}.mjs`;
 /** Image file extensions handled by the vinext:image-imports plugin.
 *  Shared between the Rolldown hook filter and the transform handler regex. */
 const IMAGE_EXTS = "png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?";
@@ -335,10 +358,12 @@ function vinext(options = {}) {
 	let middlewarePath = null;
 	let instrumentationPath = null;
 	let instrumentationClientPath = null;
+	let clientInjectModule = null;
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
 	let rscCompatibilityId;
+	const draftModeSecret = randomUUID();
 	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => tryRealpathSync(p) ?? p;
@@ -366,6 +391,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")));
@@ -455,6 +488,12 @@ function vinext(options = {}) {
 				};
 			}
 		}] : [],
+		createMiddlewareServerOnlyPlugin({
+			getMiddlewarePath: () => middlewarePath,
+			getCanonicalMiddlewarePath: () => middlewarePath ? tryRealpathSync(middlewarePath) ?? middlewarePath : null,
+			serverOnlyShimPath: resolveShimModulePath(shimsDir, "server-only")
+		}),
+		dataUrlCssPlugin(),
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -504,6 +543,9 @@ function vinext(options = {}) {
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				middlewarePath = findMiddlewareFile(root, fileMatcher);
+				const instrumentationClientInjects = nextConfig.instrumentationClientInject.map((spec) => spec.startsWith("./") || spec.startsWith("../") ? path.resolve(root, spec) : spec);
+				clientInjectModule = instrumentationClientInjects.length ? generateInstrumentationClientInjectModule(instrumentationClientInjects, instrumentationClientPath, INSTRUMENTATION_CLIENT_EMPTY_MODULE) : null;
+				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)) {
@@ -540,11 +582,11 @@ 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_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"),
@@ -600,7 +642,7 @@ function vinext(options = {}) {
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
 					"vinext/html": path.resolve(__dirname, "server", "html"),
-					"private-next-instrumentation-client": instrumentationClientPath ?? path.resolve(__dirname, "client", "empty-module")
+					...clientInjectModule === null ? { "private-next-instrumentation-client": instrumentationClientPath ?? INSTRUMENTATION_CLIENT_EMPTY_MODULE } : {}
 				}).flatMap(([k, v]) => k.startsWith("next/") ? [[k, v], [`${k}.js`, v]] : [[k, v]]));
 				const pluginsFlat = [];
 				function flattenPlugins(arr) {
@@ -627,7 +669,7 @@ function vinext(options = {}) {
 							"firefox114",
 							"safari15"
 						],
-						...nextConfig.assetPrefix ? { assetsDir: resolveAssetsDir(nextConfig.assetPrefix) } : {},
+						assetsDir: resolveAssetsDir(nextConfig.assetPrefix ?? ""),
 						...withBuildBundlerOptions(viteMajorVersion, {
 							onwarn: (() => {
 								const userOnwarn = getBuildBundlerOptions(config.build)?.onwarn;
@@ -841,9 +883,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;
@@ -880,12 +923,14 @@ function vinext(options = {}) {
 						allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+						htmlLimitedBots: nextConfig?.htmlLimitedBots,
 						assetPrefix: nextConfig?.assetPrefix,
 						expireTime: nextConfig?.expireTime,
 						i18n: nextConfig?.i18n,
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root),
-						globalNotFoundPath
+						globalNotFoundPath,
+						draftModeSecret
 					}, instrumentationPath);
 				}
 				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
@@ -936,6 +981,18 @@ function vinext(options = {}) {
 		},
 		asyncHooksStubPlugin,
 		createInstrumentationClientTransformPlugin(() => instrumentationClientPath),
+		{
+			name: "vinext:instrumentation-client-inject",
+			enforce: "pre",
+			resolveId(id) {
+				if (id !== VIRTUAL_INSTRUMENTATION_CLIENT) return null;
+				return clientInjectModule !== null ? RESOLVED_INSTRUMENTATION_CLIENT : null;
+			},
+			load(id) {
+				if (id !== RESOLVED_INSTRUMENTATION_CLIENT) return null;
+				return clientInjectModule;
+			}
+		},
 		...options.experimental?.clientReferenceDedup ? [clientReferenceDedupPlugin()] : [],
 		{
 			name: "vinext:mdx",
@@ -1030,16 +1087,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({
@@ -1130,7 +1217,7 @@ function vinext(options = {}) {
 								res.end("Forbidden");
 								return;
 							}
-							if (url.split("?")[0] === "/_vinext/image") {
+							if (isImageOptimizationPath(url.split("?")[0])) {
 								const rawImgUrl = new URLSearchParams(url.split("?")[1] ?? "").get("url");
 								const imgUrl = rawImgUrl?.replaceAll("\\", "/") ?? null;
 								if (!imgUrl || !imgUrl.startsWith("/") || imgUrl.startsWith("//") || imgUrl.startsWith("/@") || imgUrl.startsWith("/__vite") || imgUrl.startsWith("/node_modules")) {
@@ -1153,7 +1240,6 @@ 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("This page could not be found");
@@ -1173,30 +1259,46 @@ 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];
+							for (const header of VINEXT_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];
@@ -1218,7 +1320,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) {
@@ -1272,23 +1374,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");
@@ -1297,9 +1403,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);
 								}
 							}
@@ -1309,16 +1415,16 @@ function vinext(options = {}) {
 								await proxyExternalRewriteNode(req, res, resolvedUrl);
 								return;
 							}
-							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false);
+							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null);
 							const mwStatus = req.__vinextMiddlewareStatus;
 							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();
@@ -1329,12 +1435,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);
 						}
@@ -1792,7 +1898,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");
@@ -1872,7 +1978,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 });
@@ -1919,8 +2028,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;
 }
@@ -1929,8 +2041,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") {