vinext 0.0.49 → 0.0.51

package/dist/index.js

@@ -3,14 +3,15 @@ import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { createValidFileMatcher } from "./routing/file-matcher.js";
 import { hasBasePath, removeTrailingSlash } 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 { INTERNAL_HEADERS, filterInternalHeaders, isOpenRedirectShaped } from "./server/request-pipeline.js";
+import { filterInternalHeaders, isOpenRedirectShaped } from "./server/request-pipeline.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 { createSSRHandler } from "./server/dev-server.js";
@@ -26,20 +27,23 @@ 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 { 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 { 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 { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.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";
@@ -49,14 +53,18 @@ import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
-import { loadEnv, parseAst } from "vite";
+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 {
@@ -184,6 +192,27 @@ function getViteMajorVersion() {
 		return 7;
 	}
 }
+/**
+* Read the vinext package version once at plugin load. Surfaced via
+* `process.env.__NEXT_VERSION` define so `window.next.version` lands a
+* real string instead of the `"vinext"` fallback. Resolved relative to
+* this module's own `package.json`, not the project root.
+*
+* Defaults to `"vinext"` on read failure so a malformed install never
+* breaks the build — only the diagnostic global loses fidelity.
+*/
+let _vinextVersionCache = null;
+function getVinextVersion() {
+	if (_vinextVersionCache !== null) return _vinextVersionCache;
+	try {
+		const pkgUrl = new URL("../package.json", import.meta.url);
+		const pkg = JSON.parse(fs.readFileSync(pkgUrl, "utf-8"));
+		_vinextVersionCache = typeof pkg.version === "string" ? pkg.version : "vinext";
+	} catch {
+		_vinextVersionCache = "vinext";
+	}
+	return _vinextVersionCache;
+}
 const _tsconfigAliasCache = /* @__PURE__ */ new Map();
 function resolveTsconfigAliases(projectRoot) {
 	if (_tsconfigAliasCache.has(projectRoot)) return _tsconfigAliasCache.get(projectRoot);
@@ -217,6 +246,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";
@@ -264,6 +338,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;
@@ -359,6 +434,27 @@ function vinext(options = {}) {
 		...viteMajorVersion >= 8 ? [] : [tsconfigPaths()],
 		reactPluginPromise,
 		commonjs(),
+		...viteMajorVersion >= 8 ? [{
+			name: "vinext:jsx-in-js",
+			enforce: "pre",
+			async transform(code, id) {
+				const cleanId = id.split("?")[0];
+				if (!/\.(m?js)$/.test(cleanId)) 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" },
+					sourcemap: true
+				});
+				return {
+					code: result.code,
+					map: result.map
+				};
+			}
+		}] : [],
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -403,6 +499,7 @@ 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);
@@ -414,6 +511,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 ?? []));
 				{
@@ -441,8 +539,12 @@ function vinext(options = {}) {
 					defines["process.env.__VINEXT_IMAGE_SIZES"] = JSON.stringify(JSON.stringify(imageSizes));
 				}
 				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());
 				nextShimMap = Object.fromEntries(Object.entries({
 					"next/link": path.join(shimsDir, "link"),
 					"next/head": path.join(shimsDir, "head"),
@@ -489,6 +591,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"),
@@ -509,26 +612,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"
+						],
+						...nextConfig.assetPrefix ? { 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+)?$/
@@ -537,7 +651,8 @@ function vinext(options = {}) {
 						external: [
 							"react",
 							"react-dom",
-							"react-dom/server"
+							"react-dom/server",
+							"ipaddr.js"
 						],
 						noExternal: true
 					} },
@@ -558,7 +673,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;
@@ -603,11 +729,11 @@ function vinext(options = {}) {
 						},
 						ssr: {
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
-								external: userSsrExternal === true ? true : [...userSsrExternal],
+								external: userSsrExternal === true ? true : [...userSsrExternal, "ipaddr.js"],
 								...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: {
@@ -672,10 +798,12 @@ function vinext(options = {}) {
 							external: [
 								"react",
 								"react-dom",
-								"react-dom/server"
+								"react-dom/server",
+								"ipaddr.js"
 							],
 							noExternal: true
 						},
+						optimizeDeps: { exclude: ["ipaddr.js"] },
 						build: {
 							outDir: "dist/server",
 							...withBuildBundlerOptions(viteMajorVersion, {
@@ -743,6 +871,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,
@@ -751,17 +880,23 @@ 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();
+				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:
 			generateBundle(_options, bundle) {
 				if (this.environment?.name !== "rsc") return;
 				if (!rscClassificationManifest) return;
@@ -953,7 +1088,7 @@ function vinext(options = {}) {
 							if (typeof reasonOrHeaders === "string") headers = maybeHeaders;
 							else headers = reasonOrHeaders;
 							if (headers && typeof headers === "object" && !Array.isArray(headers)) {
-								const timingKey = Object.keys(headers).find((k) => k.toLowerCase() === "x-vinext-timing");
+								const timingKey = Object.keys(headers).find((k) => k.toLowerCase() === VINEXT_TIMING_HEADER);
 								if (timingKey) {
 									_parseTiming(headers[timingKey]);
 									delete headers[timingKey];
@@ -976,7 +1111,7 @@ function vinext(options = {}) {
 						});
 						next();
 					});
-					server.middlewares.use(async (req, res, next) => {
+					const handlePagesMiddleware = async (req, res, next) => {
 						try {
 							let url = req.url ?? "/";
 							if (!hasPagesDir) return next();
@@ -1021,7 +1156,7 @@ function vinext(options = {}) {
 							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("\\", "/");
@@ -1074,7 +1209,7 @@ function vinext(options = {}) {
 							};
 							const applyMwRequestHeadersForExternalProxy = () => {
 								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-								else delete req.headers["x-vinext-mw-ctx"];
+								else delete req.headers[VINEXT_MW_CTX_HEADER];
 							};
 							if (middlewarePath) {
 								const rawProto = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim()) ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim() : "";
@@ -1110,7 +1245,7 @@ function vinext(options = {}) {
 									const currentRequestHeaders = new Headers();
 									for (const [key, value] of Object.entries(req.headers)) if (Array.isArray(value)) currentRequestHeaders.set(key, value.join(", "));
 									else if (value !== void 0) currentRequestHeaders.set(key, value);
-									middlewareRequestHeaders = buildRequestHeadersFromMiddlewareResponse(currentRequestHeaders, result.responseHeaders);
+									middlewareRequestHeaders = buildRequestHeadersFromMiddlewareResponse(currentRequestHeaders, result.responseHeaders, { preserveCredentialHeaders: Boolean(result.rewriteUrl && isExternalUrl(result.rewriteUrl)) });
 									if (middlewareRequestHeaders && !hasAppDir) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
 									if (hasAppDir) {
 										deferredMwResponseHeaders = [];
@@ -1121,15 +1256,16 @@ function vinext(options = {}) {
 									url = result.rewriteUrl;
 									req.url = url;
 								}
-								if (result.rewriteStatus) req.__vinextRewriteStatus = result.rewriteStatus;
+								const middlewareStatus = result.status ?? result.rewriteStatus;
+								if (middlewareStatus !== void 0) req.__vinextMiddlewareStatus = middlewareStatus;
 								if (hasAppDir) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
 										for (const [key, value] of result.responseHeaders) if (key !== "x-middleware-next" && key !== "x-middleware-rewrite") mwCtxEntries.push([key, value]);
 									}
-									req.headers["x-vinext-mw-ctx"] = JSON.stringify({
+									req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
 										h: mwCtxEntries,
-										s: result.rewriteStatus ?? null,
+										s: middlewareStatus ?? null,
 										r: result.rewriteUrl ?? null
 									});
 								}
@@ -1159,9 +1295,13 @@ function vinext(options = {}) {
 								return;
 							}
 							const routes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-							if (nextConfig?.rewrites.afterFiles.length) {
+							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);
-								if (afterRewrite) resolvedUrl = afterRewrite;
+								if (afterRewrite) {
+									resolvedUrl = afterRewrite;
+									match = matchRoute(resolvedUrl.split("?")[0], routes);
+								}
 							}
 							if (isExternalUrl(resolvedUrl)) {
 								applyDeferredMwHeaders();
@@ -1170,8 +1310,8 @@ function vinext(options = {}) {
 								return;
 							}
 							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false);
-							const mwStatus = req.__vinextRewriteStatus;
-							if (matchRoute(resolvedUrl.split("?")[0], routes)) {
+							const mwStatus = req.__vinextMiddlewareStatus;
+							if (match) {
 								applyDeferredMwHeaders();
 								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
 								await handler(req, res, resolvedUrl, mwStatus);
@@ -1198,6 +1338,9 @@ function vinext(options = {}) {
 						} catch (e) {
 							next(e);
 						}
+					};
+					server.middlewares.use((req, res, next) => {
+						handlePagesMiddleware(req, res, next);
 					});
 				};
 			}
@@ -1519,22 +1662,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) {
@@ -1624,10 +1771,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) {
@@ -1704,7 +1852,10 @@ function vinext(options = {}) {
 			}
 		}
 	];
-	if (rscPluginPromise) plugins.push(rscPluginPromise);
+	if (rscPluginPromise) {
+		plugins.push(rscPluginPromise);
+		plugins.push(createRscClientReferenceLoadersPlugin());
+	}
 	return plugins;
 }
 /**