vinext 0.0.51 → 0.0.53

package/dist/deploy.js

@@ -273,7 +273,7 @@ function generateAppRouterWorkerEntry(hasISR = false) {
  * 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 } from "vinext/server/image-optimization";
+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";
@@ -312,7 +312,7 @@ ${hasISR ? `    // Wire up KV-backed ISR cache. The vinext RSC entry automatical
     // Image optimization via Cloudflare Images binding.
     // The parseImageParams validation inside handleImageOptimization
     // normalizes backslashes and validates the origin hasn't changed.
-    if (url.pathname === "/_vinext/image") {
+    if (isImageOptimizationPath(url.pathname)) {
       const allowedWidths = [...DEFAULT_DEVICE_SIZES, ...DEFAULT_IMAGE_SIZES];
       return handleImageOptimization(request, {
         fetchAsset: (path) => env.ASSETS.fetch(new Request(new URL(path, request.url))),
@@ -337,7 +337,7 @@ function generatePagesRouterWorkerEntry() {
  * Cloudflare Worker entry point -- auto-generated by vinext deploy.
  * Edit freely or delete to regenerate on next deploy.
  */
-import { handleImageOptimization, DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES } from "vinext/server/image-optimization";
+import { handleImageOptimization, DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath } from "vinext/server/image-optimization";
 import type { ImageConfig } from "vinext/server/image-optimization";
 import {
   matchRedirect,
@@ -352,7 +352,11 @@ import {
   applyConfigHeadersToHeaderRecord,
   cloneRequestWithHeaders,
   filterInternalHeaders,
+  isOpenRedirectShaped,
+  normalizeTrailingSlash,
 } from "vinext/server/request-pipeline";
+import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "vinext/server/pages-i18n";
+import { mergeRewriteQuery } from "vinext/utils/query";
 
 // @ts-expect-error -- virtual module resolved by vinext at build time
 import { renderPage, handleApiRoute, runMiddleware, vinextConfig, matchPageRoute } from "virtual:vinext-server-entry";
@@ -376,6 +380,7 @@ interface ExecutionContext {
 // Extract config values (embedded at build time in the server entry)
 const basePath: string = vinextConfig?.basePath ?? "";
 const trailingSlash: boolean = vinextConfig?.trailingSlash ?? false;
+const i18nConfig = vinextConfig?.i18n ?? null;
 const configRedirects = vinextConfig?.redirects ?? [];
 const configRewrites = vinextConfig?.rewrites ?? { beforeFiles: [], afterFiles: [], fallback: [] };
 const configHeaders = vinextConfig?.headers ?? [];
@@ -396,20 +401,6 @@ function stripBasePath(pathname: string, basePath: string): string {
   return pathname.slice(basePath.length) || "/";
 }
 
-// Mirror of isOpenRedirectShaped in server/request-pipeline.ts. Inlined here
-// because this worker runs in the Cloudflare Workers environment and can't
-// import from our local source at build time. Keep in sync.
-function isOpenRedirectShaped(rawPathname: string): boolean {
-  if (!rawPathname.startsWith("/")) return false;
-  const afterSlash = rawPathname.slice(1);
-  if (afterSlash.startsWith("/") || afterSlash.startsWith("\\")) return true;
-  if (afterSlash.length >= 3 && afterSlash[0] === "%") {
-    const encoded = afterSlash.slice(0, 3).toLowerCase();
-    if (encoded === "%5c" || encoded === "%2f") return true;
-  }
-  return false;
-}
-
 export default {
   async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
     try {
@@ -427,6 +418,11 @@ export default {
         return new Response("This page could not be found", { status: 404 });
       }
 
+      // Capture x-nextjs-data before filterInternalHeaders strips it -- the
+      // middleware redirect protocol needs to know whether the inbound request
+      // was a _next/data fetch to emit x-nextjs-redirect instead of a 3xx.
+      const isDataRequest = request.headers.get("x-nextjs-data") === "1";
+
       // Strip internal headers from inbound requests so they cannot be
       // forged to influence routing or impersonate internal state.
       // Request.headers is immutable in Workers, so build a clean copy.
@@ -436,6 +432,10 @@ export default {
       }
 
       // ── 1. Strip basePath ─────────────────────────────────────────
+      // Track basePath presence on the original request so the matcher
+      // gating below can distinguish requests inside basePath (default
+      // rules apply) from requests outside it (only opt-out rules apply).
+      const hadBasePath = !basePath || hasBasePath(pathname, basePath);
       {
         const stripped = stripBasePath(pathname, basePath);
         if (stripped !== pathname) {
@@ -443,10 +443,11 @@ export default {
           pathname = stripped;
         }
       }
+      const basePathState = { basePath, hadBasePath };
 
       // ── Image optimization via Cloudflare Images binding ──────────
-      // Checked after basePath stripping so /<basePath>/_vinext/image works.
-      if (pathname === "/_vinext/image") {
+      // Checked after basePath stripping so /<basePath>/_next/image works.
+      if (isImageOptimizationPath(pathname)) {
         const allowedWidths = [...DEFAULT_DEVICE_SIZES, ...DEFAULT_IMAGE_SIZES];
         return handleImageOptimization(request, {
           fetchAsset: (path) => env.ASSETS.fetch(new Request(new URL(path, request.url))),
@@ -458,18 +459,15 @@ export default {
       }
 
       // ── 2. Trailing slash normalization ────────────────────────────
-      if (pathname !== "/" && pathname !== "/api" && !pathname.startsWith("/api/")) {
-        const hasTrailing = pathname.endsWith("/");
-        if (trailingSlash && !hasTrailing) {
-          return new Response(null, {
-            status: 308,
-            headers: { Location: basePath + pathname + "/" + url.search },
-          });
-        } else if (!trailingSlash && hasTrailing) {
-          return new Response(null, {
-            status: 308,
-            headers: { Location: basePath + pathname.replace(/\\/+$/, "") + url.search },
-          });
+      {
+        const trailingSlashRedirect = normalizeTrailingSlash(
+          pathname,
+          basePath,
+          trailingSlash,
+          url.search,
+        );
+        if (trailingSlashRedirect) {
+          return trailingSlashRedirect;
         }
       }
 
@@ -492,12 +490,27 @@ export default {
       // 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(pathname, configRedirects, reqCtx);
+        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
@@ -515,7 +528,7 @@ export default {
       const middlewareHeaders: Record<string, string | string[]> = {};
       let middlewareRewriteStatus: number | undefined;
       if (typeof runMiddleware === "function") {
-        const result = await runMiddleware(request, ctx);
+        const result = await runMiddleware(request, ctx, { isDataRequest });
 
         // Bubble up waitUntil promises (e.g. Clerk telemetry/session sync)
         if (result.waitUntilPromises?.length) {
@@ -591,8 +604,9 @@ export default {
       if (configHeaders.length) {
         applyConfigHeadersToHeaderRecord(middlewareHeaders, {
           configHeaders,
-          pathname,
+          pathname: matchPathname,
           requestContext: reqCtx,
+          basePathState,
         });
       }
 
@@ -601,22 +615,55 @@ export default {
         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(resolvedPathname, configRewrites.beforeFiles, postMwReqCtx);
+        const rewritten = matchRewrite(
+          matchResolvedPathname(resolvedPathname),
+          configRewrites.beforeFiles,
+          postMwReqCtx,
+          basePathState,
+        );
         if (rewritten) {
           if (isExternalUrl(rewritten)) {
             return proxyExternalRequest(request, rewritten);
           }
-          resolvedUrl = rewritten;
-          resolvedPathname = rewritten.split("?")[0];
+          // 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 ─────────────────────────────────────────────
-      if (resolvedPathname.startsWith("/api/") || resolvedPathname === "/api") {
+      // 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, resolvedUrl)
+          ? await handleApiRoute(request, apiLookupUrl, ctx)
           : new Response("404 - API route not found", { status: 404 });
         return mergeHeaders(response, middlewareHeaders, middlewareRewriteStatus);
       }
@@ -627,31 +674,68 @@ export default {
       // ── 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(resolvedPathname, configRewrites.afterFiles, postMwReqCtx);
+        const rewritten = matchRewrite(
+          matchResolvedPathname(resolvedPathname),
+          configRewrites.afterFiles,
+          postMwReqCtx,
+          basePathState,
+        );
         if (rewritten) {
           if (isExternalUrl(rewritten)) {
             return proxyExternalRequest(request, rewritten);
           }
-          resolvedUrl = rewritten;
-          resolvedPathname = rewritten.split("?")[0];
+          resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
+          resolvedPathname = resolvedUrl.split("?")[0];
         }
       }
 
       // ── 9. Page routes ────────────────────────────────────────────
       let response: Response | undefined;
       if (typeof renderPage === "function") {
-        response = await renderPage(request, resolvedUrl, null, ctx);
+        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) ─────────────
-        if (response && response.status === 404 && configRewrites.fallback?.length) {
-          const fallbackRewrite = matchRewrite(resolvedPathname, configRewrites.fallback, postMwReqCtx);
+        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);
             }
-            response = await renderPage(request, fallbackRewrite, null, ctx);
+            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);
+        }
       }
 
       if (!response) {