vinext 0.1.4 → 0.1.6

package/dist/shims/router.js

@@ -19,6 +19,7 @@ import { installWindowNext } from "../client/window-next.js";
 import { getWindowOrigin, isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { scrollToHashTarget } from "./hash-scroll.js";
 import { installPagesRouterRuntime, setPagesRouterPopStateHandler, setStampInitialHistoryState } from "./pages-router-runtime.js";
+import { interpolateDynamicRouteHref } from "./internal/interpolate-as.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
 import { Component, Fragment, createElement, useContext, useEffect, useLayoutEffect, useMemo, useState } from "react";
 //#region src/shims/router.ts
@@ -1118,7 +1119,7 @@ async function navigateClientHtml(url, fetchUrl, controller, navId, assertStillC
 * fixups). The JSON path derives its own URL from the browser-facing `url`
 * because the data endpoint speaks the unprefixed path.
 */
-async function navigateClient(url, fetchUrl = url, options = {}) {
+async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url) {
 	if (typeof window === "undefined") return;
 	const previousAbortController = routerRuntimeState.activeAbortController;
 	if (previousAbortController) queueMicrotask(() => previousAbortController.abort());
@@ -1135,7 +1136,7 @@ async function navigateClient(url, fetchUrl = url, options = {}) {
 		else {
 			let browserUrl = url;
 			let htmlFetchUrl = fetchUrl;
-			let dataTarget = resolvePagesDataNavigationTarget(browserUrl, __basePath);
+			let dataTarget = resolvePagesDataNavigationTarget(routeUrl, __basePath);
 			let middlewareDataResponse;
 			if (!dataTarget) {
 				let middlewareEffect;
@@ -1178,9 +1179,9 @@ async function navigateClient(url, fetchUrl = url, options = {}) {
 * - "failed" — genuine error, caller should return false (hard nav is already
 *   scheduled as recovery)
 */
-async function runNavigateClient(fullUrl, resolvedUrl, fetchUrl = fullUrl, options = {}) {
+async function runNavigateClient(fullUrl, resolvedUrl, fetchUrl = fullUrl, options = {}, routeUrl = fullUrl) {
 	try {
-		await navigateClient(fullUrl, fetchUrl, options);
+		await navigateClient(fullUrl, fetchUrl, options, routeUrl);
 		return "completed";
 	} catch (err) {
 		routerEvents.emit("routeChangeError", err, resolvedUrl, { shallow: false });
@@ -1252,9 +1253,9 @@ function updateHistory(mode, fullUrl, navState) {
 	const previousKey = getRouterStateKey(window.history.state);
 	const key = mode === "push" ? createHistoryKey() : previousKey ?? routerRuntimeState.currentHistoryKey ?? createHistoryKey();
 	const state = {
-		url: navState?.url ?? fullUrl,
-		as: navState?.as ?? fullUrl,
-		options: navState?.options ?? {},
+		url: navState.url,
+		as: navState.as,
+		options: navState.options,
 		__N: true,
 		key
 	};
@@ -1300,8 +1301,13 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 	assertSafeNavigationUrl(resolveUrl(url));
 	if (as !== void 0) assertSafeNavigationUrl(String(as));
 	const navigationLocale = resolveTransitionLocale(options?.locale);
-	let resolved = resolveNavigationTarget(url, as, navigationLocale, as === void 0 && options?.locale !== void 0 && typeof url !== "string" && url.pathname === void 0 && (url.query !== void 0 && Object.keys(url.query).length > 0 || typeof url.search === "string" && url.search.length > 0 || typeof url.hash === "string" && url.hash.length > 0));
-	if (as === void 0 && (typeof url === "string" && options?._vinextInterpolateDynamicRoute === true || typeof url !== "string" && url.pathname === void 0 && (url.query !== void 0 && Object.keys(url.query).length > 0 || typeof url.search === "string" && url.search.length > 0))) resolved = interpolateCurrentDynamicRoute(resolved);
+	const replaceInheritedLocale = as === void 0 && options?.locale !== void 0 && typeof url !== "string" && url.pathname === void 0 && (url.query !== void 0 && Object.keys(url.query).length > 0 || typeof url.search === "string" && url.search.length > 0 || typeof url.hash === "string" && url.hash.length > 0);
+	let resolved = resolveNavigationTarget(url, as, navigationLocale, replaceInheritedLocale);
+	let resolvedRoute = applyNavigationLocale(resolveUrl(url), navigationLocale, replaceInheritedLocale);
+	if (as === void 0 && (typeof url === "string" && options?._vinextInterpolateDynamicRoute === true || typeof url !== "string" && url.pathname === void 0 && (url.query !== void 0 && Object.keys(url.query).length > 0 || typeof url.search === "string" && url.search.length > 0))) {
+		resolved = interpolateCurrentDynamicRoute(resolved);
+		resolvedRoute = interpolateCurrentDynamicRoute(resolvedRoute);
+	}
 	if (isExternalUrl(resolved)) {
 		const localPath = toSameOriginAppPath(resolved, __basePath);
 		if (localPath == null) {
@@ -1311,10 +1317,36 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 		}
 		resolved = localPath;
 	}
+	if (isExternalUrl(resolvedRoute)) {
+		const localPath = toSameOriginAppPath(resolvedRoute, __basePath);
+		if (localPath != null) resolvedRoute = localPath;
+	}
 	resolved = normalizePathTrailingSlash(resolved, __trailingSlash);
+	resolvedRoute = normalizePathTrailingSlash(resolvedRoute, __trailingSlash);
+	let interpolatedRoute = resolvedRoute;
+	if (resolvedRoute.includes("[")) {
+		const projection = interpolateDynamicRouteHref(resolvedRoute, resolved, typeof url === "string" ? void 0 : url.query);
+		if (projection?.href) {
+			interpolatedRoute = projection.href;
+			if (as === void 0 && stripHash(resolved).split("?", 1)[0] === projection.routePathname) {
+				const remaining = new URLSearchParams();
+				const consumed = new Set(projection.params);
+				for (const [k, v] of Object.entries(projection.query)) {
+					if (consumed.has(k)) continue;
+					if (v === void 0) continue;
+					if (Array.isArray(v)) v.forEach((entry) => remaining.append(k, entry));
+					else remaining.append(k, v);
+				}
+				const searchStr = remaining.toString();
+				const hashStr = extractHash(resolved);
+				resolved = normalizePathTrailingSlash(`${projection.href.split(/[?#]/, 1)[0]}${searchStr ? `?${searchStr}` : ""}${hashStr}`, __trailingSlash);
+			}
+		} else interpolatedRoute = resolved;
+	}
 	const full = normalizePathTrailingSlash(toBrowserNavigationHref(resolved, window.location.href, __basePath), __trailingSlash);
+	const fullRouteUrl = interpolatedRoute !== resolved ? normalizePathTrailingSlash(toBrowserNavigationHref(interpolatedRoute, window.location.href, __basePath), __trailingSlash) : full;
 	const errorRouteHtmlFetchUrl = resolvePagesErrorHtmlFetchUrl(url, navigationLocale);
-	const htmlFetchUrl = errorRouteHtmlFetchUrl ?? getPagesHtmlFetchUrl(full, navigationLocale);
+	const htmlFetchUrl = errorRouteHtmlFetchUrl ?? getPagesHtmlFetchUrl(fullRouteUrl, navigationLocale);
 	const shallow = options?.shallow ?? false;
 	const doScroll = options?.scroll !== false;
 	const hash = extractHash(resolved);
@@ -1330,15 +1362,17 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 		mode,
 		scroll: scrollTarget
 	};
+	const currentLocale = getCurrentUrlLocale();
+	if (mode === "push" && interpolatedRoute !== resolved && stripHash(full) === routerRuntimeState.lastPathnameAndSearch && navigationLocale === currentLocale) mode = "replace";
 	const navStateOptions = { shallow };
 	if (navigationLocale !== void 0) navStateOptions.locale = navigationLocale;
 	const resolvedNoHash = stripHash(resolved);
 	const navState = {
-		url: resolvedNoHash,
+		url: stripHash(interpolatedRoute),
 		as: resolvedNoHash,
 		options: navStateOptions
 	};
-	if (options?._h !== 1 && isHashOnlyChange(full)) {
+	if (options?._h !== 1 && interpolatedRoute === resolved && isHashOnlyChange(full)) {
 		if (mode === "push") saveScrollPosition();
 		const eventUrl = resolveHashUrl(full);
 		routerEvents.emit("hashChangeStart", eventUrl, { shallow });
@@ -1363,7 +1397,7 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 	routerEvents.emit("beforeHistoryChange", resolved, { shallow });
 	updateHistory(mode, full, navState);
 	if (!shallow) {
-		const result = await runNavigateClient(full, resolved, htmlFetchUrl, navigateOptions);
+		const result = await runNavigateClient(full, resolved, htmlFetchUrl, navigateOptions, fullRouteUrl);
 		if (result === "cancelled") return true;
 		if (result === "failed") return false;
 	} else if (doScroll) if (hash) scrollToHashTarget(hash);
@@ -1479,7 +1513,7 @@ function PagesRouterProvider({ children }) {
 	return AppRouterContext ? createElement(AppRouterContext.Provider, { value: appRouter }, content) : content;
 }
 function isNextRouterState(state) {
-	return typeof state === "object" && state !== null && "__N" in state && state.__N === true;
+	return typeof state === "object" && state !== null && "__N" in state && state.__N === true && "url" in state && typeof state.url === "string" && "as" in state && typeof state.as === "string" && "options" in state && typeof state.options === "object" && state.options !== null;
 }
 function getRouterStateKey(state) {
 	if (!isNextRouterState(state)) return void 0;
@@ -1508,11 +1542,16 @@ function handlePagesRouterPopState(e) {
 		};
 	}
 	if (routerRuntimeState.beforePopStateCb !== void 0) {
-		if (!routerRuntimeState.beforePopStateCb({
+		const beforePopStateState = isNextRouterState(state) ? {
+			url: state.url,
+			as: state.as,
+			options: state.options
+		} : {
 			url: appUrl,
 			as: appUrl,
 			options: { shallow: false }
-		})) return;
+		};
+		if (!routerRuntimeState.beforePopStateCb({ ...beforePopStateState })) return;
 	}
 	if (targetKey !== void 0) routerRuntimeState.currentHistoryKey = targetKey;
 	routerRuntimeState.lastPathnameAndSearch = browserUrl;
@@ -1524,7 +1563,8 @@ function handlePagesRouterPopState(e) {
 		dispatchNavigateEvent();
 		return;
 	}
-	const effectiveLocale = (isNextRouterState(state) ? state.options?.locale : void 0) ?? window.__VINEXT_LOCALE__;
+	const stateLocale = isNextRouterState(state) ? state.options?.locale : void 0;
+	const effectiveLocale = typeof stateLocale === "string" ? stateLocale : window.__VINEXT_LOCALE__;
 	const fullAppUrl = appUrl + window.location.hash;
 	routerEvents.emit("routeChangeStart", fullAppUrl, { shallow: false });
 	routerEvents.emit("beforeHistoryChange", fullAppUrl, { shallow: false });
@@ -1533,7 +1573,11 @@ function handlePagesRouterPopState(e) {
 			x: 0,
 			y: 0
 		} : readScrollPosition(state);
-		if (await runNavigateClient(browserUrl, fullAppUrl, getPagesHtmlFetchUrl(browserUrl, effectiveLocale), { scroll: scrollTarget }) === "completed") {
+		const stateRouteUrl = (() => {
+			if (isNextRouterState(state) && typeof state.url === "string" && typeof state.as === "string" && state.url !== state.as) return normalizePathTrailingSlash(withBasePath(state.url, __basePath), __trailingSlash);
+			return browserUrl;
+		})();
+		if (await runNavigateClient(browserUrl, fullAppUrl, getPagesHtmlFetchUrl(stateRouteUrl, effectiveLocale), { scroll: scrollTarget }, stateRouteUrl) === "completed") {
 			routerEvents.emit("routeChangeComplete", fullAppUrl, { shallow: false });
 			dispatchNavigateEvent();
 		}

package/dist/shims/script.js

@@ -1,7 +1,7 @@
 "use client";
 import { escapeInlineContent } from "./head.js";
-import { hasAppNavigationRuntimeBootstrap } from "../client/navigation-runtime.js";
 import { useScriptNonce } from "./script-nonce-context.js";
+import { hasAppNavigationRuntimeBootstrap } from "../client/navigation-runtime.js";
 import { useBeforeInteractiveRegister } from "./before-interactive-context.js";
 import React, { useEffect, useRef } from "react";
 import * as ReactDOM from "react-dom";

package/dist/shims/slot.js

@@ -1,7 +1,9 @@
 "use client";
 import { AppElementsWire, UNMATCHED_SLOT } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
-import { getBfcacheIdMapContext, getBfcacheSegmentIdContext, notFound } from "./navigation.js";
+import { getBfcacheIdMapContext, getBfcacheSegmentIdContext } from "./navigation-context-state.js";
+import { notFound } from "./navigation-errors.js";
+import "./navigation-server.js";
 import * as React$1 from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 //#region src/shims/slot.tsx

package/dist/shims/unified-request-context.d.ts

@@ -1,10 +1,10 @@
-import { PrivateCacheState } from "./cache-runtime.js";
+import { CacheState } from "./cache-request-state.js";
 import { ExecutionContextLike } from "./request-context.js";
-import { CacheState } from "./cache.js";
 import { RootParamsState } from "./root-params.js";
 import { FetchCacheState } from "./fetch-cache.js";
 import { VinextHeadersShimState } from "./headers.js";
 import { RouterState } from "./router-state.js";
+import { PrivateCacheState } from "./cache-runtime.js";
 import { HeadState } from "./head-state.js";
 import { I18nState } from "./i18n-state.js";
 import { NavigationState } from "./navigation-state.js";

package/dist/typegen.js

@@ -1,3 +1,4 @@
+import { findDir } from "./utils/project.js";
 import { decodeRouteSegment, isInvisibleSegment } from "./routing/utils.js";
 import { patternToNextFormat } from "./routing/route-validation.js";
 import { compareStrings } from "./utils/compare.js";
@@ -15,7 +16,7 @@ import "./.next/types/routes.d.ts";
 `;
 async function generateRouteTypes(options) {
 	const root = path.resolve(options.root);
-	const appDir = options.appDir ? path.resolve(options.appDir) : await findAppDir(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 content = appDir ? renderRouteTypes(await collectRouteTypeModel(appDir, options.pageExtensions)) : renderRouteTypes(emptyRouteTypeModel());
 	await fs.mkdir(path.dirname(outPath), { recursive: true });
@@ -84,15 +85,6 @@ async function collectRouteTypeModel(appDir, pageExtensions) {
 	for (const slotNames of model.layoutSlots.values()) slotNames.sort(compareStrings);
 	return model;
 }
-async function findAppDir(root) {
-	for (const rel of ["app", path.join("src", "app")]) {
-		const candidate = path.join(root, rel);
-		try {
-			if ((await fs.stat(candidate)).isDirectory()) return candidate;
-		} catch {}
-	}
-	return null;
-}
 function renderRouteTypes(model) {
 	const allRoutes = uniqueSorted([
 		...model.pageRoutes,

package/dist/utils/project.d.ts

@@ -62,9 +62,15 @@ 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 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/`.
+ */
+declare function findDir(root: string, ...candidates: string[]): string | null;
 /**
  * Check if the project uses App Router (has an app/ directory).
  */
 declare function hasAppDir(root: string): boolean;
 //#endregion
-export { detectPackageManager, detectPackageManagerName, ensureESModule, ensureViteConfigCompatibility, findInNodeModules, hasAppDir, hasViteConfig, renameCJSConfigs };
+export { detectPackageManager, detectPackageManagerName, ensureESModule, ensureViteConfigCompatibility, findDir, findInNodeModules, hasAppDir, hasViteConfig, renameCJSConfigs };

package/dist/utils/project.js

@@ -190,10 +190,24 @@ 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 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/`.
+*/
+function findDir(root, ...candidates) {
+	for (const candidate of candidates) {
+		const full = path.join(root, candidate);
+		try {
+			if (fs.statSync(full).isDirectory()) return full;
+		} catch {}
+	}
+	return null;
+}
+/**
 * Check if the project uses App Router (has an app/ directory).
 */
 function hasAppDir(root) {
-	return fs.existsSync(path.join(root, "app")) || fs.existsSync(path.join(root, "src", "app"));
+	return findDir(root, "app", path.join("src", "app")) !== null;
 }
 //#endregion
-export { detectPackageManager, detectPackageManagerName, ensureESModule, ensureViteConfigCompatibility, findInNodeModules, hasAppDir, hasViteConfig, renameCJSConfigs };
+export { detectPackageManager, detectPackageManagerName, ensureESModule, ensureViteConfigCompatibility, findDir, findInNodeModules, hasAppDir, hasViteConfig, renameCJSConfigs };

package/dist/utils/virtual-module.d.ts

@@ -0,0 +1,5 @@
+//#region src/utils/virtual-module.d.ts
+declare const VIRTUAL_PREFIX = "\0";
+declare const VIRTUAL_MODULE_ID_RE: RegExp;
+//#endregion
+export { VIRTUAL_MODULE_ID_RE, VIRTUAL_PREFIX };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {
@@ -57,6 +57,10 @@
       "types": "./dist/server/app-router-entry.d.ts",
       "import": "./dist/server/app-router-entry.js"
     },
+    "./server/app-rsc-handler": {
+      "types": "./dist/server/app-rsc-handler.d.ts",
+      "import": "./dist/server/app-rsc-handler.js"
+    },
     "./config/config-matchers": {
       "types": "./dist/config/config-matchers.d.ts",
       "import": "./dist/config/config-matchers.js"
@@ -99,8 +103,8 @@
     "@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.1.24",
-    "vite-plus": "0.1.24",
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.1",
+    "vite-plus": "0.2.1",
     "@vinext/cloudflare": "0.1.2"
   },
   "peerDependencies": {