vinext 0.1.0 → 0.1.1

package/dist/index.js

@@ -1,13 +1,11 @@
 import { detectPackageManager } from "./utils/project.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 { 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,9 +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 { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
@@ -56,16 +54,18 @@ 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 { findClientEntryFile, findPagesClientEntryFile, readClientBuildManifest } from "./utils/client-build-manifest.js";
+import { VINEXT_CLIENT_ENTRY_MANIFEST, findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest } from "./utils/client-entry-manifest.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 { createClientAssetFileNames, createClientCodeSplittingConfig, 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 { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
@@ -306,6 +306,11 @@ 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).
@@ -825,6 +830,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 +849,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 +884,11 @@ function vinext(options = {}) {
 								])]
 							},
 							build: {
-								...hasCloudflarePlugin ? { manifest: true } : {},
+								...hasCloudflarePlugin || hasPagesDir ? { manifest: true } : {},
+								...hasPagesDir ? { ssrManifest: true } : {},
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions(viteMajorVersion, {
-									input: { index: VIRTUAL_APP_BROWSER_ENTRY },
+									input: appClientInput,
 									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
 									treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 								})
@@ -1003,10 +1014,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 +1119,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 +1413,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) || "/";
@@ -1421,154 +1457,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 +1627,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 };
+				const sharedRevalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
+				if (sharedRevalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(sharedRevalidateSecret);
+				if (Object.keys(serverDefines).length === 0) return null;
+				return { define: serverDefines };
 			}
 		},
 		{
@@ -1830,6 +1825,7 @@ function vinext(options = {}) {
 			}
 		},
 		createImportMetaUrlPlugin({ getRoot: () => root }),
+		createRequireContextPlugin(),
 		createOgInlineFetchAssetsPlugin(),
 		createOgAssetsPlugin(),
 		createServerExternalsManifestPlugin(),
@@ -2064,9 +2060,11 @@ function vinext(options = {}) {
 					const clientBase = envConfig.base ?? "/";
 					let lazyChunksData = null;
 					let clientEntryFile = null;
+					const clientEntryManifest = readClientEntryManifest(clientDir);
+					clientEntryFile = (hasAppDir && hasPagesDir ? findPagesClientEntryFileFromVinextManifest : findClientEntryFileFromVinextManifest)(clientEntryManifest, clientBase) ?? null;
 					const buildManifest = readClientBuildManifest(path.join(clientDir, ".vite", "manifest.json"));
 					if (buildManifest) {
-						clientEntryFile = findClientEntryFile({
+						if (!clientEntryFile) clientEntryFile = (hasAppDir && hasPagesDir ? findPagesClientEntryFile : findClientEntryFile)({
 							buildManifest,
 							clientDir,
 							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
@@ -2082,9 +2080,15 @@ function vinext(options = {}) {
 					} catch {}
 					if (hasAppDir) {
 						const workerEntry = path.resolve(distDir, "server", "index.js");
-						if (fs.existsSync(workerEntry) && (lazyChunksData || ssrManifestData)) {
+						if (!clientEntryFile && hasPagesDir) clientEntryFile = findPagesClientEntryFile({
+							clientDir,
+							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
+							assetBase: clientBase
+						}) ?? null;
+						if (fs.existsSync(workerEntry) && (lazyChunksData || ssrManifestData || hasPagesDir && clientEntryFile)) {
 							let code = fs.readFileSync(workerEntry, "utf-8");
 							const globals = [];
+							if (hasPagesDir && 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;
@@ -2129,6 +2133,7 @@ function vinext(options = {}) {
 						fs.mkdirSync(clientDir, { recursive: true });
 						fs.writeFileSync(headersPath, headersContent);
 					}
+					ensureAssetsIgnore(clientDir);
 				}
 			}
 		},
@@ -2202,91 +2207,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 };

package/dist/plugins/postcss.js

@@ -73,20 +73,24 @@ async function resolvePostcssStringPluginsUncached(projectRoot) {
 	if (!config || !Array.isArray(config.plugins)) return;
 	if (!config.plugins.some((p) => typeof p === "string" || Array.isArray(p) && typeof p[0] === "string")) return;
 	const req = createRequire(path.join(projectRoot, "package.json"));
-	return { plugins: await Promise.all(config.plugins.filter(Boolean).map(async (plugin) => {
-		if (typeof plugin === "string") {
-			const mod = await import(pathToFileURL(req.resolve(plugin)).href);
-			const fn = mod.default ?? mod;
-			return typeof fn === "function" ? fn() : fn;
-		}
-		if (Array.isArray(plugin) && typeof plugin[0] === "string") {
-			const [name, options] = plugin;
-			const mod = await import(pathToFileURL(req.resolve(name)).href);
-			const fn = mod.default ?? mod;
-			return typeof fn === "function" ? fn(options) : fn;
-		}
-		return plugin;
-	})) };
+	try {
+		return { plugins: await Promise.all(config.plugins.filter(Boolean).map(async (plugin) => {
+			if (typeof plugin === "string") {
+				const mod = await import(pathToFileURL(req.resolve(plugin)).href);
+				const fn = mod.default ?? mod;
+				return typeof fn === "function" ? fn() : fn;
+			}
+			if (Array.isArray(plugin) && typeof plugin[0] === "string") {
+				const [name, options] = plugin;
+				const mod = await import(pathToFileURL(req.resolve(name)).href);
+				const fn = mod.default ?? mod;
+				return typeof fn === "function" ? fn(options) : fn;
+			}
+			return plugin;
+		})) };
+	} catch {
+		return;
+	}
 }
 //#endregion
 export { postcssCache, resolvePostcssStringPlugins };

package/dist/plugins/require-context.d.ts

@@ -0,0 +1,6 @@
+import { Plugin } from "vite";
+
+//#region src/plugins/require-context.d.ts
+declare function createRequireContextPlugin(): Plugin;
+//#endregion
+export { createRequireContextPlugin };