vinext 0.1.4 → 0.1.5

package/dist/plugins/import-meta-url.js

@@ -1,3 +1,4 @@
+import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import { collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray } from "./ast-utils.js";
 import { tryRealpathSync } from "../build/ssr-manifest.js";
 import path from "node:path";
@@ -32,18 +33,26 @@ function createImportMetaUrlPlugin(options) {
 			outputDirs = [config.build.outDir];
 			rootPaths = createRootPaths(root, { outputDirs });
 		},
-		transform(code, id) {
-			if (!mayContainSourceIdentityToken(code)) return null;
-			const paths = getRootPaths();
-			if (!paths) return null;
-			const canonicalId = transformableModuleCanonicalId(cleanModuleId(id), paths);
-			if (!canonicalId) return null;
-			const rewritten = rewriteCanonicalSourceIdentity(code, canonicalId, paths, this.environment?.name === "client" ? "client" : "server");
-			if (!rewritten) return null;
-			return {
-				code: rewritten.code,
-				map: rewritten.map
-			};
+		transform: {
+			filter: {
+				id: {
+					include: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/,
+					exclude: [/[\\/]node_modules[\\/]/, VIRTUAL_MODULE_ID_RE]
+				},
+				code: /import\.meta(?:\.|\?\.)url|__filename|__dirname/
+			},
+			handler(code, id) {
+				const paths = getRootPaths();
+				if (!paths) return null;
+				const canonicalId = transformableModuleCanonicalId(cleanModuleId(id), paths);
+				if (!canonicalId) return null;
+				const rewritten = rewriteCanonicalSourceIdentity(code, canonicalId, paths, this.environment?.name === "client" ? "client" : "server");
+				if (!rewritten) return null;
+				return {
+					code: rewritten.code,
+					map: rewritten.map
+				};
+			}
 		}
 	};
 }
@@ -120,9 +129,6 @@ function mayContainImportMetaUrl(code) {
 function mayContainServerCjsGlobal(code) {
 	return code.includes("__filename") || code.includes("__dirname");
 }
-function mayContainSourceIdentityToken(code) {
-	return mayContainImportMetaUrl(code) || mayContainServerCjsGlobal(code);
-}
 function excludedRelativePrefixes(canonicalRoot, normalizedRoot, options) {
 	const prefixes = new Set([
 		".next",

package/dist/plugins/instrumentation-client.js

@@ -8,7 +8,7 @@ function createInstrumentationClientTransformPlugin(getInstrumentationClientPath
 		transform(code, id) {
 			const instrumentationClientPath = getInstrumentationClientPath();
 			if (!instrumentationClientPath) return null;
-			if (normalizePath(id.split("?", 1)[0]) !== normalizePath(instrumentationClientPath)) return null;
+			if (normalizePath(id.split("?", 1)[0]) !== instrumentationClientPath) return null;
 			if (code.includes("__vinextInstrumentationClientStart")) return null;
 			const ast = parseAst(code);
 			let insertPos = 0;

package/dist/plugins/middleware-server-only.js

@@ -1,3 +1,4 @@
+import { normalizePathSeparators } from "../utils/path.js";
 //#region src/plugins/middleware-server-only.ts
 /**
 * Allow `import 'server-only'` from middleware (and any module reachable
@@ -44,16 +45,16 @@
 */
 function createMiddlewareServerOnlyPlugin(options) {
 	const tainted = /* @__PURE__ */ new Set();
+	function canonicalizeId(id) {
+		const queryIndex = id.indexOf("?");
+		return normalizePathSeparators(queryIndex === -1 ? id : id.slice(0, queryIndex));
+	}
 	function isTainted(id) {
 		if (!id) return false;
-		if (tainted.has(id)) return true;
-		const queryIndex = id.indexOf("?");
-		if (queryIndex !== -1) return tainted.has(id.slice(0, queryIndex));
-		return false;
+		return tainted.has(canonicalizeId(id));
 	}
 	function addTainted(id) {
-		const queryIndex = id.indexOf("?");
-		tainted.add(queryIndex === -1 ? id : id.slice(0, queryIndex));
+		tainted.add(canonicalizeId(id));
 	}
 	return {
 		name: "vinext:middleware-server-only",

package/dist/plugins/og-assets.js

@@ -25,54 +25,56 @@ function createOgInlineFetchAssetsPlugin() {
 		buildStart() {
 			if (isBuild) cache.clear();
 		},
-		async transform(code, id) {
-			if (!code.includes("import.meta.url")) return null;
-			const useCache = isBuild;
-			const moduleDir = path.dirname(id);
-			let newCode = code;
-			let didReplace = false;
-			const readAsBase64 = async (absPath) => {
-				const cached = useCache ? cache.get(absPath) : void 0;
-				if (cached !== void 0) return cached;
-				try {
-					const b64 = (await fs.promises.readFile(absPath)).toString("base64");
-					if (useCache) cache.set(absPath, b64);
-					return b64;
-				} catch {
-					return null;
+		transform: {
+			filter: { code: "import.meta.url" },
+			async handler(code, id) {
+				const useCache = isBuild;
+				const moduleDir = path.dirname(id);
+				let newCode = code;
+				let didReplace = false;
+				const readAsBase64 = async (absPath) => {
+					const cached = useCache ? cache.get(absPath) : void 0;
+					if (cached !== void 0) return cached;
+					try {
+						const b64 = (await fs.promises.readFile(absPath)).toString("base64");
+						if (useCache) cache.set(absPath, b64);
+						return b64;
+					} catch {
+						return null;
+					}
+				};
+				if (code.includes("fetch(")) for (const match of code.matchAll(/fetch\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)(?:\.then\(\s*(?:function\s*\([^)]*\)|\([^)]*\)\s*=>)\s*\{?\s*return\s+[^.]+\.arrayBuffer\(\)\s*;?\s*\}?\s*,?\s*\)|\.then\(\s*\([^)]*\)\s*=>\s*[^.]+\.arrayBuffer\(\)\s*,?\s*\))/g)) {
+					const fullMatch = match[0];
+					const relPath = match[2];
+					const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
+					if (fileBase64 === null) continue;
+					const inlined = [
+						`(function(){`,
+						`var b=${JSON.stringify(fileBase64)};`,
+						`var r=atob(b);`,
+						`var a=new Uint8Array(r.length);`,
+						`for(var i=0;i<r.length;i++)a[i]=r.charCodeAt(i);`,
+						`return Promise.resolve(a.buffer);`,
+						`})()`
+					].join("");
+					newCode = newCode.replaceAll(fullMatch, inlined);
+					didReplace = true;
 				}
-			};
-			if (code.includes("fetch(")) for (const match of code.matchAll(/fetch\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)(?:\.then\(\s*(?:function\s*\([^)]*\)|\([^)]*\)\s*=>)\s*\{?\s*return\s+[^.]+\.arrayBuffer\(\)\s*;?\s*\}?\s*,?\s*\)|\.then\(\s*\([^)]*\)\s*=>\s*[^.]+\.arrayBuffer\(\)\s*,?\s*\))/g)) {
-				const fullMatch = match[0];
-				const relPath = match[2];
-				const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
-				if (fileBase64 === null) continue;
-				const inlined = [
-					`(function(){`,
-					`var b=${JSON.stringify(fileBase64)};`,
-					`var r=atob(b);`,
-					`var a=new Uint8Array(r.length);`,
-					`for(var i=0;i<r.length;i++)a[i]=r.charCodeAt(i);`,
-					`return Promise.resolve(a.buffer);`,
-					`})()`
-				].join("");
-				newCode = newCode.replaceAll(fullMatch, inlined);
-				didReplace = true;
-			}
-			if (code.includes("readFileSync(")) for (const match of newCode.matchAll(/[a-zA-Z_$][a-zA-Z0-9_$]*\.readFileSync\(\s*(?:[a-zA-Z_$][a-zA-Z0-9_$]*\.)?fileURLToPath\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)\s*\)/g)) {
-				const fullMatch = match[0];
-				const relPath = match[2];
-				const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
-				if (fileBase64 === null) continue;
-				const inlined = `Buffer.from(${JSON.stringify(fileBase64)},"base64")`;
-				newCode = newCode.replaceAll(fullMatch, inlined);
-				didReplace = true;
+				if (code.includes("readFileSync(")) for (const match of newCode.matchAll(/[a-zA-Z_$][a-zA-Z0-9_$]*\.readFileSync\(\s*(?:[a-zA-Z_$][a-zA-Z0-9_$]*\.)?fileURLToPath\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)\s*\)/g)) {
+					const fullMatch = match[0];
+					const relPath = match[2];
+					const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
+					if (fileBase64 === null) continue;
+					const inlined = `Buffer.from(${JSON.stringify(fileBase64)},"base64")`;
+					newCode = newCode.replaceAll(fullMatch, inlined);
+					didReplace = true;
+				}
+				if (!didReplace) return null;
+				return {
+					code: newCode,
+					map: null
+				};
 			}
-			if (!didReplace) return null;
-			return {
-				code: newCode,
-				map: null
-			};
 		}
 	};
 }

package/dist/plugins/optimize-imports.js

@@ -1,5 +1,6 @@
 import { normalizePathSeparators } from "../utils/path.js";
 import { escapeRegExp } from "../utils/regex.js";
+import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import { getAstName } from "./ast-utils.js";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -445,12 +446,17 @@ function createOptimizeImportsPlugin(getNextConfig, getRoot) {
 			return await this.resolve(source, barrelEntry, { skipSelf: true }) ?? void 0;
 		},
 		transform: {
-			filter: { id: { include: /\.(tsx?|jsx?|mjs)$/ } },
-			async handler(code, id) {
+			filter: {
+				id: {
+					include: /\.(tsx?|jsx?|mjs)$/,
+					exclude: VIRTUAL_MODULE_ID_RE
+				},
+				code: /\bimport\b[\s\S]*\bfrom\b/
+			},
+			async handler(code) {
 				const env = this.environment;
 				if (env?.name === "client") return null;
 				const preferReactServer = env?.name === "rsc";
-				if (id.startsWith("\0")) return null;
 				const packages = optimizedPackages;
 				if (!hasOptimizedImportSource(code)) return null;
 				let ast;

package/dist/plugins/remove-console.d.ts

@@ -1,7 +1,13 @@
+import MagicString from "magic-string";
+
 //#region src/plugins/remove-console.d.ts
 type RemoveConsoleConfig = boolean | {
   exclude: string[];
 };
+type RemoveConsoleResult = {
+  code: string;
+  map: ReturnType<MagicString["generateMap"]>;
+};
 /**
  * Walk the AST body looking for expression statements whose expression is a
  * CallExpression with a callee of `console.<identifier>`. When found, check
@@ -10,6 +16,6 @@ type RemoveConsoleConfig = boolean | {
  *
  * Returns `null` if no console calls are removed.
  */
-declare function removeConsoleCalls(code: string, config: RemoveConsoleConfig): string | null;
+declare function removeConsoleCalls(code: string, config: RemoveConsoleConfig): RemoveConsoleResult | null;
 //#endregion
 export { removeConsoleCalls };

package/dist/plugins/remove-console.js

@@ -168,7 +168,10 @@ function removeConsoleCalls(code, config) {
 	}
 	for (const node of ast.body) walk(node);
 	if (!changed) return null;
-	return s.toString();
+	return {
+		code: s.toString(),
+		map: s.generateMap({ hires: "boundary" })
+	};
 }
 //#endregion
 export { removeConsoleCalls };

package/dist/plugins/require-context.js

@@ -16,30 +16,31 @@ function createRequireContextPlugin() {
 	return {
 		name: "vinext:require-context",
 		enforce: "pre",
-		transform(code, id) {
-			if (!mayContainRequireContext(code)) return null;
-			const lang = langForId(id);
-			if (!lang) return null;
-			let ast;
-			try {
-				ast = parseAst(code, { lang });
-			} catch {
-				return null;
+		transform: {
+			filter: {
+				id: /\.(?:[cm]?[jt]s|[jt]sx)(?:\?.*)?$/i,
+				code: /\brequire\b[\s\S]*\.context/
+			},
+			handler(code, id) {
+				const lang = langForId(id);
+				let ast;
+				try {
+					ast = parseAst(code, { lang });
+				} catch {
+					return null;
+				}
+				const calls = collectRequireContextCalls(ast);
+				if (calls.length === 0) return null;
+				const output = new MagicString(code);
+				for (const call of calls) output.overwrite(call.range.start, call.range.end, buildReplacement(call));
+				return {
+					code: output.toString(),
+					map: output.generateMap({ hires: "boundary" })
+				};
 			}
-			const calls = collectRequireContextCalls(ast);
-			if (calls.length === 0) return null;
-			const output = new MagicString(code);
-			for (const call of calls) output.overwrite(call.range.start, call.range.end, buildReplacement(call));
-			return {
-				code: output.toString(),
-				map: output.generateMap({ hires: "boundary" })
-			};
 		}
 	};
 }
-function mayContainRequireContext(code) {
-	return code.includes("require") && code.includes(".context");
-}
 function langForId(id) {
 	const clean = id.split("?", 1)[0];
 	const dot = clean.lastIndexOf(".");

package/dist/plugins/strip-server-exports.d.ts

@@ -1,7 +1,13 @@
+import MagicString from "magic-string";
+
 //#region src/plugins/strip-server-exports.d.ts
 declare function hasServerExportCandidate(code: string): boolean;
 declare function hasExportAllCandidate(code: string): boolean;
 declare function validatePageExports(code: string): void;
+type StripServerExportsResult = {
+  code: string;
+  map: ReturnType<MagicString["generateMap"]>;
+};
 /**
  * Strip server-only Pages Router data-fetching exports and their unique
  * dependency graph from browser bundles.
@@ -10,6 +16,6 @@ declare function validatePageExports(code: string): void;
  * - test/unit/babel-plugin-next-ssg-transform.test.ts
  * - crates/next-custom-transforms/src/transforms/strip_page_exports.rs
  */
-declare function stripServerExports(code: string): string | null;
+declare function stripServerExports(code: string): StripServerExportsResult | null;
 //#endregion
 export { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };

package/dist/plugins/strip-server-exports.js

@@ -509,7 +509,10 @@ function stripServerExports(code) {
 		string.overwrite(edit.start, edit.end, edit.replacement);
 		lastStart = edit.start;
 	}
-	return string.toString();
+	return {
+		code: string.toString(),
+		map: string.generateMap({ hires: "boundary" })
+	};
 }
 //#endregion
 export { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };

package/dist/server/app-bfcache-identity.d.ts

@@ -0,0 +1,26 @@
+import { AppElements } from "./app-elements-wire.js";
+import { BfcacheIdMap } from "./app-history-state.js";
+
+//#region src/server/app-bfcache-identity.d.ts
+type BfcacheStateKeyMap = Readonly<Record<string, string>>;
+declare function createInitialBfcacheIdMap(elements: AppElements): BfcacheIdMap;
+declare function createBfcacheSegmentStateKeyMap(options: {
+  elements: AppElements;
+  pathname: string;
+}): BfcacheStateKeyMap;
+declare function createNextBfcacheIdMap(options: {
+  current: BfcacheIdMap;
+  currentElements: AppElements;
+  currentPathname: string;
+  elements: AppElements;
+  nextPathname: string;
+  restored?: BfcacheIdMap | null;
+  reuseCurrent?: boolean;
+}): BfcacheIdMap;
+declare function preserveBfcacheIdsForMergedElements(options: {
+  elements: AppElements;
+  next: BfcacheIdMap;
+  previous: BfcacheIdMap;
+}): BfcacheIdMap;
+//#endregion
+export { BfcacheStateKeyMap, createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements };

package/dist/server/app-bfcache-identity.js

@@ -0,0 +1,127 @@
+import { countConsumedPathnameSegments, isInvisibleSegment, normalizePathnameForRouteMatch, splitPathSegments } from "../routing/utils.js";
+import { normalizePath } from "./normalize-path.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
+import "./app-bfcache-id.js";
+import { isBfcacheSegmentId } from "./app-history-state.js";
+//#region src/server/app-bfcache-identity.ts
+let nextBfcacheId = 0;
+function rememberBfcacheId(value) {
+	const match = /^_b_(\d+)_$/.exec(value);
+	if (!match) return;
+	nextBfcacheId = Math.max(nextBfcacheId, Number(match[1]));
+}
+function mintBfcacheId() {
+	nextBfcacheId += 1;
+	return `_b_${nextBfcacheId}_`;
+}
+function getVisibleTreePathSegments(treePath) {
+	return splitPathSegments(treePath).filter((segment) => !isInvisibleSegment(segment));
+}
+function getTreePathIdentityPrefix(pathname, treePath) {
+	const pathnameSegments = splitPathSegments(pathname);
+	const consumedPathnameSegments = countConsumedPathnameSegments(getVisibleTreePathSegments(treePath), pathnameSegments.length);
+	if (consumedPathnameSegments === 0) return "/";
+	return `/${pathnameSegments.slice(0, consumedPathnameSegments).join("/")}`;
+}
+function readAppElementsMetadata(elements) {
+	let metadata;
+	try {
+		metadata = AppElementsWire.readMetadata(elements);
+	} catch {
+		return null;
+	}
+	const slotBindingsBySlotId = /* @__PURE__ */ new Map();
+	for (const binding of metadata.slotBindings) slotBindingsBySlotId.set(binding.slotId, binding);
+	return {
+		metadata,
+		slotBindingsBySlotId
+	};
+}
+function createActiveSlotIdentity(id, parsed) {
+	const activeSlotBinding = parsed?.slotBindingsBySlotId.get(id);
+	if (activeSlotBinding?.activeRouteId != null) return `${id}@${activeSlotBinding.activeRouteId}`;
+	const interception = parsed?.metadata.interception;
+	if (interception?.slotId !== id) return null;
+	return `${id}@${interception.targetRouteId}`;
+}
+/**
+* Derive BFCache identity from AppElements wire keys. Keep wire-key parsing
+* contained here until vinext has a route-manifest authority equivalent to
+* Next.js CacheNode or segment-cache state.
+*/
+function createBfcacheSegmentIdentity(id, options) {
+	const parsed = AppElementsWire.parseElementKey(id);
+	if (!parsed) return null;
+	if (parsed.kind === "page") return `${id}@${options.pathname}`;
+	if (parsed.kind === "slot") {
+		const activeSlotIdentity = createActiveSlotIdentity(id, options.metadata);
+		if (activeSlotIdentity !== null) return activeSlotIdentity;
+		return `${id}@${getTreePathIdentityPrefix(options.pathname, parsed.treePath)}`;
+	}
+	if (parsed.kind === "layout" || parsed.kind === "template") return `${id}@${getTreePathIdentityPrefix(options.pathname, parsed.treePath)}`;
+	return null;
+}
+function collectBfcacheSegmentIds(elements, parsed) {
+	const ids = new Set(Object.keys(elements));
+	const metadata = parsed === void 0 ? readAppElementsMetadata(elements) : parsed;
+	for (const layoutId of metadata?.metadata.layoutIds ?? []) ids.add(layoutId);
+	return Array.from(ids).filter(isBfcacheSegmentId);
+}
+function createInitialBfcacheIdMap(elements) {
+	const ids = {};
+	for (const id of collectBfcacheSegmentIds(elements)) ids[id] = "0";
+	return ids;
+}
+function normalizeBfcachePathname(pathname) {
+	const normalized = normalizePath(normalizePathnameForRouteMatch(pathname));
+	return normalized.length > 1 ? normalized.replace(/\/$/, "") : normalized;
+}
+function createBfcacheSegmentStateKeyMap(options) {
+	const metadata = readAppElementsMetadata(options.elements);
+	const normalizedPathname = normalizeBfcachePathname(options.pathname);
+	const stateKeys = {};
+	for (const id of collectBfcacheSegmentIds(options.elements, metadata)) {
+		const stateKey = createBfcacheSegmentIdentity(id, {
+			metadata,
+			pathname: normalizedPathname
+		});
+		if (stateKey !== null) stateKeys[id] = stateKey;
+	}
+	return stateKeys;
+}
+function createNextBfcacheIdMap(options) {
+	const current = options.reuseCurrent === false ? {} : options.current;
+	for (const value of Object.values(current)) rememberBfcacheId(value);
+	for (const value of Object.values(options.restored ?? {})) rememberBfcacheId(value);
+	const currentMetadata = readAppElementsMetadata(options.currentElements);
+	const nextMetadata = readAppElementsMetadata(options.elements);
+	const currentPathname = normalizeBfcachePathname(options.currentPathname);
+	const nextPathname = normalizeBfcachePathname(options.nextPathname);
+	const ids = {};
+	for (const id of collectBfcacheSegmentIds(options.elements, nextMetadata)) {
+		const currentValue = createBfcacheSegmentIdentity(id, {
+			metadata: currentMetadata,
+			pathname: currentPathname
+		}) === createBfcacheSegmentIdentity(id, {
+			metadata: nextMetadata,
+			pathname: nextPathname
+		}) ? current[id] : void 0;
+		const value = options.restored?.[id] ?? currentValue ?? mintBfcacheId();
+		ids[id] = value;
+		rememberBfcacheId(value);
+	}
+	return ids;
+}
+function preserveBfcacheIdsForMergedElements(options) {
+	const ids = {};
+	for (const id of collectBfcacheSegmentIds(options.elements)) {
+		const value = options.next[id] ?? options.previous[id];
+		if (value === void 0) continue;
+		ids[id] = value;
+		rememberBfcacheId(value);
+	}
+	return ids;
+}
+//#endregion
+export { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements };

package/dist/server/app-browser-entry.js

@@ -6,25 +6,28 @@ import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } fr
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { installWindowNext, setWindowNextInternalSourcePage } from "../client/window-next.js";
 import { retryScrollTo, scrollToHashTargetOnNextFrame } from "../shims/hash-scroll.js";
-import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
-import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
-import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
-import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
-import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId } from "./app-rsc-cache-busting.js";
-import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
-import { navigationPlanner } from "./navigation-planner.js";
-import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, getBfcacheIdMapContext, getClientNavigationRenderContext, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, isRedirectError, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, useRouter } from "../shims/navigation.js";
+import { getBfcacheIdMapContext, setNavigationContext } from "../shims/navigation-context-state.js";
+import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
+import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners } from "../client/app-nav-failure-handler.js";
 import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
+import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
 import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId } from "./app-rsc-cache-busting.js";
+import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
+import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
+import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
 import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult } from "./app-browser-action-result.js";
 import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
+import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
+import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
+import { navigationPlanner } from "./navigation-planner.js";
+import { __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, getClientNavigationRenderContext, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
-import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, isCacheRestorableAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl, resolveServerActionRequestState } from "./app-browser-state.js";
+import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl, resolveServerActionRequestState } from "./app-browser-state.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
 import { applyServerActionResultDecision } from "./app-browser-server-action-navigation.js";
 import { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition } from "./app-browser-hydration.js";

package/dist/server/app-browser-navigation-controller.js

@@ -1,8 +1,8 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { claimAppRouterScrollIntentForCommit, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
+import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
 import { startTransition, useInsertionEffect, useLayoutEffect } from "react";

package/dist/server/app-browser-state.d.ts

@@ -3,8 +3,9 @@ import { CacheEntryReuseProof } from "./cache-proof.js";
 import { AppElements, AppElementsInterception, AppElementsSlotBinding, LayoutFlags } from "./app-elements-wire.js";
 import { NavigationTrace } from "./navigation-trace.js";
 import { OperationLane } from "./operation-token.js";
-import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 import { BfcacheIdMap, HistoryTraversalIntent, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
+import { ClientNavigationRenderSnapshot } from "../shims/navigation.js";
 
 //#region src/server/app-browser-state.d.ts
 type OperationRecordBase = {
@@ -70,7 +71,6 @@ type AppNavigationPayloadOrigin = Readonly<{
 } | {
   origin: "visited-cache";
 }>;
-type BfcacheStateKeyMap = Readonly<Record<string, string>>;
 declare const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
 declare const VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN: AppNavigationPayloadOrigin;
 type PendingNavigationCommitDisposition = "dispatch" | "hard-navigate" | "skip";
@@ -91,25 +91,6 @@ type NonDispatchPendingNavigationCommitDispositionDecision = {
   trace: NavigationTrace;
 };
 type PendingNavigationCommitDispositionDecision = DispatchPendingNavigationCommitDispositionDecision | NonDispatchPendingNavigationCommitDispositionDecision;
-declare function createInitialBfcacheIdMap(elements: AppElements): BfcacheIdMap;
-declare function createBfcacheSegmentStateKeyMap(options: {
-  elements: AppElements;
-  pathname: string;
-}): BfcacheStateKeyMap;
-declare function createNextBfcacheIdMap(options: {
-  current: BfcacheIdMap;
-  currentElements: AppElements;
-  currentPathname: string;
-  elements: AppElements;
-  nextPathname: string;
-  restored?: BfcacheIdMap | null;
-  reuseCurrent?: boolean;
-}): BfcacheIdMap;
-declare function preserveBfcacheIdsForMergedElements(options: {
-  elements: AppElements;
-  next: BfcacheIdMap;
-  previous: BfcacheIdMap;
-}): BfcacheIdMap;
 declare function isCacheRestorableAppPayloadMetadata(metadata: CacheRestorableAppPayloadMetadata): metadata is CacheRestorableAppPayloadMetadata & {
   cacheEntryReuseProof: CacheEntryReuseProof;
 };