vinext 0.1.1 → 0.1.2

package/README.md

@@ -528,22 +528,19 @@ The cache is pluggable. The default `MemoryCacheHandler` works out of the box. S
 
 #### Configuring cache adapters from `vite.config`
 
-Instead of wiring up cache handlers imperatively from a worker entry, you can declare them in the `vinext()` plugin config. The `@vinext/cloudflare` package ships two Cloudflare adapters for this:
+Instead of wiring up cache handlers imperatively from a worker entry, you can declare them in the `vinext()` plugin config. The `@vinext/cloudflare` package ships Cloudflare adapters for this:
 
 - **`kvDataAdapter()`** (`@vinext/cloudflare/cache/kv-data-adapter`) — backs the `"use cache"` data cache with a Workers KV namespace.
-- **`cdnAdapter()`** (`@vinext/cloudflare/cache/cdn-adapter`) — backs full-route CDN caching with the Workers Cache API.
 
 ```ts
 import { defineConfig } from "vite";
 import vinext from "vinext";
-import { cdnAdapter } from "@vinext/cloudflare/cache/cdn-adapter";
 import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";
 
 export default defineConfig({
   plugins: [
     vinext({
       cache: {
-        cdn: cdnAdapter(),
         data: kvDataAdapter(),
       },
     }),
@@ -559,7 +556,7 @@ The KV data adapter reads `env[binding]` at runtime, so add the matching KV name
 }
 ```
 
-`binding` defaults to `VINEXT_KV_CACHE`, so `kvDataAdapter()` with no options works as long as that's your binding name. Other options: `appPrefix` (namespace cache keys to isolate multiple apps in one KV namespace), `ttlSeconds` (default KV `expirationTtl`, default 30 days), and `tagCacheTtlMs` (in-memory tag-invalidation cache TTL, default 5s). `cdnAdapter()` takes no options — it just needs the Workers Cache, which is always available on Workers.
+`binding` defaults to `VINEXT_KV_CACHE`, so `kvDataAdapter()` with no options works as long as that's your binding name. Other options: `appPrefix` (namespace cache keys to isolate multiple apps in one KV namespace), `ttlSeconds` (default KV `expirationTtl`, default 30 days), and `tagCacheTtlMs` (in-memory tag-invalidation cache TTL, default 5s).
 
 Each builder returns a plain, serializable `{ adapter, options }` descriptor — **it never touches the Workers runtime**, so nothing throws at build or dev time when bindings aren't available. The actual adapter (and its `env` binding lookup) is instantiated lazily on the first request.
 

package/dist/build/client-build-config.d.ts

@@ -51,10 +51,16 @@ declare function createClientManualChunks(shimsDir: string): (id: string) => str
  * compression efficiency — small files restart the compression dictionary,
  * adding ~5-15% wire overhead vs fewer larger chunks.
  */
+declare function createClientFileNameConfig(assetsDir: string): {
+  entryFileNames: string;
+  chunkFileNames: string;
+};
 declare function createClientOutputConfig(clientManualChunks: (id: string) => string | undefined, assetsDir: string): {
   assetFileNames: (assetInfo: ClientAssetFileNameInfo) => string;
   manualChunks: (id: string) => string | undefined;
   experimentalMinChunkSize: number;
+  entryFileNames: string;
+  chunkFileNames: string;
 };
 declare function createClientCodeSplittingConfig(clientManualChunks: (id: string) => string | undefined): {
   minSize: number;
@@ -155,4 +161,4 @@ type VinextBuildConfigWithLegacy = VinextBuildConfig & {
 declare function getBuildBundlerOptions(build: UserConfig["build"] | undefined): VinextBuildBundlerOptions | undefined;
 declare function withBuildBundlerOptions(viteMajorVersion: number, bundlerOptions: VinextBuildBundlerOptions): Partial<VinextBuildConfigWithLegacy>;
 //#endregion
-export { RSC_FRAMEWORK_CHUNK_TEST, clientTreeshakeConfig, createClientAssetFileNames, createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, isRscFrameworkModule, withBuildBundlerOptions };
+export { RSC_FRAMEWORK_CHUNK_TEST, clientTreeshakeConfig, createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, isRscFrameworkModule, withBuildBundlerOptions };

package/dist/build/client-build-config.js

@@ -89,8 +89,16 @@ function createClientManualChunks(shimsDir) {
 * compression efficiency — small files restart the compression dictionary,
 * adding ~5-15% wire overhead vs fewer larger chunks.
 */
+function createClientFileNameConfig(assetsDir) {
+	const chunksDir = `${assetsDir}/chunks`;
+	return {
+		entryFileNames: `${chunksDir}/[name]-[hash].js`,
+		chunkFileNames: `${chunksDir}/[name]-[hash].js`
+	};
+}
 function createClientOutputConfig(clientManualChunks, assetsDir) {
 	return {
+		...createClientFileNameConfig(assetsDir),
 		assetFileNames: createClientAssetFileNames(assetsDir),
 		manualChunks: clientManualChunks,
 		experimentalMinChunkSize: 1e4
@@ -228,4 +236,4 @@ function withBuildBundlerOptions(viteMajorVersion, bundlerOptions) {
 	return viteMajorVersion >= 8 ? { rolldownOptions: bundlerOptions } : { rollupOptions: bundlerOptions };
 }
 //#endregion
-export { RSC_FRAMEWORK_CHUNK_TEST, clientTreeshakeConfig, createClientAssetFileNames, createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, isRscFrameworkModule, withBuildBundlerOptions };
+export { RSC_FRAMEWORK_CHUNK_TEST, clientTreeshakeConfig, createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, isRscFrameworkModule, withBuildBundlerOptions };

package/dist/check.js

@@ -1,4 +1,5 @@
 import { detectPackageManager } from "./utils/project.js";
+import { normalizePathSeparators } from "./utils/path.js";
 import fs from "node:fs";
 import path from "node:path";
 import { parseAst } from "vite";
@@ -342,7 +343,7 @@ function findSourceFiles(dir, extensions = [
 	if (!fs.existsSync(dir)) return results;
 	const entries = fs.readdirSync(dir, { withFileTypes: true });
 	for (const entry of entries) {
-		const fullPath = path.join(dir, entry.name);
+		const fullPath = normalizePathSeparators(path.join(dir, entry.name));
 		if (entry.isDirectory()) {
 			if (entry.name === "node_modules" || entry.name === ".next" || entry.name === "dist" || entry.name === ".git") continue;
 			results.push(...findSourceFiles(fullPath, extensions));
@@ -563,7 +564,7 @@ function scanImports(root) {
 			if (mod.startsWith("next/") || mod === "next" || mod === "server-only" || mod === "client-only") {
 				const normalized = mod === "next" ? "next" : mod;
 				if (!importUsage.has(normalized)) importUsage.set(normalized, []);
-				const relFile = path.relative(root, file);
+				const relFile = normalizePathSeparators(path.relative(root, file));
 				const usedInFiles = importUsage.get(normalized) ?? [];
 				if (!usedInFiles.includes(relFile)) usedInFiles.push(relFile);
 			}
@@ -876,7 +877,7 @@ function checkConventions(root) {
 	const cjsGlobalFiles = [];
 	for (const file of allSourceFiles) {
 		const content = fs.readFileSync(file, "utf-8");
-		const rel = path.relative(root, file);
+		const rel = normalizePathSeparators(path.relative(root, file));
 		if (viewTransitionRegex.test(content)) viewTransitionFiles.push(rel);
 		if (hasFreeCjsGlobal(content)) cjsGlobalFiles.push(rel);
 	}

package/dist/client/navigation-runtime.d.ts

@@ -15,12 +15,13 @@ type NavigationRuntimeRscBootstrap = {
 };
 type NavigationRuntimeKind = "navigate" | "traverse" | "refresh";
 type NavigationRuntimeHistoryUpdateMode = "push" | "replace";
+type NavigationRuntimeVisibleCommitMode = "transition" | "synchronous";
 type NavigationRuntimeTraversalIntent = {
   direction: "back" | "forward" | "unknown";
   historyState: unknown;
   targetHistoryIndex: number | null;
 };
-type NavigationRuntimeNavigate = (href: string, redirectDepth?: number, navigationKind?: NavigationRuntimeKind, historyUpdateMode?: NavigationRuntimeHistoryUpdateMode, previousNextUrlOverride?: string | null, programmaticTransition?: boolean, traversalIntent?: NavigationRuntimeTraversalIntent, scrollIntent?: AppRouterScrollIntent | null) => Promise<void>;
+type NavigationRuntimeNavigate = (href: string, redirectDepth?: number, navigationKind?: NavigationRuntimeKind, historyUpdateMode?: NavigationRuntimeHistoryUpdateMode, previousNextUrlOverride?: string | null, programmaticTransition?: boolean, traversalIntent?: NavigationRuntimeTraversalIntent, scrollIntent?: AppRouterScrollIntent | null, visibleCommitMode?: NavigationRuntimeVisibleCommitMode) => Promise<void>;
 type NavigationRuntimeFunctions = {
   clearNavigationCaches?: () => void;
   commitHashNavigation?: (href: string, historyUpdateMode: NavigationRuntimeHistoryUpdateMode, scroll: boolean) => void;
@@ -66,4 +67,4 @@ declare function hasAppNavigationRuntime(): boolean;
  */
 declare function hasAppNavigationRuntimeBootstrap(): boolean;
 //#endregion
-export { NAVIGATION_RUNTIME_KEY, NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, NavigationRuntime, NavigationRuntimeBootstrap, NavigationRuntimeFunctions, NavigationRuntimeNavigate, NavigationRuntimeRscBootstrap, NavigationRuntimeRscChunk, NavigationRuntimeSnapshot, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions, subscribeNavigationRuntimeRscChunk };
+export { NAVIGATION_RUNTIME_KEY, NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, NavigationRuntime, NavigationRuntimeBootstrap, NavigationRuntimeFunctions, NavigationRuntimeNavigate, NavigationRuntimeRscBootstrap, NavigationRuntimeRscChunk, NavigationRuntimeSnapshot, NavigationRuntimeVisibleCommitMode, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions, subscribeNavigationRuntimeRscChunk };

package/dist/client/window-next.d.ts

@@ -40,10 +40,9 @@
  * `window.next.router`. Mirrors the `publicAppRouterInstance` shape from
  * `packages/next/src/client/components/app-router-instance.ts`.
  *
- * `hmrRefresh` and `experimental_gesturePush` are intentionally omitted —
- * vinext does not implement them. Library callers that branch on their
- * presence (`typeof router.hmrRefresh === "function"`) will skip the
- * branch, matching what they would do on a production Next.js build.
+ * `hmrRefresh` is intentionally omitted — vinext does not implement it.
+ * `experimental_gesturePush` is attached only when
+ * `experimental.gestureTransition` is enabled, matching Next.js.
  */
 type AppRouterPublicInstance = {
   push: (href: string, options?: {
@@ -57,6 +56,9 @@ type AppRouterPublicInstance = {
   refresh: () => void;
   prefetch: (href: string, options?: {
     onInvalidate?: () => void;
+  }) => void;
+  experimental_gesturePush?: (href: string, options?: {
+    scroll?: boolean;
   }) => void; /** Default placeholder, matches Next.js. */
   bfcacheId?: string;
 };

package/dist/config/config-matchers.d.ts

@@ -32,10 +32,10 @@ declare function escapeHeaderSource(source: string): string;
  * Callers extract the relevant parts from the incoming Request.
  */
 type RequestContext = {
-  headers: Headers;
-  cookies: Record<string, string>;
-  query: URLSearchParams;
-  host: string;
+  readonly headers: Headers;
+  readonly cookies: Record<string, string>;
+  readonly query: URLSearchParams;
+  readonly host: string;
 };
 /**
  * basePath gating state passed alongside the pathname to every matcher.
@@ -65,6 +65,13 @@ type BasePathMatchState = {
 declare function parseCookies(cookieHeader: string | null): Record<string, string>;
 /**
  * Build a RequestContext from a Web Request object.
+ *
+ * `cookies` and `query` are lazy memoized getters: they are consumed only by
+ * `has`/`missing` condition evaluation (`checkHasConditions` /
+ * `matchesRuleConditions`), and most apps configure no such conditions. The
+ * cookie split and `searchParams` access are therefore deferred until first
+ * read and computed at most once. Mirrors `headersContextFromRequest` in
+ * `shims/headers.ts`.
  */
 declare function requestContextFromRequest(request: Request): RequestContext;
 declare function normalizeHost(hostHeader: string | null, fallbackHostname: string): string;

package/dist/config/config-matchers.js

@@ -356,13 +356,26 @@ function parseCookies(cookieHeader) {
 }
 /**
 * Build a RequestContext from a Web Request object.
+*
+* `cookies` and `query` are lazy memoized getters: they are consumed only by
+* `has`/`missing` condition evaluation (`checkHasConditions` /
+* `matchesRuleConditions`), and most apps configure no such conditions. The
+* cookie split and `searchParams` access are therefore deferred until first
+* read and computed at most once. Mirrors `headersContextFromRequest` in
+* `shims/headers.ts`.
 */
 function requestContextFromRequest(request) {
 	const url = new URL(request.url);
+	let cookies;
+	let query;
 	return {
 		headers: request.headers,
-		cookies: parseCookies(request.headers.get("cookie")),
-		query: url.searchParams,
+		get cookies() {
+			return cookies ??= parseCookies(request.headers.get("cookie"));
+		},
+		get query() {
+			return query ??= url.searchParams;
+		},
 		host: normalizeHost(request.headers.get("host"), url.hostname)
 	};
 }

package/dist/config/next-config.d.ts

@@ -181,6 +181,14 @@ type NextConfig = {
      */
     defineServer?: Record<string, string | number | boolean>;
   };
+  experimental?: {
+    /**
+     * Enables the experimental App Router gesture transition API:
+     * `useRouter().experimental_gesturePush()`.
+     */
+    gestureTransition?: boolean;
+    [key: string]: unknown;
+  };
   /**
    * Path to a custom cache handler module (e.g., KV, Redis, DynamoDB).
    * Accepts relative paths, absolute paths, or file:// URLs from import.meta.resolve().
@@ -230,6 +238,11 @@ type ResolvedNextConfig = {
   pageExtensions: string[];
   instrumentationClientInject: string[];
   cacheComponents: boolean;
+  /**
+   * Enables the experimental App Router gesture transition API:
+   * `useRouter().experimental_gesturePush()`.
+   */
+  gestureTransition: boolean;
   /**
    * Whether `experimental.prefetchInlining` is configured. Next.js uses this
    * with the Segment Cache to fetch the route tree before the bundled inlined

package/dist/config/next-config.js

@@ -512,6 +512,7 @@ async function resolveNextConfig(config, root = process.cwd()) {
 			output: "",
 			pageExtensions: normalizePageExtensions(),
 			cacheComponents: false,
+			gestureTransition: false,
 			prefetchInlining: false,
 			redirects: [],
 			rewrites: {
@@ -655,6 +656,7 @@ async function resolveNextConfig(config, root = process.cwd()) {
 		pageExtensions,
 		instrumentationClientInject: Array.isArray(config.instrumentationClientInject) ? config.instrumentationClientInject.filter((x) => typeof x === "string") : [],
 		cacheComponents: config.cacheComponents ?? false,
+		gestureTransition: experimental?.gestureTransition === true,
 		prefetchInlining,
 		redirects,
 		rewrites,

package/dist/deploy.js

@@ -334,7 +334,7 @@ function generatePagesRouterWorkerEntry() {
  * Cloudflare Worker entry point -- auto-generated by vinext deploy.
  * Edit freely or delete to regenerate on next deploy.
  */
-import { runPagesRequest } from "vinext/server/pages-request-pipeline";
+import { runPagesRequest, wrapMiddlewareWithBasePath } from "vinext/server/pages-request-pipeline";
 import type { PagesPipelineDeps } from "vinext/server/pages-request-pipeline";
 import { handleImageOptimization, DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath } from "vinext/server/image-optimization";
 import type { ImageConfig } from "vinext/server/image-optimization";
@@ -468,7 +468,14 @@ export default {
         isDataRequest,
         ctx,
         matchPageRoute: typeof matchPageRoute === "function" ? matchPageRoute : null,
-        runMiddleware: typeof runMiddleware === "function" ? runMiddleware : null,
+        // Pass the original (pre-basePath-stripping) URL to middleware so that
+        // request.nextUrl.basePath reflects whether the URL actually had the
+        // basePath prefix. Matches Next.js behavior and the prod-server.ts
+        // equivalent (shared via wrapMiddlewareWithBasePath).
+        runMiddleware:
+          typeof runMiddleware === "function"
+            ? wrapMiddlewareWithBasePath(runMiddleware, basePath, hadBasePath)
+            : null,
         renderPage: typeof renderPage === "function"
           ? (req, resolvedUrl, options, stagedHeaders) =>
               renderPage(req, resolvedUrl, null, ctx, stagedHeaders, options)

package/dist/entries/app-rsc-entry.js

@@ -275,6 +275,10 @@ ${metaRouteEntries.join(",\n")}
 // recognising /_next/static/* paths (parity with __assetPrefix below).
 export const __basePath = ${JSON.stringify(bp)};
 
+// Hoisted alongside __basePath so __fallbackRenderer / buildPageElements can
+// thread the configured trailingSlash flag through canonical URL rendering.
+const __trailingSlash = ${JSON.stringify(ts)};
+
 const rootNotFoundModule = ${rootNotFoundVar ? rootNotFoundVar : "null"};
 const rootForbiddenModule = ${rootForbiddenVar ? rootForbiddenVar : "null"};
 const rootUnauthorizedModule = ${rootUnauthorizedVar ? rootUnauthorizedVar : "null"};
@@ -298,6 +302,7 @@ const createRscOnErrorHandler = (request, pathname, routePath) =>
 
 const __fallbackRenderer = __createAppFallbackRenderer({
   basePath: __basePath,
+  trailingSlash: __trailingSlash,
   rootBoundaries: {
     rootForbiddenModule,
     rootLayouts,
@@ -357,11 +362,11 @@ async function buildPageElements(route, params, routePath, pageRequest, layoutPa
     metadataRoutes,
     layoutParamAccess,
     basePath: __basePath,
+    trailingSlash: __trailingSlash,
     htmlLimitedBots: __htmlLimitedBots,
   });
 }
 
-const __trailingSlash = ${JSON.stringify(ts)};
 const __i18nConfig = ${JSON.stringify(i18nConfig)};
 const __configRedirects = ${JSON.stringify(redirects)};
 const __configRewrites = ${JSON.stringify(rewrites)};
@@ -484,6 +489,7 @@ export default __createAppRscHandler({
       },
       clientReuseManifest,
       cleanPathname,
+      displayPathname,
       clearRequestContext() {
         __clearRequestContext();
       },

package/dist/entries/pages-client-entry.js

@@ -1,7 +1,7 @@
+import { normalizePathSeparators } from "../utils/path.js";
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { pagesRouter } from "../routing/pages-router.js";
-import { normalizePathSeparators } from "../utils/path.js";
 //#region src/entries/pages-client-entry.ts
 /**
 * Pages Router client hydration entry generator.

package/dist/entries/pages-server-entry.js

@@ -1,6 +1,6 @@
+import { normalizePathSeparators } from "../utils/path.js";
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
-import { normalizePathSeparators } from "../utils/path.js";
 import { resolveEntryPath } from "./runtime-entry-module.js";
 import { isProxyFile } from "../server/middleware.js";
 //#region src/entries/pages-server-entry.ts
@@ -46,11 +46,11 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 	const docFilePath = findFileWithExts(pagesDir, "_document", fileMatcher);
 	const errorFilePath = findFileWithExts(pagesDir, "_error", fileMatcher);
-	const appAssetPathJson = appFilePath !== null ? JSON.stringify(normalizePathSeparators(appFilePath)) : "null";
-	const appImportCode = appFilePath !== null ? `import { default as AppComponent } from ${JSON.stringify(normalizePathSeparators(appFilePath))};` : `const AppComponent = null;`;
-	const docImportCode = docFilePath !== null ? `import { default as DocumentComponent } from ${JSON.stringify(normalizePathSeparators(docFilePath))};` : `const DocumentComponent = null;`;
-	const errorAssetPathJson = errorFilePath !== null ? JSON.stringify(normalizePathSeparators(errorFilePath)) : "null";
-	const errorImportCode = errorFilePath !== null ? `import * as ErrorPageModule from ${JSON.stringify(normalizePathSeparators(errorFilePath))};` : `const ErrorPageModule = null;`;
+	const appAssetPathJson = appFilePath !== null ? JSON.stringify(appFilePath) : "null";
+	const appImportCode = appFilePath !== null ? `import { default as AppComponent } from ${JSON.stringify(appFilePath)};` : `const AppComponent = null;`;
+	const docImportCode = docFilePath !== null ? `import { default as DocumentComponent } from ${JSON.stringify(docFilePath)};` : `const DocumentComponent = null;`;
+	const errorAssetPathJson = errorFilePath !== null ? JSON.stringify(errorFilePath) : "null";
+	const errorImportCode = errorFilePath !== null ? `import * as ErrorPageModule from ${JSON.stringify(errorFilePath)};` : `const ErrorPageModule = null;`;
 	const i18nConfigJson = nextConfig?.i18n ? JSON.stringify({
 		locales: nextConfig.i18n.locales,
 		defaultLocale: nextConfig.i18n.defaultLocale,
@@ -279,6 +279,7 @@ const _renderPage = __createPagesPageHandler({
   i18nConfig,
   vinextConfig: {
     basePath: vinextConfig.basePath,
+    assetPrefix: vinextConfig.assetPrefix,
     trailingSlash: vinextConfig.trailingSlash,
     expireTime: vinextConfig.expireTime,
     clientTraceMetadata: vinextConfig.clientTraceMetadata,

package/dist/index.d.ts

@@ -88,12 +88,10 @@ type VinextOptions = {
    * need a binding — e.g. a KV namespace — can read it.
    *
    * @example
-   * import { cdnAdapter } from "@vinext/cloudflare/cache/cdn-adapter";
    * import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";
    *
    * vinext({
    *   cache: {
-   *     cdn:  cdnAdapter(),
    *     data: kvDataAdapter({ binding: "MY_KV" }),
    *   },
    * })