vinext 1.2.1 → 1.3.1

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

@@ -1,7 +1,7 @@
 import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
-import { apiRouter, pagesRouter } from "../routing/pages-router.js";
+import { 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";
@@ -56,15 +56,12 @@ async function hasGetServerSidePropsExport(filePath) {
 }
 async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options = {}) {
 	const pageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-	const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 	const errorFilePath = findFileWithExts(pagesDir, "_error", fileMatcher);
 	const hasApp = appFilePath !== null;
 	const appPrefetchRoutes = options.appPrefetchRoutes ?? [];
-	const pagesPrefetchRoutes = [...pageRoutes.map(toPagesLinkPrefetchRoute), ...apiRoutes.map((route) => ({
-		...toPagesLinkPrefetchRoute(route),
-		documentOnly: true
-	}))];
+	const appRouteHandlers = options.appRouteHandlers ?? [];
+	const pagesPrefetchRoutes = pageRoutes.map(toPagesLinkPrefetchRoute);
 	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;
@@ -137,6 +134,9 @@ window.__VINEXT_APP_LOADER__ = appLoader;
 // when the user lands on an App Router page (see app-browser-entry.ts) — the
 // two writes do not race because only one entry executes per page load.
 window.__VINEXT_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(appPrefetchRoutes)};
+// App route handlers with hashed static segments, for the same ownership
+// decisions (see hashed-route-patterns.ts).
+window.__VINEXT_APP_ROUTE_HANDLERS__ = ${JSON.stringify(appRouteHandlers)};
 // Pages route manifest, exposed so the App Router runtime can decide when
 // a soft-navigated URL is actually owned by Pages (and must hard-navigate
 // instead of issuing an RSC request). Set here AND in app-browser-entry.ts

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

@@ -1,2 +1 @@
-import { findFileWithExts } from "../routing/file-matcher.js";
-export { findFileWithExts };
+export { findFileWithExts } from "../routing/file-matcher.js";

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

@@ -17,4 +17,5 @@ export declare function generatePagesRequestEntry(pagesDir: string, nextConfig:
  */
 export declare function generatePagesResponseEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, prerenderSecret?: string): Promise<string>;
 export declare function generateServerEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, publicFiles?: string[], options?: GeneratePagesServerEntryOptions): Promise<string>;
-//#endregion
+//#endregion
+export {};

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

@@ -28,6 +28,7 @@ const _pagesRouteDataKindPath = resolveEntryPath("../server/pages-route-data-kin
 const _isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url);
 const _revalidationRequestPath = resolveEntryPath("../server/revalidation-request.js", import.meta.url);
 const _instrumentationRuntimePath = resolveEntryPath("../server/instrumentation-runtime.js", import.meta.url);
+const _isolateSharedPromisePath = resolveEntryPath("../server/isolate-shared-promise.js", import.meta.url);
 async function getPagesDataKind(filePath) {
 	const source = await readFile(filePath, "utf8");
 	if (hasExportedName(source, "getStaticProps")) return "static";
@@ -85,18 +86,19 @@ async function generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, midd
 		}
 	});
 	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
-import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};` : "";
+import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};
+import { shareIsolatePromise as __shareIsolatePromise } from ${JSON.stringify(_isolateSharedPromisePath)};` : "";
 	const instrumentationInitCode = instrumentationPath ? `let __applicationInitialization;
 async function __initializeApplication() {
   await __ensureInstrumentationRegistered(_instrumentation, ${JSON.stringify(instrumentationPath)});
   ${middlewarePath ? `middlewareModule = await import(${JSON.stringify(middlewarePath)});` : ""}
 }
-export function __ensureInstrumentation() {
-  return __applicationInitialization ??= __initializeApplication();
+export function __ensureInstrumentation(ctx) {
+  return __applicationInitialization ??= __shareIsolatePromise(__initializeApplication(), ctx);
 }` : "export function __ensureInstrumentation() {}";
 	const middlewareImportCode = middlewarePath ? instrumentationPath ? "let middlewareModule;" : `import * as middlewareModule from ${JSON.stringify(middlewarePath)};` : "";
 	const middlewareExportCode = middlewarePath ? `export async function runMiddleware(request, ctx, options) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   return __runGeneratedMiddleware({
     basePath: vinextConfig.basePath,
     ctx,
@@ -110,8 +112,8 @@ export function __ensureInstrumentation() {
     skipTrailingSlashRedirect: vinextConfig.skipTrailingSlashRedirect,
     trailingSlash: vinextConfig.trailingSlash,
   });
-}` : `export async function runMiddleware() {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+}` : `export async function runMiddleware(request, ctx) {
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   return { continue: true };
 }`;
 	return `
@@ -260,7 +262,8 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		}
 	});
 	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
-import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};` : "";
+import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};
+import { shareIsolatePromise as __shareIsolatePromise } from ${JSON.stringify(_isolateSharedPromisePath)};` : "";
 	const specialModuleInitializers = instrumentationPath ? [
 		appFilePath ? `({ default: AppComponent } = await import(${JSON.stringify(appFilePath)}));` : "",
 		docFilePath ? `({ default: DocumentComponent } = await import(${JSON.stringify(docFilePath)}));` : "",
@@ -278,8 +281,8 @@ async function __initializeApplication() {
   _errorPageRoute.module = ErrorPageModule;
   _renderPage = __createRenderPage();
 }
-export function __ensureInstrumentation() {
-  return __applicationInitialization ??= __initializeApplication();
+export function __ensureInstrumentation(ctx) {
+  return __applicationInitialization ??= __shareIsolatePromise(__initializeApplication(), ctx);
 }` : "export function __ensureInstrumentation() {}";
 	const openTelemetryLoaderCode = options.nodeOpenTelemetryLoader ? `import { register as __registerOpenTelemetryLoader } from "node:module";
 const __openTelemetryLoaderKey = Symbol.for("vinext.openTelemetryLoader");
@@ -291,7 +294,7 @@ if (process.env.VINEXT_PRERENDER !== "1" && !globalThis[__openTelemetryLoaderKey
 	const middlewareRuntimeImportCode = includeMiddlewareRuntime ? `import { runGeneratedMiddleware as __runGeneratedMiddleware } from ${JSON.stringify(_middlewareRuntimePath)};` : "";
 	const middlewareExportCode = includeMiddlewareRuntime ? middlewarePath ? `
 export async function runMiddleware(request, ctx, options) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   return __runGeneratedMiddleware({
     basePath: vinextConfig.basePath,
     ctx,
@@ -307,15 +310,15 @@ export async function runMiddleware(request, ctx, options) {
   });
 }
 ` : `
-export async function runMiddleware(request) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+export async function runMiddleware(request, ctx) {
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   return { continue: true };
 }
 ` : "";
 	return `
 import ${JSON.stringify(_serverGlobalsPath)};
 import React from "react";
-import { renderToReadableStream } from "react-dom/server.edge";
+import { renderToReadableStream } from "react-dom/server";
 import { resetSSRHead, getSSRHeadHTML, setDocumentInitialHead } from "next/head";
 import { flushPreloads } from "next/dynamic";
 import Router, { setSSRContext, wrapWithRouterContext, getPagesNavigationIsReadyFromSerializedState } from "next/router";
@@ -568,7 +571,7 @@ function __createRenderPage() {
 ${instrumentationPath ? "let _renderPage;" : "const _renderPage = __createRenderPage();"}
 
 export async function renderPage(request, url, manifest, ctx, middlewareHeaders, options, initialResponseHeaders) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   __registerConfiguredCacheAdapters();
   if (ctx) return _runWithExecutionContext(ctx, () => _renderPage(request, url, manifest, middlewareHeaders, options, initialResponseHeaders));
   return _renderPage(request, url, manifest, middlewareHeaders, options, initialResponseHeaders);
@@ -577,7 +580,7 @@ export async function renderPage(request, url, manifest, ctx, middlewareHeaders,
 
 
 export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin, edgeRuntime = "worker", initialResponseHeaders) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   __registerConfiguredCacheAdapters();
   const match = matchRoute(url, apiRoutes);
   return __handlePagesApiRoute({

package/dist/entries/runtime-entry-module.d.ts

@@ -21,4 +21,5 @@ export declare function resolveEntryPath(rel: string, base: string): string;
  */
 export declare function resolveRuntimeEntryModule(name: string): string;
 export declare function resolveClientRuntimeModule(name: string): string;
+export declare function resolveShimRuntimeModule(name: string): string;
 //#endregion

package/dist/entries/runtime-entry-module.js

@@ -30,6 +30,9 @@ function resolveRuntimeEntryModule(name) {
 function resolveClientRuntimeModule(name) {
 	return resolveRuntimeModulePath("client", name);
 }
+function resolveShimRuntimeModule(name) {
+	return resolveRuntimeModulePath("shims", name);
+}
 function resolveRuntimeModulePath(directory, name) {
 	for (const ext of [
 		".ts",
@@ -43,4 +46,4 @@ function resolveRuntimeModulePath(directory, name) {
 	return resolveEntryPath(`../${directory}/${name}.js`, import.meta.url);
 }
 //#endregion
-export { resolveClientRuntimeModule, resolveEntryPath, resolveRuntimeEntryModule };
+export { resolveClientRuntimeModule, resolveEntryPath, resolveRuntimeEntryModule, resolveShimRuntimeModule };

package/dist/image/image-adapters-virtual.d.ts

@@ -57,4 +57,5 @@ export declare const VIRTUAL_IMAGE_ADAPTERS = "virtual:vinext-image-adapters";
  * given config. Always exports `registerConfiguredImageOptimizer(env)`.
  */
 export declare function generateImageAdaptersModule(images?: VinextImageConfig): string;
-//#endregion
+//#endregion
+export {};

package/dist/index.d.ts

@@ -24,6 +24,17 @@ export type VinextOptions = {
    * @default false
    */
   disableAppRouter?: boolean;
+  /**
+   * Turn off Next.js-like client chunking in App Router production builds.
+   * By default, client components that the same routes use load through one
+   * shared chunk, as they do from Next.js' per-route client entries. Set this
+   * to load each client component from its own chunk instead, for example to
+   * control chunking entirely through your own chunk groups. vinext already
+   * turns this chunking off when the client build has chunk groups other than
+   * its own (`codeSplitting.groups`, `advancedChunks` or `manualChunks`).
+   * @default false
+   */
+  disableNextLikeChunking?: boolean;
   /**
    * Override the output directory for the RSC server bundle.
    * Absolute paths are used as-is; relative paths are resolved from the