vinext 1.4.2 → 1.4.4

package/dist/index.js

@@ -18,8 +18,8 @@ import { hasBasePath, restoreBasePath, stripBasePath } from "./utils/base-path.j
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
 import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
-import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
-import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
+import { canonicalizeRequestUrlPathname, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { proxyExternalRequest } from "./config/config-matchers.js";
 import { omitUnusedBuildSourcemap } from "./plugins/transform-result.js";
 import { assetPrefixPathname, isNextStaticPath, resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
@@ -31,7 +31,7 @@ import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./rout
 import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
+import { resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash } from "./server/pages-i18n.js";
 import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
@@ -64,6 +64,7 @@ import { generateBrowserEntry, generateBrowserRouteManifestModule, toHashedRoute
 import { createRscScanGlobImportsPlugin, isRscScanGlobImportsAffected } from "./plugins/rsc-scan-glob-imports.js";
 import { loadOrGenerateServerActionsEncryptionKey } from "./build/server-actions-encryption-key.js";
 import { findOpenTelemetryPackages, mergeServerExternalPackages } from "./config/server-external-packages.js";
+import { removeRequestHeaders } from "./server/remove-request-headers.js";
 import { precompressAssets } from "./build/precompress.js";
 import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
 import { VINEXT_CLIENT_ENTRY_MANIFEST, VINEXT_CLIENT_REFERENCE_SOURCES } from "./utils/client-entry-manifest.js";
@@ -78,6 +79,7 @@ import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
 import { sealForwardedMiddlewareContext } from "./server/forwarded-middleware-context.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { traceFrameworkRequest } from "./server/request-tracing.js";
+import { publicFileRouteKey } from "./utils/public-file-path.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
 import { hasReactCompilerPlugin, isReactCompilerPlugin, isReactCompilerRequested, reactCompilerUnsupportedMessage } from "./utils/react-compiler-support.js";
@@ -134,7 +136,6 @@ import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
 import { hasMdxFiles, loadMdxEsmReader, pageExtensionsIncludeMdx } from "./utils/mdx-scan.js";
-import { publicFileRouteKey } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes, scanPublicFiles } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
 import { assertPluginRscVersion, needsAppReactServerDom } from "./utils/plugin-rsc-version.js";
@@ -182,10 +183,10 @@ const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
 	"client"
 ]);
 const VINEXT_GENERATED_DIR_RE = /(?:^|[/\\])\.vinext(?:[/\\]|$)/;
+const FORWARDED_MIDDLEWARE_CONTEXT_HEADERS = /* @__PURE__ */ new Set([VINEXT_MW_CTX_HEADER]);
+const STRIPPED_INTERNAL_REQUEST_HEADERS = /* @__PURE__ */ new Set([...INTERNAL_HEADERS, ...VINEXT_INTERNAL_HEADERS]);
 function removeForwardedMiddlewareContext(req) {
-	delete req.headers[VINEXT_MW_CTX_HEADER];
-	const rawHeaders = req.rawHeaders;
-	for (let i = rawHeaders.length - 2; i >= 0; i -= 2) if (rawHeaders[i].toLowerCase() === "x-vinext-mw-ctx") rawHeaders.splice(i, 2);
+	removeRequestHeaders(req, FORWARDED_MIDDLEWARE_CONTEXT_HEADERS);
 }
 function setForwardedMiddlewareContext(req, key, context) {
 	removeForwardedMiddlewareContext(req);
@@ -844,6 +845,7 @@ const PAGES_REQUEST_STAGE_ENTRY = resolveRuntimeEntryModule("pages-request-stage
 const PAGES_RESPONSE_STAGE_ENTRY = resolveRuntimeEntryModule("pages-response-stage-entry");
 const NITRO_PUBLIC_FILES_ENTRY = resolveRuntimeEntryModule("nitro-public-files");
 const NITRO_PUBLIC_FILES_PLUGIN = resolveRuntimeEntryModule("nitro-public-files-plugin");
+const SRVX_MIDDLEWARE_ORIGIN_ENTRY = resolveRuntimeEntryModule("srvx-middleware-origin");
 const WORKER_ROUTER_ENTRIES = /* @__PURE__ */ new Set([resolveRuntimeEntryModule("app-router-entry"), resolveRuntimeEntryModule("pages-router-entry")]);
 /** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
 const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
@@ -939,6 +941,20 @@ function getLeadingReactDirective(code) {
 function hasReactDirective(code) {
 	return getLeadingReactDirective(code) !== null;
 }
+/**
+* Resolve a project directory through symlinks the way Vite resolves
+* `config.root` (and Next.js its project dir), so route files, `server.config.root`
+* and module ids all share one path. Windows uses the JS realpath, as Vite
+* does, to keep mapped network drives.
+*/
+function resolveProjectDir(dir, preserveSymlinks) {
+	if (preserveSymlinks) return toSlash(dir);
+	try {
+		return toSlash(process.platform === "win32" ? fs.realpathSync(dir) : fs.realpathSync.native(dir));
+	} catch {
+		return toSlash(dir);
+	}
+}
 function generateRootParamsModule(rootParamNames) {
 	const names = Array.from(new Set(rootParamNames)).filter(isValidExportIdentifier).sort();
 	if (names.length === 0) return "export {};\n";
@@ -1488,7 +1504,7 @@ function vinext(options = {}) {
 				buildEmptyOutDir = typeof config.build?.emptyOutDir === "boolean" ? config.build.emptyOutDir : void 0;
 				isServeCommand = env.command === "serve";
 				const ipaddrSsrExternal = env.command === "serve" ? ["ipaddr.js"] : [];
-				root = path.resolve(toSlash(process.cwd()), config.root ?? ".");
+				root = resolveProjectDir(path.resolve(toSlash(process.cwd()), config.root ?? "."), config.resolve?.preserveSymlinks);
 				if (env.command === "build") assertClientOutDirIsSeparate(root, options);
 				const devCliLifecycleEnabled = env.command === "serve" && env.isPreview !== true && claimViteCliDevInvocation(root, config["__vinextDevRestart"] === true, reservedDevCliInvocation && config.configFile === false);
 				buildLifecycleInvocation = config[VINEXT_BUILD_LIFECYCLE_CONFIG];
@@ -1500,7 +1516,7 @@ function vinext(options = {}) {
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
 				const envDir = config.envDir === false ? void 0 : config.envDir ? path.resolve(root, config.envDir) : root;
-				if (earlyDotenv && envDir !== earlyDotenv.dir) {
+				if (earlyDotenv && (envDir === void 0 || resolveProjectDir(envDir, config.resolve?.preserveSymlinks) !== resolveProjectDir(earlyDotenv.dir, config.resolve?.preserveSymlinks))) {
 					for (const [key, value] of Object.entries(earlyDotenv.env)) if (process.env[key] === value) Reflect.deleteProperty(process.env, key);
 					earlyDotenv = void 0;
 				}
@@ -1519,10 +1535,8 @@ function vinext(options = {}) {
 				}
 				draftModeSecret = previewBuildCredentials?.id ?? getPagesPreviewModeId();
 				let baseDir;
-				if (options.appDir) {
-					const dir = path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir);
-					baseDir = toSlash(dir);
-				} else {
+				if (options.appDir) baseDir = resolveProjectDir(path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir), config.resolve?.preserveSymlinks);
+				else {
 					const hasRootApp = fs.existsSync(path.join(root, "app"));
 					const hasRootPages = fs.existsSync(path.join(root, "pages"));
 					const hasSrcApp = fs.existsSync(path.join(root, "src", "app"));
@@ -1757,6 +1771,7 @@ function vinext(options = {}) {
 					delete config.resolve.alias;
 				}
 				const viteConfig = {
+					root,
 					appType: "custom",
 					...devCliLifecycleEnabled ? { [VINEXT_DEV_CLI_LIFECYCLE]: true } : {},
 					...hasAppDir && hasNitroPlugin ? { rsc: { serverHandler: false } } : {},
@@ -2359,9 +2374,14 @@ function vinext(options = {}) {
 						const entry = hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry";
 						if (!hasAppDir && hasNitroPlugin) return [
 							`import pagesWorker from ${JSON.stringify(entry)};`,
+							`import { resolveSrvxMiddlewareOrigin } from ${JSON.stringify(SRVX_MIDDLEWARE_ORIGIN_ENTRY)};`,
 							...nitroPublicFiles ? [`import { withNitroPagesPublicFiles } from ${JSON.stringify(NITRO_PUBLIC_FILES_ENTRY)};`, "const worker = withNitroPagesPublicFiles(pagesWorker);"] : ["const worker = pagesWorker;"],
 							"export default { fetch(request, env, ctx) {",
-							`  return worker.fetch(request, env, { ...ctx, hostRuntime: ${JSON.stringify(nitroHostRuntime)} });`,
+							"  return worker.fetch(request, env, {",
+							"    ...ctx,",
+							`    hostRuntime: ${JSON.stringify(nitroHostRuntime)},`,
+							"    middlewareOrigin: resolveSrvxMiddlewareOrigin(request),",
+							"  });",
 							"} };"
 						].join("\n");
 						return `export { default } from ${JSON.stringify(entry)};`;
@@ -2453,7 +2473,9 @@ function vinext(options = {}) {
 								dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 								dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
 								contentDispositionType: nextConfig?.images?.contentDispositionType,
-								contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+								contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy,
+								minimumCacheTTL: nextConfig?.images?.minimumCacheTTL,
+								maximumResponseBody: nextConfig?.images?.maximumResponseBody
 							},
 							hasPagesDir,
 							publicFiles: isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, this.environment.config.publicDir === "" ? false : this.environment.config.publicDir),
@@ -2734,9 +2756,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				handler(_options, bundle) {
 					if (this.environment?.name !== "client") return;
 					const manifest = {};
+					const appBrowserRuntimeModule = toSlash(resolveRuntimeEntryModule("app-browser-entry"));
 					for (const chunk of Object.values(bundle)) {
 						if (chunk.type !== "chunk") continue;
 						if (chunk.isDynamicEntry && isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_ROUTE_MANIFEST)) manifest.appRouteManifest = chunk.fileName;
+						if (chunk.moduleIds.some((id) => toSlash(id) === appBrowserRuntimeModule)) manifest.appBrowserRuntime = chunk.fileName;
 						if (!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;
@@ -3332,6 +3356,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 								revalidationHostname = readTrustedRevalidationHostname(revalidationHeaders, nextConfig?.i18n);
 							}
+							removeRequestHeaders(req, STRIPPED_INTERNAL_REQUEST_HEADERS);
 							const requestHost = revalidationHostname ?? ((Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost");
 							const requestOrigin = `http://${requestHost}`;
 							const getUrlHostname = (requestUrl) => new URL(requestUrl).hostname;
@@ -3441,31 +3466,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									});
 								}
 							}
-							const filePathMatchesRewrite = [
-								...nextConfig?.rewrites.beforeFiles ?? [],
-								...nextConfig?.rewrites.afterFiles ?? [],
-								...nextConfig?.rewrites.fallback ?? []
-							].some((rewrite) => matchesRewriteSource(pathname, rewrite, {
-								basePath: bp,
-								hadBasePath: true
-							}));
-							const isFilePathRequest = pathname.includes(".") && !pathname.endsWith(".html");
-							const isExistingPublicMutation = req.method !== "GET" && req.method !== "HEAD" && isExistingDevPublicFile(pathname);
-							let filePathMatchesPagesRoute = false;
-							const requestHostname = getUrlHostname(requestOrigin);
-							if (isFilePathRequest && !filePathMatchesRewrite && !isDataReq) {
-								const [pageRoutes, apiRoutes] = await Promise.all([pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher), apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)]);
-								const pageRouteUrl = nextConfig?.i18n ? resolvePagesI18nRequest(pathname, nextConfig.i18n, req.headers, requestHostname, bp, nextConfig.trailingSlash ?? false).url : pathname;
-								const apiRouteUrl = stripI18nLocaleForApiRoute(pathname, nextConfig?.i18n ?? null);
-								filePathMatchesPagesRoute = matchRoute(pageRouteUrl, pageRoutes) !== null || matchRoute(apiRouteUrl, apiRoutes) !== null;
-							}
-							if (isFilePathRequest && !isDataReq && !filePathMatchesRewrite && !filePathMatchesPagesRoute && !isNextStaticPath(pathname, "", assetPrefixPathname(nextConfig?.assetPrefix ?? "")) && !isExistingPublicMutation) return next();
-							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
+							const nodeRequestHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
-							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
 							if (revalidationHostname) nodeRequestHeaders.set("host", revalidationHostname);
-							for (const header of INTERNAL_HEADERS) delete req.headers[header];
-							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
 							const method = req.method ?? "GET";
 							const webRequest = new Request(new URL(routeUrl, requestOrigin), {
 								method,
@@ -3489,7 +3492,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									headers: nodeRequestHeaders,
 									signal: webRequest.signal
 								});
-								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname, opts.isStaleDataRequest, nextConfig?.skipTrailingSlashRedirect);
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname, opts.isStaleDataRequest, nextConfig?.skipTrailingSlashRedirect, opts.restoreLocaleRootTrailingSlash);
 								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
@@ -4120,6 +4123,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				nitroHostRuntime = nitro.options.exportConditions?.includes("workerd") ? "worker" : "node";
 				if (!nextConfig) return;
 				if (!hasAppDir && !hasPagesDir) return;
+				if (!nitro.options.dev) {
+					const requestTargetPlugin = resolveRuntimeEntryModule("nitro-request-target-plugin");
+					nitro.options.plugins ??= [];
+					if (!nitro.options.plugins.includes(requestTargetPlugin)) nitro.options.plugins.push(requestTargetPlugin);
+				}
 				nitroPublicFiles = registerNitroPublicFiles(nitro.options, NITRO_PUBLIC_FILES_PLUGIN, () => scanPublicFiles(root, nitroPublicDir));
 				if (resolvedServerExternalPackages.length > 0) nitro.options.traceDeps = [.../* @__PURE__ */ new Set([...nitro.options.traceDeps ?? [], ...resolvedServerExternalPackages])];
 			} }
@@ -4266,6 +4274,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						pagesClientAssetsModule = buildPagesClientAssetsModule({
 							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
 							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
+							appBootstrapPreloadModules: runtimeMetadata.appBootstrapPreloadModules,
 							appRouteManifestModule: runtimeMetadata.appRouteManifestModule,
 							appClientReferenceChunks: runtimeMetadata.appClientReferenceChunks,
 							ssrManifest,

package/dist/init-platform.js

@@ -148,9 +148,9 @@ async function resolveInitOptions(args, options = {}) {
 	if (name && platform !== "cloudflare") throw new Error("--name requires --platform=cloudflare.");
 	const explicitPrerender = parsePrerenderArg(args);
 	if (platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" && explicitPrerender === false) throw new Error("--no-prerender cannot be used with --cdn-cache=static-assets, which requires build-time prerendering.");
-	const supportsWarmCdnCache = platformOptions?.cdnCache === "response-store" || platformOptions?.cdnCache === "workers-cache";
+	const supportsWarmCdnCache = platformOptions?.cdnCache !== void 0 && platformOptions.cdnCache !== "none";
 	if (platform === "cloudflare" && !supportsWarmCdnCache) {
-		if (explicitWarmCdnCache === true) throw new Error("--warm-cache requires --cdn-cache=response-store or workers-cache.");
+		if (explicitWarmCdnCache === true) throw new Error("--warm-cache requires a cache: pass --cdn-cache=response-store, workers-cache, data-cache, or static-assets.");
 	}
 	const prerender = platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" ? false : explicitPrerender ?? await resolveInitPrerender(args, options, platform);
 	const warmCdnCache = platform === "cloudflare" && supportsWarmCdnCache ? await resolveInitWarmCdnCache(args, options) : false;

package/dist/init.js

@@ -1,8 +1,9 @@
 import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { detectPackageManager, detectPackageManagerName, detectProject, ensureESModule, findViteConfigPath, hasViteConfig, renameCJSConfigs } from "./utils/project.js";
 import { compactResourceName, cssModulesConfigSource, findConfigKeepingWorkerName, setupCloudflarePlatform, updateViteConfigForCssModules, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
-import { getReactUpgradeDeps } from "./utils/react-version.js";
+import { findPackageVersion, getReactUpgradeDeps } from "./utils/react-version.js";
 import { getPluginReactUpgradeDeps } from "./utils/plugin-react-version.js";
+import { createRequire } from "node:module";
 import fs from "node:fs";
 import { spawn, spawnSync } from "node:child_process";
 //#region src/init.ts
@@ -297,6 +298,26 @@ function addDependencyEntries(root, deps, { dev }) {
 	if (added.length > 0) fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
 	return added;
 }
+/** The spec in the manifest sections `isDepInstalled` reads. */
+function readDeclaredDependency(root, name) {
+	try {
+		const pkg = JSON.parse(fs.readFileSync(path.join(root, "package.json"), "utf-8"));
+		return pkg.dependencies?.[name] ?? pkg.devDependencies?.[name] ?? pkg.peerDependencies?.[name];
+	} catch {
+		return;
+	}
+}
+/** The declared spec, or the installed version of a package hoisted from elsewhere. */
+function readCurrentDependencyVersion(root, name) {
+	const declared = readDeclaredDependency(root, name);
+	if (declared !== void 0) return declared;
+	try {
+		const resolved = createRequire(path.join(root, "package.json")).resolve(name);
+		return findPackageVersion(resolved, name) ?? void 0;
+	} catch {
+		return;
+	}
+}
 /**
 * Check if react/react-dom need upgrading for react-server-dom-webpack compatibility.
 *
@@ -578,12 +599,20 @@ async function init(options) {
 	let dependencyInstallNeedsApproval = false;
 	const dependencyEntriesAdded = [];
 	const devDependencyEntriesAdded = [];
+	const upgradedFrom = /* @__PURE__ */ new Map();
+	const recordUpgrades = (deps) => {
+		for (const dep of deps) {
+			const { name } = parseDependencySpecifier(dep);
+			upgradedFrom.set(name, readCurrentDependencyVersion(root, name));
+		}
+	};
 	if (isApp) {
 		const reactUpgrade = shouldInstall ? [.../* @__PURE__ */ new Set([...getReactUpgradeDeps(root), ...getReactUpgradeDeps(root, {
 			fromManifest: true,
 			installing: true
 		})])] : getReactUpgradeDeps(root, { fromManifest: true });
 		if (reactUpgrade.length > 0) {
+			recordUpgrades(reactUpgrade);
 			console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Upgrading dependencies:"))}`);
 			console.log(formatList(reactUpgrade.map((dep) => dep.replace(/@latest$/, "")), "    "));
 			try {
@@ -601,6 +630,7 @@ async function init(options) {
 	}
 	const pluginReactUpgrade = getPluginReactUpgradeDeps(root);
 	if (pluginReactUpgrade.length > 0) {
+		recordUpgrades(pluginReactUpgrade);
 		console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Upgrading devDependencies:"))}`);
 		console.log(formatList(pluginReactUpgrade.map((dep) => dep.replace(/@latest$/, "")), "    "));
 		try {
@@ -654,13 +684,20 @@ async function init(options) {
 	if (pmName === "pnpm" && shouldInstall && !dependencyInstallNeedsApproval && !options._exec && hasAutomaticallyIgnoredBuilds(inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
 	else if (pmName === "pnpm" && shouldInstall && !dependencyInstallNeedsApproval && options._inspectPnpmIgnoredBuilds && hasAutomaticallyIgnoredBuilds(options._inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
 	console.log(`  ${terminalStyle.green(terminalStyle.bold("vinext init complete!"))}\n`);
-	if (dependencyEntriesAdded.length > 0) {
+	const addedDependencies = dependencyEntriesAdded.filter((name) => !upgradedFrom.has(name));
+	const addedDevDependencies = devDependencyEntriesAdded.filter((name) => !upgradedFrom.has(name));
+	if (addedDependencies.length > 0) {
 		console.log(`    ${terminalStyle.green("✓")} Added dependencies to dependencies:`);
-		console.log(formatList(dependencyEntriesAdded, "      "));
+		console.log(formatList(addedDependencies, "      "));
 	}
-	if (devDependencyEntriesAdded.length > 0) {
+	if (addedDevDependencies.length > 0) {
 		console.log(`    ${terminalStyle.green("✓")} Added dependencies to devDependencies:`);
-		console.log(formatList(devDependencyEntriesAdded, "      "));
+		console.log(formatList(addedDevDependencies, "      "));
+	}
+	for (const [name, from] of upgradedFrom) {
+		const to = readDeclaredDependency(root, name);
+		if (to === void 0 || to === from) continue;
+		console.log(`    ${terminalStyle.green("✓")} Upgraded ${name} ${from ?? "(not installed)"} \u2192 ${to}`);
 	}
 	if (dependencyInstallNeedsApproval) console.log(`    ${terminalStyle.yellow("!")} Dependency installation is waiting for build-script approval`);
 	if (addedTypeModule) console.log(`    ${terminalStyle.green("✓")} Added "type": "module" to package.json`);

package/dist/server/api-handler.js

@@ -186,10 +186,14 @@ function enhanceApiObjects(req, res, query, body, trustedRevalidateOrigin, allow
 			return this;
 		},
 		json(data) {
-			this.setHeader("Content-Type", "application/json");
+			this.setHeader("Content-Type", "application/json; charset=utf-8");
 			this.end(JSON.stringify(data));
 		},
 		send(data) {
+			if (data === null || data === void 0) {
+				this.end();
+				return;
+			}
 			if (this.statusCode === 204 || this.statusCode === 304) {
 				this.removeHeader("Content-Type");
 				this.removeHeader("Content-Length");
@@ -208,8 +212,8 @@ function enhanceApiObjects(req, res, query, body, trustedRevalidateOrigin, allow
 				this.end(data);
 				return;
 			}
-			if (typeof data === "object" && data !== null) {
-				this.setHeader("Content-Type", "application/json");
+			if (typeof data === "object" || typeof data === "number" || typeof data === "boolean") {
+				this.setHeader("Content-Type", "application/json; charset=utf-8");
 				this.end(JSON.stringify(data));
 			} else {
 				if (!this.getHeader("Content-Type")) this.setHeader("Content-Type", "text/plain");
@@ -259,11 +263,10 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 			const response = finalizeEdgeApiResponse(handlerResponse, "node");
 			res.statusCode = response.status;
 			res.statusMessage = response.statusText;
-			const setCookieHeaders = response.headers.getSetCookie();
 			response.headers.forEach((value, name) => {
 				if (name !== "set-cookie") res.setHeader(name, value);
 			});
-			if (setCookieHeaders.length) res.setHeader("set-cookie", setCookieHeaders);
+			for (const cookie of response.headers.getSetCookie()) res.appendHeader("set-cookie", cookie);
 			await writeEdgeApiResponseBody(res, response.body, nextRequest.signal);
 			return true;
 		}

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

@@ -1,8 +1,5 @@
-import { addBasePathToPathname, stripBasePath } from "../utils/base-path.js";
 import { VINEXT_MOUNTED_LAYOUTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
-import { splitPathnameForRouteMatch } from "../routing/utils.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
-import { matchRoutePattern } from "../routing/route-pattern.js";
 import { installWindowNext, setWindowNextInternalSourcePage } from "../client/window-next.js";
 import { retryScrollTo, scrollToHashTargetOnNextFrame } from "../shims/hash-scroll.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, formatRscRequestPath, isRscCompatibilityIdCompatible } from "./app-rsc-cache-busting.js";
@@ -10,36 +7,36 @@ import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners }
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
 import { createNavigationRuntimeRouteManifestLoader, getNavigationRuntime, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
+import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
+import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
+import { getBfcacheIdMapContext, getNavigationContext, setNavigationContext } from "../shims/navigation-context-state.js";
+import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
-import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
-import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
 import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
 import { isExternalHistoryState, readHistoryStateActiveRoutePaths, readHistoryStatePreviousNextUrl, resolveActiveRoutePaths } from "./app-history-state.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
 import { stripRscCompletionMetadataResponse } from "./rsc-completion-metadata.js";
 import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
 import { navigationPlanner } from "./navigation-planner.js";
-import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
-import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { getBfcacheIdMapContext, getNavigationContext, setNavigationContext } from "../shims/navigation-context-state.js";
 import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, activateNavigationSnapshot, appRouterInstance, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidateDynamicPrefetchCache, invalidatePrefetchCache, invalidateVisitedResponsePrefetches, parseRenderedPathAndSearchHeader, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, trackAppRouterNavigationInFlight, useRouter } from "../shims/navigation.js";
-import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
+import { BfcacheIdentityMapContext, bindAppElementsRenderedSearch, isBfcacheIdentityRetained, setAppElementsRenderedSearch } from "../shims/slot.js";
+import DefaultGlobalError from "../shims/default-global-error.js";
+import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
+import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
+import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
 import { createMountedLayoutsHeader, holdsSkippedLayouts } from "./app-mounted-layouts.js";
-import { BfcacheIdentityMapContext, bindAppElementsRenderedSearch, isBfcacheIdentityRetained, setAppElementsRenderedSearch } from "../shims/slot.js";
 import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch, navigateDocumentDirectly } from "./app-browser-navigation-controller.js";
 import { createAppRouteTree } from "./app-route-tree.js";
 import { shouldRecoverSamePathSearchCommitOnResponseCompletion } from "./app-browser-navigation-response.js";
-import { createSupplementalRefreshCoordinator, mergeRefreshedParallelSlot, requireCompleteSupplementalRefresh, resolvePersistedSourcePageRefreshes, resolveServerActionSupplementalRefresh, resolveSupplementalRefreshes } from "./app-browser-supplemental-refresh.js";
+import { createSupplementalRefreshCoordinator, mergeRefreshedParallelSlot, requireCompleteSupplementalRefresh, resolvePersistedRefreshInterceptions, resolvePersistedSourcePageRefreshes, resolveServerActionSupplementalRefresh, resolveSupplementalRefreshes } from "./app-browser-supplemental-refresh.js";
 import { createAppBrowserNavigationAbortCoordinator } from "./app-browser-navigation-abort.js";
 import { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition, resolveFetchedHydrationLocation } from "./app-browser-hydration.js";
 import { AppBrowserHistoryController } from "./app-browser-history-controller.js";
 import { createVisitedResponseCacheEntry, deleteAllVisitedResponseCacheEntries, deleteVisitedResponseCacheEntry, findVisitedResponseCacheEntry, findVisitedResponseForFullPrefetch, hasNavigationResponseHistoryLifetime, isVisitedResponseCacheEntryFresh, revokeHistoryRestoreNavigationReuse } from "./app-visited-response-cache.js";
 import { createPopstateRestoreHandler, restoreSynchronousPopstateScrollPosition, shouldCommitPopstateUrlWithoutNavigation } from "./app-browser-popstate.js";
-import DefaultGlobalError from "../shims/default-global-error.js";
-import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
 import { createDevOnCaughtError, createOnUncaughtError, createProdOnCaughtError, createProdOnRecoverableError } from "./app-browser-error.js";
 import { createHydrationCachePublication } from "./app-hydration-cache-publication.js";
 import { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl } from "./app-browser-prefetch-response.js";
@@ -47,8 +44,8 @@ import { canCommitOptimisticRouteTemplate, createOptimisticRouteTemplate, create
 import { removeStylesheetLinksCoveredByInlineCss } from "./app-inline-css-client.js";
 import { Fragment, createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { createRoot, hydrateRoot } from "react-dom/client";
-import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { flushSync } from "react-dom";
+import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hasServerActions, loadServerActionClient } from "virtual:vinext-app-capabilities";
 //#region src/server/app-browser-entry.ts
 const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";
@@ -278,36 +275,6 @@ function clearDynamicClientNavigationCaches() {
 	optimisticRouteTemplates.clear();
 	historyController.invalidateRestorableClientState();
 }
-function getMatchedUrlPathname(matchedUrl) {
-	return new URL(matchedUrl, "https://vinext.local").pathname;
-}
-function resolvePersistedRefreshInterceptions(state, routeManifest, refreshUrl, requestInterceptionContext) {
-	if (routeManifest === null) return [];
-	const refreshPathname = stripBasePath(refreshUrl.pathname, __basePath);
-	const refreshPathParts = splitPathnameForRouteMatch(refreshPathname);
-	const resolved = [];
-	for (const binding of state.slotBindings) {
-		if (binding.state !== "active" || !binding.activeRouteId) continue;
-		if (!binding.interceptionId || !binding.interceptionSourceMatchedUrl) continue;
-		const activeRoute = AppElementsWire.parseElementKey(binding.activeRouteId);
-		if (activeRoute?.kind !== "route") continue;
-		const match = routeManifest.segmentGraph.interceptions.get(binding.interceptionId);
-		if (!match) continue;
-		const retainedInterception = state.interception?.slotId === binding.slotId && matchRoutePattern(splitPathnameForRouteMatch(getMatchedUrlPathname(state.interception.targetMatchedUrl)), match.targetPatternParts) !== null ? state.interception : null;
-		const targetPathname = retainedInterception?.targetMatchedUrl ?? activeRoute.path;
-		const targetParts = splitPathnameForRouteMatch(getMatchedUrlPathname(targetPathname));
-		if (requestInterceptionContext !== null && state.interception?.slotId === binding.slotId && matchRoutePattern(refreshPathParts, match.targetPatternParts) !== null && matchRoutePattern(targetParts, match.targetPatternParts) !== null) continue;
-		const targetUrl = new URL(targetPathname, refreshUrl);
-		targetUrl.pathname = addBasePathToPathname(targetUrl.pathname, __basePath);
-		targetUrl.search = refreshUrl.search;
-		resolved.push({
-			interception: match,
-			interceptionContext: retainedInterception?.sourceMatchedUrl ?? binding.interceptionSourceMatchedUrl,
-			targetPathname: `${targetUrl.pathname}${targetUrl.search}`
-		});
-	}
-	return resolved;
-}
 async function fetchPersistedInterceptedSlotRefresh(options) {
 	const headers = createRscRequestHeaders({
 		interceptionContext: options.interceptionContext,
@@ -482,7 +449,13 @@ async function commitSameUrlNavigatePayload(nextElements, actionInitiation, retu
 	if (revalidation !== "none" && routeManifestLoaded) {
 		const refreshUrl = new URL(actionInitiation.href);
 		const requestInterceptionContext = resolveInterceptionContextFromPreviousNextUrl(actionInitiation.routerState.previousNextUrl, __basePath);
-		const persistedInterceptions = resolvePersistedRefreshInterceptions(actionInitiation.routerState, getBrowserRouteManifest(), refreshUrl, requestInterceptionContext);
+		const persistedInterceptions = resolvePersistedRefreshInterceptions({
+			basePath: __basePath,
+			refreshUrl,
+			requestInterceptionContext,
+			routeManifest: getBrowserRouteManifest(),
+			state: actionInitiation.routerState
+		});
 		const sourcePageRefreshes = resolvePersistedSourcePageRefreshes({
 			basePath: __basePath,
 			refreshUrl,
@@ -1094,7 +1067,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 	const formState = consumeInitialFormState(getVinextBrowserGlobal());
 	const hydrateRootOptions = import.meta.env.DEV && devErrorOverlay ? createVinextHydrateRootOptions({
 		formState,
-		onCaughtError: invalidateOnCaughtError(createDevOnCaughtError(devErrorOverlay.devOnCaughtError, onUncaughtError)),
+		onCaughtError: invalidateOnCaughtError(createDevOnCaughtError(devErrorOverlay.devOnCaughtError, onUncaughtError, devErrorOverlay.reportRootErrorBoundaryCatch)),
 		onUncaughtError
 	}) : createVinextHydrateRootOptions({
 		formState,
@@ -1195,7 +1168,13 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 					const requestInterceptionContext = requestState.interceptionContext;
 					const requestPreviousNextUrl = requestState.previousNextUrl;
 					const shouldSupplementVisibleBranches = navigationKind === "refresh" || navigationKind === "traverse" && !reuseCurrentBfcacheIds;
-					const persistedRefreshInterceptions = navigationKind === "refresh" ? resolvePersistedRefreshInterceptions(navigationInitiationState, getBrowserRouteManifest(), url, requestInterceptionContext) : [];
+					const persistedRefreshInterceptions = navigationKind === "refresh" ? resolvePersistedRefreshInterceptions({
+						basePath: __basePath,
+						refreshUrl: url,
+						requestInterceptionContext,
+						routeManifest: getBrowserRouteManifest(),
+						state: navigationInitiationState
+					}) : [];
 					const persistedSourcePageRefreshes = shouldSupplementVisibleBranches ? resolvePersistedSourcePageRefreshes({
 						activeRoutePaths: navigationKind === "traverse" ? readHistoryStateActiveRoutePaths(activeTraversalIntent?.historyState) ?? [] : void 0,
 						basePath: __basePath,

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

@@ -8,7 +8,7 @@ export declare function createOnUncaughtError(options?: {
   coerceToError?: boolean;
 }): HydrateRootErrorHandler;
 export declare function createProdOnCaughtError(onImplicitRootError: HydrateRootErrorHandler): HydrateRootErrorHandler;
-export declare function createDevOnCaughtError(onCaughtError: HydrateRootErrorHandler, onImplicitRootError: HydrateRootErrorHandler): HydrateRootErrorHandler;
+export declare function createDevOnCaughtError(onCaughtError: HydrateRootErrorHandler, onImplicitRootError: HydrateRootErrorHandler, onRootErrorBoundaryCatch?: () => void): HydrateRootErrorHandler;
 export declare function createProdOnRecoverableError(onReportedError: () => void): (error: unknown) => void;
 //#endregion
 export {};

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

@@ -2,10 +2,18 @@ import { isUnknownRecord } from "../utils/record.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { isBailoutToCSRError } from "../shims/navigation-errors.js";
 //#region src/server/app-browser-error.ts
-function isImplicitRootErrorBoundary(errorInfo) {
-	if (!isUnknownRecord(errorInfo.errorBoundary)) return false;
+function getErrorBoundaryProps(errorInfo) {
+	if (!isUnknownRecord(errorInfo.errorBoundary)) return {};
 	const props = errorInfo.errorBoundary.props;
-	return isUnknownRecord(props) && props.isImplicitRootErrorBoundary === true;
+	return isUnknownRecord(props) ? props : {};
+}
+function isImplicitRootErrorBoundary(errorInfo) {
+	return getErrorBoundaryProps(errorInfo).isImplicitRootErrorBoundary === true;
+}
+function isRootErrorBoundary(errorInfo) {
+	const props = getErrorBoundaryProps(errorInfo);
+	if (props.isGlobalErrorBoundary === true) return true;
+	return props.isImplicitRootErrorBoundary === true && props.wrapsGlobalErrorBoundary !== true;
 }
 function logCaughtError(error, errorInfo) {
 	console.error(error);
@@ -38,8 +46,9 @@ function createProdOnCaughtError(onImplicitRootError) {
 		logCaughtError(error, errorInfo);
 	};
 }
-function createDevOnCaughtError(onCaughtError, onImplicitRootError) {
+function createDevOnCaughtError(onCaughtError, onImplicitRootError, onRootErrorBoundaryCatch) {
 	return (error, errorInfo) => {
+		if (!isNavigationSignalError(error) && isRootErrorBoundary(errorInfo)) onRootErrorBoundaryCatch?.();
 		if (isImplicitRootErrorBoundary(errorInfo)) {
 			onImplicitRootError(error, errorInfo);
 			return;

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

@@ -1,10 +1,10 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { withBasePath } from "../shims/url-utils.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
-import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
-import { resolveActiveRoutePaths } from "./app-history-state.js";
 import { claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
+import { resolveActiveRoutePaths } from "./app-history-state.js";
 import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
+import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit, createPendingNavigationCommitFromElements } 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-server-action-client.js

@@ -2,11 +2,11 @@ import { hasBasePath } from "../utils/base-path.js";
 import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
 import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createServerActionRequestUrl, toPathAbsolutePathname } from "./app-rsc-cache-busting.js";
-import { throwOnServerActionNotFound } from "./server-action-not-found.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult, shouldSyncServerActionHttpFallbackHead } from "./app-browser-action-result.js";
 import { parseRenderedPathAndSearchHeader } from "../shims/navigation.js";
+import { throwOnServerActionNotFound } from "./server-action-not-found.js";
+import { createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult, shouldSyncServerActionHttpFallbackHead } from "./app-browser-action-result.js";
 import { resolveServerActionRequestState } from "./app-browser-state.js";
 import { applyServerActionResultDecision } from "./app-browser-server-action-navigation.js";
 import { createFromFetch, createTemporaryReferenceSet, encodeReply } from "@vitejs/plugin-rsc/browser";

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

@@ -6,15 +6,15 @@ import { normalizePath } from "./normalize-path.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
-import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
 import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
 import { createSnapshotPathAndSearch } from "../shims/navigation.js";
+import { bindAppElementsRenderedSearch } from "../shims/slot.js";
+import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { holdsSkippedLayouts } from "./app-mounted-layouts.js";
 import { createCacheEntryReuseProof } from "./cache-proof.js";
-import { bindAppElementsRenderedSearch } from "../shims/slot.js";
 //#region src/server/app-browser-state.ts
 const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "committed-cache" };
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };