vinext 0.0.45 → 0.0.47

package/dist/index.js

@@ -3,36 +3,38 @@ import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { createValidFileMatcher } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-request-headers.js";
-import { isExternalUrl, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.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 { hasBasePath } from "./utils/base-path.js";
+import { 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 { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
-import { hasBasePath } from "./utils/base-path.js";
 import { logRequest, now } from "./server/request-log.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
+import { scanMetadataFiles } from "./server/metadata-routes.js";
+import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
 import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { generateBrowserEntry } from "./entries/app-browser-entry.js";
-import { buildGenerateBundleReplacement, buildReasonsReplacement, collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
-import { classifyLayoutByModuleGraph, isStaticModuleGraphResult, moduleGraphReason } from "./build/layout-classification.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 { findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
-import { isOpenRedirectShaped } from "./server/request-pipeline.js";
 import { precompressAssets } from "./build/precompress.js";
-import { scanMetadataFiles } from "./server/metadata-routes.js";
 import { manifestFileWithBase, manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.js";
+import { 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";
@@ -205,12 +207,23 @@ const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
 const RESOLVED_APP_SSR_ENTRY = "\0" + VIRTUAL_APP_SSR_ENTRY;
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
 const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
+const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
 /** 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") + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
+function isValidExportIdentifier(name) {
+	return /^[$A-Z_a-z][$\w]*$/.test(name);
+}
+function generateRootParamsModule(rootParamNames) {
+	const names = Array.from(new Set(rootParamNames)).filter(isValidExportIdentifier).sort();
+	if (names.length === 0) return "export {};\n";
+	const rootParamsShimPath = resolveShimModulePath(_shimsDir, "root-params");
+	const exports = names.map((name) => `export function ${name}() { return getRootParam(${JSON.stringify(name)}); }`).join("\n");
+	return `import { getRootParam } from ${JSON.stringify(rootParamsShimPath)};\n${exports}\n`;
+}
 /**
 * Shims with a `.react-server.ts` variant for the RSC environment.
 * Maps import specifier → base shim name. In the RSC env, resolveId
@@ -451,6 +464,7 @@ function vinext(options = {}) {
 					"next/og": path.join(shimsDir, "og"),
 					"next/web-vitals": path.join(shimsDir, "web-vitals"),
 					"next/amp": path.join(shimsDir, "amp"),
+					"next/offline": path.join(shimsDir, "offline"),
 					"next/error": path.join(shimsDir, "error"),
 					"next/constants": path.join(shimsDir, "constants"),
 					"next/dist/shared/lib/app-router-context.shared-runtime": path.join(shimsDir, "internal", "app-router-context"),
@@ -464,6 +478,7 @@ function vinext(options = {}) {
 					"next/dist/client/components/work-unit-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
 					"next/dist/client/components/request-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
 					"next/dist/client/components/request-async-storage": path.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/server/request/root-params": path.join(shimsDir, "root-params"),
 					"next/dist/server/config-shared": path.join(shimsDir, "internal", "utils"),
 					"server-only": path.join(shimsDir, "server-only"),
 					"client-only": path.join(shimsDir, "client-only"),
@@ -557,12 +572,7 @@ function vinext(options = {}) {
 					}
 				};
 				viteConfig.optimizeDeps = {
-					exclude: [...new Set([
-						...incomingExclude,
-						"vinext",
-						"@vercel/og",
-						"@tailwindcss/oxide"
-					])],
+					exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["@tailwindcss/oxide"]),
 					...incomingInclude.length > 0 ? { include: incomingInclude } : {},
 					rolldownOptions: { plugins: [depOptimizeAliasPlugin] }
 				};
@@ -583,11 +593,7 @@ function vinext(options = {}) {
 								...userSsrExternal === true ? {} : { noExternal: true }
 							} },
 							optimizeDeps: {
-								exclude: [...new Set([
-									...incomingExclude,
-									"vinext",
-									"@vercel/og"
-								])],
+								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
 								entries: optimizeEntries
 							},
 							build: {
@@ -601,11 +607,7 @@ function vinext(options = {}) {
 								...userSsrExternal === true ? {} : { noExternal: true }
 							} },
 							optimizeDeps: {
-								exclude: [...new Set([
-									...incomingExclude,
-									"vinext",
-									"@vercel/og"
-								])],
+								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
 								entries: optimizeEntries
 							},
 							build: {
@@ -616,12 +618,7 @@ function vinext(options = {}) {
 						client: {
 							consumer: "client",
 							optimizeDeps: {
-								exclude: [...new Set([
-									...incomingExclude,
-									"vinext",
-									"@vercel/og",
-									...nextServerExternal
-								])],
+								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, nextServerExternal),
 								entries: optimizeEntries,
 								include: [...new Set([
 									...incomingInclude,
@@ -722,6 +719,7 @@ function vinext(options = {}) {
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
 					if (cleanId === VIRTUAL_APP_SSR_ENTRY) return RESOLVED_APP_SSR_ENTRY;
 					if (cleanId === VIRTUAL_APP_BROWSER_ENTRY) return RESOLVED_APP_BROWSER_ENTRY;
+					if (cleanId === "next/root-params" || cleanId === "next/root-params.js") return RESOLVED_ROOT_PARAMS;
 					if (cleanId.startsWith("virtual:vinext-google-fonts?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(VIRTUAL_GOOGLE_FONTS.length);
 					if (cleanId.endsWith("/" + VIRTUAL_RSC_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_RSC_ENTRY)) return RESOLVED_RSC_ENTRY;
 					if (cleanId.endsWith("/" + VIRTUAL_APP_SSR_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_APP_SSR_ENTRY)) return RESOLVED_APP_SSR_ENTRY;
@@ -749,11 +747,13 @@ function vinext(options = {}) {
 						allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+						expireTime: nextConfig?.expireTime,
 						i18n: nextConfig?.i18n,
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root)
 					}, 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.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
@@ -762,60 +762,36 @@ function vinext(options = {}) {
 				if (this.environment?.name !== "rsc") return;
 				if (!rscClassificationManifest) return;
 				const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
-				const stubRe = /function __VINEXT_CLASS\(routeIdx\)\s*\{\s*return null;?\s*\}/;
-				const reasonsStubRe = /function __VINEXT_CLASS_REASONS\(routeIdx\)\s*\{\s*return null;?\s*\}/;
-				const chunksMentioningStub = [];
-				const chunksWithStubBody = [];
+				const chunks = [];
+				const chunksByFileName = /* @__PURE__ */ new Map();
 				for (const chunk of Object.values(bundle)) {
 					if (chunk.type !== "chunk") continue;
-					if (!chunk.code.includes("__VINEXT_CLASS")) continue;
-					chunksMentioningStub.push({
-						chunk,
-						fileName: chunk.fileName
-					});
-					if (stubRe.test(chunk.code)) chunksWithStubBody.push({
-						chunk,
+					chunks.push({
+						code: chunk.code,
 						fileName: chunk.fileName
 					});
+					chunksByFileName.set(chunk.fileName, chunk);
 				}
-				if (chunksMentioningStub.length === 0) return;
-				if (chunksWithStubBody.length === 0) throw new Error(`vinext: build-time classification — __VINEXT_CLASS is referenced in ${chunksMentioningStub.map((c) => c.fileName).join(", ")} but no chunk contains the stub body. The generator and generateBundle have drifted.`);
-				if (chunksWithStubBody.length > 1) throw new Error(`vinext: build-time classification — expected __VINEXT_CLASS stub in exactly one RSC chunk, found ${chunksWithStubBody.length}`);
-				if (enableClassificationDebug && !reasonsStubRe.test(chunksWithStubBody[0].chunk.code)) throw new Error("vinext: build-time classification — __VINEXT_CLASS_REASONS stub is missing alongside __VINEXT_CLASS. The generator and generateBundle have drifted.");
-				const moduleInfo = { getModuleInfo: (moduleId) => {
-					const info = this.getModuleInfo(moduleId);
-					if (!info) return null;
-					return {
-						importedIds: info.importedIds ?? [],
-						dynamicImportedIds: info.dynamicallyImportedIds ?? []
-					};
-				} };
-				const layer2PerRoute = /* @__PURE__ */ new Map();
-				const graphCache = /* @__PURE__ */ new Map();
-				for (let routeIdx = 0; routeIdx < rscClassificationManifest.routes.length; routeIdx++) {
-					const route = rscClassificationManifest.routes[routeIdx];
-					const perRoute = /* @__PURE__ */ new Map();
-					for (let layoutIdx = 0; layoutIdx < route.layoutPaths.length; layoutIdx++) {
-						if (route.layer1.has(layoutIdx)) continue;
-						const layoutModuleId = canonicalize(route.layoutPaths[layoutIdx]);
-						if (!moduleInfo.getModuleInfo(layoutModuleId)) continue;
-						let graphResult = graphCache.get(layoutModuleId);
-						if (graphResult === void 0) {
-							graphResult = classifyLayoutByModuleGraph(layoutModuleId, dynamicShimPaths, moduleInfo);
-							graphCache.set(layoutModuleId, graphResult);
-						}
-						if (isStaticModuleGraphResult(graphResult)) perRoute.set(layoutIdx, moduleGraphReason(graphResult));
-					}
-					if (perRoute.size > 0) layer2PerRoute.set(routeIdx, perRoute);
-				}
-				const patchedBody = `function __VINEXT_CLASS(routeIdx) { return (${buildGenerateBundleReplacement(rscClassificationManifest, layer2PerRoute)})(routeIdx); }`;
-				const target = chunksWithStubBody[0].chunk;
-				target.code = target.code.replace(stubRe, patchedBody);
-				if (enableClassificationDebug) {
-					const patchedReasonsBody = `function __VINEXT_CLASS_REASONS(routeIdx) { return (${buildReasonsReplacement(rscClassificationManifest, layer2PerRoute)})(routeIdx); }`;
-					target.code = target.code.replace(reasonsStubRe, patchedReasonsBody);
-				}
-				target.map = null;
+				const patchPlan = planRouteClassificationInjection({
+					canonicalizeLayoutPath: canonicalize,
+					chunks,
+					dynamicShimPaths,
+					enableDebugReasons: enableClassificationDebug,
+					manifest: rscClassificationManifest,
+					moduleInfo: { getModuleInfo: (moduleId) => {
+						const info = this.getModuleInfo(moduleId);
+						if (!info) return null;
+						return {
+							importedIds: info.importedIds ?? [],
+							dynamicImportedIds: info.dynamicallyImportedIds ?? []
+						};
+					} }
+				});
+				if (patchPlan.kind === "skip") return;
+				const target = chunksByFileName.get(patchPlan.fileName);
+				if (!target) throw new Error(`vinext: build-time classification — patch target ${patchPlan.fileName} disappeared from the RSC bundle`);
+				target.code = patchPlan.code;
+				target.map = patchPlan.map;
 				rscClassificationManifest = null;
 			}
 		},
@@ -904,22 +880,27 @@ function vinext(options = {}) {
 						rscEnv.hot.send({ type: "full-reload" });
 					}
 				}
+				function invalidateRootParamsModule() {
+					for (const env of Object.values(server.environments)) {
+						const mod = env.moduleGraph.getModuleById(RESOLVED_ROOT_PARAMS);
+						if (mod) env.moduleGraph.invalidateModule(mod);
+					}
+				}
+				function invalidateAppRoutingModules() {
+					invalidateAppRouteCache();
+					invalidateRscEntryModule();
+					invalidateRootParamsModule();
+				}
 				server.httpServer?.on("connection", (socket) => {
 					socket.on("error", () => {});
 				});
 				server.watcher.on("add", (filePath) => {
 					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) invalidateRouteCache(pagesDir);
-					if (hasAppDir && filePath.startsWith(appDir) && pageExtensions.test(filePath)) {
-						invalidateAppRouteCache();
-						invalidateRscEntryModule();
-					}
+					if (hasAppDir && shouldInvalidateAppRouteFile(appDir, filePath, fileMatcher)) invalidateAppRoutingModules();
 				});
 				server.watcher.on("unlink", (filePath) => {
 					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) invalidateRouteCache(pagesDir);
-					if (hasAppDir && filePath.startsWith(appDir) && pageExtensions.test(filePath)) {
-						invalidateAppRouteCache();
-						invalidateRscEntryModule();
-					}
+					if (hasAppDir && shouldInvalidateAppRouteFile(appDir, filePath, fileMatcher)) invalidateAppRoutingModules();
 				});
 				server.middlewares.use((req, res, next) => {
 					const blockReason = validateDevRequest({
@@ -1086,6 +1067,10 @@ function vinext(options = {}) {
 							const applyDeferredMwHeaders = () => {
 								if (deferredMwResponseHeaders) for (const [key, value] of deferredMwResponseHeaders) res.appendHeader(key, value);
 							};
+							const applyMwRequestHeadersForExternalProxy = () => {
+								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
+								else delete req.headers["x-vinext-mw-ctx"];
+							};
 							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() : "";
 								const origin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${req.headers.host || "localhost"}`;
@@ -1151,6 +1136,7 @@ function vinext(options = {}) {
 							if (nextConfig?.rewrites.beforeFiles.length) resolvedUrl = applyRewrites(pathname, nextConfig.rewrites.beforeFiles, reqCtx) ?? url;
 							if (isExternalUrl(resolvedUrl)) {
 								applyDeferredMwHeaders();
+								applyMwRequestHeadersForExternalProxy();
 								await proxyExternalRewriteNode(req, res, resolvedUrl);
 								return;
 							}
@@ -1174,6 +1160,7 @@ function vinext(options = {}) {
 							}
 							if (isExternalUrl(resolvedUrl)) {
 								applyDeferredMwHeaders();
+								applyMwRequestHeadersForExternalProxy();
 								await proxyExternalRewriteNode(req, res, resolvedUrl);
 								return;
 							}
@@ -1190,6 +1177,7 @@ function vinext(options = {}) {
 								if (fallbackRewrite) {
 									if (isExternalUrl(fallbackRewrite)) {
 										applyDeferredMwHeaders();
+										applyMwRequestHeadersForExternalProxy();
 										await proxyExternalRewriteNode(req, res, fallbackRewrite);
 										return;
 									}
@@ -1442,6 +1430,15 @@ function vinext(options = {}) {
 				}
 			};
 		})(),
+		{
+			name: "vinext:hash-salt",
+			apply: "build",
+			augmentChunkHash() {
+				if (this.environment?.name !== "client") return;
+				const salt = nextConfig?.hashSalt;
+				if (salt) return salt;
+			}
+		},
 		(() => {
 			const prerenderSecret = randomBytes(32).toString("hex");
 			return {