vinext 0.0.46 → 0.0.47

package/dist/index.js

@@ -23,8 +23,8 @@ 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 { precompressAssets } from "./build/precompress.js";
@@ -747,6 +747,7 @@ function vinext(options = {}) {
 						allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+						expireTime: nextConfig?.expireTime,
 						i18n: nextConfig?.i18n,
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root)
@@ -761,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,
+					chunks.push({
+						code: chunk.code,
 						fileName: chunk.fileName
 					});
-					if (stubRe.test(chunk.code)) chunksWithStubBody.push({
-						chunk,
-						fileName: chunk.fileName
-					});
-				}
-				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);
+					chunksByFileName.set(chunk.fileName, chunk);
 				}
-				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;
 			}
 		},