vinext 1.0.0-beta.5 → 1.0.0-beta.7

package/dist/build/run-prerender.js

@@ -3,9 +3,11 @@ import { findDir } from "../utils/project.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
 import { appRouter } from "../routing/app-router.js";
 import { scanMetadataFiles } from "../server/metadata-routes.js";
+import { PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
 import { loadNextConfig, resolveNextConfig } from "../config/next-config.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { rememberCurrentServerEntryImportMtime, startProdServer } from "../server/prod-server.js";
+import { enterPrerenderPhase } from "./prerender-phase.js";
 import { prerenderApp, prerenderPages, writePrerenderIndex } from "./prerender.js";
 import { injectPregeneratedConcretePaths } from "./inject-pregenerated-paths.js";
 import fs from "node:fs";
@@ -104,12 +106,10 @@ async function runPrerender(options) {
 	const appDir = findDir(root, "app", "src/app");
 	const pagesDir = findDir(root, "pages", "src/pages");
 	if (!appDir && !pagesDir) return null;
-	const previousPrerenderFlag = process.env.VINEXT_PRERENDER;
-	process.env.VINEXT_PRERENDER = "1";
 	const manifestDir = path.join(root, "dist", "server");
 	const rscBundlePath = options.rscBundlePath ?? path.join(root, "dist", "server", "index.js");
 	const serverDir = path.dirname(rscBundlePath);
-	const config = options.nextConfig ? { ...options.nextConfig } : { ...await resolveNextConfig(await loadNextConfig(root), root) };
+	const config = options.nextConfig ? { ...options.nextConfig } : { ...await resolveNextConfig(await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root) };
 	const builtBuildId = readBuiltBuildId(serverDir);
 	if (builtBuildId) config.buildId = builtBuildId;
 	const mode = config.output === "export" ? "export" : "default";
@@ -121,6 +121,7 @@ async function runPrerender(options) {
 	const outDir = mode === "export" ? path.join(root, "dist", "client") : path.join(root, "dist", "server", "prerendered-routes");
 	let sharedProdServer = null;
 	let sharedPrerenderSecret;
+	const restorePrerenderPhase = enterPrerenderPhase();
 	try {
 		if (appDir && pagesDir) {
 			sharedProdServer = await startProdServer({
@@ -187,9 +188,11 @@ async function runPrerender(options) {
 			if (result.outputFiles) allOutputFiles.push(...result.outputFiles);
 		}
 	} finally {
-		if (sharedProdServer) await new Promise((resolve) => sharedProdServer.server.close(() => resolve()));
-		if (previousPrerenderFlag === void 0) delete process.env.VINEXT_PRERENDER;
-		else process.env.VINEXT_PRERENDER = previousPrerenderFlag;
+		try {
+			if (sharedProdServer) await new Promise((resolve) => sharedProdServer.server.close(() => resolve()));
+		} finally {
+			restorePrerenderPhase();
+		}
 	}
 	if (allRoutes.length === 0) {
 		progress.finish(0, 0, 0);

package/dist/build/static-export.d.ts

@@ -1,6 +1,6 @@
+import { AppRoute } from "../routing/app-route-graph.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
 import { Route } from "../routing/pages-router.js";
-import { AppRoute } from "../routing/app-route-graph.js";
 //#region src/build/static-export.d.ts
 type StaticExportOptions = {
   /**

package/dist/client/app-nav-failure-handler.js

@@ -22,6 +22,7 @@ function clearAppNavigationFailureTarget(target) {
 }
 function handleAppNavigationFailure(error) {
 	if (!process.env.__NEXT_APP_NAV_FAIL_HANDLING || typeof window === "undefined") return false;
+	if (error !== null && typeof error === "object" && "handled" in error && error.handled === true) return false;
 	const pendingUrl = getPendingUrl();
 	if (pendingUrl === null || pendingUrl.href === window.location.href) return false;
 	console.error("Error occurred during navigation, falling back to hard navigation", error);

package/dist/client/navigation-runtime.d.ts

@@ -10,6 +10,7 @@ type NavigationRuntimeRscBootstrap = {
   done?: boolean;
   dynamicStaleTimeSeconds?: number;
   initialCacheKind?: "dynamic" | "static";
+  searchParamsFromBrowser?: boolean;
   nav?: NavigationRuntimeSnapshot;
   params?: Record<string, string | string[]>;
   rsc: NavigationRuntimeRscChunk[];
@@ -32,7 +33,7 @@ type NavigationRuntimeTraversalIntent = {
   historyState: unknown;
   targetHistoryIndex: number | null;
 };
-type NavigationRuntimeNavigate = (href: string, redirectDepth?: number, navigationKind?: NavigationRuntimeKind, historyUpdateMode?: NavigationRuntimeHistoryUpdateMode, previousNextUrlOverride?: string | null, programmaticTransition?: boolean, traversalIntent?: NavigationRuntimeTraversalIntent, scrollIntent?: AppRouterScrollIntent | null, visibleCommitMode?: NavigationRuntimeVisibleCommitMode) => Promise<void>;
+type NavigationRuntimeNavigate = (href: string, redirectDepth?: number, navigationKind?: NavigationRuntimeKind, historyUpdateMode?: NavigationRuntimeHistoryUpdateMode, previousNextUrlOverride?: string | null, programmaticTransition?: boolean, traversalIntent?: NavigationRuntimeTraversalIntent, scrollIntent?: AppRouterScrollIntent | null, visibleCommitMode?: NavigationRuntimeVisibleCommitMode, bypassNavigationCache?: boolean) => Promise<void>;
 type NavigationRuntimeFunctions = {
   clearNavigationCaches?: () => void;
   commitHashNavigation?: (href: string, historyUpdateMode: NavigationRuntimeHistoryUpdateMode, scroll: boolean) => void;
@@ -49,6 +50,8 @@ type NavigationRuntimeFunctions = {
   notifyLinkNavigationStart?: () => void;
   pingVisibleLinks?: () => void;
   preparePrefetchResponse?: (response: Response) => Promise<unknown>;
+  claimCurrentHistoryTreeSnapshot?: (historyUpdateMode: NavigationRuntimeHistoryUpdateMode, previousHistoryState: unknown) => void;
+  commitAppOwnedHistoryStateWrite?: (historyUpdateMode: NavigationRuntimeHistoryUpdateMode, previousHistoryState: unknown) => void;
 };
 type NavigationRuntimeBootstrap = {
   routeManifest: RouteManifest | null;
@@ -64,7 +67,6 @@ declare function getNavigationRuntime(): NavigationRuntime | null;
 declare function registerNavigationRuntimeBootstrap(bootstrap: Partial<NavigationRuntimeBootstrap>): NavigationRuntime;
 declare function registerNavigationRuntimeFunctions(functions: Partial<NavigationRuntimeFunctions>): NavigationRuntime;
 declare function ensureNavigationRuntimeRscBootstrap(): NavigationRuntimeRscBootstrap;
-declare function subscribeNavigationRuntimeRscChunk(chunk: NavigationRuntimeRscChunk): NavigationRuntime;
 declare function hasAppNavigationRuntime(): boolean;
 /**
  * True when the App Router has installed its runtime bootstrap on `window`,
@@ -80,4 +82,4 @@ declare function hasAppNavigationRuntime(): boolean;
  */
 declare function hasAppNavigationRuntimeBootstrap(): boolean;
 //#endregion
-export { NAVIGATION_RUNTIME_KEY, NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, NavigationRuntime, NavigationRuntimeBootstrap, NavigationRuntimeFunctions, NavigationRuntimeNavigate, NavigationRuntimeRscBootstrap, NavigationRuntimeRscChunk, NavigationRuntimeSnapshot, NavigationRuntimeVisibleCommitMode, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions, subscribeNavigationRuntimeRscChunk };
+export { NAVIGATION_RUNTIME_KEY, NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, NavigationRuntime, NavigationRuntimeBootstrap, NavigationRuntimeFunctions, NavigationRuntimeNavigate, NavigationRuntimeRscBootstrap, NavigationRuntimeRscChunk, NavigationRuntimeVisibleCommitMode, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions };

package/dist/client/navigation-runtime.js

@@ -31,7 +31,7 @@ function readRuntimeWindow() {
 }
 function isNavigationRuntimeFunctions(value) {
 	if (!isUnknownRecord(value)) return false;
-	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse"));
+	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse")) && isOptionalRuntimeFunction(Reflect.get(value, "claimCurrentHistoryTreeSnapshot")) && isOptionalRuntimeFunction(Reflect.get(value, "commitAppOwnedHistoryStateWrite"));
 }
 function isNavigationRuntimeRscChunk(value) {
 	if (typeof value === "string") return true;
@@ -52,11 +52,12 @@ function isNavigationRuntimeRscBootstrap(value) {
 	const done = Reflect.get(value, "done");
 	const dynamicStaleTimeSeconds = Reflect.get(value, "dynamicStaleTimeSeconds");
 	const initialCacheKind = Reflect.get(value, "initialCacheKind");
+	const searchParamsFromBrowser = Reflect.get(value, "searchParamsFromBrowser");
 	const nav = Reflect.get(value, "nav");
 	const params = Reflect.get(value, "params");
 	const rsc = Reflect.get(value, "rsc");
 	const staleTimeSeconds = Reflect.get(value, "staleTimeSeconds");
-	return (done === void 0 || typeof done === "boolean") && isOptionalStaleTimeSeconds(dynamicStaleTimeSeconds) && (initialCacheKind === void 0 || initialCacheKind === "dynamic" || initialCacheKind === "static") && (nav === void 0 || isNavigationRuntimeSnapshot(nav)) && (params === void 0 || isNavigationRuntimeParams(params)) && Array.isArray(rsc) && rsc.every(isNavigationRuntimeRscChunk) && isOptionalStaleTimeSeconds(staleTimeSeconds);
+	return (done === void 0 || typeof done === "boolean") && isOptionalStaleTimeSeconds(dynamicStaleTimeSeconds) && (initialCacheKind === void 0 || initialCacheKind === "dynamic" || initialCacheKind === "static") && (searchParamsFromBrowser === void 0 || typeof searchParamsFromBrowser === "boolean") && (nav === void 0 || isNavigationRuntimeSnapshot(nav)) && (params === void 0 || isNavigationRuntimeParams(params)) && Array.isArray(rsc) && rsc.every(isNavigationRuntimeRscChunk) && isOptionalStaleTimeSeconds(staleTimeSeconds);
 }
 function isOptionalStaleTimeSeconds(value) {
 	return value === void 0 || typeof value === "number" && Number.isFinite(value) && value >= 0;
@@ -148,11 +149,6 @@ function ensureNavigationRuntimeRscBootstrapForRuntime(runtime) {
 	}
 	return rscBootstrap;
 }
-function subscribeNavigationRuntimeRscChunk(chunk) {
-	const runtime = ensureNavigationRuntime();
-	ensureNavigationRuntimeRscBootstrapForRuntime(runtime).rsc.push(chunk);
-	return runtime;
-}
 function hasAppNavigationRuntime() {
 	return typeof getNavigationRuntime()?.functions.navigate === "function";
 }
@@ -172,4 +168,4 @@ function hasAppNavigationRuntimeBootstrap() {
 	return getNavigationRuntime() !== null;
 }
 //#endregion
-export { NAVIGATION_RUNTIME_KEY, NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions, subscribeNavigationRuntimeRscChunk };
+export { NAVIGATION_RUNTIME_KEY, NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions };

package/dist/client/vinext-next-data.d.ts

@@ -6,6 +6,8 @@ type VinextLinkPrefetchRoute = {
   isDynamic: boolean;
   patternParts: string[];
   requiresDynamicNavigationRequest?: boolean;
+  /** The route has dynamic params above its root layout. */
+  hasRootParams?: true;
 };
 /**
  * Pages Router route pattern exposed to the client so the App Router's

package/dist/config/next-config.js

@@ -332,7 +332,11 @@ async function loadNextConfig(root, phase = DEFAULT_PHASE) {
 	const normalizedConfigPath = safeRealpath(path.resolve(configPath));
 	try {
 		const { runnerImport } = await import("vite");
-		const { module: mod } = await runnerImport(configPath, {
+		const virtualConfigId = "virtual:vinext-resolved-next-config";
+		const resolvedVirtualConfigId = `\0${virtualConfigId}`;
+		const configPathLiteral = JSON.stringify(configPath);
+		const phaseLiteral = JSON.stringify(phase);
+		const { module: mod } = await runnerImport(virtualConfigId, {
 			root,
 			logLevel: "error",
 			clearScreen: false,
@@ -351,13 +355,26 @@ async function loadNextConfig(root, phase = DEFAULT_PHASE) {
 					".json"
 				]
 			},
-			plugins: [...isTypeScriptConfig ? [cjsGlobalsInjectorPlugin(configPath)] : [], commonjs({ filter: (id) => {
-				const idPath = id.startsWith("file://") ? fileURLToPath(id) : id.split("?")[0];
-				if (safeRealpath(path.resolve(idPath)) === normalizedConfigPath) return false;
-				return id.includes("node_modules") ? true : void 0;
-			} })]
+			plugins: [
+				{
+					name: "vinext:resolve-next-config-value",
+					resolveId(id) {
+						if (id === virtualConfigId) return resolvedVirtualConfigId;
+					},
+					load(id) {
+						if (id !== resolvedVirtualConfigId) return;
+						return `import * as configModule from ${configPathLiteral};\nconst cjsModule = configModule[${JSON.stringify(VINEXT_CJS_EXPORTS_KEY)}];\nconst cjsInitial = configModule[${JSON.stringify(VINEXT_CJS_INITIAL_KEY)}];\nconst cjsExports = cjsModule && cjsModule.exports;\nconst cjsValue = cjsExports != null && (cjsExports !== cjsInitial || (typeof cjsExports === "object" && Object.keys(cjsExports).length > 0)) ? cjsExports : undefined;\nconst value = cjsValue ?? configModule.default ?? configModule;\nexport default typeof value === "function" ? await value(${phaseLiteral}, { defaultConfig: {} }) : value;\n`;
+					}
+				},
+				...isTypeScriptConfig ? [cjsGlobalsInjectorPlugin(configPath)] : [],
+				commonjs({ filter: (id) => {
+					const idPath = id.startsWith("file://") ? fileURLToPath(id) : id.split("?")[0];
+					if (safeRealpath(path.resolve(idPath)) === normalizedConfigPath) return false;
+					return id.includes("node_modules") ? true : void 0;
+				} })
+			]
 		});
-		return await unwrapConfig(mod, phase);
+		return mod.default;
 	} catch (e) {
 		if (isCjsError(e) && (filename.endsWith(".js") || filename.endsWith(".cjs"))) try {
 			return await loadConfigViaRequire(configPath, root, phase);