@qzsy/vinext 0.1.12 → 0.1.123

package/dist/server/headers.js

@@ -101,6 +101,8 @@ const NEXT_ROUTER_STATE_TREE_HEADER = "Next-Router-State-Tree";
 const NEXT_ROUTER_PREFETCH_HEADER = "Next-Router-Prefetch";
 const NEXT_ROUTER_SEGMENT_PREFETCH_HEADER = "Next-Router-Segment-Prefetch";
 const NEXT_URL_HEADER = "Next-Url";
+const NEXT_REQUEST_ID_HEADER = "x-nextjs-request-id";
+const NEXT_HTML_REQUEST_ID_HEADER = "x-nextjs-html-request-id";
 /** Lowercase flight header variants used in middleware forwarding. */
 const FLIGHT_HEADERS = [
 	"rsc",
@@ -133,4 +135,4 @@ const INTERNAL_HEADERS = [
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 const VINEXT_INTERNAL_HEADERS = [VINEXT_PRERENDER_ROUTE_PARAMS_HEADER];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/prod-server.js

@@ -819,13 +819,12 @@ async function startAppRouterServer(options) {
 				return;
 			}
 		}
+		let missingBuildAsset = false;
 		{
 			const assetLookupPath = resolveAppRouterAssetPath(pathname, appAssetPathPrefix, appRouterAssetPrefix);
 			if (assetLookupPath) {
 				if (await tryServeStatic(req, res, clientDir, assetLookupPath, compress, staticCache)) return;
-				res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
-				res.end("Not Found");
-				return;
+				missingBuildAsset = true;
 			}
 		}
 		if (isImageOptimizationPath(pathname)) {
@@ -868,6 +867,12 @@ async function startAppRouterServer(options) {
 				await sendWebResponse(notFoundResponse({ headers: toWebHeaders(staticResponseHeaders) }), req, res, compress);
 				return;
 			}
+			if (missingBuildAsset && response.status === 404) {
+				cancelResponseBody(response);
+				res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
+				res.end("Not Found");
+				return;
+			}
 			await sendWebResponse(response, req, res, compress);
 		} catch (e) {
 			console.error("[vinext] Server error:", e);
@@ -1000,11 +1005,9 @@ async function startPagesRouterServer(options) {
 		}
 		const staticLookupPath = stripBasePath(pathname, basePath);
 		const pagesAssetLookup = resolveAppRouterAssetPath(pathname, pagesAssetPathPrefix, assetPrefix);
+		const missingBuildAsset = pagesAssetLookup !== null;
 		if (pagesAssetLookup) {
 			if (await tryServeStatic(req, res, clientDir, pagesAssetLookup, compress, staticCache)) return;
-			res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
-			res.end("Not Found");
-			return;
 		}
 		if (isImageOptimizationPath(pathname) || isImageOptimizationPath(staticLookupPath)) {
 			const params = parseImageParams(new URL(rawUrl, "http://localhost"), allowedImageWidths, pagesImageConfig?.qualities);
@@ -1089,6 +1092,12 @@ async function startPagesRouterServer(options) {
 			if (result.type === "handled") return;
 			if (result.type === "response") {
 				const { response } = result;
+				if (missingBuildAsset && response.status === 404) {
+					cancelResponseBody(response);
+					res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
+					res.end("Not Found");
+					return;
+				}
 				if (isVinextStreamedHtmlResponse(response) || !response.body || result.defaultContentType === void 0) {
 					await sendWebResponse(response, req, res, compress);
 					return;

package/dist/server/worker-utils.d.ts

@@ -1,7 +1,8 @@
 //#region src/server/worker-utils.d.ts
+declare function finalizeMissingStaticAssetResponse(response: Response, missingBuildAsset: boolean): Response;
 declare function mergeHeaders(response: Response, extraHeaders: Record<string, string | string[]>, statusOverride?: number): Response;
 declare function resolveStaticAssetSignal(signalResponse: Response, options: {
   fetchAsset(path: string): Promise<Response>;
 }): Promise<Response | null>;
 //#endregion
-export { mergeHeaders, resolveStaticAssetSignal };
+export { finalizeMissingStaticAssetResponse, mergeHeaders, resolveStaticAssetSignal };

package/dist/server/worker-utils.js

@@ -1,4 +1,5 @@
 import { VINEXT_STATIC_FILE_HEADER } from "./headers.js";
+import { notFoundStaticAssetResponse } from "./http-error-responses.js";
 //#region src/server/worker-utils.ts
 /**
 * Shared utilities for Cloudflare Worker entries.
@@ -29,6 +30,11 @@ function cancelResponseBody(response) {
 	if (!body || body.locked) return;
 	body.cancel().catch(() => {});
 }
+function finalizeMissingStaticAssetResponse(response, missingBuildAsset) {
+	if (!missingBuildAsset || response.status !== 404) return response;
+	cancelResponseBody(response);
+	return notFoundStaticAssetResponse();
+}
 function buildHeaderRecord(response, omitNames = []) {
 	const omitted = new Set(omitNames.map((name) => name.toLowerCase()));
 	const headers = {};
@@ -96,4 +102,4 @@ async function resolveStaticAssetSignal(signalResponse, options) {
 	return mergeHeaders(assetResponse, extraHeaders, assetResponse.ok && signalResponse.status !== 200 ? signalResponse.status : void 0);
 }
 //#endregion
-export { mergeHeaders, resolveStaticAssetSignal };
+export { finalizeMissingStaticAssetResponse, mergeHeaders, resolveStaticAssetSignal };

package/dist/shims/error-boundary.d.ts

@@ -9,6 +9,24 @@ type ErrorBoundaryProps = {
   children: React.ReactNode;
   resetKey?: string | null;
 };
+type SerializedBoundaryError = {
+  digest?: string;
+  message: string;
+  name?: string;
+  stack?: string;
+};
+declare function SerializedErrorBoundary({
+  fallback: Fallback,
+  error
+}: {
+  fallback: React.ComponentType<{
+    error: Error & {
+      digest?: string;
+    };
+    reset: () => void;
+  }>;
+  error: SerializedBoundaryError;
+}): React.JSX.Element;
 type CapturedError = {
   thrownValue: unknown;
 };
@@ -152,4 +170,4 @@ declare class DevRecoveryBoundary extends React.Component<DevRecoveryBoundaryPro
   render(): React.ReactNode;
 }
 //#endregion
-export { DevRecoveryBoundary, DevRecoveryBoundaryProps, ErrorBoundary, ErrorBoundaryInner, ErrorBoundaryProps, ErrorBoundaryState, ForbiddenBoundary, ForbiddenBoundaryInner, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, RedirectErrorBoundary, UnauthorizedBoundary, UnauthorizedBoundaryInner };
+export { DevRecoveryBoundary, DevRecoveryBoundaryProps, ErrorBoundary, ErrorBoundaryInner, ErrorBoundaryProps, ErrorBoundaryState, ForbiddenBoundary, ForbiddenBoundaryInner, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, RedirectErrorBoundary, SerializedBoundaryError, SerializedErrorBoundary, UnauthorizedBoundary, UnauthorizedBoundaryInner };

package/dist/shims/error-boundary.js

@@ -9,6 +9,16 @@ import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import React from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/shims/error-boundary.tsx
+function SerializedErrorBoundary({ fallback: Fallback, error }) {
+	return /* @__PURE__ */ jsx(Fallback, {
+		error: Object.assign(new Error(error.message), {
+			digest: error.digest,
+			name: error.name ?? "Error",
+			stack: error.stack
+		}),
+		reset: () => globalThis.location?.reload()
+	});
+}
 function normalizeBoundaryResetKey(resetKey) {
 	return resetKey === void 0 || resetKey === null || resetKey === "" ? null : resetKey;
 }
@@ -339,4 +349,4 @@ var DevRecoveryBoundary = class extends React.Component {
 	}
 };
 //#endregion
-export { DevRecoveryBoundary, ErrorBoundary, ErrorBoundaryInner, ForbiddenBoundary, ForbiddenBoundaryInner, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, RedirectErrorBoundary, UnauthorizedBoundary, UnauthorizedBoundaryInner };
+export { DevRecoveryBoundary, ErrorBoundary, ErrorBoundaryInner, ForbiddenBoundary, ForbiddenBoundaryInner, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, RedirectErrorBoundary, SerializedErrorBoundary, UnauthorizedBoundary, UnauthorizedBoundaryInner };

package/dist/shims/headers.d.ts

@@ -5,6 +5,7 @@ type HeadersContext = {
   headers: Headers;
   cookies: Map<string, string>;
   accessError?: Error;
+  draftModeEnabled?: boolean;
   forceStatic?: boolean;
   mutableCookies?: RequestCookies;
   readonlyCookies?: RequestCookies;
@@ -47,6 +48,7 @@ type ConnectionProbeResult<T> = {
  */
 declare function markDynamicUsage(): void;
 declare function markRenderRequestApiUsage(kind: RenderRequestApiKind): void;
+declare function throwIfStaticGenerationAccessError(): void;
 declare function runWithConnectionProbe<T>(fn: () => T | Promise<T>): Promise<ConnectionProbeResult<T>>;
 declare function suspendConnectionProbe(): Promise<never> | null;
 declare function peekRenderRequestApiUsage(): RenderRequestApiKind[];
@@ -250,4 +252,4 @@ declare class RequestCookies {
   toString(): string;
 }
 //#endregion
-export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope };
+export { HeadersAccessPhase, HeadersContext, type RequestCookies, VinextHeadersShimState, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/headers.js

@@ -1,6 +1,6 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { MIDDLEWARE_SET_COOKIE_HEADER } from "../server/headers.js";
+import { FLIGHT_HEADERS, MIDDLEWARE_SET_COOKIE_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../server/middleware-request-headers.js";
 import { serializeSetCookie, validateCookieAttributeValue, validateCookieName } from "./internal/cookie-serialize.js";
 import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
@@ -117,6 +117,10 @@ function markDynamicUsage() {
 function markRenderRequestApiUsage(kind) {
 	_getState().renderRequestApiUsage.add(kind);
 }
+function throwIfStaticGenerationAccessError() {
+	const accessError = _getState().headersContext?.accessError;
+	if (accessError) throw accessError;
+}
 async function runWithConnectionProbe(fn) {
 	const state = _getState();
 	const previousProbe = state.connectionProbe;
@@ -468,7 +472,13 @@ function _getReadonlyCookies(ctx) {
 	return ctx.readonlyCookies;
 }
 function _getReadonlyHeaders(ctx) {
-	if (!ctx.readonlyHeaders) ctx.readonlyHeaders = _sealHeaders(ctx.headers);
+	if (!ctx.readonlyHeaders) {
+		const cleaned = new Headers(ctx.headers);
+		for (const header of FLIGHT_HEADERS) cleaned.delete(header);
+		cleaned.delete(NEXT_REQUEST_ID_HEADER);
+		cleaned.delete(NEXT_HTML_REQUEST_ID_HEADER);
+		ctx.readonlyHeaders = _sealHeaders(cleaned);
+	}
 	return ctx.readonlyHeaders;
 }
 /**
@@ -631,16 +641,16 @@ async function draftMode() {
 	const state = _getState();
 	const context = state.headersContext;
 	if (!context) throw createDraftModeScopeError("draftMode()");
-	if (context.accessError) throw context.accessError;
 	const secret = ensureContextDraftModeSecret(context);
 	return {
 		get isEnabled() {
-			return context.cookies.get(DRAFT_MODE_COOKIE) === secret;
+			return context.draftModeEnabled ?? context.cookies.get(DRAFT_MODE_COOKIE) === secret;
 		},
 		enable() {
 			throwIfInsideCacheScope("draftMode().enable()");
 			const activeContext = requireActiveDraftModeContext(state, context, "draftMode().enable()");
 			markDynamicUsage();
+			activeContext.draftModeEnabled = true;
 			activeContext.cookies.set(DRAFT_MODE_COOKIE, secret);
 			state.draftModeCookieHeader = `${DRAFT_MODE_COOKIE}=${secret}; ${draftModeCookieAttributes()}`;
 		},
@@ -648,6 +658,7 @@ async function draftMode() {
 			throwIfInsideCacheScope("draftMode().disable()");
 			const activeContext = requireActiveDraftModeContext(state, context, "draftMode().disable()");
 			markDynamicUsage();
+			activeContext.draftModeEnabled = false;
 			activeContext.cookies.delete(DRAFT_MODE_COOKIE);
 			state.draftModeCookieHeader = `${DRAFT_MODE_COOKIE}=; ${draftModeCookieAttributes()}; Expires=${DRAFT_MODE_EXPIRED_DATE}`;
 		}
@@ -751,4 +762,4 @@ var RequestCookies = class {
 	}
 };
 //#endregion
-export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope };
+export { applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, draftMode, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersAccessPhase, getHeadersContext, headers, headersContextFromRequest, isDraftModeRequest, markDynamicUsage, markRenderRequestApiUsage, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/metadata.d.ts

@@ -1,3 +1,4 @@
+import { ThenableParamsObserver } from "./thenable-params.js";
 import React from "react";
 
 //#region src/shims/metadata.d.ts
@@ -18,7 +19,7 @@ type Viewport = {
  * Resolve viewport config from a module. Handles both static `viewport` export
  * and async `generateViewport()` function.
  */
-declare function resolveModuleViewport(mod: Record<string, unknown>, params: Record<string, string | string[]>): Promise<Viewport | null>;
+declare function resolveModuleViewport(mod: Record<string, unknown>, params: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, searchParamsObserver?: ThenableParamsObserver): Promise<Viewport | null>;
 /**
  * Merge viewport configs from multiple sources (layouts + page).
  * Later entries override earlier ones.
@@ -267,7 +268,7 @@ declare function mergeMetadataEntries(entries: readonly MetadataMergeEntry[]): M
  *   resolution approach. If not provided, defaults to a promise that resolves
  *   to an empty object (so `await parent` never throws).
  */
-declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<Metadata>): Promise<Metadata | null>;
+declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<Metadata>, searchParamsObserver?: ThenableParamsObserver): Promise<Metadata | null>;
 type MetadataHeadProps = {
   metadata: Metadata;
   pathname?: string;

package/dist/shims/metadata.js

@@ -13,10 +13,14 @@ import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 * Resolve viewport config from a module. Handles both static `viewport` export
 * and async `generateViewport()` function.
 */
-async function resolveModuleViewport(mod, params) {
+async function resolveModuleViewport(mod, params, searchParams, searchParamsObserver) {
 	if (typeof mod.generateViewport === "function") {
 		const asyncParams = makeThenableParams(params);
-		return await mod.generateViewport({ params: asyncParams });
+		const props = searchParams === void 0 ? { params: asyncParams } : {
+			params: asyncParams,
+			searchParams: makeThenableParams(searchParams, searchParamsObserver)
+		};
+		return await mod.generateViewport(props);
 	}
 	if (mod.viewport && typeof mod.viewport === "object") return mod.viewport;
 	return null;
@@ -213,12 +217,12 @@ function mergeMetadataEntries(entries) {
 *   resolution approach. If not provided, defaults to a promise that resolves
 *   to an empty object (so `await parent` never throws).
 */
-async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Promise.resolve({})) {
+async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Promise.resolve({}), searchParamsObserver) {
 	if (typeof mod.generateMetadata === "function") {
 		const asyncParams = makeThenableParams(params);
 		const props = searchParams === void 0 ? { params: asyncParams } : {
 			params: asyncParams,
-			searchParams: makeThenableParams(searchParams)
+			searchParams: makeThenableParams(searchParams, searchParamsObserver)
 		};
 		return await (mod.generateMetadata.length >= 2 ? mod.generateMetadata(props, parent) : mod.generateMetadata(props));
 	}

package/dist/shims/router.js

@@ -186,6 +186,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 +942,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 +1101,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);
@@ -1153,6 +1156,7 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 					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?.rewriteTarget) {
@@ -1263,6 +1267,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() {
@@ -1519,6 +1524,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 +1537,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 +1565,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/typegen.js

@@ -1,4 +1,5 @@
 import { findDir } from "./utils/project.js";
+import { normalizePathSeparators } from "./utils/path.js";
 import { decodeRouteSegment, isInvisibleSegment } from "./routing/utils.js";
 import { patternToNextFormat } from "./routing/route-validation.js";
 import { compareStrings } from "./utils/compare.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", path.posix.join("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/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

@@ -66,6 +66,10 @@ declare function hasViteConfig(root: string): boolean;
  * 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;
 /**

package/dist/utils/project.js

@@ -193,10 +193,14 @@ function hasViteConfig(root) {
 * 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 {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qzsy/vinext",
-  "version": "0.1.12",
+  "version": "0.1.123",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {