vinext 1.0.1 → 1.2.0

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

@@ -6,6 +6,7 @@ import { resolveClientRuntimeModule } from "./runtime-entry-module.js";
 import { compileMiddlewareMatcherPattern } from "../server/middleware-matcher-pattern.js";
 import { hasExportedName } from "../build/report.js";
 import { toClientRewrites } from "../client/client-rewrites.js";
+import { toClientRedirects } from "../client/client-redirects.js";
 import { readFile } from "node:fs/promises";
 //#region src/entries/pages-client-entry.ts
 /**
@@ -67,6 +68,7 @@ async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options =
 	const pagesSsgPatterns = (await Promise.all(pageRoutes.map(async (route) => await hasGetStaticPropsExport(route.filePath) ? patternToNextFormat(route.pattern) : null))).filter((pattern) => pattern !== null);
 	const pagesSspPatterns = (await Promise.all(pageRoutes.map(async (route) => await hasGetServerSidePropsExport(route.filePath) ? patternToNextFormat(route.pattern) : null))).filter((pattern) => pattern !== null);
 	const instrumentationClientPath = options.instrumentationClientPath ?? null;
+	const clientRedirects = toClientRedirects(nextConfig.redirects);
 	const clientRewrites = toClientRewrites(nextConfig.rewrites);
 	const clientMiddlewareMatchers = compileClientMiddlewareMatchers(options.middlewareMatcher);
 	const reactInstanceBootstrapPath = resolveClientRuntimeModule("react-instance-bootstrap");
@@ -140,7 +142,7 @@ window.__VINEXT_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(appPrefetchRoutes)};
 // instead of issuing an RSC request). Set here AND in app-browser-entry.ts
 // so whichever entry runs first emits the Pages manifest.
 window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(pagesPrefetchRoutes)};
-window.__VINEXT_CLIENT_REDIRECTS__ = ${JSON.stringify(nextConfig.redirects)};
+window.__VINEXT_CLIENT_REDIRECTS__ = ${JSON.stringify(clientRedirects)};
 window.__VINEXT_CLIENT_REWRITES__ = ${JSON.stringify(clientRewrites)};
 
 const nextDataElement = document.getElementById("__NEXT_DATA__");

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

@@ -57,6 +57,7 @@ async function generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, midd
 		basePath: nextConfig?.basePath ?? "",
 		assetPrefix: nextConfig?.assetPrefix ?? "",
 		trailingSlash: nextConfig?.trailingSlash ?? false,
+		skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect ?? false,
 		skipProxyUrlNormalize: nextConfig?.skipProxyUrlNormalize ?? false,
 		redirects: nextConfig?.redirects ?? [],
 		rewrites: nextConfig?.rewrites ?? {
@@ -102,9 +103,11 @@ export function __ensureInstrumentation() {
     filePath: ${JSON.stringify(middlewarePath)},
     i18nConfig,
     isDataRequest: options?.isDataRequest === true,
+    isStaleDataRequest: options?.isStaleDataRequest === true,
     isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
     module: middlewareModule,
     request,
+    skipTrailingSlashRedirect: vinextConfig.skipTrailingSlashRedirect,
     trailingSlash: vinextConfig.trailingSlash,
   });
 }` : `export async function runMiddleware() {
@@ -118,6 +121,7 @@ import { buildRouteTrie as _buildRouteTrie, trieMatch as _trieMatch } from ${JSO
 import { resolvePagesI18nRequest } from ${JSON.stringify(_pagesI18nPath)};
 import { normalizePagesDataRequest as __normalizePagesDataRequest, shouldAddTrailingSlashToPagesDataPath as __shouldAddTrailingSlashToPagesDataPath } from ${JSON.stringify(_pagesDataRoutePath)};
 import { isOnDemandRevalidateRequest as __isOnDemandRevalidateRequest } from ${JSON.stringify(_revalidationRequestPath)};
+import __pagesClientAssets from "virtual:vinext-pages-client-assets";
 ${instrumentationImportCode}
 
 ${instrumentationInitCode}
@@ -131,6 +135,7 @@ export const hasMiddleware = ${JSON.stringify(Boolean(middlewarePath))};
 export const hasRequestAwareDocument = ${JSON.stringify(hasRequestAwareDocument)};
 export const vinextConfig = ${vinextConfigJson};
 export const publicFiles = new Set(${JSON.stringify(publicFiles)});
+export const clientBuildFiles = new Set(__pagesClientAssets.clientBuildFiles ?? []);
 
 export function normalizeDataRequest(request) {
   return __normalizePagesDataRequest(
@@ -227,6 +232,7 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		basePath: nextConfig?.basePath ?? "",
 		assetPrefix: nextConfig?.assetPrefix ?? "",
 		trailingSlash: nextConfig?.trailingSlash ?? false,
+		skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect ?? false,
 		skipProxyUrlNormalize: nextConfig?.skipProxyUrlNormalize ?? false,
 		redirects: nextConfig?.redirects ?? [],
 		rewrites: nextConfig?.rewrites ?? {
@@ -292,9 +298,11 @@ export async function runMiddleware(request, ctx, options) {
     filePath: ${JSON.stringify(middlewarePath)},
     i18nConfig,
     isDataRequest: options?.isDataRequest === true,
+    isStaleDataRequest: options?.isStaleDataRequest === true,
     isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
     module: middlewareModule,
     request,
+    skipTrailingSlashRedirect: vinextConfig.skipTrailingSlashRedirect,
     trailingSlash: vinextConfig.trailingSlash,
   });
 }
@@ -311,16 +319,16 @@ import { renderToReadableStream } from "react-dom/server.edge";
 import { resetSSRHead, getSSRHeadHTML, setDocumentInitialHead } from "next/head";
 import { flushPreloads } from "next/dynamic";
 import Router, { setSSRContext, wrapWithRouterContext, getPagesNavigationIsReadyFromSerializedState } from "next/router";
-import { _runWithCacheState } from "vinext/shims/cache-request-state";
+import "vinext/shims/cache-request-state";
 import { configureMemoryCacheHandler as __configureMemoryCacheHandler } from "vinext/shims/cache-handler";
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 import __pagesClientAssets from "virtual:vinext-pages-client-assets";
 import { setPagesClientAssets as __setPagesClientAssets } from "vinext/server/pages-client-assets";
-import { runWithPrivateCache } from "vinext/cache-runtime";
-import { ensureFetchPatch, runWithFetchCache } from "vinext/fetch-cache";
+import "vinext/cache-runtime";
+import { ensureFetchPatch } from "vinext/fetch-cache";
 import "vinext/router-state";
-import { runWithServerInsertedHTMLState } from "vinext/navigation-state";
-import { runWithHeadState } from "vinext/head-state";
+import "vinext/navigation-state";
+import "vinext/head-state";
 import "vinext/i18n-state";
 import { setI18nContext } from "vinext/i18n-context";
 import { safeJsonStringify } from "vinext/html";
@@ -388,37 +396,6 @@ __configureMemoryCacheHandler({ cacheMaxMemorySize: vinextConfig.cacheMaxMemoryS
 // by _app are included in every page's <link rel="stylesheet"> set.
 const _appAssetPath = ${appAssetPathJson};
 
-async function _renderToStringAsync(element) {
-  const stream = await renderToReadableStream(element);
-  await stream.allReady;
-  return new Response(stream).text();
-}
-
-async function _renderIsrPassToStringAsync(element, onHeadReady) {
-  // The cache-fill render is a second render pass for the same request.
-  // Reset render-scoped state so it cannot leak from the streamed response
-  // render or affect async work that is still draining from that stream.
-  // Keep request identity state (pathname/query/locale/executionContext)
-  // intact: this second pass still belongs to the same request.
-  return await runWithServerInsertedHTMLState(() =>
-    runWithHeadState(() =>
-      _runWithCacheState(() =>
-        runWithPrivateCache(() =>
-          runWithFetchCache(async () => {
-            const html = await _renderToStringAsync(element);
-            // next/head tags are collected as a side effect of the render
-            // above and live in this ALS scope only, so a caller that wants
-            // the regenerated head has to read it here — after the render,
-            // before the scope unwinds.
-            await onHeadReady?.();
-            return html;
-          }),
-        ),
-      ),
-    ),
-  );
-}
-
 ${pageImports.join("\n")}
 ${apiImports.join("\n")}
 
@@ -552,7 +529,6 @@ function __createRenderPage() {
     } catch { return []; }
   },
   renderToReadableStream,
-  renderIsrPassToStringAsync: _renderIsrPassToStringAsync,
   safeJsonStringify,
   sanitizeDestination: sanitizeDestinationLocal,
   createPageElement(PageComponent, AppComponent, props) {

package/dist/index.d.ts

@@ -39,7 +39,9 @@ export type VinextOptions = {
   ssrOutDir?: string;
   /**
    * Override the output directory for the client bundle.
-   * Defaults to Vite's default (dist/client or dist).
+   * Defaults to "dist/client". Like rscOutDir and ssrOutDir, it is not
+   * supported by `vinext start` or `output: "standalone"`, which expect the
+   * default dist/ layout.
    */
   clientOutDir?: string;
   /**
@@ -106,7 +108,10 @@ export type VinextOptions = {
    * Configure cache handlers declaratively, so you don't need a custom worker
    * entry that calls `setDataCacheHandler()` / `setCdnCacheAdapter()`. Each slot
    * is a `{ adapter, options }` descriptor pointing at an adapter module whose
-   * default export is a factory; the plugin registers them automatically on the
+   * default export is a factory function or a class; either receives one
+   * `{ env, options }` argument (classes are invoked with `new`, other
+   * functions are called; see `CacheAdapterDescriptor.adapter` for how
+   * classes are recognised). The plugin registers them automatically on the
    * first request, passing the host `env` (Worker bindings) so adapters that
    * need a binding — e.g. a KV namespace — can read it.
    *