vinext 0.1.5 → 0.1.6

package/README.md

@@ -404,7 +404,7 @@ These are deployed to Cloudflare Workers and updated on every push to `main`:
 | App Router (minimal)   | Minimal App Router on Workers                                                                                    | [app-router-cloudflare.vinext.workers.dev](https://app-router-cloudflare.vinext.workers.dev)     |
 | Pages Router (minimal) | Minimal Pages Router on Workers                                                                                  | [pages-router-cloudflare.vinext.workers.dev](https://pages-router-cloudflare.vinext.workers.dev) |
 | RealWorld API          | REST API routes example                                                                                          | [realworld-api-rest.vinext.workers.dev](https://realworld-api-rest.vinext.workers.dev)           |
-| Benchmarks Dashboard   | Build performance tracking over time (D1-backed)                                                                 | [benchmarks.vinext.workers.dev](https://benchmarks.vinext.workers.dev)                           |
+| Benchmarks Dashboard   | Build performance tracking over time (D1-backed)                                                                 | [vinext-web.vinext.workers.dev/benchmarks](https://vinext-web.vinext.workers.dev/benchmarks)     |
 | App Router + Nitro     | App Router deployed via Nitro (multi-platform)                                                                   | [examples/app-router-nitro](examples/app-router-nitro)                                           |
 
 ## API coverage
@@ -614,7 +614,7 @@ We measure three things:
 - **Client bundle size** — gzipped output of each build.
 - **Dev server cold start** — 10 runs, randomized execution order. Vite's dependency optimizer cache is cleared before each run.
 
-Benchmarks run on GitHub CI runners (2-core Ubuntu) on every merge to `main`. See the launch numbers in the [announcement blog post](https://blog.cloudflare.com/vinext/) and the latest results at **[benchmarks.vinext.workers.dev](https://benchmarks.vinext.workers.dev)**.
+Benchmarks run on GitHub CI runners (2-core Ubuntu) on every merge to `main`. See the launch numbers in the [announcement blog post](https://blog.cloudflare.com/vinext/) and the latest results at **[vinext-web.vinext.workers.dev/benchmarks](https://vinext-web.vinext.workers.dev/benchmarks)**.
 
 <details>
 <summary>Why the bundle size difference?</summary>

package/dist/build/google-fonts/find-font-files-in-css.d.ts

@@ -0,0 +1,16 @@
+//#region src/build/google-fonts/find-font-files-in-css.d.ts
+/**
+ * Find all font files in the CSS response and determine which files should be preloaded.
+ * In Google Fonts responses, the @font-face's subset is above it in a comment.
+ * Walk through the CSS from top to bottom, keeping track of the current subset.
+ *
+ * Ported from Next.js:
+ * packages/font/src/google/find-font-files-in-css.ts
+ * https://github.com/vercel/next.js/blob/canary/packages/font/src/google/find-font-files-in-css.ts
+ */
+declare function findFontFilesInCss(css: string, subsetsToPreload?: string[]): {
+  googleFontFileUrl: string;
+  preloadFontFile: boolean;
+}[];
+//#endregion
+export { findFontFilesInCss };

package/dist/build/google-fonts/find-font-files-in-css.js

@@ -0,0 +1,28 @@
+//#region src/build/google-fonts/find-font-files-in-css.ts
+/**
+* Find all font files in the CSS response and determine which files should be preloaded.
+* In Google Fonts responses, the @font-face's subset is above it in a comment.
+* Walk through the CSS from top to bottom, keeping track of the current subset.
+*
+* Ported from Next.js:
+* packages/font/src/google/find-font-files-in-css.ts
+* https://github.com/vercel/next.js/blob/canary/packages/font/src/google/find-font-files-in-css.ts
+*/
+function findFontFilesInCss(css, subsetsToPreload) {
+	const fontFiles = [];
+	let currentSubset = "";
+	for (const line of css.split("\n")) {
+		const newSubset = /\/\* (.+?) \*\//.exec(line)?.[1];
+		if (newSubset) currentSubset = newSubset;
+		else {
+			const googleFontFileUrl = /src: url\((.+?)\)/.exec(line)?.[1];
+			if (googleFontFileUrl && !fontFiles.some((foundFile) => foundFile.googleFontFileUrl === googleFontFileUrl)) fontFiles.push({
+				googleFontFileUrl,
+				preloadFontFile: !!subsetsToPreload?.includes(currentSubset)
+			});
+		}
+	}
+	return fontFiles;
+}
+//#endregion
+export { findFontFilesInCss };

package/dist/build/report.d.ts

@@ -117,7 +117,6 @@ declare function buildReportRows(options: {
  *   ○ Static  ◐ ISR  ƒ Dynamic  λ API
  */
 declare function formatBuildReport(rows: RouteRow[], routerLabel?: string): string;
-declare function findDir(root: string, ...candidates: string[]): string | null;
 /**
  * Scans the project at `root`, classifies all routes, and prints the
  * Next.js-style build report to stdout.
@@ -130,4 +129,4 @@ declare function printBuildReport(options: {
   prerenderResult?: PrerenderResult;
 }): Promise<void>;
 //#endregion
-export { RouteRow, RouteType, buildReportRows, classifyAppRoute, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, findDir, formatBuildReport, getAppRouteRenderEntryPath, hasNamedExport, printBuildReport };
+export { RouteRow, RouteType, buildReportRows, classifyAppRoute, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, formatBuildReport, getAppRouteRenderEntryPath, hasNamedExport, printBuildReport };

package/dist/build/report.js

@@ -1,5 +1,5 @@
+import { findDir } from "../utils/project.js";
 import fs from "node:fs";
-import path from "node:path";
 import { parseSync } from "vite";
 //#region src/build/report.ts
 /**
@@ -470,15 +470,6 @@ function formatBuildReport(rows, routerLabel = "app") {
 	}
 	return lines.join("\n");
 }
-function findDir(root, ...candidates) {
-	for (const candidate of candidates) {
-		const full = path.join(root, candidate);
-		try {
-			if (fs.statSync(full).isDirectory()) return full;
-		} catch {}
-	}
-	return null;
-}
 /**
 * Scans the project at `root`, classifies all routes, and prints the
 * Next.js-style build report to stdout.
@@ -510,4 +501,4 @@ async function printBuildReport(options) {
 	}
 }
 //#endregion
-export { buildReportRows, classifyAppRoute, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, findDir, formatBuildReport, getAppRouteRenderEntryPath, hasNamedExport, printBuildReport };
+export { buildReportRows, classifyAppRoute, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, formatBuildReport, getAppRouteRenderEntryPath, hasNamedExport, printBuildReport };

package/dist/build/run-prerender.js

@@ -1,7 +1,7 @@
+import { findDir } from "../utils/project.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
 import { appRouter } from "../routing/app-router.js";
 import { scanMetadataFiles } from "../server/metadata-routes.js";
-import { findDir } from "./report.js";
 import { loadNextConfig, resolveNextConfig } from "../config/next-config.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { startProdServer } from "../server/prod-server.js";

package/dist/check.js

@@ -1,4 +1,4 @@
-import { detectPackageManager } from "./utils/project.js";
+import { detectPackageManager, findDir } from "./utils/project.js";
 import { normalizePathSeparators } from "./utils/path.js";
 import fs from "node:fs";
 import path from "node:path";
@@ -780,8 +780,8 @@ function checkLibraries(root) {
 */
 function checkConventions(root) {
 	const items = [];
-	const pagesDir = fs.existsSync(path.join(root, "pages")) ? path.join(root, "pages") : fs.existsSync(path.join(root, "src", "pages")) ? path.join(root, "src", "pages") : null;
-	const appDirPath = fs.existsSync(path.join(root, "app")) ? path.join(root, "app") : fs.existsSync(path.join(root, "src", "app")) ? path.join(root, "src", "app") : null;
+	const pagesDir = findDir(root, "pages", path.join("src", "pages"));
+	const appDirPath = findDir(root, "app", path.join("src", "app"));
 	const hasPages = pagesDir !== null;
 	const hasApp = appDirPath !== null;
 	const hasProxy = fs.existsSync(path.join(root, "proxy.ts")) || fs.existsSync(path.join(root, "proxy.js"));

package/dist/client/pages-router-link-navigation.d.ts

@@ -11,6 +11,15 @@ type PagesRouterLinkRuntime = {
 };
 type PagesRouterLinkNavigation = {
   href: string;
+  /**
+   * Optional `as` mask — the browser-bar URL when it differs from `href`
+   * (a Pages Router route pattern, e.g. `<Link href="/posts/[id]" as="/posts/1">`).
+   * When present, `router.push/replace(href, as, ...)` is invoked with both
+   * values so the upstream (url, as) pair survives end-to-end. Mirrors
+   * Next.js's Link → Router contract: packages/next/src/client/link.tsx
+   * → router.push(href, as).
+   */
+  as?: string;
   replace: boolean;
   scroll: boolean;
   shallow?: boolean;
@@ -30,6 +39,7 @@ declare function resolvePagesRouterQueryOnlyHref(href: string, {
 }): string;
 declare function navigatePagesRouterLink(router: PagesRouterLinkRuntime, {
   href,
+  as,
   replace,
   scroll,
   shallow,

package/dist/client/pages-router-link-navigation.js

@@ -14,15 +14,15 @@ function resolvePagesRouterQueryOnlyHref(href, { asPath, basePath, fallbackHref,
 		return href;
 	}
 }
-async function navigatePagesRouterLink(router, { href, replace, scroll, shallow, locale, interpolateDynamicRoute = false }) {
+async function navigatePagesRouterLink(router, { href, as, replace, scroll, shallow, locale, interpolateDynamicRoute = false }) {
 	const routerOptions = {
 		scroll,
 		locale
 	};
 	if (interpolateDynamicRoute) routerOptions._vinextInterpolateDynamicRoute = true;
 	if (shallow !== void 0) routerOptions.shallow = shallow;
-	if (replace) await router.replace(href, void 0, routerOptions);
-	else await router.push(href, void 0, routerOptions);
+	if (replace) await router.replace(href, as, routerOptions);
+	else await router.push(href, as, routerOptions);
 }
 async function navigatePagesRouterLinkWithFallback({ router, loadRouter, navigation, fallback }) {
 	let pagesRouter = router;

package/dist/deploy.js

@@ -1,4 +1,4 @@
-import { detectPackageManager as detectPackageManager$1, ensureESModule as ensureESModule$1, findInNodeModules, renameCJSConfigs as renameCJSConfigs$1 } from "./utils/project.js";
+import { detectPackageManager as detectPackageManager$1, ensureESModule as ensureESModule$1, findDir, findInNodeModules, hasAppDir, renameCJSConfigs as renameCJSConfigs$1 } from "./utils/project.js";
 import { parsePositiveIntegerArg } from "./cli-args.js";
 import { escapeRegExp } from "./utils/regex.js";
 import { loadNextConfig, resolveNextConfig } from "./config/next-config.js";
@@ -108,8 +108,8 @@ function formatMissingCloudflarePluginError(options) {
 	return `[vinext] Missing @cloudflare/vite-plugin in ${configRef}.\n\n  Cloudflare Workers builds require the cloudflare() plugin.\n  Add it to ${configRef}:\n\n    import { cloudflare } from "@cloudflare/vite-plugin";\n\n    export default defineConfig({\n      plugins: [\n        vinext(),\n        cloudflare(${cfArg}),\n      ],\n    });\n\n  Or delete ${configRef} and re-run \`vinext deploy\` to auto-generate it.`;
 }
 function detectProject(root) {
-	const hasApp = fs.existsSync(path.join(root, "app")) || fs.existsSync(path.join(root, "src", "app"));
-	const hasPages = fs.existsSync(path.join(root, "pages")) || fs.existsSync(path.join(root, "src", "pages"));
+	const hasApp = hasAppDir(root);
+	const hasPages = findDir(root, "pages", path.join("src", "pages")) !== null;
 	const isAppRouter = hasApp;
 	const isPagesRouter = !hasApp && hasPages;
 	const hasViteConfig = fs.existsSync(path.join(root, "vite.config.ts")) || fs.existsSync(path.join(root, "vite.config.js")) || fs.existsSync(path.join(root, "vite.config.mjs"));

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

@@ -866,6 +866,7 @@ export default createAppRscHandler({
   makeThenableParams,
   matchRoute,
   metadataRoutes,
+  middlewareFilePath: ${middlewarePath ? JSON.stringify(normalizePathSeparators(middlewarePath)) : "null"},
   middlewareModule: ${middlewarePath ? "middlewareModule" : "null"},
   publicFiles: __publicFiles,
   renderNotFound({ isRscRequest, matchedParams, middlewareContext, request, route, scriptNonce }) {

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

@@ -50,58 +50,68 @@ function registerRouteModules(routes, imports) {
 	for (const route of routes) {
 		if (route.pagePath) imports.getLazyLoaderVar(route.pagePath);
 		if (route.routePath) imports.getLazyLoaderVar(route.routePath);
-		for (const layout of route.layouts) imports.getImportVar(layout);
-		for (const tmpl of route.templates) imports.getImportVar(tmpl);
-		if (route.loadingPath) imports.getImportVar(route.loadingPath);
-		if (route.errorPath) imports.getImportVar(route.errorPath);
+		for (const layout of route.layouts) imports.getLazyLoaderVar(layout);
+		for (const tmpl of route.templates) imports.getLazyLoaderVar(tmpl);
+		if (route.loadingPath) imports.getLazyLoaderVar(route.loadingPath);
+		if (route.errorPath) imports.getLazyLoaderVar(route.errorPath);
 		if (route.layoutErrorPaths) {
-			for (const ep of route.layoutErrorPaths) if (ep) imports.getImportVar(ep);
+			for (const ep of route.layoutErrorPaths) if (ep) imports.getLazyLoaderVar(ep);
 		}
-		if (route.errorPaths) for (const ep of route.errorPaths) imports.getImportVar(ep);
-		if (route.notFoundPath) imports.getImportVar(route.notFoundPath);
+		if (route.errorPaths) for (const ep of route.errorPaths) imports.getLazyLoaderVar(ep);
+		if (route.notFoundPath) imports.getLazyLoaderVar(route.notFoundPath);
 		if (route.notFoundPaths) {
-			for (const nfp of route.notFoundPaths) if (nfp) imports.getImportVar(nfp);
+			for (const nfp of route.notFoundPaths) if (nfp) imports.getLazyLoaderVar(nfp);
 		}
-		if (route.forbiddenPath) imports.getImportVar(route.forbiddenPath);
+		if (route.forbiddenPath) imports.getLazyLoaderVar(route.forbiddenPath);
 		if (route.forbiddenPaths) {
-			for (const fp of route.forbiddenPaths) if (fp) imports.getImportVar(fp);
+			for (const fp of route.forbiddenPaths) if (fp) imports.getLazyLoaderVar(fp);
 		}
-		if (route.unauthorizedPath) imports.getImportVar(route.unauthorizedPath);
+		if (route.unauthorizedPath) imports.getLazyLoaderVar(route.unauthorizedPath);
 		if (route.unauthorizedPaths) {
-			for (const up of route.unauthorizedPaths) if (up) imports.getImportVar(up);
+			for (const up of route.unauthorizedPaths) if (up) imports.getLazyLoaderVar(up);
 		}
 		for (const slot of route.parallelSlots) {
-			if (slot.pagePath) imports.getImportVar(slot.pagePath);
-			if (slot.defaultPath) imports.getImportVar(slot.defaultPath);
-			if (slot.layoutPath) imports.getImportVar(slot.layoutPath);
-			if (slot.loadingPath) imports.getImportVar(slot.loadingPath);
-			if (slot.errorPath) imports.getImportVar(slot.errorPath);
+			if (slot.pagePath) imports.getLazyLoaderVar(slot.pagePath);
+			if (slot.defaultPath) imports.getLazyLoaderVar(slot.defaultPath);
+			if (slot.layoutPath) imports.getLazyLoaderVar(slot.layoutPath);
+			if (slot.loadingPath) imports.getLazyLoaderVar(slot.loadingPath);
+			if (slot.errorPath) imports.getLazyLoaderVar(slot.errorPath);
 			for (const ir of slot.interceptingRoutes) {
 				imports.getLazyLoaderVar(ir.pagePath);
-				for (const layoutPath of ir.layoutPaths) imports.getImportVar(layoutPath);
+				for (const layoutPath of ir.layoutPaths) imports.getLazyLoaderVar(layoutPath);
 			}
 		}
 		for (const ir of route.siblingIntercepts ?? []) {
 			imports.getLazyLoaderVar(ir.pagePath);
-			for (const layoutPath of ir.layoutPaths) imports.getImportVar(layoutPath);
+			for (const layoutPath of ir.layoutPaths) imports.getLazyLoaderVar(layoutPath);
 		}
 	}
 }
+function moduleArray(length) {
+	return `[${Array.from({ length }, () => "null").join(", ")}]`;
+}
+function lazyLoaderArray(filePaths, imports) {
+	return `[${filePaths.map((filePath) => filePath ? imports.getLazyLoaderVar(filePath) : "null").join(", ")}]`;
+}
 function buildRouteEntries(routes, imports) {
 	return routes.map((route, routeIdx) => {
 		const staticSiblings = route.isDynamic ? computeAppRouteStaticSiblings(routes, route) : [];
-		const layoutVars = route.layouts.map((l) => imports.getImportVar(l));
-		const templateVars = route.templates.map((t) => imports.getImportVar(t));
-		const notFoundVars = (route.notFoundPaths ?? []).map((nf) => nf ? imports.getImportVar(nf) : "null");
-		const forbiddenVars = (route.forbiddenPaths ?? []).map((fp) => fp ? imports.getImportVar(fp) : "null");
-		const unauthorizedVars = (route.unauthorizedPaths ?? []).map((up) => up ? imports.getImportVar(up) : "null");
+		const layoutLoaders = lazyLoaderArray(route.layouts, imports);
+		const templateLoaders = lazyLoaderArray(route.templates, imports);
+		const notFoundPaths = route.notFoundPaths ?? [];
+		const forbiddenPaths = route.forbiddenPaths ?? [];
+		const unauthorizedPaths = route.unauthorizedPaths ?? [];
+		const notFoundLoaders = lazyLoaderArray(notFoundPaths, imports);
+		const forbiddenLoaders = lazyLoaderArray(forbiddenPaths, imports);
+		const unauthorizedLoaders = lazyLoaderArray(unauthorizedPaths, imports);
 		const siblingInterceptEntries = (route.siblingIntercepts ?? []).map((ir) => `    {
       convention: ${JSON.stringify(ir.convention)},
       targetPattern: ${JSON.stringify(ir.targetPattern)},
       sourceMatchPattern: ${JSON.stringify(ir.sourceMatchPattern)},
       sourcePageSegments: ${JSON.stringify(ir.sourcePageSegments)},
       slotId: ${JSON.stringify(ir.slotId ?? null)},
-      interceptLayouts: [${ir.layoutPaths.map((l) => imports.getImportVar(l)).join(", ")}],
+      interceptLayouts: ${moduleArray(ir.layoutPaths.length)},
+      __loadInterceptLayouts: ${lazyLoaderArray(ir.layoutPaths, imports)},
       page: null,
       __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
       params: ${JSON.stringify(ir.params)},
@@ -112,7 +122,8 @@ function buildRouteEntries(routes, imports) {
           targetPattern: ${JSON.stringify(ir.targetPattern)},
           sourceMatchPattern: ${JSON.stringify(ir.sourceMatchPattern)},
           sourcePageSegments: ${JSON.stringify(ir.sourcePageSegments)},
-          interceptLayouts: [${ir.layoutPaths.map((layoutPath) => imports.getImportVar(layoutPath)).join(", ")}],
+          interceptLayouts: ${moduleArray(ir.layoutPaths.length)},
+          __loadInterceptLayouts: ${lazyLoaderArray(ir.layoutPaths, imports)},
           page: null,
           __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
           params: ${JSON.stringify(ir.params)},
@@ -120,11 +131,16 @@ function buildRouteEntries(routes, imports) {
 			return `      ${JSON.stringify(slot.key)}: {
         id: ${JSON.stringify(slot.id ?? null)},
         name: ${JSON.stringify(slot.name)},
-        page: ${slot.pagePath ? imports.getImportVar(slot.pagePath) : "null"},
-        default: ${slot.defaultPath ? imports.getImportVar(slot.defaultPath) : "null"},
-        layout: ${slot.layoutPath ? imports.getImportVar(slot.layoutPath) : "null"},
-        loading: ${slot.loadingPath ? imports.getImportVar(slot.loadingPath) : "null"},
-        error: ${slot.errorPath ? imports.getImportVar(slot.errorPath) : "null"},
+        page: null,
+        __loadPage: ${slot.pagePath ? imports.getLazyLoaderVar(slot.pagePath) : "null"},
+        default: null,
+        __loadDefault: ${slot.defaultPath ? imports.getLazyLoaderVar(slot.defaultPath) : "null"},
+        layout: null,
+        __loadLayout: ${slot.layoutPath ? imports.getLazyLoaderVar(slot.layoutPath) : "null"},
+        loading: null,
+        __loadLoading: ${slot.loadingPath ? imports.getLazyLoaderVar(slot.loadingPath) : "null"},
+        error: null,
+        __loadError: ${slot.errorPath ? imports.getLazyLoaderVar(slot.errorPath) : "null"},
         layoutIndex: ${slot.layoutIndex},
         routeSegments: ${JSON.stringify(slot.routeSegments)},
         slotPatternParts: ${slot.slotPatternParts ? JSON.stringify(slot.slotPatternParts) : "null"},
@@ -134,8 +150,10 @@ ${interceptEntries.join(",\n")}
         ],
       }`;
 		});
-		const layoutErrorVars = (route.layoutErrorPaths || []).map((ep) => ep ? imports.getImportVar(ep) : "null");
-		const errorVars = (route.errorPaths ?? []).map((ep) => imports.getImportVar(ep));
+		const layoutErrorPaths = route.layoutErrorPaths ?? [];
+		const errorPaths = route.errorPaths ?? [];
+		const layoutErrorLoaders = lazyLoaderArray(layoutErrorPaths, imports);
+		const errorLoaders = lazyLoaderArray(errorPaths, imports);
 		const loadPageField = route.pagePath ? imports.getLazyLoaderVar(route.pagePath) : "null";
 		const loadRouteHandlerField = route.routePath ? imports.getLazyLoaderVar(route.routePath) : "null";
 		return `  {
@@ -152,13 +170,17 @@ ${interceptEntries.join(",\n")}
     __loadPage: ${loadPageField},
     routeHandler: null,
     __loadRouteHandler: ${loadRouteHandlerField},
-    layouts: [${layoutVars.join(", ")}],
+    layouts: ${moduleArray(route.layouts.length)},
+    __loadLayouts: ${layoutLoaders},
     routeSegments: ${JSON.stringify(route.routeSegments)},
     templateTreePositions: ${JSON.stringify(route.templateTreePositions)},
     layoutTreePositions: ${JSON.stringify(route.layoutTreePositions)},
-    templates: [${templateVars.join(", ")}],
-    errors: [${layoutErrorVars.join(", ")}],
-    errorPaths: [${errorVars.join(", ")}],
+    templates: ${moduleArray(route.templates.length)},
+    __loadTemplates: ${templateLoaders},
+    errors: ${moduleArray(layoutErrorPaths.length)},
+    __loadErrors: ${layoutErrorLoaders},
+    errorPaths: ${moduleArray(errorPaths.length)},
+    __loadErrorPaths: ${errorLoaders},
     errorTreePositions: ${JSON.stringify(route.errorTreePositions ?? null)},
     slots: {
 ${slotEntries.join(",\n")}
@@ -166,14 +188,22 @@ ${slotEntries.join(",\n")}
     siblingIntercepts: [
 ${siblingInterceptEntries.join(",\n")}
     ],
-    loading: ${route.loadingPath ? imports.getImportVar(route.loadingPath) : "null"},
-    error: ${route.errorPath ? imports.getImportVar(route.errorPath) : "null"},
-    notFound: ${route.notFoundPath ? imports.getImportVar(route.notFoundPath) : "null"},
-    notFounds: [${notFoundVars.join(", ")}],
-    forbidden: ${route.forbiddenPath ? imports.getImportVar(route.forbiddenPath) : "null"},
-    forbiddens: [${forbiddenVars.join(", ")}],
-    unauthorized: ${route.unauthorizedPath ? imports.getImportVar(route.unauthorizedPath) : "null"},
-    unauthorizeds: [${unauthorizedVars.join(", ")}],
+    loading: null,
+    __loadLoading: ${route.loadingPath ? imports.getLazyLoaderVar(route.loadingPath) : "null"},
+    error: null,
+    __loadError: ${route.errorPath ? imports.getLazyLoaderVar(route.errorPath) : "null"},
+    notFound: null,
+    __loadNotFound: ${route.notFoundPath ? imports.getLazyLoaderVar(route.notFoundPath) : "null"},
+    notFounds: ${moduleArray(notFoundPaths.length)},
+    __loadNotFounds: ${notFoundLoaders},
+    forbidden: null,
+    __loadForbidden: ${route.forbiddenPath ? imports.getLazyLoaderVar(route.forbiddenPath) : "null"},
+    forbiddens: ${moduleArray(forbiddenPaths.length)},
+    __loadForbiddens: ${forbiddenLoaders},
+    unauthorized: null,
+    __loadUnauthorized: ${route.unauthorizedPath ? imports.getLazyLoaderVar(route.unauthorizedPath) : "null"},
+    unauthorizeds: ${moduleArray(unauthorizedPaths.length)},
+    __loadUnauthorizeds: ${unauthorizedLoaders},
   }`;
 	});
 }
@@ -217,7 +247,7 @@ function buildGenerateStaticParamsEntries(routes, imports, namesByPattern) {
 	const sourcesByPattern = /* @__PURE__ */ new Map();
 	for (const route of routes) {
 		if (!route.isDynamic) continue;
-		for (const [index, layoutPath] of route.layouts.entries()) appendStaticParamSource(sourcesByPattern, createRoutePatternPrefix(route.routeSegments, route.layoutTreePositions[index] ?? 0)?.pattern ?? null, `${imports.getImportVar(layoutPath)}?.generateStaticParams`);
+		for (const [index, layoutPath] of route.layouts.entries()) appendStaticParamSource(sourcesByPattern, createRoutePatternPrefix(route.routeSegments, route.layoutTreePositions[index] ?? 0)?.pattern ?? null, `{ load: ${imports.getLazyLoaderVar(layoutPath)} }`);
 		if (route.pagePath) appendStaticParamSource(sourcesByPattern, route.pattern, `{ load: ${imports.getLazyLoaderVar(route.pagePath)} }`);
 	}
 	return Array.from(sourcesByPattern.entries()).map(([pattern, sources]) => {

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

@@ -103,6 +103,7 @@ export async function runMiddleware(request, ctx, options) {
   return __runGeneratedMiddleware({
     basePath: vinextConfig.basePath,
     ctx,
+    filePath: ${JSON.stringify(normalizePathSeparators(middlewarePath))},
     i18nConfig,
     isDataRequest: options?.isDataRequest === true,
     isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},

package/dist/index.js

@@ -9,7 +9,7 @@ import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
 import { filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
-import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
+import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
@@ -52,6 +52,7 @@ import { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-refe
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
+import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { createDynamicPreloadMetadataPlugin } from "./plugins/dynamic-preload-metadata.js";
@@ -331,7 +332,7 @@ function createStaticImageAsset(imagePath) {
 */
 const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
-const _appRscHandlerPath = resolveShimModulePath(path.resolve(__dirname, "server"), "app-rsc-handler");
+const _appRscHandlerPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-rsc-handler");
 const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
@@ -449,7 +450,7 @@ function vinext(options = {}) {
 	const sassComposesLoader = createSassAwareFileSystemLoader();
 	const typeofWindowIdFilter = { exclude: /(?!)/ };
 	let rscClassificationManifest = null;
-	const shimsDir = path.resolve(__dirname, "shims");
+	const shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims"));
 	const canonicalize = (p) => normalizePathSeparators(tryRealpathSync(p) ?? p);
 	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
 	const canonicalizePageTransformPath = (modulePath) => {
@@ -658,7 +659,8 @@ function vinext(options = {}) {
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
-				middlewarePath = findMiddlewareFile(root, fileMatcher);
+				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.posix.join(root, "src")) ? path.posix.join(root, "src") : root;
+				middlewarePath = findMiddlewareFile(root, fileMatcher, middlewareConventionDir);
 				const instrumentationClientInjects = nextConfig.instrumentationClientInject.map((spec) => spec.startsWith("./") || spec.startsWith("../") ? path.resolve(root, spec) : spec);
 				clientInjectModule = instrumentationClientInjects.length ? generateInstrumentationClientInjectModule(instrumentationClientInjects, instrumentationClientPath, INSTRUMENTATION_CLIENT_EMPTY_MODULE) : null;
 				if (env?.command === "build") await writeRouteTypes();
@@ -721,55 +723,55 @@ function vinext(options = {}) {
 				}
 				for (const key of Object.keys(nextConfig.compilerDefineServer)) if (key in defines) throw new Error(`The \`compiler.defineServer\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 				nextShimMap = Object.fromEntries(Object.entries({
-					"next/link": path.join(shimsDir, "link"),
-					"next/head": path.join(shimsDir, "head"),
-					"next/router": path.join(shimsDir, "router"),
-					"next/compat/router": path.join(shimsDir, "compat-router"),
-					"next/image": path.join(shimsDir, "image"),
-					"next/legacy/image": path.join(shimsDir, "legacy-image"),
-					"next/dynamic": path.join(shimsDir, "dynamic"),
-					"next/app": path.join(shimsDir, "app"),
-					"next/document": path.join(shimsDir, "document"),
-					"next/config": path.join(shimsDir, "config"),
-					"next/script": path.join(shimsDir, "script"),
-					"next/server": path.join(shimsDir, "server"),
-					"next/headers": path.join(shimsDir, "headers"),
-					"next/font/google": path.join(shimsDir, "font-google"),
-					"next/font/local": path.join(shimsDir, "font-local"),
-					"next/cache": path.join(shimsDir, "cache"),
-					"next/form": path.join(shimsDir, "form"),
-					"next/og": path.join(shimsDir, "og"),
-					"next/web-vitals": path.join(shimsDir, "web-vitals"),
-					"next/amp": path.join(shimsDir, "amp"),
-					"next/offline": path.join(shimsDir, "offline"),
-					"next/constants": path.join(shimsDir, "constants"),
-					"next/dist/shared/lib/app-router-context.shared-runtime": path.join(shimsDir, "internal", "app-router-context"),
-					"next/dist/shared/lib/app-router-context": path.join(shimsDir, "internal", "app-router-context"),
-					"next/dist/shared/lib/router-context.shared-runtime": path.join(shimsDir, "internal", "router-context"),
-					"next/dist/shared/lib/utils": path.join(shimsDir, "internal", "utils"),
-					"next/dist/server/api-utils": path.join(shimsDir, "internal", "api-utils"),
-					"next/dist/server/web/spec-extension/cookies": path.join(shimsDir, "internal", "cookies"),
-					"next/dist/compiled/@edge-runtime/cookies": path.join(shimsDir, "internal", "cookies"),
-					"next/dist/server/app-render/work-unit-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/work-unit-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/request-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/request-async-storage": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/server/request/root-params": path.join(shimsDir, "root-params"),
-					"next/dist/server/config-shared": path.join(shimsDir, "internal", "utils"),
-					"server-only": path.join(shimsDir, "server-only"),
-					"client-only": path.join(shimsDir, "client-only"),
-					"vinext/error-boundary": path.join(shimsDir, "error-boundary"),
-					"vinext/layout-segment-context": path.join(shimsDir, "layout-segment-context"),
-					"vinext/metadata": path.join(shimsDir, "metadata"),
-					"vinext/fetch-cache": path.join(shimsDir, "fetch-cache"),
-					"vinext/cache-runtime": path.join(shimsDir, "cache-runtime"),
-					"vinext/navigation-state": path.join(shimsDir, "navigation-state"),
-					"vinext/unified-request-context": path.join(shimsDir, "unified-request-context"),
-					"vinext/pages-router-runtime": path.join(shimsDir, "pages-router-runtime"),
-					"vinext/router-state": path.join(shimsDir, "router-state"),
-					"vinext/head-state": path.join(shimsDir, "head-state"),
-					"vinext/i18n-state": path.join(shimsDir, "i18n-state"),
-					"vinext/i18n-context": path.join(shimsDir, "i18n-context"),
+					"next/link": path.posix.join(shimsDir, "link"),
+					"next/head": path.posix.join(shimsDir, "head"),
+					"next/router": path.posix.join(shimsDir, "router"),
+					"next/compat/router": path.posix.join(shimsDir, "compat-router"),
+					"next/image": path.posix.join(shimsDir, "image"),
+					"next/legacy/image": path.posix.join(shimsDir, "legacy-image"),
+					"next/dynamic": path.posix.join(shimsDir, "dynamic"),
+					"next/app": path.posix.join(shimsDir, "app"),
+					"next/document": path.posix.join(shimsDir, "document"),
+					"next/config": path.posix.join(shimsDir, "config"),
+					"next/script": path.posix.join(shimsDir, "script"),
+					"next/server": path.posix.join(shimsDir, "server"),
+					"next/headers": path.posix.join(shimsDir, "headers"),
+					"next/font/google": path.posix.join(shimsDir, "font-google"),
+					"next/font/local": path.posix.join(shimsDir, "font-local"),
+					"next/cache": path.posix.join(shimsDir, "cache"),
+					"next/form": path.posix.join(shimsDir, "form"),
+					"next/og": path.posix.join(shimsDir, "og"),
+					"next/web-vitals": path.posix.join(shimsDir, "web-vitals"),
+					"next/amp": path.posix.join(shimsDir, "amp"),
+					"next/offline": path.posix.join(shimsDir, "offline"),
+					"next/constants": path.posix.join(shimsDir, "constants"),
+					"next/dist/shared/lib/app-router-context.shared-runtime": path.posix.join(shimsDir, "internal", "app-router-context"),
+					"next/dist/shared/lib/app-router-context": path.posix.join(shimsDir, "internal", "app-router-context"),
+					"next/dist/shared/lib/router-context.shared-runtime": path.posix.join(shimsDir, "internal", "router-context"),
+					"next/dist/shared/lib/utils": path.posix.join(shimsDir, "internal", "utils"),
+					"next/dist/server/api-utils": path.posix.join(shimsDir, "internal", "api-utils"),
+					"next/dist/server/web/spec-extension/cookies": path.posix.join(shimsDir, "internal", "cookies"),
+					"next/dist/compiled/@edge-runtime/cookies": path.posix.join(shimsDir, "internal", "cookies"),
+					"next/dist/server/app-render/work-unit-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/work-unit-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/request-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/request-async-storage": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/server/request/root-params": path.posix.join(shimsDir, "root-params"),
+					"next/dist/server/config-shared": path.posix.join(shimsDir, "internal", "utils"),
+					"server-only": path.posix.join(shimsDir, "server-only"),
+					"client-only": path.posix.join(shimsDir, "client-only"),
+					"vinext/error-boundary": path.posix.join(shimsDir, "error-boundary"),
+					"vinext/layout-segment-context": path.posix.join(shimsDir, "layout-segment-context"),
+					"vinext/metadata": path.posix.join(shimsDir, "metadata"),
+					"vinext/fetch-cache": path.posix.join(shimsDir, "fetch-cache"),
+					"vinext/cache-runtime": path.posix.join(shimsDir, "cache-runtime"),
+					"vinext/navigation-state": path.posix.join(shimsDir, "navigation-state"),
+					"vinext/unified-request-context": path.posix.join(shimsDir, "unified-request-context"),
+					"vinext/pages-router-runtime": path.posix.join(shimsDir, "pages-router-runtime"),
+					"vinext/router-state": path.posix.join(shimsDir, "router-state"),
+					"vinext/head-state": path.posix.join(shimsDir, "head-state"),
+					"vinext/i18n-state": path.posix.join(shimsDir, "i18n-state"),
+					"vinext/i18n-context": path.posix.join(shimsDir, "i18n-context"),
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
@@ -1858,6 +1860,17 @@ function vinext(options = {}) {
 				};
 			}
 		},
+		{
+			name: "vinext:validate-middleware-exports",
+			enforce: "pre",
+			transform(code, id) {
+				if (!middlewarePath) return null;
+				const modulePath = stripViteModuleQuery(id);
+				if (canonicalize(modulePath) !== canonicalize(middlewarePath)) return null;
+				validateMiddlewareModuleExports(code, modulePath, middlewarePath, isProxyFile(middlewarePath));
+				return null;
+			}
+		},
 		{
 			name: "vinext:validate-page-exports",
 			transform: {
@@ -2048,7 +2061,9 @@ function vinext(options = {}) {
 						const varName = specifier.local?.name;
 						if (!varName) continue;
 						const dir = path.dirname(id);
-						const absImagePath = normalizePathSeparators(path.resolve(dir, importPath));
+						const resolvedImage = importPath.startsWith(".") ? path.resolve(dir, importPath) : (await this.resolve(importPath, id, { skipSelf: true }))?.id;
+						if (!resolvedImage) continue;
+						const absImagePath = normalizePathSeparators(resolvedImage.split("?", 1)[0]);
 						if (!fs.existsSync(absImagePath)) continue;
 						imageImports.add(absImagePath);
 						const urlVar = `__vinext_img_url_${varName}`;