vinext 0.0.55 → 0.1.1

package/dist/deploy.js

@@ -259,28 +259,29 @@ function generateWranglerConfig(info) {
 		images: { binding: "IMAGES" }
 	};
 	if (info.hasISR) config.kv_namespaces = [{
-		binding: "VINEXT_CACHE",
+		binding: "VINEXT_KV_CACHE",
 		id: "<your-kv-namespace-id>"
 	}];
 	return JSON.stringify(config, null, 2) + "\n";
 }
 /** Generate worker/index.ts for App Router */
-function generateAppRouterWorkerEntry(hasISR = false) {
+function generateAppRouterWorkerEntry() {
 	return `/**
  * Cloudflare Worker entry point — auto-generated by vinext deploy.
  * Edit freely or delete to regenerate on next deploy.
  *
+ * Cache backends (data + page ISR) are configured declaratively in
+ * vite.config via the vinext({ cache }) option.
+ *
  * For apps without image optimization, you can use vinext/server/app-router-entry
  * directly in wrangler.jsonc: "main": "vinext/server/app-router-entry"
  */
 import { handleImageOptimization, DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath } from "vinext/server/image-optimization";
 import type { ImageConfig } from "vinext/server/image-optimization";
 import handler from "vinext/server/app-router-entry";
-${hasISR ? `import { KVCacheHandler } from "vinext/cloudflare";
-import { setCacheHandler } from "vinext/shims/cache";
-` : ""}
+
 interface Env {
-  ASSETS: Fetcher;${hasISR ? `\n  VINEXT_CACHE: KVNamespace;` : ""}
+  ASSETS: Fetcher;
   IMAGES: {
     input(stream: ReadableStream): {
       transform(options: Record<string, unknown>): {
@@ -303,11 +304,7 @@ interface ExecutionContext {
 
 export default {
   async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
-${hasISR ? `    // Wire up KV-backed ISR cache. The vinext RSC entry automatically
-    // registers ctx in ALS so background KV puts use waitUntil — without
-    // this every request would return MISS.
-    setCacheHandler(new KVCacheHandler(env.VINEXT_CACHE));
-` : ""}    const url = new URL(request.url);
+    const url = new URL(request.url);
 
     // Image optimization via Cloudflare Images binding.
     // The parseImageParams validation inside handleImageOptimization
@@ -337,31 +334,19 @@ 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 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";
-import {
-  matchRedirect,
-  matchRewrite,
-  requestContextFromRequest,
-  applyMiddlewareRequestHeaders,
-  isExternalUrl,
-  proxyExternalRequest,
-  sanitizeDestination,
-} from "vinext/config/config-matchers";
-import {
-  applyConfigHeadersToHeaderRecord,
-  cloneRequestWithHeaders,
-  filterInternalHeaders,
-  isOpenRedirectShaped,
-  normalizeTrailingSlash,
-} from "vinext/server/request-pipeline";
+import { cloneRequestWithHeaders, filterInternalHeaders, isOpenRedirectShaped } from "vinext/server/request-pipeline";
 import { notFoundStaticAssetResponse } from "vinext/server/http-error-responses";
 import { assetPrefixPathname, isNextStaticPath } from "vinext/utils/asset-prefix";
-import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "vinext/server/pages-i18n";
-import { mergeRewriteQuery } from "vinext/utils/query";
+import { hasBasePath, stripBasePath } from "vinext/utils/base-path";
 
 // @ts-expect-error -- virtual module resolved by vinext at build time
 import { renderPage, handleApiRoute, runMiddleware, vinextConfig, matchPageRoute } from "virtual:vinext-server-entry";
+// @ts-expect-error -- virtual module resolved by vinext at build time
+import { registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 
 interface Env {
   ASSETS: Fetcher;
@@ -394,22 +379,13 @@ const imageConfig: ImageConfig | undefined = vinextConfig?.images ? {
   contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy,
 } : undefined;
 
-function hasBasePath(pathname: string, basePath: string): boolean {
-  if (!basePath) return false;
-  return pathname === basePath || pathname.startsWith(basePath + "/");
-}
-
-function stripBasePath(pathname: string, basePath: string): string {
-  if (!hasBasePath(pathname, basePath)) return pathname;
-  return pathname.slice(basePath.length) || "/";
-}
-
 export default {
   async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+    // Pass the Worker \`env\` so binding-backed adapters (e.g. KV) resolve.
+    registerConfiguredCacheAdapters(env);
     try {
       const url = new URL(request.url);
       let pathname = url.pathname;
-      let urlWithQuery = pathname + url.search;
 
       // Block protocol-relative URL open redirects in all shapes:
       //   literal  //evil.com, /\\\\evil.com
@@ -452,11 +428,12 @@ export default {
       {
         const stripped = stripBasePath(pathname, basePath);
         if (stripped !== pathname) {
-          urlWithQuery = stripped + url.search;
+          const strippedUrl = new URL(request.url);
+          strippedUrl.pathname = stripped;
+          request = new Request(strippedUrl, request);
           pathname = stripped;
         }
       }
-      const basePathState = { basePath, hadBasePath };
 
       // ── Image optimization via Cloudflare Images binding ──────────
       // Checked after basePath stripping so /<basePath>/_next/image works.
@@ -471,291 +448,43 @@ export default {
         }, allowedWidths, imageConfig);
       }
 
-      // ── 2. Trailing slash normalization ────────────────────────────
-      {
-        const trailingSlashRedirect = normalizeTrailingSlash(
-          pathname,
-          basePath,
-          trailingSlash,
-          url.search,
-        );
-        if (trailingSlashRedirect) {
-          return trailingSlashRedirect;
-        }
-      }
-
-      // Build a request with the basePath-stripped URL for middleware and
-      // downstream handlers. In Workers the incoming request URL still
-      // contains basePath; prod-server constructs its webRequest from
-      // the already-stripped URL, so we replicate that here.
-      if (basePath) {
-        const strippedUrl = new URL(request.url);
-        strippedUrl.pathname = pathname;
-        request = new Request(strippedUrl, request);
-      }
-
-      // Build request context for pre-middleware config matching. Redirects
-      // run before middleware in Next.js. Header match conditions also use the
-      // original request snapshot even though header merging happens later so
-      // middleware response headers can still take precedence.
-      // beforeFiles, afterFiles, and fallback rewrites run after middleware
-      // (App Router order), so they use postMwReqCtx created after
-      // x-middleware-request-* headers are unpacked into request.
-      const reqCtx = requestContextFromRequest(request);
-
-      // Default-locale path normalisation (issue #1336, item 4). Mirrors
-      // Next.js's resolve-routes.ts: every request without a locale prefix
-      // gets the (domain-aware) default locale prepended before config rule
-      // matching so that locale-aware rules with :locale placeholders or
-      // locale: false overrides still match default-locale URLs.
-      const matchPathname = i18nConfig
-        ? normalizeDefaultLocalePathname(pathname, i18nConfig, {
-            hostname: url.hostname,
-          })
-        : pathname;
-
-      // ── 3. Apply redirects from next.config.js ────────────────────
-      if (configRedirects.length) {
-        const redirect = matchRedirect(matchPathname, configRedirects, reqCtx, basePathState);
-        if (redirect) {
-          // Only prepend basePath when the request was actually under basePath.
-          // Opt-out rules running on out-of-basepath requests must not receive
-          // a basePath prefix.
-          const dest = sanitizeDestination(
-            basePath &&
-              hadBasePath &&
-              !isExternalUrl(redirect.destination) &&
-              !hasBasePath(redirect.destination, basePath)
-              ? basePath + redirect.destination
-              : redirect.destination,
-          );
-          return new Response(null, {
-            status: redirect.permanent ? 308 : 307,
-            headers: { Location: dest },
-          });
-        }
-      }
-
-      // ── 4. Run middleware ──────────────────────────────────────────
-      let resolvedUrl = urlWithQuery;
-      const middlewareHeaders: Record<string, string | string[]> = {};
-      let middlewareRewriteStatus: number | undefined;
-      if (typeof runMiddleware === "function") {
-        const result = await runMiddleware(request, ctx, { isDataRequest });
-
-        // Bubble up waitUntil promises (e.g. Clerk telemetry/session sync)
-        if (result.waitUntilPromises?.length) {
-          for (const p of result.waitUntilPromises) {
-            ctx.waitUntil(p);
-          }
-        }
-
-        if (!result.continue) {
-          if (result.redirectUrl) {
-            const redirectHeaders = new Headers({ Location: result.redirectUrl });
-            if (result.responseHeaders) {
-              for (const [key, value] of result.responseHeaders) {
-                redirectHeaders.append(key, value);
-              }
-            }
-            return new Response(null, {
-              status: result.redirectStatus ?? 307,
-              headers: redirectHeaders,
-            });
-          }
-          if (result.response) {
-            return result.response;
-          }
-        }
-
-        // Collect middleware response headers to merge into final response.
-        // Use an array for Set-Cookie to preserve multiple values.
-        if (result.responseHeaders) {
-          for (const [key, value] of result.responseHeaders) {
-            if (key === "set-cookie") {
-              const existing = middlewareHeaders[key];
-              if (Array.isArray(existing)) {
-                existing.push(value);
-              } else if (existing) {
-                middlewareHeaders[key] = [existing as string, value];
-              } else {
-                middlewareHeaders[key] = [value];
-              }
-            } else {
-              middlewareHeaders[key] = value;
-            }
-          }
-        }
-
-        // Apply middleware rewrite
-        if (result.rewriteUrl) {
-          resolvedUrl = result.rewriteUrl;
-        }
-
-        // Apply custom status code from middleware rewrite
-        middlewareRewriteStatus = result.rewriteStatus;
-      }
-
-      // Unpack x-middleware-request-* headers into the actual request and strip
-      // all x-middleware-* internal signals. Rebuilds postMwReqCtx for use by
-      // beforeFiles, afterFiles, and fallback config rules (which run after
-      // middleware per the Next.js execution order).
-      const { postMwReqCtx, request: postMwReq } = applyMiddlewareRequestHeaders(middlewareHeaders, request);
-      request = postMwReq;
-
-      // Config header matching must keep using the original normalized pathname
-      // even if middleware rewrites the downstream route/render target.
-      let resolvedPathname = resolvedUrl.split("?")[0];
-
-      // ── 5. Apply custom headers from next.config.js ───────────────
-      // Config headers are additive for multi-value headers (Vary,
-      // Set-Cookie) and override for everything else. Vary values are
-      // comma-joined per HTTP spec. Set-Cookie values are accumulated
-      // as arrays (RFC 6265 forbids comma-joining cookies).
-      // Middleware headers take precedence: skip config keys already set
-      // by middleware so middleware always wins for the same key.
-      if (configHeaders.length) {
-        applyConfigHeadersToHeaderRecord(middlewareHeaders, {
-          configHeaders,
-          pathname: matchPathname,
-          requestContext: reqCtx,
-          basePathState,
-        });
-      }
-
-      if (isExternalUrl(resolvedUrl)) {
-        const proxyResponse = await proxyExternalRequest(request, resolvedUrl);
-        return mergeHeaders(proxyResponse, middlewareHeaders, undefined);
-      }
-
-      // Default-locale-normalised form of resolvedPathname for matching
-      // against next.config.js rewrites (beforeFiles, afterFiles, fallback).
-      const matchResolvedPathname = (p: string): string =>
-        i18nConfig
-          ? normalizeDefaultLocalePathname(p, i18nConfig, { hostname: url.hostname })
-          : p;
-
-      // ── 6. Apply beforeFiles rewrites from next.config.js ─────────
-      let configRewriteFired = false;
-      if (configRewrites.beforeFiles?.length) {
-        const rewritten = matchRewrite(
-          matchResolvedPathname(resolvedPathname),
-          configRewrites.beforeFiles,
-          postMwReqCtx,
-          basePathState,
-        );
-        if (rewritten) {
-          if (isExternalUrl(rewritten)) {
-            return proxyExternalRequest(request, rewritten);
-          }
-          // Preserve original query params across rewrites (Next.js parity).
-          resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
-          resolvedPathname = resolvedUrl.split("?")[0];
-          configRewriteFired = true;
-        }
-      }
-
-      // Reject out-of-basePath requests that no rule rewrote. See the
-      // matching comment in prod-server.ts step 7b.
-      if (basePath && !hadBasePath && !configRewriteFired) {
-        return new Response("This page could not be found", {
-          status: 404,
-          headers: { "Content-Type": "text/html; charset=utf-8" },
-        });
-      }
-
-      // ── 7. API routes ─────────────────────────────────────────────
-      // Forward ctx so handlePagesApiRoute can wrap the user handler in
-      // runWithExecutionContext, making ctx.waitUntil() reachable from
-      // after() and other shims that schedule deferred work.
-      //
-      // Strip the i18n locale prefix before the /api/ check so
-      // /fr/api/ok resolves to the pages/api/ok handler (Next.js
-      // parity -- see base-server.ts's normalizeLocalePath call).
-      const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, vinextConfig?.i18n ?? null);
-      const apiLookupPathname = apiLookupUrl.split("?")[0];
-      if (apiLookupPathname.startsWith("/api/") || apiLookupPathname === "/api") {
-        const response = typeof handleApiRoute === "function"
-          ? await handleApiRoute(request, apiLookupUrl, ctx)
-          : new Response("404 - API route not found", { status: 404 });
-        return mergeHeaders(response, middlewareHeaders, middlewareRewriteStatus);
-      }
-
-      const pageMatch =
-        typeof matchPageRoute === "function" ? matchPageRoute(resolvedPathname, request) : null;
-
-      // ── 8. Apply afterFiles rewrites from next.config.js ──────────
-      // These run after non-dynamic page routes but before dynamic routes.
-      if ((!pageMatch || pageMatch.route.isDynamic) && configRewrites.afterFiles?.length) {
-        const rewritten = matchRewrite(
-          matchResolvedPathname(resolvedPathname),
-          configRewrites.afterFiles,
-          postMwReqCtx,
-          basePathState,
-        );
-        if (rewritten) {
-          if (isExternalUrl(rewritten)) {
-            return proxyExternalRequest(request, rewritten);
-          }
-          resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
-          resolvedPathname = resolvedUrl.split("?")[0];
-        }
-      }
-
-      // ── 9. Page routes ────────────────────────────────────────────
-      let response: Response | undefined;
-      if (typeof renderPage === "function") {
-        const renderPageMatch =
-          typeof matchPageRoute === "function" ? matchPageRoute(resolvedPathname, request) : null;
-        const shouldDeferErrorPageOnMiss =
-          !isDataRequest && typeof matchPageRoute === "function" && !renderPageMatch;
-        const initialRenderOptions = shouldDeferErrorPageOnMiss
-          ? { renderErrorPageOnMiss: false }
-          : undefined;
-        response = await renderPage(request, resolvedUrl, null, ctx, undefined, initialRenderOptions);
-
-        // ── 10. Fallback rewrites (if SSR returned 404) ─────────────
-        let matchedFallbackRewrite = false;
-        if (
-          response &&
-          response.status === 404 &&
-          shouldDeferErrorPageOnMiss &&
-          configRewrites.fallback?.length
-        ) {
-          const fallbackRewrite = matchRewrite(
-            matchResolvedPathname(resolvedPathname),
-            configRewrites.fallback,
-            postMwReqCtx,
-            basePathState,
-          );
-          if (fallbackRewrite) {
-            if (isExternalUrl(fallbackRewrite)) {
-              return proxyExternalRequest(request, fallbackRewrite);
-            }
-            matchedFallbackRewrite = true;
-            response = await renderPage(
-              request,
-              mergeRewriteQuery(resolvedUrl, fallbackRewrite),
-              null,
-              ctx,
-            );
-          }
-        }
-        if (
-          response &&
-          response.status === 404 &&
-          shouldDeferErrorPageOnMiss &&
-          !matchedFallbackRewrite
-        ) {
-          response = await renderPage(request, resolvedUrl, null, ctx);
-        }
-      }
+      // Delegate the canonical 9-step Next.js pipeline to the shared owner.
+      // The worker adapter is responsible for: open-redirect guard, _next/static
+      // 404 short-circuit, header filtering, basePath stripping, and image
+      // optimization. runPagesRequest receives a clean, basePath-stripped request.
+      const deps: PagesPipelineDeps = {
+        basePath,
+        trailingSlash,
+        i18nConfig,
+        configRedirects,
+        configRewrites,
+        configHeaders,
+        hadBasePath,
+        // The worker adapter does not do _next/data URL normalization (no
+        // buildId available at request time). isDataReq is used by the pipeline
+        // only for renderPage options and shouldDeferErrorPageOnMiss -- false
+        // is correct here.
+        isDataReq: false,
+        isDataRequest,
+        ctx,
+        matchPageRoute: typeof matchPageRoute === "function" ? matchPageRoute : null,
+        runMiddleware: typeof runMiddleware === "function" ? runMiddleware : null,
+        renderPage: typeof renderPage === "function"
+          ? (req, resolvedUrl, options, stagedHeaders) =>
+              renderPage(req, resolvedUrl, null, ctx, stagedHeaders, options)
+          : null,
+        handleApi: typeof handleApiRoute === "function"
+          ? (req, apiUrl) => handleApiRoute(req, apiUrl, ctx)
+          : null,
+      };
 
-      if (!response) {
-        return new Response("This page could not be found", { status: 404 });
+      const result = await runPagesRequest(request, deps);
+      if (result.type === "response") {
+        return result.response;
       }
+      // Should not reach here for prod/worker (all callbacks supplied).
+      return new Response("This page could not be found", { status: 404 });
 
-      return mergeHeaders(response, middlewareHeaders, middlewareRewriteStatus);
     } catch (error) {
       console.error("[vinext] Worker error:", error);
       return new Response("Internal Server Error", { status: 500 });
@@ -763,90 +492,6 @@ export default {
   },
 };
 
-/**
- * Merge middleware/config headers into a response.
- * Response headers take precedence over middleware headers for all headers
- * except Set-Cookie, which is additive (both middleware and response cookies
- * are preserved). Matches the behavior in prod-server.ts. Uses getSetCookie()
- * to preserve multiple Set-Cookie values. Keep this in sync with
- * prod-server.ts and server/worker-utils.ts.
- */
-function mergeHeaders(
-  response: Response,
-  extraHeaders: Record<string, string | string[]>,
-  statusOverride?: number,
-): Response {
-  const NO_BODY_RESPONSE_STATUSES = new Set([204, 205, 304]);
-  function isVinextStreamedHtmlResponse(response: Response): boolean {
-    return response.__vinextStreamedHtmlResponse === true;
-  }
-  function isContentLengthHeader(name: string): boolean {
-    return name.toLowerCase() === "content-length";
-  }
-  function cancelResponseBody(response: Response): void {
-    const body = response.body;
-    if (!body || body.locked) return;
-    void body.cancel().catch(() => {
-      /* ignore cancellation failures on discarded bodies */
-    });
-  }
-
-  const status = statusOverride ?? response.status;
-  const merged = new Headers();
-  // Middleware/config headers go in first (lower precedence)
-  for (const [k, v] of Object.entries(extraHeaders)) {
-    if (isContentLengthHeader(k)) continue;
-    if (Array.isArray(v)) {
-      for (const item of v) merged.append(k, item);
-    } else {
-      merged.set(k, v);
-    }
-  }
-  // Response headers overlay them (higher precedence), except Set-Cookie
-  // which is additive (both middleware and response cookies should be sent).
-  response.headers.forEach((v, k) => {
-    if (k === "set-cookie") return;
-    merged.set(k, v);
-  });
-  const responseCookies = response.headers.getSetCookie?.() ?? [];
-  for (const cookie of responseCookies) merged.append("set-cookie", cookie);
-
-  const shouldDropBody = NO_BODY_RESPONSE_STATUSES.has(status);
-  const shouldStripStreamLength =
-    isVinextStreamedHtmlResponse(response) && merged.has("content-length");
-
-  if (
-    !Object.keys(extraHeaders).some((key) => !isContentLengthHeader(key)) &&
-    statusOverride === undefined &&
-    !shouldDropBody &&
-    !shouldStripStreamLength
-  ) {
-    return response;
-  }
-
-  if (shouldDropBody) {
-    cancelResponseBody(response);
-    merged.delete("content-encoding");
-    merged.delete("content-length");
-    merged.delete("content-type");
-    merged.delete("transfer-encoding");
-    return new Response(null, {
-      status,
-      statusText: status === response.status ? response.statusText : undefined,
-      headers: merged,
-    });
-  }
-
-  if (shouldStripStreamLength) {
-    merged.delete("content-length");
-  }
-
-  return new Response(response.body, {
-    status,
-    statusText: status === response.status ? response.statusText : undefined,
-    headers: merged,
-  });
-}
 `;
 }
 /** Generate vite.config.ts for App Router */
@@ -980,6 +625,101 @@ function viteConfigHasCloudflarePlugin(root) {
 	}
 	return false;
 }
+/**
+* Extract the object-literal text of the `cache:` key (the `{ ... }` passed as
+* `vinext({ cache })`) from a Vite config source, via brace matching. Returns
+* null if there is no `cache:` object literal.
+*/
+function extractCacheBlock(content) {
+	const m = /\bcache\s*:\s*\{/.exec(content);
+	if (!m) return null;
+	const open = m.index + m[0].length - 1;
+	let depth = 0;
+	for (let i = open; i < content.length; i++) {
+		const ch = content[i];
+		if (ch === "{") depth++;
+		else if (ch === "}" && --depth === 0) return content.slice(open, i + 1);
+	}
+	return null;
+}
+/**
+* Whether a `cdn` / `data` field inside the cache object is assigned a real
+* value (not absent, `undefined`, or `null`). Reads the value up to the next
+* comma / closing brace / newline, which is enough to tell an assignment like
+* `data: kvDataAdapter()` from `data: undefined`.
+*/
+function cacheFieldAssigned(cacheBlock, field) {
+	const m = new RegExp(`\\b${field}\\s*:\\s*([^,}\\n]+)`).exec(cacheBlock);
+	if (!m) return false;
+	const value = m[1].trim();
+	return value.length > 0 && value !== "undefined" && value !== "null";
+}
+/**
+* Detect whether the Vite config assigns a CDN or data cache adapter — i.e. the
+* `cdn` or `data` field of the `vinext({ cache })` option is given a value.
+* This is a source-level check on those exact object fields, not a fuzzy scan
+* for adapter names. Mirrors {@link viteConfigHasCloudflarePlugin}'s leniency:
+* an unreadable or absent config is treated as configured so a deploy is never
+* blocked on a false negative.
+*/
+function viteConfigHasCacheAdapter(root) {
+	const candidates = [
+		path.join(root, "vite.config.ts"),
+		path.join(root, "vite.config.js"),
+		path.join(root, "vite.config.mjs")
+	];
+	for (const candidate of candidates) {
+		if (!fs.existsSync(candidate)) continue;
+		let content;
+		try {
+			content = fs.readFileSync(candidate, "utf-8");
+		} catch {
+			return true;
+		}
+		const block = extractCacheBlock(content);
+		if (!block) return false;
+		return cacheFieldAssigned(block, "cdn") || cacheFieldAssigned(block, "data");
+	}
+	return true;
+}
+/**
+* Detect whether an existing user-authored Worker entry wires up a cache
+* backend imperatively via one of the `setCacheHandler` / `setDataCacheHandler`
+* / `setCdnCacheAdapter` setters. These setters are deprecated in favour of the
+* declarative `vinext({ cache })` option, but older apps that scaffolded a KV
+* cache handler into their Worker entry must keep working — so a deploy should
+* not be blocked when the Worker entry already configures a backend.
+*
+* This is a heuristic text scan (it doesn't execute the entry), mirroring
+* {@link viteConfigHasCacheAdapter}'s leniency: an unreadable Worker entry is
+* treated as configured so a deploy is never blocked on a false negative. A
+* missing Worker entry returns false (nothing to inspect — defer to other
+* checks).
+*/
+function workerEntryHasCacheHandler(root) {
+	const candidates = [path.join(root, "worker", "index.ts"), path.join(root, "worker", "index.js")];
+	for (const candidate of candidates) {
+		if (!fs.existsSync(candidate)) continue;
+		let content;
+		try {
+			content = fs.readFileSync(candidate, "utf-8");
+		} catch {
+			return true;
+		}
+		return /\b(?:setCacheHandler|setDataCacheHandler|setCdnCacheAdapter)\s*\(/.test(content);
+	}
+	return false;
+}
+/**
+* Build the error thrown when an ISR/cached app is deployed without a cache
+* adapter configured in the Vite config. Production deployments need a
+* persistent cache backend; vinext no longer scaffolds one into the Worker
+* entry, so it must be declared via `vinext({ cache })`.
+*/
+function formatMissingCacheAdapterError(options) {
+	const configRef = options.configFile ? options.configFile : "your Vite config";
+	return `[vinext] This app uses ISR / caching but no cache adapter is configured in ${configRef}.\n\n  Production deployments need a persistent cache backend. Declare one on the\n  vinext() plugin in ${configRef}:\n\n    import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";\n\n    export default defineConfig({\n      plugins: [\n        vinext({\n          cache: {\n            data: kvDataAdapter(), // KV-backed data cache (binding: VINEXT_KV_CACHE)\n          },\n        }),\n        cloudflare(),\n      ],\n    });\n\n  The VINEXT_KV_CACHE namespace binding is added to wrangler.jsonc for you.\n  Create the namespace with:\n\n    npx wrangler kv namespace create VINEXT_KV_CACHE`;
+}
 function getFilesToGenerate(info) {
 	const files = [];
 	if (!info.hasWranglerConfig) files.push({
@@ -988,7 +728,7 @@ function getFilesToGenerate(info) {
 		description: "wrangler.jsonc"
 	});
 	if (!info.hasWorkerEntry) {
-		const workerContent = info.isAppRouter ? generateAppRouterWorkerEntry(info.hasISR) : generatePagesRouterWorkerEntry();
+		const workerContent = info.isAppRouter ? generateAppRouterWorkerEntry() : generatePagesRouterWorkerEntry();
 		files.push({
 			path: path.join(info.root, "worker", "index.ts"),
 			content: workerContent,
@@ -1013,7 +753,31 @@ function writeGeneratedFiles(files) {
 		console.log(`  Created ${file.description}`);
 	}
 }
-async function runBuild(info) {
+/**
+* Run a function with `process.env.CLOUDFLARE_ENV` set to the given value,
+* restoring the previous state (whether set or absent) after the function
+* resolves or throws.
+*
+* The `@cloudflare/vite-plugin` reads `CLOUDFLARE_ENV` from `process.env` to
+* drive the multi-environment merge applied to the emitted `wrangler.json`.
+* Without this propagation the `--env <name>` CLI flag is silently ignored at
+* build time and the top-level config is emitted regardless. See issue #1210.
+*
+* Passing `undefined` is a no-op; the callback runs with `process.env` untouched.
+*/
+async function withCloudflareEnv(env, fn) {
+	if (env === void 0 || env === "") return fn();
+	const hadPrev = "CLOUDFLARE_ENV" in process.env;
+	const prev = process.env.CLOUDFLARE_ENV;
+	process.env.CLOUDFLARE_ENV = env;
+	try {
+		return await fn();
+	} finally {
+		if (hadPrev) process.env.CLOUDFLARE_ENV = prev;
+		else delete process.env.CLOUDFLARE_ENV;
+	}
+}
+async function runBuild(info, env) {
 	console.log("\n  Building for Cloudflare Workers...\n");
 	let vitePath;
 	try {
@@ -1022,7 +786,9 @@ async function runBuild(info) {
 		vitePath = "vite";
 	}
 	const { createBuilder } = await (vitePath === "vite" ? import(vitePath) : import(pathToFileURL(vitePath).href));
-	await (await createBuilder({ root: info.root })).buildApp();
+	await withCloudflareEnv(env, async () => {
+		await (await createBuilder({ root: info.root })).buildApp();
+	});
 }
 function buildWranglerDeployArgs(options) {
 	const args = ["deploy"];
@@ -1127,11 +893,12 @@ async function deploy(options) {
 		writeGeneratedFiles(filesToGenerate);
 	}
 	if (info.hasViteConfig && !viteConfigHasCloudflarePlugin(root)) throw new Error(formatMissingCloudflarePluginError({ isAppRouter: info.isAppRouter }));
+	if (info.hasISR && !viteConfigHasCacheAdapter(root) && !workerEntryHasCacheHandler(root)) throw new Error(formatMissingCacheAdapterError({}));
 	if (options.dryRun) {
 		console.log("\n  Dry run complete. Files generated but no build or deploy performed.\n");
 		return;
 	}
-	if (!options.skipBuild) await runBuild(info);
+	if (!options.skipBuild) await runBuild(info, options.env || (options.preview ? "preview" : void 0));
 	else console.log("\n  Skipping build (--skip-build)");
 	{
 		const nextConfig = await resolveNextConfig(await loadNextConfig(info.root), info.root);
@@ -1168,6 +935,4 @@ async function deploy(options) {
 	console.log("  ─────────────────────────────────────────\n");
 }
 //#endregion
-export { buildWranglerDeployArgs, deploy, detectProject, ensureESModule, formatMissingCloudflarePluginError, generateAppRouterViteConfig, generateAppRouterWorkerEntry, generatePagesRouterViteConfig, generatePagesRouterWorkerEntry, generateWranglerConfig, getFilesToGenerate, getMissingDeps, hasWranglerConfig, isPackageResolvable, parseDeployArgs, renameCJSConfigs, resolveWranglerBin, viteConfigHasCloudflarePlugin };
-
-//# sourceMappingURL=deploy.js.map
+export { buildWranglerDeployArgs, deploy, detectProject, ensureESModule, formatMissingCacheAdapterError, formatMissingCloudflarePluginError, generateAppRouterViteConfig, generateAppRouterWorkerEntry, generatePagesRouterViteConfig, generatePagesRouterWorkerEntry, generateWranglerConfig, getFilesToGenerate, getMissingDeps, hasWranglerConfig, isPackageResolvable, parseDeployArgs, renameCJSConfigs, resolveWranglerBin, viteConfigHasCacheAdapter, viteConfigHasCloudflarePlugin, withCloudflareEnv, workerEntryHasCacheHandler };