vinext 1.0.0-beta.11 → 1.0.0-beta.13

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

@@ -208,7 +208,7 @@ export type NextConfig = {
   cacheComponents?: boolean;
   /**
    * Enables source maps while generating static pages.
-   * Helps with errors during the prerender phase in `vinext build`.
+   * Helps with errors during the prerender phase in `vite build`.
    * Defaults to `true`. Set to `false` to disable.
    */
   enablePrerenderSourceMaps?: boolean;
@@ -602,7 +602,7 @@ export declare function normalizeAssetPrefix(value: unknown): string;
  * across plugin instances); otherwise we mint a random UUID.
  *
  * NOTE: like `resolveBuildId`, this is non-deterministic in the no-deploymentId
- * case, so a single `vinext build` that instantiates the plugin more than once
+ * case, so a single `vite build` that instantiates the plugin more than once
  * (App Router `buildApp()` + the hybrid Pages Router `vite.build()`) must
  * resolve it once and share it — see `__VINEXT_SHARED_RSC_COMPATIBILITY_ID`.
  */

package/dist/config/next-config.js

@@ -1,11 +1,11 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { normalizePageExtensions } from "../routing/file-matcher.js";
-import { isExternalUrl } from "../utils/external-url.js";
-import { applyLocaleToRoutes } from "./config-matchers.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
+import { normalizePageExtensions } from "../routing/file-matcher.js";
 import { getHtmlLimitedBotRegex } from "../utils/html-limited-bots.js";
 import { flattenPluginOptions } from "../utils/plugin-options.js";
-import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
+import { isExternalUrl } from "../utils/external-url.js";
+import { applyLocaleToRoutes } from "./config-matchers.js";
 import { loadTsconfigResolutionForRoot } from "./tsconfig-paths.js";
 import { loadCommonJsModule, shouldRetryAsCommonJs } from "../utils/commonjs-loader.js";
 import { Module, createRequire } from "node:module";
@@ -527,7 +527,7 @@ function resolveDeploymentId(configDeploymentId) {
 * across plugin instances); otherwise we mint a random UUID.
 *
 * NOTE: like `resolveBuildId`, this is non-deterministic in the no-deploymentId
-* case, so a single `vinext build` that instantiates the plugin more than once
+* case, so a single `vite build` that instantiates the plugin more than once
 * (App Router `buildApp()` + the hybrid Pages Router `vite.build()`) must
 * resolve it once and share it — see `__VINEXT_SHARED_RSC_COMPATIBILITY_ID`.
 */

package/dist/config/prerender.d.ts

@@ -9,9 +9,12 @@ export type VinextPrerenderConfig = true | {
    * App Router and Pages Router route that vinext can statically render.
    */
   routes: "*";
+  /** Maximum number of routes to render concurrently. */
+  concurrency?: number;
 };
 export type ResolvedVinextPrerenderConfig = {
   routes: "*";
+  concurrency?: number;
 };
 export type VinextPrerenderDecisionReason = "flag" | "next-export" | "vinext-config";
 export type VinextPrerenderDecision = ResolvedVinextPrerenderConfig & {

package/dist/config/prerender.js

@@ -8,7 +8,13 @@ function normalizeVinextPrerenderConfig(config) {
 	if (config === void 0) return null;
 	if (config === true) return { routes: "*" };
 	if (!isUnknownRecord(config)) throw new Error("[vinext] Invalid `prerender` config. Use `true` or `{ routes: \"*\" }`.");
-	if (config.routes === "*") return { routes: "*" };
+	if (config.routes === "*") {
+		if (config.concurrency !== void 0 && (!Number.isInteger(config.concurrency) || config.concurrency <= 0)) throw new Error("[vinext] `prerender.concurrency` must be a positive integer.");
+		return {
+			routes: "*",
+			...config.concurrency === void 0 ? {} : { concurrency: config.concurrency }
+		};
+	}
 	throw new Error("[vinext] Unsupported `prerender.routes` config. Currently only `routes: \"*\"` is supported.");
 }
 async function findVinextPrerenderConfigInPlugins(plugins) {
@@ -51,7 +57,7 @@ function resolveVinextPrerenderDecision(options) {
 		reason: "next-export"
 	};
 	if (options.vinextPrerenderConfig?.routes === "*") return {
-		routes: "*",
+		...options.vinextPrerenderConfig,
 		reason: "vinext-config"
 	};
 	return null;

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

@@ -1,6 +1,6 @@
+import { patternsStructurallyEquivalent } from "../routing/app-route-graph.js";
 import { resolveClientRuntimeModule, resolveRuntimeEntryModule } from "./runtime-entry-module.js";
 import { toClientRewrites } from "../client/client-rewrites.js";
-import { patternsStructurallyEquivalent } from "../routing/app-route-graph.js";
 //#region src/entries/app-browser-entry.ts
 /**
 * Generate the virtual browser entry module.

package/dist/entries/app-rsc-entry.d.ts

@@ -43,6 +43,8 @@ type AppRouterConfig = {
    * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/assetPrefix
    */
   assetPrefix?: string;
+  /** CORS mode for framework-managed assets from next.config. */
+  crossOrigin?: "anonymous" | "use-credentials";
   /** Route-level expire fallback in seconds for ISR entries with numeric revalidate. */
   expireTime?: number;
   /**

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

@@ -1,8 +1,8 @@
 import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { appRouteHasMainTreeLoadingBoundary } from "../routing/app-router.js";
 import { resolveEntryPath } from "./runtime-entry-module.js";
 import { isProxyFile } from "../server/middleware.js";
 import { extractExportConstString } from "../build/report.js";
-import { appRouteHasMainTreeLoadingBoundary } from "../routing/app-router.js";
 import { routePatternParts } from "../routing/route-pattern.js";
 import { safeJsonStringify } from "../server/html.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES } from "../server/image-optimization.js";
@@ -190,6 +190,7 @@ const __trailingSlash = ${JSON.stringify(ts)};
 const __draftModeSecret = ${JSON.stringify(config?.draftModeSecret ?? "")};
 export const __prerenderSecret = ${JSON.stringify(config?.prerenderSecret ?? "")};
 export const __assetPrefix = ${JSON.stringify(config?.assetPrefix ?? "")};
+export const __crossOrigin = ${JSON.stringify(config?.crossOrigin ?? "")};
 export { __basePath };
 export const __imageAllowedWidths = ${JSON.stringify([...config?.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...config?.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES])};
 export const __imageConfig = ${JSON.stringify({
@@ -371,6 +372,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const htmlLimitedBots = config?.htmlLimitedBots;
 	const clientTraceMetadata = config?.clientTraceMetadata;
 	const assetPrefix = config?.assetPrefix ?? "";
+	const crossOrigin = config?.crossOrigin ?? "";
 	const expireTime = config?.expireTime ?? DEFAULT_EXPIRE_TIME;
 	const reactMaxHeadersLength = config?.reactMaxHeadersLength ?? DEFAULT_REACT_MAX_HEADERS_LENGTH;
 	const cacheMaxMemorySize = config?.cacheMaxMemorySize;
@@ -820,6 +822,7 @@ const __reactMaxHeadersLength = ${JSON.stringify(reactMaxHeadersLength)};
 // mirrors the embedded \`__basePath\` pattern (and Pages Router's
 // \`vinextConfig\` export). Empty string when unset.
 export const __assetPrefix = ${JSON.stringify(assetPrefix)};
+export const __crossOrigin = ${JSON.stringify(crossOrigin)};
 export const __imageAllowedWidths = ${JSON.stringify(imageAllowedWidths)};
 export const __imageConfig = ${JSON.stringify(imageConfig)};
 export const __inlineCss = ${JSON.stringify(inlineCss)};
@@ -898,6 +901,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
   draftModeSecret: __draftModeSecret,
   dispatchMatchedPage({
     bypassInterceptionContextCache,
+    cachePathname,
     clientReuseManifest,
     cleanPathname,
     displayPathname,
@@ -1025,8 +1029,18 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       isRscRequest,
       isrDebug: __isrDebug,
       isrGet: __isrGet,
-      isrHtmlKey: __isrHtmlKey,
-      isrRscKey: __isrRscKey,
+      isrHtmlKey(pathname) {
+        return __isrHtmlKey(pathname === cleanPathname ? cachePathname : pathname);
+      },
+      isrRscKey(pathname, mountedSlots, requestedRenderMode, requestedInterceptionContext, requestedInterceptionId) {
+        return __isrRscKey(
+          pathname === cleanPathname ? cachePathname : pathname,
+          mountedSlots,
+          requestedRenderMode,
+          requestedInterceptionContext,
+          requestedInterceptionId,
+        );
+      },
       isrSet: __isrSet,
       loadSsrHandler() {
         return import.meta.viteRsc.loadModule("ssr", "index");
@@ -1133,6 +1147,8 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
     });
   },
   async dispatchMatchedRouteHandler({
+    bypassInterceptionContextCache,
+    cachePathname,
     cleanPathname,
     middlewareContext,
     params,
@@ -1144,6 +1160,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       await __loadAppRouteHandlerDispatch();
     return __dispatchAppRouteHandler({
       basePath: __basePath,
+      bypassSharedCache: bypassInterceptionContextCache,
       cleanPathname,
       clearRequestContext() {
         __clearRequestContext();
@@ -1153,7 +1170,9 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       trailingSlash: __trailingSlash,
       isrDebug: __isrDebug,
       isrGet: __isrGet,
-      isrRouteKey: __isrRouteKey,
+      isrRouteKey(pathname) {
+        return __isrRouteKey(pathname === cleanPathname ? cachePathname : pathname);
+      },
       isrSet: __isrSet,
       middlewareContext,
       middlewareRequestHeaders: middlewareContext.requestHeaders,
@@ -1461,7 +1480,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       await __loadMetadataRouteResponse();
     return __isMetadataRouteRequestPath(metadataRoutes, cleanPathname);
   },` : ""}
-  ${(metadataRoutes?.length ?? 0) > 0 ? `async handleMetadataRouteRequest(cleanPathname) {
+  ${(metadataRoutes?.length ?? 0) > 0 ? `async handleMetadataRouteRequest(cleanPathname, routePathname) {
     const { handleMetadataRouteRequest: __handleMetadataRouteRequest } =
       await __loadMetadataRouteResponse();
     return __handleMetadataRouteRequest({
@@ -1471,6 +1490,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       isrRouteKey: __isrRouteKey,
       isrSet: __isrSet,
       makeThenableParams,
+      routePathname,
       scheduleBackgroundRegeneration: __triggerBackgroundRegeneration,
     });
   },` : ""}

package/dist/entries/pages-client-entry.d.ts

@@ -3,6 +3,7 @@ import { ResolvedNextConfig } from "../config/next-config.js";
 import { StaticMiddlewareMatcher } from "../build/report.js";
 import { VinextLinkPrefetchRoute } from "../client/vinext-next-data.js";
 //#region src/entries/pages-client-entry.d.ts
+export declare function compileClientMiddlewareMatchers(matcher: StaticMiddlewareMatcher | undefined): unknown[] | undefined;
 export declare function generateClientEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, options?: {
   appPrefetchRoutes?: readonly VinextLinkPrefetchRoute[];
   instrumentationClientPath?: string | null;

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

@@ -3,6 +3,7 @@ import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
 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 { readFile } from "node:fs/promises";
@@ -18,6 +19,19 @@ import { readFile } from "node:fs/promises";
 *
 * Extracted from index.ts.
 */
+function compileClientMiddlewareMatchers(matcher) {
+	if (matcher === void 0) return void 0;
+	return (typeof matcher === "string" ? [matcher] : matcher).map((entry) => {
+		const source = typeof entry === "string" ? entry : entry.source;
+		const compiled = compileMiddlewareMatcherPattern(source);
+		if (!compiled.regexp) return entry;
+		return {
+			...typeof entry === "string" ? { source } : entry,
+			regexp: compiled.regexp.source,
+			flags: compiled.regexp.flags
+		};
+	});
+}
 /**
 * Project a Pages `Route` down to the public `VinextPagesLinkPrefetchRoute`
 * shape used for client-side hybrid ownership decisions. Mirrors
@@ -54,6 +68,7 @@ async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options =
 	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 clientRewrites = toClientRewrites(nextConfig.rewrites);
+	const clientMiddlewareMatchers = compileClientMiddlewareMatchers(options.middlewareMatcher);
 	const reactInstanceBootstrapPath = resolveClientRuntimeModule("react-instance-bootstrap");
 	const loaderEntries = pageRoutes.map((r) => {
 		const absPath = r.filePath;
@@ -103,7 +118,7 @@ window.__VINEXT_PAGE_PATTERNS__ = Object.keys(pageLoaders);
 window.__VINEXT_REACT_STRICT_MODE__ = ${JSON.stringify(reactStrictModeEnabled)};
 window.__VINEXT_PAGES_SSG_PATTERNS__ = ${JSON.stringify(pagesSsgPatterns)};
 window.__VINEXT_PAGES_SSP_PATTERNS__ = ${JSON.stringify(pagesSspPatterns)};
-window.__VINEXT_MIDDLEWARE_MATCHER__ = ${JSON.stringify(options.middlewareMatcher)};
+window.__VINEXT_MIDDLEWARE_MATCHER__ = ${JSON.stringify(clientMiddlewareMatchers)};
 window.__VINEXT_APP_LOADER__ = appLoader;
 // Expose the App Router prefetch manifest so Pages Router \`<Link>\`s and
 // \`Router.prefetch\` can detect when a prefetch target is actually an App
@@ -237,4 +252,4 @@ hydrate();
 `;
 }
 //#endregion
-export { generateClientEntry };
+export { compileClientMiddlewareMatchers, generateClientEntry };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { NextConfig, NextConfigInput } from "./config/next-config.js";
 import { VinextMultiStageOutput, VinextResponseStageDispatchOptions, VinextResponseStageTransport } from "./server/multi-stage.js";
 import { VinextCacheConfig } from "./cache/cache-adapters-virtual.js";
 import { VinextPrerenderConfig } from "./config/prerender.js";
+import { NextConfig, NextConfigInput } from "./config/next-config.js";
 import { AppStaticExportOptions, StaticExportOptions, StaticExportResult, staticExportApp, staticExportPages } from "./build/static-export.js";
 import { VinextImageConfig } from "./image/image-adapters-virtual.js";
 import { PluginOption } from "vite";
@@ -78,22 +78,20 @@ export type VinextOptions = {
    * Disabled by default. Not useful when deploying to edge platforms
    * (Cloudflare Workers, Nitro) that handle compression at the CDN layer.
    *
-   * Can also be enabled via the `--precompress` CLI flag or by setting the
-   * `VINEXT_PRECOMPRESS=1` environment variable (useful for CI pipelines
-   * that need to enable precompression without modifying vite.config.ts).
+   * Can also be enabled by setting the `VINEXT_PRECOMPRESS=1` environment
+   * variable (useful for CI pipelines that cannot modify vite.config.ts).
    * @default false
    */
   precompress?: boolean;
   /**
-   * Pre-render routes after `vinext build` without passing
-   * `--prerender-all`.
+   * Pre-render routes after `vite build`.
    *
    * Use `true` as shorthand for `{ routes: "*" }`. The object form is
    * available so future releases can support narrower route selections, but
    * currently only `"*"` is supported.
    *
-   * The `vinext build --prerender-all` and `vinext deploy --prerender-all`
-   * flags still work and take priority when present.
+   * The `vinext-cloudflare deploy --prerender-all` flag takes priority when
+   * present.
    *
    * @example
    * vinext({ prerender: true })