vinext 0.1.0 → 0.1.2

package/dist/index.js

@@ -1,13 +1,11 @@
 import { detectPackageManager } from "./utils/project.js";
+import { normalizePathSeparators, stripViteModuleQuery } from "./utils/path.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts } from "./routing/file-matcher.js";
-import { hasBasePath } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
-import { normalizePathSeparators } from "./utils/path.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 { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/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 { proxyExternalRequest } from "./config/config-matchers.js";
 import { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
@@ -15,9 +13,7 @@ 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 { isUnknownRecord } from "./utils/record.js";
-import { mergeRewriteQuery } from "./utils/query.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";
@@ -39,10 +35,11 @@ import { getViteMajorVersion } from "./utils/vite-version.js";
 import { createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
+import { ensureAssetsIgnore } from "./build/assets-ignore.js";
 import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
-import { manifestFilesWithBase } from "./utils/manifest-paths.js";
+import { runPagesRequest } from "./server/pages-request-pipeline.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";
@@ -51,21 +48,24 @@ import { createInstrumentationClientTransformPlugin } from "./plugins/instrument
 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 { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
+import { createDynamicPreloadMetadataPlugin } from "./plugins/dynamic-preload-metadata.js";
 import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } 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";
-import { findClientEntryFile, readClientBuildManifest } from "./utils/client-build-manifest.js";
+import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
+import { buildRuntimeGlobalsScript, computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
-import { buildSassPreprocessorOptions } from "./plugins/sass.js";
-import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassTildeImporter } from "./plugins/sass.js";
+import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
-import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { stripServerExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
+import { createRequireContextPlugin } from "./plugins/require-context.js";
+import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
@@ -80,10 +80,6 @@ import MagicString from "magic-string";
 import tsconfigPaths from "vite-tsconfig-paths";
 //#region src/index.ts
 installSocketErrorBackstop();
-function stripViteModuleQuery(id) {
-	const queryIndex = id.search(/[?#]/);
-	return queryIndex === -1 ? id : id.slice(0, queryIndex);
-}
 function isInsideDirectory(dir, filePath) {
 	const relativePath = path.relative(dir, filePath);
 	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
@@ -148,10 +144,10 @@ function resolveShimModulePath(shimsDir, moduleName) {
 		".tsx",
 		".js"
 	]) {
-		const candidate = path.join(shimsDir, `${moduleName}${ext}`);
+		const candidate = path.posix.join(shimsDir, `${moduleName}${ext}`);
 		if (fs.existsSync(candidate)) return candidate;
 	}
-	return path.join(shimsDir, `${moduleName}.js`);
+	return path.posix.join(shimsDir, `${moduleName}.js`);
 }
 function isVercelOgImport(id) {
 	return id === "@vercel/og" || id === "@vercel/og.js";
@@ -300,12 +296,23 @@ 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?";
-/** Absolute path to vinext's shims directory, used by clientManualChunks. */
-const _shimsDir = path.resolve(__dirname, "shims") + "/";
+/**
+* Absolute path to vinext's shims directory, with a trailing slash. Normalized
+* to forward slashes because it is prefix-matched against Vite module ids (which
+* Vite always normalizes to forward slashes) in the font plugins and
+* clientManualChunks — a raw path.resolve value has backslashes on Windows and
+* the `id.startsWith(_shimsDir)` checks would never match.
+*/
+const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
 }
+function isVirtualEntryFacade(id, virtualId) {
+	if (!id) return false;
+	const cleanId = id.startsWith("\0") ? id.slice(1) : id;
+	return cleanId === virtualId || cleanId.endsWith("/" + virtualId) || cleanId.endsWith("\\" + virtualId);
+}
 /**
 * Returns true when `code` starts with a React `"use client"` or `"use server"`
 * directive (after stripping leading comments, hashbang, and whitespace).
@@ -381,6 +388,7 @@ const clientManualChunks = createClientManualChunks(_shimsDir);
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
 function getClientOutputConfigForVite(viteMajorVersion, assetsDir) {
 	return viteMajorVersion >= 8 ? {
+		...createClientFileNameConfig(assetsDir),
 		assetFileNames: createClientAssetFileNames(assetsDir),
 		codeSplitting: clientCodeSplittingConfig
 	} : createClientOutputConfig(clientManualChunks, assetsDir);
@@ -404,6 +412,7 @@ function vinext(options = {}) {
 	let hasNitroPlugin = false;
 	let rscCompatibilityId;
 	const draftModeSecret = randomUUID();
+	const sassComposesLoader = createSassAwareFileSystemLoader();
 	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => tryRealpathSync(p) ?? p;
@@ -542,7 +551,7 @@ function vinext(options = {}) {
 			name: "vinext:config",
 			enforce: "pre",
 			async config(config, env) {
-				root = config.root ?? process.cwd();
+				root = normalizePathSeparators(config.root ?? process.cwd());
 				const userResolve = config.resolve;
 				const shouldEnableNativeTsconfigPaths = viteMajorVersion >= 8 && userResolve?.tsconfigPaths === void 0;
 				const tsconfigPathAliases = resolveTsconfigAliases(root);
@@ -555,18 +564,18 @@ function vinext(options = {}) {
 				else resolvedNodeEnv = "development";
 				if (process.env.NODE_ENV !== resolvedNodeEnv) process.env.NODE_ENV = resolvedNodeEnv;
 				let baseDir;
-				if (options.appDir) baseDir = path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir);
+				if (options.appDir) baseDir = normalizePathSeparators(path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir));
 				else {
-					const hasRootApp = fs.existsSync(path.join(root, "app"));
-					const hasRootPages = fs.existsSync(path.join(root, "pages"));
-					const hasSrcApp = fs.existsSync(path.join(root, "src", "app"));
-					const hasSrcPages = fs.existsSync(path.join(root, "src", "pages"));
+					const hasRootApp = fs.existsSync(path.posix.join(root, "app"));
+					const hasRootPages = fs.existsSync(path.posix.join(root, "pages"));
+					const hasSrcApp = fs.existsSync(path.posix.join(root, "src", "app"));
+					const hasSrcPages = fs.existsSync(path.posix.join(root, "src", "pages"));
 					if (hasRootApp || hasRootPages) baseDir = root;
-					else if (hasSrcApp || hasSrcPages) baseDir = path.join(root, "src");
+					else if (hasSrcApp || hasSrcPages) baseDir = path.posix.join(root, "src");
 					else baseDir = root;
 				}
-				pagesDir = path.join(baseDir, "pages");
-				appDir = path.join(baseDir, "app");
+				pagesDir = path.posix.join(baseDir, "pages");
+				appDir = path.posix.join(baseDir, "app");
 				hasPagesDir = fs.existsSync(pagesDir);
 				hasAppDir = !options.disableAppRouter && fs.existsSync(appDir);
 				if (!nextConfig) {
@@ -607,6 +616,7 @@ function vinext(options = {}) {
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
 				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
+				defines["process.env.__NEXT_GESTURE_TRANSITION"] = JSON.stringify(nextConfig.gestureTransition);
 				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 ?? []));
@@ -640,9 +650,10 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
 				defines["process.env.NEXT_DEPLOYMENT_ID"] = nextConfig.deploymentId ? JSON.stringify(nextConfig.deploymentId) : "false";
+				defines["process.env.NEXT_RUNTIME"] = "\"\"";
 				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
 				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(nextConfig.appShells);
-				defines["process.env.__NEXT_CACHE_COMPONENTS"] = JSON.stringify(String(nextConfig.cacheComponents ?? false));
+				defines["process.env.__NEXT_CACHE_COMPONENTS"] = JSON.stringify(nextConfig.cacheComponents ?? false);
 				for (const [key, value] of Object.entries(nextConfig.compilerDefine)) {
 					if (key in defines) throw new Error(`The \`compiler.define\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 					defines[key] = value;
@@ -730,6 +741,7 @@ function vinext(options = {}) {
 					...typeof config.server?.hmr === "object" ? config.server.hmr : {},
 					overlay: false
 				};
+				const cssModulesOverride = config.css?.modules === false || typeof config.css?.modules === "object" && "Loader" in config.css.modules ? {} : { modules: { Loader: sassComposesLoader.Loader } };
 				const viteConfig = {
 					appType: "custom",
 					build: {
@@ -796,13 +808,21 @@ function vinext(options = {}) {
 						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: {
+					css: {
 						...postcssOverride ? { postcss: postcssOverride } : {},
-						...sassPreprocessorOptions ? { preprocessorOptions: {
-							scss: sassPreprocessorOptions,
-							sass: sassPreprocessorOptions
-						} } : {}
-					} } : {}
+						preprocessorOptions: (() => {
+							const tildeImporter = createSassTildeImporter(root);
+							const baseOpts = {
+								...sassPreprocessorOptions,
+								importers: [tildeImporter, ...sassPreprocessorOptions?.importers ?? []]
+							};
+							return {
+								scss: baseOpts,
+								sass: baseOpts
+							};
+						})(),
+						...cssModulesOverride
+					}
 				};
 				const nextServerExternal = nextConfig?.serverExternalPackages ?? [];
 				const userSsrExternal = Array.isArray(config.ssr?.external) ? [...config.ssr.external, ...nextServerExternal] : config.ssr?.external === true ? true : nextServerExternal;
@@ -825,6 +845,8 @@ function vinext(options = {}) {
 					const appEntries = [`${path.relative(root, appDir)}/**/*.{tsx,ts,jsx,js}`];
 					const explicitInstrumentationEntries = [instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : []);
 					const optimizeEntries = [...new Set([...appEntries, ...explicitInstrumentationEntries])];
+					const appClientInput = { index: VIRTUAL_APP_BROWSER_ENTRY };
+					if (hasPagesDir) appClientInput["vinext-client-entry"] = VIRTUAL_CLIENT_ENTRY;
 					viteConfig.environments = {
 						rsc: {
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
@@ -842,7 +864,10 @@ function vinext(options = {}) {
 							},
 							build: {
 								outDir: options.rscOutDir ?? "dist/server",
-								...withBuildBundlerOptions(viteMajorVersion, { input: { index: VIRTUAL_RSC_ENTRY } })
+								...withBuildBundlerOptions(viteMajorVersion, {
+									input: { index: VIRTUAL_RSC_ENTRY },
+									output: createRscFrameworkChunkOutputConfig(viteMajorVersion)
+								})
 							}
 						},
 						ssr: {
@@ -874,10 +899,11 @@ function vinext(options = {}) {
 								])]
 							},
 							build: {
-								...hasCloudflarePlugin ? { manifest: true } : {},
+								manifest: true,
+								...hasPagesDir ? { ssrManifest: true } : {},
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions(viteMajorVersion, {
-									input: { index: VIRTUAL_APP_BROWSER_ENTRY },
+									input: appClientInput,
 									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
 									treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 								})
@@ -941,6 +967,7 @@ function vinext(options = {}) {
 				return viteConfig;
 			},
 			configResolved(config) {
+				sassComposesLoader.setResolvedConfig(config);
 				if (hasAppDir) {
 					const ssrEnv = config.environments?.ssr;
 					if (ssrEnv?.resolve?.external === true && Array.isArray(ssrEnv.resolve.noExternal)) ssrEnv.resolve.noExternal = ssrEnv.resolve.noExternal.filter((entry) => typeof entry !== "string" || !SSR_EXTERNAL_REACT_ENTRIES.includes(entry));
@@ -1003,10 +1030,12 @@ function vinext(options = {}) {
 						allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+						bodySizeLimitLabel: nextConfig?.serverActionsBodySizeLimitLabel,
 						htmlLimitedBots: nextConfig?.htmlLimitedBots,
 						clientTraceMetadata: nextConfig?.clientTraceMetadata,
 						assetPrefix: nextConfig?.assetPrefix,
 						expireTime: nextConfig?.expireTime,
+						reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 						inlineCss: nextConfig?.inlineCss,
 						i18n: nextConfig?.i18n,
@@ -1106,6 +1135,25 @@ function vinext(options = {}) {
 				});
 			}
 		},
+		{
+			name: "vinext:client-entry-manifest",
+			apply: "build",
+			generateBundle(_options, bundle) {
+				if (this.environment?.name !== "client") return;
+				const manifest = {};
+				for (const chunk of Object.values(bundle)) {
+					if (chunk.type !== "chunk" || !chunk.isEntry) continue;
+					if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_CLIENT_ENTRY)) manifest.pagesClientEntry = chunk.fileName;
+					else if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_BROWSER_ENTRY)) manifest.appBrowserEntry = chunk.fileName;
+				}
+				if (!manifest.pagesClientEntry && !manifest.appBrowserEntry) return;
+				this.emitFile({
+					type: "asset",
+					fileName: VINEXT_CLIENT_ENTRY_MANIFEST,
+					source: JSON.stringify(manifest, null, 2) + "\n"
+				});
+			}
+		},
 		asyncHooksStubPlugin,
 		createInstrumentationClientTransformPlugin(() => instrumentationClientPath),
 		{
@@ -1381,6 +1429,10 @@ function vinext(options = {}) {
 								res.end("Bad Request");
 								return;
 							}
+							{
+								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
+								url = pathname + qs;
+							}
 							const bp = nextConfig?.basePath ?? "";
 							if (bp && pathname.startsWith(bp)) {
 								const stripped = pathname.slice(bp.length) || "/";
@@ -1408,7 +1460,10 @@ function vinext(options = {}) {
 									pathname = dataMatch.pagePathname;
 									req.url = url;
 								} else {
-									res.writeHead(404, { "Content-Type": "application/json" });
+									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
+									const notFoundHeaders = { "Content-Type": "application/json" };
+									if (deploymentId) notFoundHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
+									res.writeHead(404, notFoundHeaders);
 									res.end("{}");
 									return;
 								}
@@ -1421,154 +1476,110 @@ function vinext(options = {}) {
 							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(matchPathname, res, nextConfig.redirects, preMiddlewareReqCtx, nextConfig.basePath ?? "")) return;
-							}
+							const method = req.method ?? "GET";
+							const webRequest = new Request(new URL(url, requestOrigin), {
+								method,
+								headers: nodeRequestHeaders
+							});
 							const applyRequestHeadersToNodeRequest = (nextRequestHeaders) => {
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
 								for (const [key, value] of nextRequestHeaders) req.headers[key] = value;
 							};
-							let middlewareRequestHeaders = null;
-							let deferredMwResponseHeaders = null;
-							const applyDeferredMwHeaders = () => {
-								if (deferredMwResponseHeaders) for (const [key, value] of deferredMwResponseHeaders) res.appendHeader(key, value);
-							};
-							const applyMwRequestHeadersForExternalProxy = () => {
-								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-								else delete req.headers[VINEXT_MW_CTX_HEADER];
-							};
-							if (middlewarePath) {
+							const capturedMiddlewarePath = middlewarePath;
+							const devRunMiddlewareAdapter = capturedMiddlewarePath ? async (_request, _ctx, opts) => {
 								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() : "";
-								const origin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${req.headers.host || "localhost"}`;
-								const middlewareRequest = new Request(new URL(url, origin), {
+								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${req.headers.host || "localhost"}`;
+								const middlewareRequest = new Request(new URL(url, mwOrigin), {
 									method: req.method,
 									headers: nodeRequestHeaders
 								});
-								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) {
-										const redirectHeaders = { Location: result.redirectUrl };
-										if (result.responseHeaders) for (const [key, value] of result.responseHeaders) {
-											const existing = redirectHeaders[key];
-											if (existing === void 0) redirectHeaders[key] = value;
-											else if (Array.isArray(existing)) existing.push(value);
-											else redirectHeaders[key] = [existing, value];
-										}
-										res.writeHead(result.redirectStatus ?? 307, redirectHeaders);
-										res.end();
-										return;
-									}
-									if (result.response) {
-										res.statusCode = result.response.status;
-										for (const [key, value] of result.response.headers) res.appendHeader(key, value);
-										const body = Buffer.from(await result.response.arrayBuffer());
-										res.end(body);
-										return;
-									}
-								}
-								if (result.responseHeaders) {
-									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, { preserveCredentialHeaders: Boolean(result.rewriteUrl && isExternalUrl(result.rewriteUrl)) });
-									if (middlewareRequestHeaders && !hasAppDir) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-									if (hasAppDir) {
-										deferredMwResponseHeaders = [];
-										for (const [key, value] of result.responseHeaders) if (!key.startsWith("x-middleware-")) deferredMwResponseHeaders.push([key, value]);
-									} else for (const [key, value] of result.responseHeaders) if (!key.startsWith("x-middleware-")) res.appendHeader(key, value);
-								}
-								if (result.rewriteUrl) {
-									url = result.rewriteUrl;
-									req.url = url;
-								}
-								const middlewareStatus = result.status ?? result.rewriteStatus;
-								if (middlewareStatus !== void 0) req.__vinextMiddlewareStatus = middlewareStatus;
-								if (hasAppDir) {
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest);
+								if (hasAppDir && result.continue) {
 									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]);
 									}
+									const mwStatus = result.status ?? result.rewriteStatus;
 									req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
 										h: mwCtxEntries,
-										s: middlewareStatus ?? null,
+										s: mwStatus ?? null,
 										r: result.rewriteUrl ?? null
 									});
 								}
-							}
-							const reqUrl = new URL(url, requestOrigin);
-							const reqCtx = requestContextFromRequest(new Request(reqUrl, { headers: middlewareRequestHeaders ?? nodeRequestHeaders }));
-							if (nextConfig?.headers.length) applyHeaders(matchPathname, res, nextConfig.headers, preMiddlewareReqCtx, bp);
-							let resolvedUrl = 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 result;
+							} : null;
+							const devPageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+							const pipelineResult = await runPagesRequest(webRequest, {
+								basePath: bp,
+								trailingSlash: nextConfig?.trailingSlash ?? false,
+								i18nConfig: nextConfig?.i18n ?? null,
+								configRedirects: nextConfig?.redirects ?? [],
+								configRewrites: nextConfig?.rewrites ?? {
+									beforeFiles: [],
+									afterFiles: [],
+									fallback: []
+								},
+								configHeaders: nextConfig?.headers ?? [],
+								hadBasePath: true,
+								isDataReq,
+								isDataRequest,
+								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
+								runMiddleware: devRunMiddlewareAdapter,
+								matchPageRoute: (resolvedPathname) => {
+									const m = matchRoute(resolvedPathname, devPageRoutes);
+									return m ? { route: { isDynamic: m.route.isDynamic } } : null;
+								},
+								proxyExternal: async (currentRequest, externalUrl) => {
+									const externalMethod = req.method ?? "GET";
+									const hasBody = externalMethod !== "GET" && externalMethod !== "HEAD";
+									const externalInit = {
+										method: externalMethod,
+										headers: currentRequest.headers
+									};
+									if (hasBody) {
+										const { Readable } = await import("node:stream");
+										externalInit.body = Readable.toWeb(req);
+										externalInit.duplex = "half";
+									}
+									return proxyExternalRequest(new Request(new URL(url, requestOrigin), externalInit), externalUrl);
+								}
+							});
+							if (pipelineResult.type === "response") {
+								await writeWebResponseToNodeRes(res, pipelineResult.response);
 								return;
 							}
-							const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, nextConfig?.i18n);
-							const resolvedPathname = apiLookupUrl.split("?")[0];
-							if (resolvedPathname.startsWith("/api/") || resolvedPathname === "/api") {
+							if (pipelineResult.type === "next") return next();
+							if (pipelineResult.type === "handled") return;
+							const flushStagedHeaders = () => {
+								for (const [key, value] of Object.entries(pipelineResult.stagedHeaders)) if (Array.isArray(value)) for (const v of value) res.appendHeader(key, v);
+								else res.appendHeader(key, value);
+							};
+							const flushRequestHeaders = () => {
+								applyRequestHeadersToNodeRequest(pipelineResult.requestHeaders);
+							};
+							if (pipelineResult.type === "api") {
 								const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-								if (matchRoute(apiLookupUrl, apiRoutes)) {
-									applyDeferredMwHeaders();
-									if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
+								if (matchRoute(pipelineResult.apiUrl, apiRoutes)) {
+									flushStagedHeaders();
+									flushRequestHeaders();
+									if (pipelineResult.middlewareStatus !== void 0) req.__vinextMiddlewareStatus = pipelineResult.middlewareStatus;
 								}
-								if (await handleApiRoute(getPagesRunner(), req, res, apiLookupUrl, apiRoutes)) return;
+								if (await handleApiRoute(getPagesRunner(), req, res, pipelineResult.apiUrl, apiRoutes)) return;
 								if (hasAppDir) return next();
 								res.statusCode = 404;
 								res.end("404 - API route not found");
 								return;
 							}
-							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(matchResolvedPathname(resolvedUrl.split("?")[0]), nextConfig.rewrites.afterFiles, reqCtx, bp);
-								if (afterRewrite) {
-									resolvedUrl = mergeRewriteQuery(resolvedUrl, afterRewrite);
-									match = matchRoute(resolvedUrl.split("?")[0], routes);
-								}
-							}
-							if (isExternalUrl(resolvedUrl)) {
-								applyDeferredMwHeaders();
-								applyMwRequestHeadersForExternalProxy();
-								await proxyExternalRewriteNode(req, res, resolvedUrl);
-								return;
-							}
-							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, nextConfig?.clientTraceMetadata);
-							const mwStatus = req.__vinextMiddlewareStatus;
-							if (match) {
-								applyDeferredMwHeaders();
-								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-								await handler(req, res, resolvedUrl, mwStatus, isDataReq);
-								return;
-							}
-							if (nextConfig?.rewrites.fallback.length) {
-								const fallbackRewrite = applyRewrites(matchResolvedPathname(resolvedUrl.split("?")[0]), nextConfig.rewrites.fallback, reqCtx, bp);
-								if (fallbackRewrite) {
-									if (isExternalUrl(fallbackRewrite)) {
-										applyDeferredMwHeaders();
-										applyMwRequestHeadersForExternalProxy();
-										await proxyExternalRewriteNode(req, res, fallbackRewrite);
-										return;
-									}
-									if (!matchRoute(fallbackRewrite.split("?")[0], routes) && hasAppDir) return next();
-									applyDeferredMwHeaders();
-									if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-									await handler(req, res, fallbackRewrite, mwStatus, isDataReq);
-									return;
-								}
+							{
+								const routes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+								if (!matchRoute(pipelineResult.resolvedUrl.split("?")[0], routes) && hasAppDir) return next();
+								const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata);
+								flushStagedHeaders();
+								flushRequestHeaders();
+								if (pipelineResult.middlewareStatus !== void 0) req.__vinextMiddlewareStatus = pipelineResult.middlewareStatus;
+								req.url = pipelineResult.resolvedUrl;
+								await handler(req, res, pipelineResult.resolvedUrl, req.__vinextMiddlewareStatus, pipelineResult.isDataReq);
 							}
-							if (hasAppDir) return next();
-							await handler(req, res, resolvedUrl, mwStatus, isDataReq);
 						} catch (e) {
 							next(e);
 						}
@@ -1635,9 +1646,12 @@ function vinext(options = {}) {
 		{
 			name: "vinext:compiler-define-server",
 			configEnvironment(name) {
-				if (Object.keys(nextConfig.compilerDefineServer).length === 0) return null;
 				if (name === "client") return null;
-				return { define: { ...nextConfig.compilerDefineServer } };
+				const serverDefines = { ...nextConfig.compilerDefineServer };
+				serverDefines["process.env.NEXT_RUNTIME"] = JSON.stringify("nodejs");
+				const sharedRevalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
+				if (sharedRevalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(sharedRevalidateSecret);
+				return { define: serverDefines };
 			}
 		},
 		{
@@ -1726,6 +1740,7 @@ function vinext(options = {}) {
 		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),
 		createLocalFontsPlugin(_shimsDir),
 		createOptimizeImportsPlugin(() => nextConfig, () => root),
+		createDynamicPreloadMetadataPlugin(),
 		{
 			name: "vinext:use-cache",
 			transform: {
@@ -1830,6 +1845,7 @@ function vinext(options = {}) {
 			}
 		},
 		createImportMetaUrlPlugin({ getRoot: () => root }),
+		createRequireContextPlugin(),
 		createOgInlineFetchAssetsPlugin(),
 		createOgAssetsPlugin(),
 		createServerExternalsManifestPlugin(),
@@ -2061,20 +2077,15 @@ function vinext(options = {}) {
 					const distDir = path.resolve(buildRoot, "dist");
 					if (!fs.existsSync(distDir)) return;
 					const clientDir = path.resolve(buildRoot, "dist", "client");
-					const clientBase = envConfig.base ?? "/";
-					let lazyChunksData = null;
-					let clientEntryFile = null;
-					const buildManifest = readClientBuildManifest(path.join(clientDir, ".vite", "manifest.json"));
-					if (buildManifest) {
-						clientEntryFile = findClientEntryFile({
-							buildManifest,
-							clientDir,
-							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
-							assetBase: clientBase
-						}) ?? null;
-						const lazy = manifestFilesWithBase(computeLazyChunks(buildManifest), clientBase);
-						if (lazy.length > 0) lazyChunksData = lazy;
-					}
+					const runtimeMetadata = computeClientRuntimeMetadata({
+						clientDir,
+						assetBase: envConfig.base ?? "/",
+						assetPrefix: nextConfig.assetPrefix,
+						includeClientEntry: !hasAppDir ? true : hasPagesDir ? "pages-client-entry" : false
+					});
+					const lazyChunksData = runtimeMetadata.lazyChunks ?? null;
+					const dynamicPreloadsData = runtimeMetadata.dynamicPreloads ?? null;
+					let clientEntryFile = runtimeMetadata.clientEntryFile ?? null;
 					let ssrManifestData = null;
 					const ssrManifestPath = path.join(clientDir, ".vite", "ssr-manifest.json");
 					if (fs.existsSync(ssrManifestPath)) try {
@@ -2082,13 +2093,17 @@ function vinext(options = {}) {
 					} catch {}
 					if (hasAppDir) {
 						const workerEntry = path.resolve(distDir, "server", "index.js");
-						if (fs.existsSync(workerEntry) && (lazyChunksData || ssrManifestData)) {
-							let code = fs.readFileSync(workerEntry, "utf-8");
-							const globals = [];
-							if (ssrManifestData) globals.push(`globalThis.__VINEXT_SSR_MANIFEST__ = ${JSON.stringify(ssrManifestData)};`);
-							if (lazyChunksData) globals.push(`globalThis.__VINEXT_LAZY_CHUNKS__ = ${JSON.stringify(lazyChunksData)};`);
-							code = globals.join("\n") + "\n" + code;
-							fs.writeFileSync(workerEntry, code);
+						if (fs.existsSync(workerEntry)) {
+							const script = buildRuntimeGlobalsScript({
+								clientEntryFile,
+								ssrManifest: ssrManifestData,
+								lazyChunks: lazyChunksData,
+								dynamicPreloads: dynamicPreloadsData
+							});
+							if (script) {
+								const code = fs.readFileSync(workerEntry, "utf-8");
+								fs.writeFileSync(workerEntry, script + "\n" + code);
+							}
 						}
 					} else {
 						let workerOutDir = null;
@@ -2103,19 +2118,15 @@ function vinext(options = {}) {
 						if (!workerOutDir) return;
 						const workerEntry = path.join(workerOutDir, "index.js");
 						if (!fs.existsSync(workerEntry)) return;
-						if (!clientEntryFile) clientEntryFile = findClientEntryFile({
-							clientDir,
-							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
-							assetBase: clientBase
-						}) ?? null;
-						if (clientEntryFile || ssrManifestData || lazyChunksData) {
-							let code = fs.readFileSync(workerEntry, "utf-8");
-							const globals = [];
-							if (clientEntryFile) globals.push(`globalThis.__VINEXT_CLIENT_ENTRY__ = ${JSON.stringify(clientEntryFile)};`);
-							if (ssrManifestData) globals.push(`globalThis.__VINEXT_SSR_MANIFEST__ = ${JSON.stringify(ssrManifestData)};`);
-							if (lazyChunksData) globals.push(`globalThis.__VINEXT_LAZY_CHUNKS__ = ${JSON.stringify(lazyChunksData)};`);
-							code = globals.join("\n") + "\n" + code;
-							fs.writeFileSync(workerEntry, code);
+						const script = buildRuntimeGlobalsScript({
+							clientEntryFile,
+							ssrManifest: ssrManifestData,
+							lazyChunks: lazyChunksData,
+							dynamicPreloads: dynamicPreloadsData
+						});
+						if (script) {
+							const code = fs.readFileSync(workerEntry, "utf-8");
+							fs.writeFileSync(workerEntry, script + "\n" + code);
 						}
 					}
 					const headersPath = path.join(clientDir, "_headers");
@@ -2129,9 +2140,11 @@ function vinext(options = {}) {
 						fs.mkdirSync(clientDir, { recursive: true });
 						fs.writeFileSync(headersPath, headersContent);
 					}
+					ensureAssetsIgnore(clientDir);
 				}
 			}
 		},
+		createWasmModuleImportPlugin(),
 		{
 			name: "vinext:og-font-patch",
 			enforce: "pre",
@@ -2202,91 +2215,31 @@ function getNextPublicEnvDefines() {
 	return defines;
 }
 /**
-* Apply redirect rules from next.config.js.
-* Returns true if a redirect was applied.
+* Write a Web API Response to a Node.js ServerResponse.
+* Handles multi-value headers (Set-Cookie) correctly.
 */
-function applyRedirects(pathname, res, redirects, ctx, basePath = "") {
-	const result = matchRedirect(pathname, redirects, ctx, {
-		basePath,
-		hadBasePath: true
+async function writeWebResponseToNodeRes(res, response) {
+	const nodeHeaders = {};
+	response.headers.forEach((value, key) => {
+		if (key === "set-cookie") return;
+		const existing = nodeHeaders[key];
+		if (existing !== void 0) nodeHeaders[key] = Array.isArray(existing) ? [...existing, value] : [existing, value];
+		else nodeHeaders[key] = value;
 	});
-	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 });
-		res.end();
-		return true;
-	}
-	return false;
-}
-async function proxyExternalRewriteNode(req, res, externalUrl) {
-	try {
-		const origin = `http://${req.headers.host || "localhost"}`;
-		const method = req.method ?? "GET";
-		const hasBody = method !== "GET" && method !== "HEAD";
-		const init = {
-			method,
-			headers: Object.fromEntries(Object.entries(req.headers).filter(([, v]) => v !== void 0).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)]))
-		};
-		if (hasBody) {
-			const { Readable } = await import("node:stream");
-			init.body = Readable.toWeb(req);
-			init.duplex = "half";
-		}
-		const proxyResponse = await proxyExternalRequest(new Request(new URL(req.url ?? "/", origin), init), externalUrl);
-		const nodeHeaders = {};
-		proxyResponse.headers.forEach((value, key) => {
-			const existing = nodeHeaders[key];
-			if (existing !== void 0) nodeHeaders[key] = Array.isArray(existing) ? [...existing, value] : [existing, value];
-			else nodeHeaders[key] = value;
+	const cookies = response.headers.getSetCookie?.() ?? [];
+	if (cookies.length > 0) nodeHeaders["set-cookie"] = cookies;
+	if (response.statusText) res.writeHead(response.status, response.statusText, nodeHeaders);
+	else res.writeHead(response.status, nodeHeaders);
+	if (response.body) {
+		const { Readable } = await import("node:stream");
+		const nodeStream = Readable.fromWeb(response.body);
+		await new Promise((resolve, reject) => {
+			nodeStream.on("error", reject);
+			res.on("error", reject);
+			nodeStream.pipe(res);
+			nodeStream.on("end", resolve);
 		});
-		res.writeHead(proxyResponse.status, nodeHeaders);
-		if (proxyResponse.body) {
-			const { Readable: ReadableImport } = await import("node:stream");
-			ReadableImport.fromWeb(proxyResponse.body).pipe(res);
-		} else res.end();
-	} catch (e) {
-		console.error("[vinext] External rewrite proxy error:", e);
-		if (!res.headersSent) {
-			res.writeHead(502);
-			res.end("Bad Gateway");
-		}
-	}
-}
-/**
-* Apply rewrite rules from next.config.js.
-* Returns the rewritten URL or null if no rewrite matched.
-*/
-function applyRewrites(pathname, rewrites, ctx, basePath = "") {
-	const dest = matchRewrite(pathname, rewrites, ctx, {
-		basePath,
-		hadBasePath: true
-	});
-	if (dest) return sanitizeDestination(dest);
-	return null;
-}
-/**
-* Apply custom header rules from next.config.js.
-* 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, basePath = "") {
-	const matched = matchHeaders(pathname, headers, ctx, {
-		basePath,
-		hadBasePath: true
-	});
-	for (const header of matched) {
-		const lk = header.key.toLowerCase();
-		if (lk === "set-cookie") {
-			const existing = res.getHeader(lk);
-			if (Array.isArray(existing)) res.setHeader(header.key, [...existing, header.value]);
-			else if (existing) res.setHeader(header.key, [String(existing), header.value]);
-			else res.setHeader(header.key, header.value);
-		} else if (lk === "vary") {
-			const existing = res.getHeader(lk);
-			if (existing) res.setHeader(header.key, existing + ", " + header.value);
-			else res.setHeader(header.key, header.value);
-		} else if (!res.getHeader(lk)) res.setHeader(header.key, header.value);
-	}
+	} else res.end();
 }
 //#endregion
 export { vinext as default, staticExportApp, staticExportPages };