@qzsy/vinext 0.1.12 → 0.1.81

package/dist/shims/router.js

@@ -1,22 +1,23 @@
 import { splitPathSegments } from "../routing/utils.js";
 import { removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
-import { fillRoutePatternSegments, matchRoutePattern, routePatternParts } from "../routing/route-pattern.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { RouterContext } from "./internal/router-context.js";
 import { applyVinextLocaleGlobals, extractVinextNextDataJson, parseVinextNextDataJson } from "../client/vinext-next-data.js";
 import { isValidModulePath } from "../client/validate-module-path.js";
 import { addLocalePrefix, getDomainLocaleUrl, getLocalePathPrefix } from "../utils/domain-locale.js";
+import { fillRoutePatternSegments, matchRoutePattern, routePatternParts } from "../routing/route-pattern.js";
 import { buildPagesDataHref } from "./internal/pages-data-url.js";
 import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../utils/deployment-id.js";
 import { dedupedPagesDataFetch } from "./internal/pages-data-fetch-dedup.js";
 import { prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
-import { addQueryParam, appendSearchParamsToUrl, mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
-import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
-import { getPagesRouterComponentsMap, markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
+import { getPagesRouterComponentsMap } from "./internal/pages-router-components.js";
+import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
+import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-route-owner-direct.js";
 import { installWindowNext } from "../client/window-next.js";
 import { getWindowOrigin, isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
+import { addQueryParam, appendSearchParamsToUrl, mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { scrollToHashTarget } from "./hash-scroll.js";
 import { installPagesRouterRuntime, setPagesRouterPopStateHandler, setStampInitialHistoryState } from "./pages-router-runtime.js";
 import { interpolateDynamicRouteHref } from "./internal/interpolate-as.js";
@@ -186,6 +187,7 @@ function createPagesRouterRuntimeState() {
 		activeAbortController: null,
 		cancelPendingRenderCommit: null,
 		lastPathnameAndSearch: typeof window !== "undefined" ? window.location.pathname + window.location.search : "",
+		lastHash: typeof window !== "undefined" ? window.location.hash : "",
 		isFirstPopStateEvent: true,
 		routerDidNavigate: false,
 		deprecatedEventBridgeInstalled: false,
@@ -941,6 +943,7 @@ async function navigateClientData(url, initialTarget, controller, navId, assertS
 		if (!redirectedUrl) scheduleHardNavigationAndThrow(softRedirect, "Navigation redirected externally");
 		window.history.replaceState(window.history.state ?? {}, "", redirectedUrl);
 		routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+		routerRuntimeState.lastHash = window.location.hash;
 		await navigateClientHtml(redirectedUrl, redirectedUrl, controller, navId, assertStillCurrent);
 		return;
 	}
@@ -1099,6 +1102,7 @@ async function navigateClientHtml(url, fetchUrl, controller, navId, assertStillC
 	if (pendingRedirectHistoryUrl) {
 		window.history.replaceState(window.history.state ?? {}, "", pendingRedirectHistoryUrl);
 		routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+		routerRuntimeState.lastHash = window.location.hash;
 	}
 	window.__NEXT_DATA__ = nextData;
 	applyVinextLocaleGlobals(window, nextData);
@@ -1138,8 +1142,8 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 			let htmlFetchUrl = fetchUrl;
 			let dataTarget = resolvePagesDataNavigationTarget(routeUrl, __basePath);
 			let middlewareDataResponse;
-			if (!dataTarget) {
-				let middlewareEffect;
+			let middlewareEffect = null;
+			if (hasVinextMiddleware(window.__NEXT_DATA__)) {
 				try {
 					middlewareEffect = await resolveMiddlewareDataEffect(browserUrl, controller.signal);
 				} catch (err) {
@@ -1147,18 +1151,19 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 					throw err;
 				}
 				assertStillCurrent();
-				const redirectLocation = middlewareEffect?.redirectLocation ?? null;
-				if (redirectLocation) {
-					const redirectedUrl = resolveLocalRedirectUrl(redirectLocation);
-					if (!redirectedUrl) scheduleHardNavigationAndThrow(redirectLocation, "Navigation redirected externally");
-					window.history.replaceState(window.history.state ?? {}, "", redirectedUrl);
-					routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
-					browserUrl = redirectedUrl;
-					htmlFetchUrl = redirectedUrl;
-				} else if (middlewareEffect?.rewriteTarget) {
-					dataTarget = resolvePagesDataNavigationTarget(middlewareEffect.rewriteTarget, __basePath);
-					if (dataTarget) middlewareDataResponse = middlewareEffect.response;
-				}
+			}
+			const redirectLocation = middlewareEffect?.redirectLocation ?? null;
+			if (redirectLocation) {
+				const redirectedUrl = resolveLocalRedirectUrl(redirectLocation);
+				if (!redirectedUrl) scheduleHardNavigationAndThrow(redirectLocation, "Navigation redirected externally");
+				window.history.replaceState(window.history.state ?? {}, "", redirectedUrl);
+				routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+				routerRuntimeState.lastHash = window.location.hash;
+				browserUrl = redirectedUrl;
+				htmlFetchUrl = redirectedUrl;
+			} else if (middlewareEffect) {
+				if (middlewareEffect.rewriteTarget || routeUrl === url) middlewareDataResponse = middlewareEffect.response;
+				if (!dataTarget && middlewareEffect.rewriteTarget) dataTarget = resolvePagesDataNavigationTarget(middlewareEffect.rewriteTarget, __basePath);
 			}
 			if (dataTarget) await navigateClientData(browserUrl, dataTarget, controller, navId, assertStillCurrent, options, middlewareDataResponse);
 			else await navigateClientHtml(browserUrl, htmlFetchUrl, controller, navId, assertStillCurrent, options);
@@ -1263,6 +1268,7 @@ function updateHistory(mode, fullUrl, navState) {
 	else window.history.replaceState(state, "", fullUrl);
 	routerRuntimeState.currentHistoryKey = key;
 	routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+	routerRuntimeState.lastHash = window.location.hash;
 	routerRuntimeState.routerDidNavigate = true;
 }
 function createHistoryKey() {
@@ -1386,7 +1392,14 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 	const appPath = getLocalPathname(resolved);
 	const appPathNorm = appPath !== null ? removeTrailingSlash(appPath) : null;
 	const appPathEntry = appPathNorm !== null ? getPagesRouterComponentsMap()[appPathNorm] : void 0;
-	if (appPathEntry !== void 0 && "__appRouter" in appPathEntry && appPathEntry.__appRouter || ["app", "document"].includes(resolveHybridClientRouteOwner(resolved, __basePath) ?? "")) {
+	if (appPathEntry !== void 0 && "__appRouter" in appPathEntry && appPathEntry.__appRouter) {
+		if (mode === "push") window.location.assign(full);
+		else window.location.replace(full);
+		return new Promise(() => {});
+	}
+	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
+	const hybridOwner = rewrites && (rewrites.beforeFiles.length > 0 || rewrites.afterFiles.length > 0 || rewrites.fallback.length > 0) ? (await import("./internal/hybrid-client-route-owner.js")).resolveHybridClientRouteOwner(resolved, __basePath) : resolveDirectHybridClientRouteOwner(resolved, __basePath);
+	if (["app", "document"].includes(hybridOwner ?? "")) {
 		if (mode === "push") window.location.assign(full);
 		else window.location.replace(full);
 		return new Promise(() => {});
@@ -1434,7 +1447,7 @@ async function prefetchUrl(url) {
 		prefetchPagesData(dataTarget);
 		return;
 	}
-	markAppRouteDetectedOnPrefetch(url, __basePath);
+	await markAppRouteDetectedOnPrefetch(url, __basePath);
 	const link = document.createElement("link");
 	link.rel = "prefetch";
 	link.href = url;
@@ -1519,6 +1532,10 @@ function getRouterStateKey(state) {
 	if (!isNextRouterState(state)) return void 0;
 	return typeof state.key === "string" ? state.key : void 0;
 }
+function getTrackedPagesRouterAsPath() {
+	const trackedUrl = new URL(routerRuntimeState.lastPathnameAndSearch, window.location.href);
+	return removeNavigationLocalePrefix(stripBasePath(trackedUrl.pathname, __basePath) + trackedUrl.search);
+}
 function handlePagesRouterPopState(e) {
 	const browserUrl = window.location.pathname + window.location.search;
 	const appUrl = stripBasePath(window.location.pathname, __basePath) + window.location.search;
@@ -1528,9 +1545,10 @@ function handlePagesRouterPopState(e) {
 	if (state !== null && state !== void 0 && !isNextRouterState(state)) return;
 	if (wasFirst && !routerRuntimeState.routerDidNavigate && isNextRouterState(state)) {
 		const currentLocale = window.__VINEXT_LOCALE__;
-		if (state.options?.locale === currentLocale && typeof state.as === "string" && withBasePath(state.as, __basePath) === routerRuntimeState.lastPathnameAndSearch) return;
+		if (state.options?.locale === currentLocale && typeof state.as === "string" && state.as === getTrackedPagesRouterAsPath()) return;
 	}
-	const isHashOnly = browserUrl === routerRuntimeState.lastPathnameAndSearch;
+	const currentHash = window.location.hash;
+	const isHashOnly = browserUrl === routerRuntimeState.lastPathnameAndSearch && (currentHash !== routerRuntimeState.lastHash || currentHash !== "");
 	const targetKey = getRouterStateKey(state);
 	let forcedScroll;
 	if (manualScrollRestoration) {
@@ -1555,6 +1573,7 @@ function handlePagesRouterPopState(e) {
 	}
 	if (targetKey !== void 0) routerRuntimeState.currentHistoryKey = targetKey;
 	routerRuntimeState.lastPathnameAndSearch = browserUrl;
+	routerRuntimeState.lastHash = currentHash;
 	if (isHashOnly) {
 		const hashUrl = appUrl + window.location.hash;
 		routerEvents.emit("hashChangeStart", hashUrl, { shallow: false });

package/dist/shims/server.js

@@ -1,7 +1,8 @@
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { getRequestExecutionContext } from "./request-context.js";
-import { MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER } from "../server/headers.js";
-import { encodeMiddlewareRequestHeaders } from "../server/middleware-request-headers.js";
+import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
+import { MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER } from "../server/headers.js";
+import { encodeMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
 import { serializeSetCookie, validateCookieName } from "./internal/cookie-serialize.js";
 import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";

package/dist/typegen.js

@@ -1,5 +1,6 @@
 import { findDir } from "./utils/project.js";
 import { decodeRouteSegment, isInvisibleSegment } from "./routing/utils.js";
+import { normalizePathSeparators } from "./utils/path.js";
 import { patternToNextFormat } from "./routing/route-validation.js";
 import { compareStrings } from "./utils/compare.js";
 import "./routing/app-route-graph.js";
@@ -15,17 +16,17 @@ import "./.next/types/routes.d.ts";
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
 `;
 async function generateRouteTypes(options) {
-	const root = path.resolve(options.root);
-	const appDir = options.appDir ? path.resolve(options.appDir) : findDir(root, "app", path.join("src", "app"));
-	const outPath = path.join(root, ".next", "types", "routes.d.ts");
+	const root = normalizePathSeparators(path.resolve(options.root));
+	const appDir = options.appDir ? normalizePathSeparators(path.resolve(options.appDir)) : findDir(root, "app", "src/app");
+	const outPath = path.posix.join(root, ".next", "types", "routes.d.ts");
 	const content = appDir ? renderRouteTypes(await collectRouteTypeModel(appDir, options.pageExtensions)) : renderRouteTypes(emptyRouteTypeModel());
-	await fs.mkdir(path.dirname(outPath), { recursive: true });
+	await fs.mkdir(path.posix.dirname(outPath), { recursive: true });
 	await fs.writeFile(outPath, content, "utf-8");
 	await ensureNextEnvFile(root);
 	return outPath;
 }
 async function ensureNextEnvFile(root) {
-	const envPath = path.join(root, "next-env.d.ts");
+	const envPath = path.posix.join(root, "next-env.d.ts");
 	try {
 		await fs.writeFile(envPath, NEXT_ENV_FILE_CONTENT, {
 			encoding: "utf-8",

package/dist/utils/client-runtime-metadata.d.ts

@@ -1,6 +1,7 @@
 //#region src/utils/client-runtime-metadata.d.ts
 type ClientRuntimeMetadata = {
   clientEntryFile?: string;
+  appBootstrapPreinitModules?: string[];
   lazyChunks?: string[];
   dynamicPreloads?: Record<string, string[]>;
 };
@@ -24,22 +25,5 @@ declare function computeClientRuntimeMetadata(opts: {
   assetPrefix: string;
   includeClientEntry?: boolean | "pages-client-entry";
 }): ClientRuntimeMetadata;
-/**
- * Serialize runtime metadata into the `globalThis.__VINEXT_*` assignment script
- * that the Cloudflare `closeBundle` hook prepends to the worker entry. Returns
- * `""` when there is nothing to inject.
- *
- * Both the App Router and Pages Router closeBundle paths call this (and the
- * deploy tests mirror it), so the injection shape stays in one place. The caller
- * decides which fields to pass — e.g. App Router only forwards `clientEntryFile`
- * for mixed app+pages builds (where `computeClientRuntimeMetadata` was asked for
- * the Pages client entry); pure App Router leaves it undefined.
- */
-declare function buildRuntimeGlobalsScript(input: {
-  clientEntryFile?: string | null;
-  ssrManifest?: Record<string, string[]> | null;
-  lazyChunks?: string[] | null;
-  dynamicPreloads?: Record<string, string[]> | null;
-}): string;
 //#endregion
-export { buildRuntimeGlobalsScript, computeClientRuntimeMetadata };
+export { computeClientRuntimeMetadata };

package/dist/utils/client-runtime-metadata.js

@@ -1,10 +1,34 @@
-import { resolveAssetsDir } from "./asset-prefix.js";
+import { isAbsoluteAssetPrefix, resolveAssetsDir } from "./asset-prefix.js";
 import { manifestFileWithAssetPrefix, manifestFileWithBase } from "./manifest-paths.js";
 import { findClientEntryFile, findPagesClientEntryFile, readClientBuildManifest } from "./client-build-manifest.js";
 import { findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest } from "./client-entry-manifest.js";
 import { computeDynamicImportPreloads, computeLazyChunks, dynamicImportPreloadsWithBase } from "./lazy-chunks.js";
 import path from "node:path";
 //#region src/utils/client-runtime-metadata.ts
+function collectAppBootstrapPreinitModules(buildManifest, appBrowserEntry, applyBase) {
+	if (!appBrowserEntry) return void 0;
+	const entryKey = Object.keys(buildManifest).find((key) => buildManifest[key].file === appBrowserEntry);
+	if (!entryKey) return void 0;
+	const modules = [];
+	const seenFiles = /* @__PURE__ */ new Set();
+	const visitedChunks = /* @__PURE__ */ new Set();
+	function visit(key) {
+		if (visitedChunks.has(key)) return;
+		visitedChunks.add(key);
+		const chunk = buildManifest[key];
+		if (!chunk) return;
+		for (const importedKey of chunk.imports ?? []) {
+			const importedChunk = buildManifest[importedKey];
+			if (importedChunk?.file.endsWith(".js") && !seenFiles.has(importedChunk.file)) {
+				seenFiles.add(importedChunk.file);
+				modules.push(applyBase(importedChunk.file));
+			}
+			visit(importedKey);
+		}
+	}
+	visit(entryKey);
+	return modules.length > 0 ? modules : void 0;
+}
 /**
 * Read the client build manifest and compute runtime metadata used by
 * Cloudflare worker entry injection and Node production server startup.
@@ -21,9 +45,9 @@ import path from "node:path";
 */
 function computeClientRuntimeMetadata(opts) {
 	const buildManifest = readClientBuildManifest(path.join(opts.clientDir, ".vite", "manifest.json"));
+	const clientEntryManifest = readClientEntryManifest(opts.clientDir);
 	const metadata = {};
 	if (opts.includeClientEntry) {
-		const clientEntryManifest = readClientEntryManifest(opts.clientDir);
 		const entryOptions = {
 			buildManifest,
 			clientDir: opts.clientDir,
@@ -34,30 +58,15 @@ function computeClientRuntimeMetadata(opts) {
 		if (entry) metadata.clientEntryFile = entry;
 	}
 	if (!buildManifest) return metadata;
+	metadata.appBootstrapPreinitModules = collectAppBootstrapPreinitModules(buildManifest, clientEntryManifest?.appBrowserEntry, (file) => {
+		const url = manifestFileWithAssetPrefix(file, opts.assetBase, opts.assetPrefix);
+		return isAbsoluteAssetPrefix(opts.assetPrefix) ? url : "/" + url;
+	});
 	const lazyChunks = computeLazyChunks(buildManifest).map((file) => manifestFileWithBase(file, opts.assetBase));
 	if (lazyChunks.length > 0) metadata.lazyChunks = lazyChunks;
 	const dynamicPreloads = dynamicImportPreloadsWithBase(computeDynamicImportPreloads(buildManifest), (file) => manifestFileWithAssetPrefix(file, opts.assetBase, opts.assetPrefix));
 	if (Object.keys(dynamicPreloads).length > 0) metadata.dynamicPreloads = dynamicPreloads;
 	return metadata;
 }
-/**
-* Serialize runtime metadata into the `globalThis.__VINEXT_*` assignment script
-* that the Cloudflare `closeBundle` hook prepends to the worker entry. Returns
-* `""` when there is nothing to inject.
-*
-* Both the App Router and Pages Router closeBundle paths call this (and the
-* deploy tests mirror it), so the injection shape stays in one place. The caller
-* decides which fields to pass — e.g. App Router only forwards `clientEntryFile`
-* for mixed app+pages builds (where `computeClientRuntimeMetadata` was asked for
-* the Pages client entry); pure App Router leaves it undefined.
-*/
-function buildRuntimeGlobalsScript(input) {
-	const globals = [];
-	if (input.clientEntryFile) globals.push(`globalThis.__VINEXT_CLIENT_ENTRY__ = ${JSON.stringify(input.clientEntryFile)};`);
-	if (input.ssrManifest && Object.keys(input.ssrManifest).length > 0) globals.push(`globalThis.__VINEXT_SSR_MANIFEST__ = ${JSON.stringify(input.ssrManifest)};`);
-	if (input.lazyChunks && input.lazyChunks.length > 0) globals.push(`globalThis.__VINEXT_LAZY_CHUNKS__ = ${JSON.stringify(input.lazyChunks)};`);
-	if (input.dynamicPreloads && Object.keys(input.dynamicPreloads).length > 0) globals.push(`globalThis.__VINEXT_DYNAMIC_PRELOADS__ = ${JSON.stringify(input.dynamicPreloads)};`);
-	return globals.join("\n");
-}
 //#endregion
-export { buildRuntimeGlobalsScript, computeClientRuntimeMetadata };
+export { computeClientRuntimeMetadata };

package/dist/utils/dev-stack-sourcemap-endpoint.d.ts

@@ -0,0 +1,4 @@
+//#region src/utils/dev-stack-sourcemap-endpoint.d.ts
+declare const VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT = "/__vinext_original-stack-trace";
+//#endregion
+export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };

package/dist/{server → utils}/dev-stack-sourcemap-endpoint.js

@@ -1,4 +1,4 @@
-//#region src/server/dev-stack-sourcemap-endpoint.ts
+//#region src/utils/dev-stack-sourcemap-endpoint.ts
 const VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT = "/__vinext_original-stack-trace";
 //#endregion
 export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };

package/dist/utils/domain-locale.d.ts

@@ -1,7 +1,10 @@
-import { NextI18nConfig } from "../config/next-config.js";
-
 //#region src/utils/domain-locale.d.ts
-type DomainLocale = NonNullable<NextI18nConfig["domains"]>[number];
+type DomainLocale = {
+  domain: string;
+  defaultLocale: string;
+  locales?: string[];
+  http?: boolean;
+};
 declare function normalizeDomainHostname(hostname: string | null | undefined): string | undefined;
 /**
  * Match a configured domain either by hostname or locale.

package/dist/{server → utils}/middleware-request-headers.d.ts

@@ -1,4 +1,4 @@
-//#region src/server/middleware-request-headers.d.ts
+//#region src/utils/middleware-request-headers.d.ts
 type MiddlewareHeaderValue = string | string[];
 type MiddlewareHeaderSource = Headers | Record<string, MiddlewareHeaderValue>;
 type BuildRequestHeadersOptions = {

package/dist/{server → utils}/middleware-request-headers.js

@@ -1,5 +1,5 @@
-import { MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX } from "./headers.js";
-//#region src/server/middleware-request-headers.ts
+import { MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX } from "./protocol-headers.js";
+//#region src/utils/middleware-request-headers.ts
 const CREDENTIAL_REQUEST_HEADERS = ["authorization", "cookie"];
 function getMiddlewareHeaderValue(source, key) {
 	if (source instanceof Headers) return source.get(key);

package/dist/utils/path.d.ts

@@ -1,4 +1,5 @@
 //#region src/utils/path.d.ts
+declare const isWindows: boolean;
 /**
  * Convert Windows-style backslash path separators to forward slashes.
  *
@@ -19,4 +20,4 @@ declare function stripViteModuleQuery(id: string): string;
  *  files like `headers.js.ts`. */
 declare function stripJsExtension(name: string): string;
 //#endregion
-export { normalizePathSeparators, stripJsExtension, stripViteModuleQuery };
+export { isWindows, normalizePathSeparators, stripJsExtension, stripViteModuleQuery };

package/dist/utils/path.js

@@ -27,4 +27,4 @@ function stripJsExtension(name) {
 	return name.endsWith(".js") ? name.slice(0, -3) : name;
 }
 //#endregion
-export { normalizePathSeparators, stripJsExtension, stripViteModuleQuery };
+export { isWindows, normalizePathSeparators, stripJsExtension, stripViteModuleQuery };

package/dist/utils/project.d.ts

@@ -62,15 +62,23 @@ declare function findInNodeModules(start: string, subPath: string): string | nul
  * Check if a vite.config file exists in the project root.
  */
 declare function hasViteConfig(root: string): boolean;
+/** Return the config file Vite will load, using Vite's default precedence. */
+declare function findViteConfigPath(root: string): string | undefined;
 /**
  * Return the first candidate directory (resolved against `root`) that exists,
  * or null. Used to locate conventional `app`/`pages` directories that may live
  * at the root or under `src/`.
+ *
+ * `root` and `candidates` must be forward-slash, and the returned path is
+ * forward-slash too: the candidate is joined with `path.posix.join`, which only
+ * stays canonical when its inputs already are.
  */
 declare function findDir(root: string, ...candidates: string[]): string | null;
 /**
  * Check if the project uses App Router (has an app/ directory).
+ *
+ * `root` must be forward-slash — it is passed straight to `findDir`.
  */
 declare function hasAppDir(root: string): boolean;
 //#endregion
-export { detectPackageManager, detectPackageManagerName, ensureESModule, ensureViteConfigCompatibility, findDir, findInNodeModules, hasAppDir, hasViteConfig, renameCJSConfigs };
+export { detectPackageManager, detectPackageManagerName, ensureESModule, ensureViteConfigCompatibility, findDir, findInNodeModules, findViteConfigPath, hasAppDir, hasViteConfig, renameCJSConfigs };

package/dist/utils/project.js

@@ -187,16 +187,31 @@ function findInNodeModules(start, subPath) {
 * Check if a vite.config file exists in the project root.
 */
 function hasViteConfig(root) {
-	return fs.existsSync(path.join(root, "vite.config.ts")) || fs.existsSync(path.join(root, "vite.config.js")) || fs.existsSync(path.join(root, "vite.config.mjs"));
+	return findViteConfigPath(root) !== void 0;
+}
+/** Return the config file Vite will load, using Vite's default precedence. */
+function findViteConfigPath(root) {
+	return [
+		"vite.config.js",
+		"vite.config.mjs",
+		"vite.config.ts",
+		"vite.config.cjs",
+		"vite.config.mts",
+		"vite.config.cts"
+	].map((fileName) => path.join(root, fileName)).find((candidate) => fs.existsSync(candidate));
 }
 /**
 * Return the first candidate directory (resolved against `root`) that exists,
 * or null. Used to locate conventional `app`/`pages` directories that may live
 * at the root or under `src/`.
+*
+* `root` and `candidates` must be forward-slash, and the returned path is
+* forward-slash too: the candidate is joined with `path.posix.join`, which only
+* stays canonical when its inputs already are.
 */
 function findDir(root, ...candidates) {
 	for (const candidate of candidates) {
-		const full = path.join(root, candidate);
+		const full = path.posix.join(root, candidate);
 		try {
 			if (fs.statSync(full).isDirectory()) return full;
 		} catch {}
@@ -205,9 +220,11 @@ function findDir(root, ...candidates) {
 }
 /**
 * Check if the project uses App Router (has an app/ directory).
+*
+* `root` must be forward-slash — it is passed straight to `findDir`.
 */
 function hasAppDir(root) {
-	return findDir(root, "app", path.join("src", "app")) !== null;
+	return findDir(root, "app", "src/app") !== null;
 }
 //#endregion
-export { detectPackageManager, detectPackageManagerName, ensureESModule, ensureViteConfigCompatibility, findDir, findInNodeModules, hasAppDir, hasViteConfig, renameCJSConfigs };
+export { detectPackageManager, detectPackageManagerName, ensureESModule, ensureViteConfigCompatibility, findDir, findInNodeModules, findViteConfigPath, hasAppDir, hasViteConfig, renameCJSConfigs };

package/dist/utils/protocol-headers.d.ts

@@ -0,0 +1,17 @@
+//#region src/utils/protocol-headers.d.ts
+/** Serialized middleware context (JSON) forwarded from dev server to RSC entry. */
+declare const VINEXT_MW_CTX_HEADER = "x-vinext-mw-ctx";
+/** Build-time prerender authentication secret. */
+declare const VINEXT_PRERENDER_SECRET_HEADER = "x-vinext-prerender-secret";
+/** URL-encoded JSON route params for build-time prerender renders. */
+declare const VINEXT_PRERENDER_ROUTE_PARAMS_HEADER = "x-vinext-prerender-route-params";
+/** Prefix for forwarded request headers (e.g. `x-middleware-request-cookie`). */
+declare const MIDDLEWARE_REQUEST_HEADER_PREFIX = "x-middleware-request-";
+/** Comma-separated list of header names that middleware wants to override. */
+declare const MIDDLEWARE_OVERRIDE_HEADERS = "x-middleware-override-headers";
+/** Carries cookies set by middleware for same-render reads. */
+declare const MIDDLEWARE_SET_COOKIE_HEADER = "x-middleware-set-cookie";
+/** Generic prefix for all middleware internal headers. */
+declare const MIDDLEWARE_HEADER_PREFIX = "x-middleware-";
+//#endregion
+export { MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_SET_COOKIE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER };

package/dist/utils/protocol-headers.js

@@ -0,0 +1,17 @@
+//#region src/utils/protocol-headers.ts
+/** Serialized middleware context (JSON) forwarded from dev server to RSC entry. */
+const VINEXT_MW_CTX_HEADER = "x-vinext-mw-ctx";
+/** Build-time prerender authentication secret. */
+const VINEXT_PRERENDER_SECRET_HEADER = "x-vinext-prerender-secret";
+/** URL-encoded JSON route params for build-time prerender renders. */
+const VINEXT_PRERENDER_ROUTE_PARAMS_HEADER = "x-vinext-prerender-route-params";
+/** Prefix for forwarded request headers (e.g. `x-middleware-request-cookie`). */
+const MIDDLEWARE_REQUEST_HEADER_PREFIX = "x-middleware-request-";
+/** Comma-separated list of header names that middleware wants to override. */
+const MIDDLEWARE_OVERRIDE_HEADERS = "x-middleware-override-headers";
+/** Carries cookies set by middleware for same-render reads. */
+const MIDDLEWARE_SET_COOKIE_HEADER = "x-middleware-set-cookie";
+/** Generic prefix for all middleware internal headers. */
+const MIDDLEWARE_HEADER_PREFIX = "x-middleware-";
+//#endregion
+export { MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_SET_COOKIE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER };

package/dist/utils/react-version.d.ts

@@ -0,0 +1,4 @@
+//#region src/utils/react-version.d.ts
+declare function getReactUpgradeDeps(root: string): string[];
+//#endregion
+export { getReactUpgradeDeps };

package/dist/utils/react-version.js

@@ -0,0 +1,44 @@
+import { createRequire } from "node:module";
+import fs from "node:fs";
+import path from "node:path";
+//#region src/utils/react-version.ts
+function getDependencyUpgradeDeps(root, recommendations) {
+	const req = createRequire(path.join(root, "package.json"));
+	for (const [dependency, recommendation] of Object.entries(recommendations)) try {
+		const version = findPackageVersion(req.resolve(dependency), dependency);
+		if (version && isVersionBelow(version, recommendation.minimumVersion)) return recommendation.upgrades;
+	} catch {
+		continue;
+	}
+	return [];
+}
+function getReactUpgradeDeps(root) {
+	return getDependencyUpgradeDeps(root, { react: {
+		minimumVersion: [
+			19,
+			2,
+			6
+		],
+		upgrades: ["react@latest", "react-dom@latest"]
+	} });
+}
+function isVersionBelow(version, minimum) {
+	const current = version.split(".").map((part) => parseInt(part, 10));
+	for (let index = 0; index < minimum.length; index++) if ((current[index] ?? 0) !== minimum[index]) return (current[index] ?? 0) < minimum[index];
+	return false;
+}
+/** Walk up from a resolved module entry to find its package version. */
+function findPackageVersion(resolvedEntry, packageName) {
+	let dir = path.dirname(resolvedEntry);
+	while (dir !== path.dirname(dir)) {
+		const candidate = path.join(dir, "package.json");
+		try {
+			const pkg = JSON.parse(fs.readFileSync(candidate, "utf-8"));
+			if (pkg.name === packageName) return pkg.version ?? null;
+		} catch {}
+		dir = path.dirname(dir);
+	}
+	return null;
+}
+//#endregion
+export { getReactUpgradeDeps };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qzsy/vinext",
-  "version": "0.1.12",
+  "version": "0.1.81",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {
@@ -53,6 +53,10 @@
       "types": "./dist/server/pages-request-pipeline.d.ts",
       "import": "./dist/server/pages-request-pipeline.js"
     },
+    "./server/pages-client-assets": {
+      "types": "./dist/server/pages-client-assets.d.ts",
+      "import": "./dist/server/pages-client-assets.js"
+    },
     "./server/app-router-entry": {
       "types": "./dist/server/app-router-entry.d.ts",
       "import": "./dist/server/app-router-entry.js"
@@ -89,26 +93,32 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "vp pack",
+    "prepack": "node --input-type=module -e \"import { copyFileSync } from 'node:fs'; copyFileSync('../../README.md','README.md');\" && vp run build",
+    "dev": "vp pack --watch"
+  },
   "dependencies": {
-    "@unpic/react": "^1.0.2",
-    "@vercel/og": "^0.8.6",
-    "image-size": "2.0.2",
-    "ipaddr.js": "^2.1.0",
-    "magic-string": "^0.30.21",
-    "vite-plugin-commonjs": "^0.10.4",
-    "web-vitals": "^4.2.4"
+    "@unpic/react": "catalog:",
+    "@vercel/og": "catalog:",
+    "image-size": "catalog:",
+    "ipaddr.js": "catalog:",
+    "magic-string": "catalog:",
+    "vite-plugin-commonjs": "catalog:",
+    "web-vitals": "catalog:"
   },
   "devDependencies": {
-    "@types/node": "^25.9.2",
-    "@types/react": "^19.2.16",
-    "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^6.0.1",
-    "@vitejs/plugin-rsc": "^0.5.27",
-    "react-server-dom-webpack": "^19.2.7",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.1",
-    "vite-plus": "0.2.1",
-    "vite-tsconfig-paths": "^6.1.1",
-    "@vinext/cloudflare": "0.1.2"
+    "@types/node": "catalog:",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
+    "@vinext/cloudflare": "workspace:*",
+    "@vitejs/plugin-react": "catalog:",
+    "@vitejs/plugin-rsc": "catalog:",
+    "am-i-vibing": "catalog:",
+    "react-server-dom-webpack": "catalog:",
+    "vite": "catalog:",
+    "vite-plus": "catalog:",
+    "vite-tsconfig-paths": "catalog:"
   },
   "peerDependencies": {
     "@mdx-js/rollup": "^3.0.0",
@@ -136,9 +146,5 @@
   },
   "engines": {
     "node": ">=22"
-  },
-  "scripts": {
-    "build": "vp pack",
-    "dev": "vp pack --watch"
   }
-}
+}

package/dist/server/dev-stack-sourcemap-endpoint.d.ts

@@ -1,4 +0,0 @@
-//#region src/server/dev-stack-sourcemap-endpoint.d.ts
-declare const VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT = "/__vinext_original-stack-trace";
-//#endregion
-export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };