vinext 0.0.53 → 0.0.55

package/dist/index.js

@@ -1,6 +1,6 @@
 import { detectPackageManager } from "./utils/project.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
-import { createValidFileMatcher } from "./routing/file-matcher.js";
+import { buildViteResolveExtensions, createValidFileMatcher } from "./routing/file-matcher.js";
 import { hasBasePath } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
@@ -8,12 +8,12 @@ import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-r
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { isExternalUrl, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.js";
 import { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
-import { mergeRewriteQuery } from "./utils/query.js";
 import { findMiddlewareFile, 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 } from "./routing/app-router.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
+import { mergeRewriteQuery } from "./utils/query.js";
 import { logRequest, now } from "./server/request-log.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { createSSRHandler } from "./server/dev-server.js";
@@ -26,16 +26,18 @@ import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
-import { generateBrowserEntry } from "./entries/app-browser-entry.js";
+import { generateBrowserEntry, isLinkPrefetchRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { ASSET_PREFIX_URL_DIR, resolveAssetUrlPrefix, resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
+import { getViteMajorVersion } from "./utils/vite-version.js";
 import { findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
-import { manifestFileWithBase, manifestFilesWithBase } from "./utils/manifest-paths.js";
+import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
+import { manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
@@ -49,12 +51,15 @@ import { generateRouteTypes } from "./typegen.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
 import { computeLazyChunks } from "./utils/lazy-chunks.js";
+import { findClientEntryFile, readClientBuildManifest } from "./utils/client-build-manifest.js";
 import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { buildSassPreprocessorOptions } from "./plugins/sass.js";
 import { createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { stripServerExports } from "./plugins/strip-server-exports.js";
+import { removeConsoleCalls } from "./plugins/remove-console.js";
+import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
 import { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
@@ -73,6 +78,50 @@ function createRscCompatibilityId(nextConfig) {
 	if (nextConfig.deploymentId) return nextConfig.deploymentId;
 	return randomUUID();
 }
+function hasModuleLevelUseServerDirective(body) {
+	for (const node of body) {
+		if (node.type !== "ExpressionStatement") break;
+		const directive = node.directive;
+		const expression = node.expression;
+		const value = typeof directive === "string" ? directive : expression?.type === "Literal" ? expression.value : void 0;
+		if (value === "use server") return true;
+		if (typeof value !== "string") break;
+	}
+	return false;
+}
+function hasServerOnlyMarkerImport(code) {
+	if (!code.includes("server-only")) return false;
+	let ast;
+	try {
+		ast = parseAst(code);
+	} catch {
+		return false;
+	}
+	if (hasModuleLevelUseServerDirective(ast.body)) return false;
+	function walk(node) {
+		if (!node) return false;
+		if (Array.isArray(node)) return node.some((child) => walk(child));
+		if (typeof node !== "object") return false;
+		if (node.type === "ImportDeclaration") {
+			if (node.source?.value === "server-only") return true;
+		}
+		if (node.type === "CallExpression") {
+			const call = node;
+			if (call.callee?.type === "Identifier" && call.callee.name === "require" && call.arguments?.[0]?.type === "Literal" && call.arguments[0].value === "server-only") return true;
+		}
+		for (const key of Object.keys(node)) {
+			if (key === "type" || key === "start" || key === "end" || key === "loc" || key === "parent") continue;
+			const value = node[key];
+			if (Array.isArray(value)) {
+				if (value.some((child) => child && typeof child === "object" && walk(child))) return true;
+			} else if (value && typeof value === "object" && "type" in value) {
+				if (walk(value)) return true;
+			}
+		}
+		return false;
+	}
+	return walk(ast.body);
+}
 const __dirname = import.meta.dirname;
 function resolveOptionalDependency(projectRoot, specifier) {
 	try {
@@ -192,27 +241,6 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 	};
 }
 /**
-* Detect Vite major version at runtime by resolving from cwd.
-* The plugin may be installed in a workspace root with Vite 7 but used
-* by a project that has Vite 8 — so we resolve from cwd, not from
-* the plugin's own location.
-*/
-function getViteMajorVersion() {
-	try {
-		const vitePkg = createRequire(path.join(process.cwd(), "package.json"))("vite/package.json");
-		const viteMajor = parseInt(vitePkg?.version, 10);
-		if (vitePkg?.name === "vite" && Number.isFinite(viteMajor)) return viteMajor;
-		const bundledViteMajor = parseInt(vitePkg?.bundledVersions?.vite, 10);
-		if (Number.isFinite(bundledViteMajor)) return bundledViteMajor;
-		console.warn(`[vinext] Could not determine Vite major version from ${vitePkg?.name ?? "vite/package.json"}; assuming Vite 7`);
-		return 7;
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		console.warn(`[vinext] Failed to resolve vite/package.json (${message}); assuming Vite 7`);
-		return 7;
-	}
-}
-/**
 * Read the vinext package version once at plugin load. Surfaced via
 * `process.env.__NEXT_VERSION` define so `window.next.version` lands a
 * real string instead of the `"vinext"` fallback. Resolved relative to
@@ -389,7 +417,8 @@ function vinext(options = {}) {
 	* __NEXT_DATA__ to determine which page to hydrate.
 	*/
 	async function generateClientEntry$1() {
-		return generateClientEntry(pagesDir, nextConfig, fileMatcher);
+		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).filter(isLinkPrefetchRoute).map(toLinkPrefetchRoute) : [];
+		return generateClientEntry(pagesDir, nextConfig, fileMatcher, { appPrefetchRoutes });
 	}
 	async function writeRouteTypes() {
 		if (!hasAppDir) return;
@@ -553,6 +582,8 @@ function vinext(options = {}) {
 					defines[`process.env.${key}`] = JSON.stringify(value);
 				}
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
+				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
+				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
 				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
@@ -585,8 +616,14 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
 				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
+				defines["process.env.NEXT_DEPLOYMENT_ID"] = nextConfig.deploymentId ? JSON.stringify(nextConfig.deploymentId) : "false";
 				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
-				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(false);
+				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(nextConfig.appShells);
+				for (const [key, value] of Object.entries(nextConfig.compilerDefine)) {
+					if (key in defines) throw new Error(`The \`compiler.define\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
+					defines[key] = value;
+				}
+				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"),
@@ -704,6 +741,7 @@ function vinext(options = {}) {
 							...nextConfig.aliases,
 							...nextShimMap
 						},
+						extensions: buildViteResolveExtensions(nextConfig.pageExtensions),
 						dedupe: [
 							"react",
 							"react-dom",
@@ -924,8 +962,11 @@ function vinext(options = {}) {
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
 						htmlLimitedBots: nextConfig?.htmlLimitedBots,
+						clientTraceMetadata: nextConfig?.clientTraceMetadata,
 						assetPrefix: nextConfig?.assetPrefix,
 						expireTime: nextConfig?.expireTime,
+						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
+						inlineCss: nextConfig?.inlineCss,
 						i18n: nextConfig?.i18n,
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root),
@@ -1415,7 +1456,7 @@ function vinext(options = {}) {
 								await proxyExternalRewriteNode(req, res, resolvedUrl);
 								return;
 							}
-							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null);
+							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, nextConfig?.clientTraceMetadata);
 							const mwStatus = req.__vinextMiddlewareStatus;
 							if (match) {
 								applyDeferredMwHeaders();
@@ -1451,6 +1492,21 @@ function vinext(options = {}) {
 				};
 			}
 		},
+		{
+			name: "vinext:validate-server-only-client-imports",
+			transform: {
+				filter: {
+					id: /\.(tsx?|jsx?|mjs)$/,
+					code: "server-only"
+				},
+				handler(code, id) {
+					if (this.environment?.name !== "client") return null;
+					if (id.startsWith("\0")) return null;
+					if (!hasServerOnlyMarkerImport(code)) return null;
+					throw new Error(`You're importing a module that depends on "server-only". This API is only available in Server Components in the App Router, but this module is reachable from a client bundle.`);
+				}
+			}
+		},
 		{
 			name: "vinext:strip-server-exports",
 			transform: {
@@ -1471,6 +1527,32 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		{
+			name: "vinext:remove-console",
+			apply: "build",
+			transform: {
+				filter: { id: /\.(tsx?|jsx?|mjs)$/ },
+				handler(code, id) {
+					if (this.environment?.name !== "client") return null;
+					if (!nextConfig.removeConsole) return null;
+					if (id.includes("/node_modules/")) return null;
+					const result = removeConsoleCalls(code, nextConfig.removeConsole);
+					if (!result) return null;
+					return {
+						code: result,
+						map: null
+					};
+				}
+			}
+		},
+		{
+			name: "vinext:compiler-define-server",
+			configEnvironment(name) {
+				if (Object.keys(nextConfig.compilerDefineServer).length === 0) return null;
+				if (name === "client") return null;
+				return { define: { ...nextConfig.compilerDefineServer } };
+			}
+		},
 		{
 			name: "vinext:image-imports",
 			enforce: "pre",
@@ -1642,6 +1724,7 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		createImportMetaUrlPlugin({ getRoot: () => root }),
 		createOgInlineFetchAssetsPlugin(),
 		ogAssetsPlugin,
 		createServerExternalsManifestPlugin(),
@@ -1818,6 +1901,25 @@ function vinext(options = {}) {
 				}
 			};
 		})(),
+		{
+			name: "vinext:inline-css-manifest",
+			apply: "build",
+			enforce: "post",
+			closeBundle: {
+				sequential: true,
+				order: "post",
+				handler() {
+					if (this.environment?.name !== "client") return;
+					if (!hasAppDir || nextConfig?.inlineCss !== true) return;
+					const envConfig = this.environment?.config;
+					if (!envConfig) return;
+					const buildRoot = envConfig.root ?? process.cwd();
+					const manifest = collectInlineCssManifest(path.resolve(buildRoot, "dist", "client"), nextConfig.assetPrefix);
+					const rscOutDir = path.resolve(buildRoot, options.rscOutDir ?? path.join("dist", "server"));
+					for (const entryFile of ["index.js", "index.mjs"]) if (injectInlineCssManifestGlobal(path.join(rscOutDir, entryFile), manifest)) break;
+				}
+			}
+		},
 		{
 			name: "vinext:cloudflare-build",
 			apply: "build",
@@ -1838,16 +1940,17 @@ function vinext(options = {}) {
 					const clientBase = envConfig.base ?? "/";
 					let lazyChunksData = null;
 					let clientEntryFile = null;
-					const buildManifestPath = path.join(clientDir, ".vite", "manifest.json");
-					if (fs.existsSync(buildManifestPath)) try {
-						const buildManifest = JSON.parse(fs.readFileSync(buildManifestPath, "utf-8"));
-						for (const [, value] of Object.entries(buildManifest)) if (value && value.isEntry && value.file) {
-							clientEntryFile = manifestFileWithBase(value.file, clientBase);
-							break;
-						}
+					const buildManifest = readClientBuildManifest(path.join(clientDir, ".vite", "manifest.json"));
+					if (buildManifest) {
+						clientEntryFile = findClientEntryFile({
+							buildManifest,
+							clientDir,
+							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
+							assetBase: clientBase
+						}) ?? null;
 						const lazy = manifestFilesWithBase(computeLazyChunks(buildManifest), clientBase);
 						if (lazy.length > 0) lazyChunksData = lazy;
-					} catch {}
+					}
 					let ssrManifestData = null;
 					const ssrManifestPath = path.join(clientDir, ".vite", "ssr-manifest.json");
 					if (fs.existsSync(ssrManifestPath)) try {
@@ -1876,14 +1979,11 @@ function vinext(options = {}) {
 						if (!workerOutDir) return;
 						const workerEntry = path.join(workerOutDir, "index.js");
 						if (!fs.existsSync(workerEntry)) return;
-						if (!clientEntryFile) {
-							const assetsSubdir = resolveAssetsDir(nextConfig?.assetPrefix);
-							const assetsDir = path.join(clientDir, assetsSubdir);
-							if (fs.existsSync(assetsDir)) {
-								const entry = fs.readdirSync(assetsDir).find((f) => (f.includes("vinext-client-entry") || f.includes("vinext-app-browser-entry")) && f.endsWith(".js"));
-								if (entry) clientEntryFile = manifestFileWithBase(`${assetsSubdir}/${entry}`, clientBase);
-							}
-						}
+						if (!clientEntryFile) clientEntryFile = findClientEntryFile({
+							clientDir,
+							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
+							assetBase: clientBase
+						}) ?? null;
 						if (clientEntryFile || ssrManifestData || lazyChunksData) {
 							let code = fs.readFileSync(workerEntry, "utf-8");
 							const globals = [];