vinext 0.1.5 → 0.1.7

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);
@@ -419,12 +420,16 @@ const _reactServerShims = new Map([
 ]);
 const clientManualChunks = createClientManualChunks(_shimsDir);
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
-function getClientOutputConfigForVite(viteMajorVersion, assetsDir) {
+const appClientManualChunks = createClientManualChunks(_shimsDir, true);
+const appClientCodeSplittingConfig = createClientCodeSplittingConfig(appClientManualChunks);
+function getClientOutputConfigForVite(viteMajorVersion, assetsDir, preserveAppRouteBoundaries = false) {
+	const manualChunks = preserveAppRouteBoundaries ? appClientManualChunks : clientManualChunks;
+	const codeSplitting = preserveAppRouteBoundaries ? appClientCodeSplittingConfig : clientCodeSplittingConfig;
 	return viteMajorVersion >= 8 ? {
 		...createClientFileNameConfig(assetsDir),
 		assetFileNames: createClientAssetFileNames(assetsDir),
-		codeSplitting: clientCodeSplittingConfig
-	} : createClientOutputConfig(clientManualChunks, assetsDir);
+		codeSplitting
+	} : createClientOutputConfig(manualChunks, assetsDir);
 }
 function vinext(options = {}) {
 	const viteMajorVersion = getViteMajorVersion();
@@ -449,7 +454,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) => {
@@ -506,13 +511,16 @@ function vinext(options = {}) {
 	let resolvedReactPath = null;
 	let resolvedRscPath = null;
 	let resolvedRscTransformsPath = null;
+	let rscPluginModulePromise = null;
 	resolvedReactPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-react");
 	resolvedRscPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-rsc");
 	resolvedRscTransformsPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-rsc/transforms");
 	let rscPluginPromise = null;
 	if (earlyAppDirExists && autoRsc) {
 		if (!resolvedRscPath) throw new Error("vinext: App Router detected but @vitejs/plugin-rsc is not installed.\nRun: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-rsc");
-		rscPluginPromise = import(pathToFileURL(resolvedRscPath).href).then((mod) => {
+		const rscImport = import(pathToFileURL(resolvedRscPath).href);
+		rscPluginModulePromise = rscImport;
+		rscPluginPromise = rscImport.then((mod) => {
 			const rsc = mod.default;
 			return rsc({ entries: {
 				rsc: VIRTUAL_RSC_ENTRY,
@@ -658,7 +666,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 +730,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"),
@@ -888,6 +897,7 @@ function vinext(options = {}) {
 				};
 				const nextServerExternal = nextConfig?.serverExternalPackages ?? [];
 				const userSsrExternal = Array.isArray(config.ssr?.external) ? [...config.ssr.external, ...nextServerExternal] : config.ssr?.external === true ? true : nextServerExternal;
+				const externalizeSsrReactInDev = env.command === "serve" && !hasCloudflarePlugin && !hasNitroPlugin;
 				const incomingExclude = config.optimizeDeps?.exclude ?? [];
 				const incomingInclude = config.optimizeDeps?.include ?? [];
 				const depOptimizeAliasPlugin = {
@@ -942,11 +952,15 @@ function vinext(options = {}) {
 						},
 						ssr: {
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
-								external: userSsrExternal === true ? true : [...userSsrExternal, "ipaddr.js"],
+								external: userSsrExternal === true ? true : [
+									...userSsrExternal,
+									"ipaddr.js",
+									...externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []
+								],
 								...userSsrExternal === true ? {} : { noExternal: true }
 							} },
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true ? SSR_EXTERNAL_REACT_ENTRIES : []),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true || externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []),
 								entries: optimizeEntries,
 								...depOptimizeNodeEnvOptions
 							},
@@ -975,7 +989,7 @@ function vinext(options = {}) {
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions(viteMajorVersion, {
 									input: appClientInput,
-									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
+									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir, true),
 									treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 								})
 							}
@@ -1125,6 +1139,12 @@ function vinext(options = {}) {
 				if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
 					const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 					const metaRoutes = scanMetadataFiles(appDir);
+					let hasServerActions = true;
+					if (this.environment?.config.command === "build" && rscPluginModulePromise) {
+						const { getPluginApi } = await rscPluginModulePromise;
+						const pluginApi = getPluginApi(this.environment.config);
+						if (pluginApi && !pluginApi.manager.isScanBuild) hasServerActions = Object.keys(pluginApi.manager.serverReferenceMetaMap).length > 0;
+					}
 					const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
 					const globalNotFoundPath = findFileWithExts(appDir, "global-not-found", fileMatcher);
 					rscClassificationManifest = collectRouteClassificationManifest(routes);
@@ -1144,6 +1164,7 @@ function vinext(options = {}) {
 						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 						inlineCss: nextConfig?.inlineCss,
 						cacheComponents: nextConfig?.cacheComponents,
+						hasServerActions,
 						i18n: nextConfig?.i18n,
 						imageConfig: {
 							deviceSizes: nextConfig?.images?.deviceSizes,
@@ -1302,15 +1323,19 @@ function vinext(options = {}) {
 				const hook = mdxDelegate.config;
 				return (typeof hook === "function" ? hook : hook.handler).call(this, config, env);
 			},
-			async transform(code, id, options) {
-				if (id.includes("?")) return;
-				if (!id.toLowerCase().endsWith(".mdx")) return;
-				const delegate = mdxDelegate ?? await ensureMdxDelegate("on-demand");
-				if (delegate?.transform) {
-					const hook = delegate.transform;
-					return (typeof hook === "function" ? hook : hook.handler).call(this, code, id, options);
+			transform: {
+				filter: { id: {
+					include: /\.mdx$/i,
+					exclude: /\?/
+				} },
+				async handler(code, id, options) {
+					const delegate = mdxDelegate ?? await ensureMdxDelegate("on-demand");
+					if (delegate?.transform) {
+						const hook = delegate.transform;
+						return (typeof hook === "function" ? hook : hook.handler).call(this, code, id, options);
+					}
+					if (!hasUserMdxPlugin) throw new Error(`[vinext] Encountered MDX module ${id} but no MDX plugin is configured. Install @mdx-js/rollup or register an MDX plugin manually.`);
 				}
-				if (!hasUserMdxPlugin) throw new Error(`[vinext] Encountered MDX module ${id} but no MDX plugin is configured. Install @mdx-js/rollup or register an MDX plugin manually.`);
 			}
 		},
 		{
@@ -1356,6 +1381,7 @@ function vinext(options = {}) {
 			configureServer(server) {
 				const pageExtensions = fileMatcher.extensionRegex;
 				let pagesRunner = null;
+				let cachedSSRHandler = null;
 				function getPagesRunner() {
 					if (!pagesRunner) pagesRunner = createDirectRunner(server.environments["ssr"] ?? Object.values(server.environments).find((e) => e !== server.environments["rsc"]) ?? Object.values(server.environments)[0]);
 					return pagesRunner;
@@ -1841,12 +1867,15 @@ function vinext(options = {}) {
 									const appMatch = matchAppRoute(resolvedPathname, await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher));
 									if (appMatch && !pagesRouteHasPriorityOverAppRoute(renderMatch.route, appMatch.route)) return next();
 								}
-								const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots);
+								if (!cachedSSRHandler || cachedSSRHandler.routes !== routes) cachedSSRHandler = {
+									routes,
+									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots)
+								};
 								flushStagedHeaders();
 								flushRequestHeaders();
 								if (pipelineResult.middlewareStatus !== void 0) req.__vinextMiddlewareStatus = pipelineResult.middlewareStatus;
 								req.url = pipelineResult.resolvedUrl;
-								await handler(req, res, pipelineResult.resolvedUrl, req.__vinextMiddlewareStatus, pipelineResult.isDataReq, originalRequestUrl);
+								await cachedSSRHandler.handler(req, res, pipelineResult.resolvedUrl, req.__vinextMiddlewareStatus, pipelineResult.isDataReq, originalRequestUrl);
 							}
 						} catch (e) {
 							next(e);
@@ -1858,6 +1887,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,12 +2088,14 @@ 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}`;
 						const metaVar = `__vinext_img_meta_${varName}`;
-						const replacement = `import ${urlVar} from ${JSON.stringify(absImagePath + "?vinext-image-url")};\nimport ${metaVar} from ${JSON.stringify(absImagePath + "?vinext-meta")};\nconst ${varName} = { src: ${urlVar}, width: ${metaVar}.width, height: ${metaVar}.height };`;
+						const replacement = `import ${urlVar} from ${JSON.stringify(absImagePath + "?vinext-image-url")};\nimport ${metaVar} from ${JSON.stringify(absImagePath + "?vinext-meta")};\nvar ${varName} = { src: ${urlVar}, width: ${metaVar}.width, height: ${metaVar}.height };`;
 						s.overwrite(importNode.start, importNode.end, replacement);
 						hasChanges = true;
 					}
@@ -2139,7 +2181,7 @@ function vinext(options = {}) {
 					const { transformWrapExport, transformHoistInlineDirective } = await import(pathToFileURL(resolvedRscTransformsPath).href);
 					if (cacheDirective) {
 						const directiveValue = cacheDirective.expression.value;
-						const variant = directiveValue === "use cache" ? "" : directiveValue.replace("use cache:", "").replace("use cache: ", "").trim();
+						const variant = directiveValue === "use cache" ? "" : directiveValue.replace("use cache:", "").trim();
 						const isLayoutOrTemplate = /\/(layout|template)\.(tsx?|jsx?|mjs)$/.test(id);
 						const modulePath = stripViteModuleQuery(id);
 						const moduleFileName = path.basename(modulePath);
@@ -2179,7 +2221,7 @@ function vinext(options = {}) {
 								directive: /^use cache(:\s*\w+)?$/,
 								runtime: (value, name, meta) => {
 									const directiveMatch = meta.directiveMatch[0];
-									const variant = directiveMatch === "use cache" ? "" : directiveMatch.replace("use cache:", "").replace("use cache: ", "").trim();
+									const variant = directiveMatch === "use cache" ? "" : directiveMatch.replace("use cache:", "").trim();
 									return `(await import(${JSON.stringify(runtimeModuleUrl2)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)})`;
 								},
 								rejectNonAsyncFunction: false

package/dist/init.d.ts

@@ -10,7 +10,7 @@
  *   4. Rename CJS config files to .cjs
  *   5. Add vinext scripts to package.json
  *   6. Generate vite.config.ts
- *   7. Update .gitignore to include /dist/
+ *   7. Update .gitignore to include /dist/ and .vinext/
  *   8. Print summary
  *
  * Non-destructive: does NOT modify next.config, tsconfig, or source files.
@@ -32,7 +32,7 @@ type InitResult = {
   renamedConfigs: Array<[string, string]>; /** Whether scripts were added to package.json */
   addedScripts: string[]; /** Whether vite.config.ts was generated */
   generatedViteConfig: boolean; /** Whether vite.config.ts generation was skipped (already exists) */
-  skippedViteConfig: boolean; /** Whether .gitignore was updated to include /dist/ */
+  skippedViteConfig: boolean; /** Whether .gitignore was updated to include vinext-generated output */
   updatedGitignore: boolean;
 };
 declare function generateViteConfig(_isAppRouter: boolean): string;
@@ -59,8 +59,9 @@ declare function isDepInstalled(root: string, dep: string): boolean;
  */
 declare function getReactUpgradeDeps(root: string): string[];
 /**
- * Ensure /dist/ is listed in .gitignore. Creates the file if it doesn't exist.
- * Returns true if the file was modified (or created), false if /dist/ was already present.
+ * Ensure vinext-generated output directories are listed in .gitignore.
+ * Creates the file if it doesn't exist. Returns true if the file was modified
+ * (or created), false if all entries were already present.
  */
 declare function updateGitignore(root: string): boolean;
 declare function init(options: InitOptions): Promise<InitResult>;

package/dist/init.js

@@ -16,7 +16,7 @@ import { execFileSync } from "node:child_process";
 *   4. Rename CJS config files to .cjs
 *   5. Add vinext scripts to package.json
 *   6. Generate vite.config.ts
-*   7. Update .gitignore to include /dist/
+*   7. Update .gitignore to include /dist/ and .vinext/
 *   8. Print summary
 *
 * Non-destructive: does NOT modify next.config, tsconfig, or source files.
@@ -140,20 +140,39 @@ function installDeps(root, deps, exec, { dev = true } = {}) {
 	});
 }
 /**
-* Ensure /dist/ is listed in .gitignore. Creates the file if it doesn't exist.
-* Returns true if the file was modified (or created), false if /dist/ was already present.
+* Ensure vinext-generated output directories are listed in .gitignore.
+* Creates the file if it doesn't exist. Returns true if the file was modified
+* (or created), false if all entries were already present.
 */
 function updateGitignore(root) {
 	const gitignorePath = path.join(root, ".gitignore");
-	const exactEntry = "/dist/";
+	const entries = [{
+		entry: "/dist/",
+		coveredBy: new Set([
+			"/dist/",
+			"/dist",
+			"dist/",
+			"dist"
+		])
+	}, {
+		entry: ".vinext/",
+		coveredBy: new Set([
+			"/.vinext/",
+			"/.vinext",
+			".vinext/",
+			".vinext"
+		])
+	}];
 	let content = "";
+	let lines = [];
 	if (fs.existsSync(gitignorePath)) {
 		content = fs.readFileSync(gitignorePath, "utf-8");
-		const lines = content.split("\n").map((l) => l.trim());
-		if (lines.includes(exactEntry) || lines.includes("dist/") || lines.includes("dist")) return false;
+		lines = content.split("\n").map((l) => l.trim());
 	}
+	const missingEntries = entries.filter(({ coveredBy }) => !lines.some((line) => coveredBy.has(line))).map(({ entry }) => entry);
+	if (missingEntries.length === 0) return false;
 	const separator = content.length > 0 && !content.endsWith("\n") ? "\n" : "";
-	fs.writeFileSync(gitignorePath, content + separator + "/dist/\n", "utf-8");
+	fs.writeFileSync(gitignorePath, content + separator + missingEntries.join("\n") + "\n", "utf-8");
 	return true;
 }
 async function init(options) {
@@ -212,7 +231,7 @@ async function init(options) {
 	for (const script of addedScripts) console.log(`    \u2713 Added ${script} script`);
 	if (generatedViteConfig) console.log(`    \u2713 Generated vite.config.ts`);
 	if (skippedViteConfig) console.log(`    - Skipped vite.config.ts (already exists, use --force to overwrite)`);
-	if (updatedGitignore) console.log(`    \u2713 Added /dist/ to .gitignore`);
+	if (updatedGitignore) console.log(`    \u2713 Added vinext output directories to .gitignore`);
 	console.log(`
   Next steps:
     ${pmName} run dev:vinext    Start the vinext dev server

package/dist/plugins/fonts.js

@@ -4,6 +4,7 @@ import { buildFallbackFontFace, getFallbackFontOverrideMetrics } from "../build/
 import { validateGoogleFontOptions } from "../build/google-fonts/validate.js";
 import { getFontAxes } from "../build/google-fonts/get-axes.js";
 import { buildGoogleFontsUrl } from "../build/google-fonts/build-url.js";
+import { findFontFilesInCss } from "../build/google-fonts/find-font-files-in-css.js";
 import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import { CONTENT_TYPES } from "../server/static-file-cache.js";
 import fs from "node:fs";
@@ -543,11 +544,12 @@ function createGoogleFontsPlugin(fontGoogleShimPath, shimsDir) {
 						return;
 					}
 					const servedCSS = _rewriteCachedFontCssToServedUrls(localCSS, cacheDir, transformAssetsDir);
+					const preloadUrls = findFontFilesInCss(servedCSS, validated.preload ? validated.subsets : void 0).filter((file) => file.preloadFontFile).map((file) => file.googleFontFileUrl);
 					const fallbackMetrics = validated.adjustFontFallback === false ? void 0 : getFallbackFontOverrideMetrics(family);
 					const adjustedFallbackCSS = fallbackMetrics ? buildFallbackFontFace(family, fallbackMetrics) : void 0;
 					const validatedFontWeight = validated.weights.length === 1 && validated.weights[0] !== "variable" ? Number(validated.weights[0]) : void 0;
 					const validatedFontStyle = validated.styles.length === 1 ? validated.styles[0] : void 0;
-					const internalFontProperties = [`selfHostedCSS: ${JSON.stringify(servedCSS)}`];
+					const internalFontProperties = [`selfHostedCSS: ${JSON.stringify(servedCSS)}`, `preloadUrls: ${JSON.stringify(preloadUrls)}`];
 					if (adjustedFallbackCSS) internalFontProperties.push(`adjustedFallbackCSS: ${JSON.stringify(adjustedFallbackCSS)}`);
 					if (Number.isFinite(validatedFontWeight)) internalFontProperties.push(`fontWeight: ${validatedFontWeight}`);
 					if (validatedFontStyle) internalFontProperties.push(`fontStyle: ${JSON.stringify(validatedFontStyle)}`);

package/dist/plugins/middleware-export-validation.d.ts

@@ -0,0 +1,5 @@
+//#region src/plugins/middleware-export-validation.d.ts
+declare function hasValidMiddlewareModuleExport(source: string, id: string, isProxy: boolean): boolean;
+declare function validateMiddlewareModuleExports(source: string, id: string, filePath: string, isProxy: boolean): void;
+//#endregion
+export { hasValidMiddlewareModuleExport, validateMiddlewareModuleExports };

package/dist/plugins/middleware-export-validation.js

@@ -0,0 +1,36 @@
+import { stripViteModuleQuery } from "../utils/path.js";
+import { createMiddlewareMissingExportError } from "../server/middleware-runtime.js";
+import { parseAst } from "vite";
+//#region src/plugins/middleware-export-validation.ts
+function parserLanguage(id) {
+	const cleanId = stripViteModuleQuery(id).toLowerCase();
+	if (cleanId.endsWith(".tsx")) return "tsx";
+	if (cleanId.endsWith(".ts") || cleanId.endsWith(".mts") || cleanId.endsWith(".cts")) return "ts";
+	return "jsx";
+}
+function astName(value) {
+	if (!value) return null;
+	if (typeof value.name === "string") return value.name;
+	if (typeof value.value === "string") return value.value;
+	return null;
+}
+function hasValidMiddlewareModuleExport(source, id, isProxy) {
+	const ast = parseAst(source, { lang: parserLanguage(id) });
+	const expectedExport = isProxy ? "proxy" : "middleware";
+	for (const statement of ast.body) {
+		if (statement.type === "ExportDefaultDeclaration") return true;
+		if (statement.type !== "ExportNamedDeclaration") continue;
+		const declaration = statement.declaration;
+		if (declaration?.type === "FunctionDeclaration" && astName(declaration.id) === expectedExport) return true;
+		if (declaration?.type === "VariableDeclaration") {
+			for (const declarator of declaration.declarations ?? []) if (astName(declarator.id) === expectedExport) return true;
+		}
+		for (const specifier of statement.specifiers ?? []) if (astName(specifier.exported ?? specifier.local) === expectedExport) return true;
+	}
+	return false;
+}
+function validateMiddlewareModuleExports(source, id, filePath, isProxy) {
+	if (!hasValidMiddlewareModuleExport(source, id, isProxy)) throw createMiddlewareMissingExportError(filePath, isProxy);
+}
+//#endregion
+export { hasValidMiddlewareModuleExport, validateMiddlewareModuleExports };

package/dist/plugins/og-asset-ownership.d.ts

@@ -0,0 +1,27 @@
+import { Alias } from "vite";
+
+//#region src/plugins/og-asset-ownership.d.ts
+type OgAssetModuleBoundary = {
+  assetRoot: string;
+  moduleDir: string;
+};
+declare class OgAssetOwnership {
+  private projectRoot;
+  private readonly linkedPackageRoots;
+  private readonly dependencyPackageNames;
+  private readonly stringAliasesByFirstCharacter;
+  private regularExpressionAliases;
+  private configuredAliases;
+  configure(projectRoot: string, aliases: readonly Alias[]): void;
+  reset(): void;
+  shouldTrackImport(source: string): boolean;
+  recordResolvedImport(source: string, resolvedId: string): Promise<void>;
+  resolveModuleBoundary(moduleId: string): Promise<OgAssetModuleBoundary | null>;
+  resolveContainedAsset(assetRoot: string, assetPath: string): Promise<string | null>;
+  private findAlias;
+  private getExpectedPackageName;
+  private resolveAliasPackageRoot;
+  private resolveConfiguredAliasRoot;
+}
+//#endregion
+export { OgAssetModuleBoundary, OgAssetOwnership };