vinext 1.0.0-beta.12 → 1.0.0-beta.13

package/dist/index.js

@@ -1,15 +1,26 @@
 import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
-import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
+import { claimViteCliBuildInvocation, getViteCliInvocation, isViteCliConfigFile } from "./utils/vite-cli-invocation.js";
+import { VINEXT_DEV_CLI_LIFECYCLE, applyDevServerDefaults, claimViteCliDevInvocation, createDevServerLifecyclePlugin, reserveViteCliDevInvocation } from "./cli-dev-config.js";
+import { isUnknownRecord } from "./utils/record.js";
+import { getReactUpgradeDeps } from "./utils/react-version.js";
+import { loadDotenv } from "./config/dotenv.js";
+import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
+import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
+import { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
+import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
+import { resolveAssetsDir } from "./utils/asset-prefix.js";
+import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
+import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { hasBasePath, stripBasePath } from "./utils/base-path.js";
+import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
+import { generateRouteTypes } from "./typegen.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
-import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
-import { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
-import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
 import { methodNotAllowedResponse } from "./server/http-error-responses.js";
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
@@ -19,12 +30,9 @@ import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentat
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
 import { extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, hasExportedName } from "./build/report.js";
 import { generatePagesRequestEntry, generatePagesResponseEntry, 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";
-import { isUnknownRecord } from "./utils/record.js";
+import { compileClientMiddlewareMatchers, generateClientEntry } from "./entries/pages-client-entry.js";
 import { logRequest, now } from "./server/request-log.js";
 import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
-import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
@@ -45,12 +53,12 @@ import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/ima
 import { generateBrowserEntry, toLinkPrefetchRoutes } 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 { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
-import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
-import { loadDotenv } from "./config/dotenv.js";
 import { findOpenTelemetryPackages, mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
+import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
+import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
+import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./build/preview-credentials.js";
+import { VINEXT_BUILD_LIFECYCLE_CONFIG, createBuildLifecyclePlugins } from "./build/lifecycle.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
 import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
@@ -79,18 +87,16 @@ import { validateMiddlewareModuleExports } from "./plugins/middleware-export-val
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { createDynamicPreloadMetadataPlugin } from "./plugins/dynamic-preload-metadata.js";
+import { createOgHarfbuzzPlugin } from "./plugins/og-harfbuzz.js";
 import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins/og-assets.js";
 import { createUseCacheCallablePlugin } from "./plugins/use-cache-callable.js";
-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 { createTransitiveExternalsPlugin } from "./plugins/transitive-externals.js";
 import public_shim_map_default from "./shims/public-shim-map.json.js";
 import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
-import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClientAssetsBuildMetadata, takePagesClientAssetsBuildMetadata, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
 import { readPrerenderSecret, readServerRuntimeOutputDirs } from "./build/server-manifest.js";
-import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./build/preview-credentials.js";
 import { createModuleDependencyCache } from "./build/module-dependency-cache.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
@@ -111,15 +117,15 @@ import { publicFilePathVariants } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
 import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
-import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { createIdResolver, createLogger, isRunnableDevEnvironment, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
+import { execFileSync } from "node:child_process";
 import { createHash, randomBytes } from "node:crypto";
-import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
+import commonjs from "vite-plugin-commonjs";
 //#region src/index.ts
 const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE = Object.freeze(["vinext/server/fetch-handler", "vinext/server/pages-router-entry"]);
 const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
@@ -133,6 +139,30 @@ const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 const OPTIONAL_OPTIMIZE_DEPS_WARNING_RE = /Failed to resolve dependency: .*use-sync-external-store\/with-selector.*present in .* 'optimizeDeps\.include'/;
 const VINEXT_FILTERED_OPTIMIZE_DEPS_WARN = Symbol.for("vinext.filteredOptimizeDepsWarn");
 const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
+	"rsc",
+	"ssr",
+	"client"
+]);
+function scopeRscPlugin(plugin) {
+	const applyToEnvironment = plugin.applyToEnvironment;
+	return {
+		...plugin,
+		applyToEnvironment(environment) {
+			if (!RSC_ENVIRONMENTS.has(environment.name)) return false;
+			return applyToEnvironment?.(environment) ?? true;
+		}
+	};
+}
+const earlyViteCliInvocation = getViteCliInvocation();
+const viteCliBuildConfigNodeEnv = earlyViteCliInvocation?.command === "build" && process.env.NODE_ENV === "test" ? "test" : void 0;
+if (earlyViteCliInvocation) {
+	if (!process.env.NODE_ENV) Reflect.set(process.env, "NODE_ENV", earlyViteCliInvocation.command === "build" ? viteCliBuildConfigNodeEnv ?? "production" : earlyViteCliInvocation.mode === "test" ? "test" : "development");
+	loadDotenv({
+		root: earlyViteCliInvocation.root,
+		mode: earlyViteCliInvocation.mode
+	});
+}
 installSocketErrorBackstop();
 function hasServerOnlyMarkerImport(code) {
 	if (!code.includes("server-only")) return false;
@@ -187,6 +217,7 @@ function resolveShimModulePath(shimsDir, moduleName) {
 	}
 	return path.join(shimsDir, `${moduleName}.js`);
 }
+const PATCHED_SERVER_PACKAGES = ["@vercel/og"];
 function isVercelOgImport(id) {
 	return id === "@vercel/og" || id === "@vercel/og.js";
 }
@@ -799,7 +830,9 @@ function createServerEnvironmentFileNameResolver(config, outputRoot) {
 	};
 }
 function vinext(options = {}) {
+	const internalOptions = options;
 	const { supportsNativeTypeofWindowFolding: useNativeTypeofWindowFolding } = assertSupportedViteVersion();
+	const reservedDevCliInvocation = reserveViteCliDevInvocation();
 	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
 	const cacheAdapterBuildOutputs = [options.cache?.data?.output, options.cache?.cdn?.output].filter((output) => output !== void 0);
 	let root;
@@ -820,10 +853,7 @@ function vinext(options = {}) {
 	let hasCloudflarePlugin = false;
 	let matchedMultiStageOutput;
 	let selectedMultiStageOutput;
-	const isMultiStageServerEnvironment = (environment) => {
-		if (environment.name === "client") return Boolean(environment.config.build.ssr);
-		return isServerEnvironment(environment) && (!hasAppDir || environment.name !== "ssr");
-	};
+	const isMultiStageServerEnvironment = (environment) => isServerEnvironment(environment) && (!hasAppDir || environment.name === "rsc");
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
 	let nitroHostRuntime = "node";
@@ -832,6 +862,12 @@ function vinext(options = {}) {
 	let pagesTsconfigAliases = {};
 	let pagesBundledPackages = /* @__PURE__ */ new Set();
 	let isServeCommand = false;
+	let buildEmptyOutDir;
+	let buildLifecycleEnabled = false;
+	let hasPlainPagesBuildEnvironments = false;
+	let originalPlainPagesEnvironments;
+	let buildLifecycleInvocation;
+	let reactUpgradeChecked = false;
 	let pagesOptimizeEntries = [];
 	const importMetaUrlCapability = createImportMetaUrlPlugin({
 		getRoot: () => root,
@@ -842,7 +878,7 @@ function vinext(options = {}) {
 	});
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
 	const resolvePagesClientAssetsOutputDir = (environmentName, outputDir) => !selectedMultiStageOutput && !hasAppDir && environmentName === "ssr" ? path.dirname(outputDir) : outputDir;
-	let pagesClientAssetsModule = null;
+	let pagesClientAssetsModule = internalOptions.__pagesClientAssetsModule ?? null;
 	let devPublicFileRoutes = null;
 	let publicDirConflictOptions = null;
 	let copyPublicDirIntoStaticExportBasePath = false;
@@ -850,6 +886,7 @@ function vinext(options = {}) {
 	let rscCompatibilityId;
 	let draftModeSecret = getPagesPreviewModeId();
 	const prerenderSecret = process.env.__VINEXT_SHARED_PRERENDER_SECRET ?? randomBytes(32).toString("hex");
+	let revalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
 	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
 	const rscClassificationManifests = /* @__PURE__ */ new Map();
@@ -930,7 +967,8 @@ function vinext(options = {}) {
 		});
 	}
 	const autoRsc = options.rsc !== false;
-	const earlyBaseDir = options.appDir ?? process.cwd();
+	const earlyRoot = earlyViteCliInvocation?.root ?? process.cwd();
+	const earlyBaseDir = path.resolve(earlyRoot, options.appDir ?? ".");
 	const earlyAppDirExists = !options.disableAppRouter && (fs.existsSync(path.join(earlyBaseDir, "app")) || fs.existsSync(path.join(earlyBaseDir, "src", "app")));
 	let resolvedReactPath = null;
 	let resolvedRscPath = null;
@@ -952,14 +990,12 @@ function vinext(options = {}) {
 			} });
 			const useCachePlugin = await createUseCacheCallablePlugin({
 				projectRoot: earlyBaseDir,
-				cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href,
-				getAppDir: () => appDir,
-				matchesPageExtension: (fileName) => fileMatcher.extensionRegex.test(fileName)
+				cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href
 			});
 			const useServerIndex = plugins.findIndex((plugin) => plugin.name === "rsc:use-server");
 			if (useServerIndex === -1) throw new Error("vinext: Failed to locate @vitejs/plugin-rsc use-server plugin.");
 			plugins.splice(useServerIndex, 0, useCachePlugin);
-			return plugins;
+			return plugins.map(scopeRscPlugin);
 		}).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
 		});
@@ -968,8 +1004,6 @@ function vinext(options = {}) {
 		manualUseCachePluginPromise = createUseCacheCallablePlugin({
 			projectRoot: earlyBaseDir,
 			cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href,
-			getAppDir: () => appDir,
-			matchesPageExtension: (fileName) => fileMatcher.extensionRegex.test(fileName),
 			allowMissingRsc: true
 		});
 	}
@@ -1106,7 +1140,59 @@ function vinext(options = {}) {
 			transformBundledCommonJsDependencies = previous;
 		}
 	};
+	const buildLifecyclePlugins = createBuildLifecyclePlugins({
+		isEnabled: (builder) => buildLifecycleEnabled && builder.config.build.write !== false && !builder.config.build.lib && (buildLifecycleInvocation !== void 0 || !builder.config.build.watch && !builder.config.build.ssr && getBuildBundlerOptions(builder.config.build)?.input === void 0),
+		onComplete: () => buildLifecycleInvocation?.onComplete?.(),
+		shouldDeferPostBuild: () => buildLifecycleInvocation !== void 0,
+		shouldPrepare: (config) => buildLifecycleEnabled && config.build?.write !== false && !config.build?.lib && (buildLifecycleInvocation !== void 0 || !config.build?.watch && !config.build?.ssr && getBuildBundlerOptions(config.build)?.input === void 0),
+		onPrepare: () => {
+			if (!hasAppDir || reactUpgradeChecked) return;
+			reactUpgradeChecked = true;
+			const reactUpgrade = getReactUpgradeDeps(root);
+			if (reactUpgrade.length === 0) return;
+			const [packageManager, ...packageManagerArgs] = detectPackageManager(root).replace(/ -D$/, "").split(" ");
+			console.log("  Upgrading React for RSC compatibility...");
+			execFileSync(packageManager, [...packageManagerArgs, ...reactUpgrade], {
+				cwd: root,
+				stdio: "inherit",
+				shell: process.platform === "win32"
+			});
+		},
+		shouldBuildPlainPages: () => !hasAppDir && !hasCloudflarePlugin && !hasNitroPlugin,
+		createContext: () => ({
+			cacheConfig: options.cache ?? null,
+			configNodeEnv: viteCliBuildConfigNodeEnv,
+			createPagesOnlyPlugins: (pagesClientAssetsModule) => vinext({
+				...options,
+				disableAppRouter: true,
+				precompress: false,
+				prerender: void 0,
+				__skipBuildLifecycle: true,
+				__pagesClientAssetsModule: pagesClientAssetsModule
+			}),
+			emptyOutDir: buildEmptyOutDir,
+			hasAppDir,
+			hasPagesDir,
+			nextConfig,
+			prerenderConfig,
+			prerenderConcurrency: prerenderConfig?.concurrency,
+			prerenderSecret,
+			previewBuildCredentials,
+			revalidateSecret,
+			root,
+			routeRootConfig: {
+				appDir: options.appDir,
+				disableAppRouter: options.disableAppRouter,
+				rscOutDir: options.rscOutDir,
+				ssrOutDir: options.ssrOutDir
+			},
+			rscBuildIdentity,
+			rscCompatibilityId,
+			skipHybridPagesBundle: hasCloudflarePlugin
+		})
+	});
 	const plugins = [
+		buildLifecyclePlugins[0],
 		createStyledJsxPlugin(earlyBaseDir),
 		mdxProxyPlugin,
 		reactPluginPromise,
@@ -1173,6 +1259,7 @@ function vinext(options = {}) {
 		}),
 		dataUrlCssPlugin(),
 		createCssModuleImportCompatibilityPlugin(),
+		createDevServerLifecyclePlugin({}, (config) => config[VINEXT_DEV_CLI_LIFECYCLE] === true),
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -1186,8 +1273,14 @@ function vinext(options = {}) {
 			},
 			[VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY]: options.cache ?? null,
 			async config(config, env) {
+				hasPlainPagesBuildEnvironments = false;
+				originalPlainPagesEnvironments = void 0;
+				buildEmptyOutDir = typeof config.build?.emptyOutDir === "boolean" ? config.build.emptyOutDir : void 0;
 				isServeCommand = env.command === "serve";
-				root = toSlash(config.root ?? process.cwd());
+				root = path.resolve(toSlash(process.cwd()), config.root ?? ".");
+				const devCliLifecycleEnabled = env.command === "serve" && env.isPreview !== true && claimViteCliDevInvocation(root, config["__vinextDevRestart"] === true, reservedDevCliInvocation && config.configFile === false);
+				buildLifecycleInvocation = config[VINEXT_BUILD_LIFECYCLE_CONFIG];
+				buildLifecycleEnabled = env.command === "build" && !internalOptions.__skipBuildLifecycle && (buildLifecycleInvocation !== void 0 || claimViteCliBuildInvocation());
 				const userResolve = config.resolve;
 				let tsconfigPathAliases = {};
 				let sassTsconfigPathAliases = [];
@@ -1204,8 +1297,11 @@ function vinext(options = {}) {
 				if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
 				else if (mode === "test") resolvedNodeEnv = "test";
 				else resolvedNodeEnv = "development";
-				if (process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(process.env, "NODE_ENV", resolvedNodeEnv);
-				if (env?.command === "build") previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
+				if (!(process.env.NODE_ENV === "test" && viteCliBuildConfigNodeEnv === "test") && process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(process.env, "NODE_ENV", resolvedNodeEnv);
+				if (env?.command === "build") {
+					previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
+					if (buildLifecycleEnabled) revalidateSecret ??= randomBytes(32).toString("hex");
+				}
 				draftModeSecret = previewBuildCredentials?.id ?? getPagesPreviewModeId();
 				let baseDir;
 				if (options.appDir) {
@@ -1245,6 +1341,7 @@ function vinext(options = {}) {
 						buildId: sharedBuildId
 					};
 				}
+				if (env?.command === "build" && earlyViteCliInvocation?.command === "build") Reflect.set(process.env, "NODE_ENV", "production");
 				const configuredTsconfigPath = isUnknownRecord(nextConfig.typescript) ? typeof nextConfig.typescript.tsconfigPath === "string" ? nextConfig.typescript.tsconfigPath : void 0 : void 0;
 				const resolvedTsconfigAliases = resolveTsconfigAliases(root, configuredTsconfigPath);
 				tsconfigPathAliases = resolvedTsconfigAliases.vite;
@@ -1401,7 +1498,7 @@ function vinext(options = {}) {
 				resolvedServerExternalPackages = nextServerExternal;
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
 				const hasBuildInput = getBuildBundlerOptions(config.build)?.input !== void 0;
-				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput;
+				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput && !config.build?.lib;
 				const hasClientBuildEnvironment = hasAppDir || hasCloudflarePlugin || hasNitroPlugin || shouldInjectPlainPagesEnvironments;
 				const clientAssetsDir = resolveAssetsDir(nextConfig.assetPrefix ?? "");
 				clientAssetsInlineLimit = config.build?.assetsInlineLimit ?? 0;
@@ -1421,6 +1518,11 @@ function vinext(options = {}) {
 				}
 				const viteConfig = {
 					appType: "custom",
+					...devCliLifecycleEnabled ? { [VINEXT_DEV_CLI_LIFECYCLE]: true } : {},
+					...!hasAppDir && hasCloudflarePlugin ? { builder: {
+						...config.builder,
+						sharedConfigBuild: true
+					} } : {},
 					build: {
 						ssrEmitAssets: true,
 						cssTarget: [
@@ -1454,7 +1556,10 @@ function vinext(options = {}) {
 						},
 						hmr: devHmrConfig
 					},
-					...hasCloudflarePlugin || hasNitroPlugin ? {} : config.ssr?.external === true ? { ssr: { external: true } } : { ssr: {
+					...hasCloudflarePlugin || hasNitroPlugin ? {} : config.ssr?.external === true ? { ssr: {
+						external: true,
+						noExternal: [...PATCHED_SERVER_PACKAGES]
+					} } : { ssr: {
 						external: [
 							"react",
 							"react-dom",
@@ -1567,7 +1672,7 @@ function vinext(options = {}) {
 									...env?.command === "serve" && _canExternalizeAppRscHandler ? ["vinext/server/app-rsc-combined-handler", "vinext/server/app-rsc-handler"] : [],
 									...userSsrExternal
 								],
-								...userSsrExternal === true ? {} : { noExternal: true }
+								noExternal: userSsrExternal === true ? [...PATCHED_SERVER_PACKAGES] : true
 							} },
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
@@ -1590,7 +1695,7 @@ function vinext(options = {}) {
 									"ipaddr.js",
 									...externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []
 								],
-								...userSsrExternal === true ? {} : { noExternal: true }
+								noExternal: userSsrExternal === true ? [...PATCHED_SERVER_PACKAGES] : true
 							} },
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true || externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []),
@@ -1647,50 +1752,55 @@ function vinext(options = {}) {
 						})
 					}
 				} };
-				else if (shouldInjectPlainPagesEnvironments) viteConfig.environments = {
-					client: {
-						consumer: "client",
-						optimizeDeps: {
-							include: ["react-dom/client"],
-							...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
-							...depOptimizeNodeEnvOptions
-						},
-						build: {
-							outDir: "dist/client",
-							manifest: true,
-							ssrManifest: true,
-							assetsInlineLimit: clientAssetsInlineLimit,
-							...withBuildBundlerOptions({
-								input: { index: VIRTUAL_CLIENT_ENTRY },
-								output: getClientOutputConfig(clientAssetsDir),
-								treeshake: getClientTreeshakeConfig()
-							})
-						}
-					},
-					ssr: {
-						resolve: {
-							external: [
-								"react",
-								"react-dom",
-								"react-dom/server",
-								"ipaddr.js",
-								...nextServerExternal
-							],
-							noExternal: true
-						},
-						optimizeDeps: {
-							exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], Object.keys(nextShimMap)),
-							...depOptimizeNodeEnvOptions
+				else if (shouldInjectPlainPagesEnvironments) {
+					const plainPagesEnvironments = {
+						client: {
+							consumer: "client",
+							optimizeDeps: {
+								include: ["react-dom/client"],
+								...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
+								...depOptimizeNodeEnvOptions
+							},
+							build: {
+								outDir: "dist/client",
+								manifest: true,
+								ssrManifest: true,
+								assetsInlineLimit: clientAssetsInlineLimit,
+								...withBuildBundlerOptions({
+									input: { index: VIRTUAL_CLIENT_ENTRY },
+									output: getClientOutputConfig(clientAssetsDir),
+									treeshake: getClientTreeshakeConfig()
+								})
+							}
 						},
-						build: {
-							outDir: "dist/server",
-							...withBuildBundlerOptions({
-								input: { index: hasNitroPlugin ? VIRTUAL_WORKER_ENTRY : VIRTUAL_SERVER_ENTRY },
-								output: { entryFileNames: "entry.js" }
-							})
+						ssr: {
+							resolve: {
+								external: [
+									"react",
+									"react-dom",
+									"react-dom/server",
+									"ipaddr.js",
+									...nextServerExternal
+								],
+								noExternal: true
+							},
+							optimizeDeps: {
+								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], Object.keys(nextShimMap)),
+								...depOptimizeNodeEnvOptions
+							},
+							build: {
+								outDir: "dist/server",
+								...withBuildBundlerOptions({
+									input: { index: hasNitroPlugin ? VIRTUAL_WORKER_ENTRY : VIRTUAL_SERVER_ENTRY },
+									output: { entryFileNames: "entry.js" }
+								})
+							}
 						}
-					}
-				};
+					};
+					originalPlainPagesEnvironments = config.environments;
+					viteConfig.environments = plainPagesEnvironments;
+					hasPlainPagesBuildEnvironments = env.command === "build";
+				}
 				if (pagesOptimizeEntries.length > 0 && !hasCloudflarePlugin) viteConfig.optimizeDeps = {
 					...viteConfig.optimizeDeps,
 					entries: pagesOptimizeEntries
@@ -1722,6 +1832,12 @@ function vinext(options = {}) {
 				return null;
 			},
 			async configResolved(config) {
+				if (isServeCommand && !config["__vinextDevCliLifecycle"] && config.configFile && isViteCliConfigFile(config.configFile, config.inlineConfig)) {
+					if (claimViteCliDevInvocation(config.root, false, true)) {
+						config[VINEXT_DEV_CLI_LIFECYCLE] = true;
+						if (!config.server.middlewareMode) applyDevServerDefaults(config.server, {});
+					}
+				}
 				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir) suppressOptionalOptimizeDepsWarnings(config.logger);
 				if (config.worker?.rolldownOptions) {
 					const workerFileNames = `${resolveAssetsDir(nextConfig.assetPrefix ?? "")}/workers/[name]-[hash].js`;
@@ -2125,6 +2241,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			transform: {
 				filter: { id: /virtual:|\.[cm]?[jt]sx?(?:\?|$)/ },
 				handler(code, id) {
+					const environment = this.environment;
+					if (!isServeCommand && (!environment || !isMultiStageServerEnvironment(environment))) return null;
 					const transformed = matchedMultiStageOutput?.transformHostEntry?.({
 						code,
 						id
@@ -2367,6 +2485,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					return `http://localhost:${typeof address === "object" && address ? address.port : server.config.server.port ?? 3e3}`;
 				};
 				let cachedSSRHandler = null;
+				const devPageRouteDataKinds = /* @__PURE__ */ new Map();
+				function classifyDevPageFile(filePath) {
+					const cached = devPageRouteDataKinds.get(filePath);
+					if (cached) return cached;
+					let dataKind = "none";
+					try {
+						const source = fs.readFileSync(filePath, "utf8");
+						dataKind = hasExportedName(source, "getStaticProps") ? "static" : hasExportedName(source, "getServerSideProps") ? "server" : "none";
+					} catch {}
+					devPageRouteDataKinds.set(filePath, dataKind);
+					return dataKind;
+				}
 				function getPagesRunner() {
 					if (!pagesRunner) {
 						const env = server.environments["ssr"] ?? Object.values(server.environments).find((e) => e !== server.environments["rsc"]) ?? Object.values(server.environments)[0];
@@ -2420,6 +2550,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					pagesRunner?.clearCache();
 				}
+				function invalidatePagesHydrationProxies() {
+					const graph = server.environments.client?.moduleGraph;
+					if (!graph) return;
+					for (const mod of graph.idToModuleMap.values()) if (mod.id?.includes("?html-proxy&index=")) graph.invalidateModule(mod);
+				}
 				function invalidateAppRoutingModules() {
 					invalidateAppRouteCache();
 					invalidateMetadataFileCache();
@@ -2531,13 +2666,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (hasAppDir) invalidateRscEntryModule();
 					if (hasCloudflarePlugin && hasPagesDir && !hasAppDir) invalidatePagesServerEntry();
 				};
+				function invalidatePagesMiddlewareMatcher(filePath) {
+					if (!hasPagesDir || !middlewarePath || toSlash(filePath) !== middlewarePath) return;
+					cachedSSRHandler = null;
+					server.ws.send({ type: "full-reload" });
+				}
 				server.watcher.on("add", (filePath) => {
+					invalidatePagesMiddlewareMatcher(filePath);
 					updatePublicFileRoute(filePath, true);
 					let routeChanged = false;
 					const pagesAppChanged = isPagesAppFile(filePath);
 					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
 					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
+						devPageRouteDataKinds.delete(toSlash(filePath));
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
 					}
@@ -2548,23 +2690,37 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (routeChanged) {
 						invalidatePagesServerEntry();
+						if (hasPagesDir) invalidatePagesHydrationProxies();
 						if (!hasAppDir) server.ws.send({ type: "full-reload" });
 						invalidateHybridClientEntries();
 						revalidateHybridRoutes();
 					}
 				});
 				server.watcher.on("change", (filePath) => {
+					invalidatePagesMiddlewareMatcher(filePath);
+					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
+						const pageFile = toSlash(filePath);
+						const previousKind = devPageRouteDataKinds.get(pageFile);
+						devPageRouteDataKinds.delete(pageFile);
+						if (previousKind !== void 0 && previousKind !== classifyDevPageFile(pageFile)) {
+							cachedSSRHandler = null;
+							invalidatePagesHydrationProxies();
+							server.ws.send({ type: "full-reload" });
+						}
+					}
 					const pagesAppChanged = isPagesAppFile(filePath);
 					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
 					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 				});
 				server.watcher.on("unlink", (filePath) => {
+					invalidatePagesMiddlewareMatcher(filePath);
 					updatePublicFileRoute(filePath, false);
 					let routeChanged = false;
 					const pagesAppChanged = isPagesAppFile(filePath);
 					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
 					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
+						devPageRouteDataKinds.delete(toSlash(filePath));
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
 					}
@@ -2575,6 +2731,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (routeChanged) {
 						invalidatePagesServerEntry();
+						if (hasPagesDir) invalidatePagesHydrationProxies();
 						if (!hasAppDir) server.ws.send({ type: "full-reload" });
 						invalidateHybridClientEntries();
 						revalidateHybridRoutes();
@@ -2931,18 +3088,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const getDevApiRoutes = () => devApiRoutesPromise ??= apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 							let devAppRoutesPromise = null;
 							const getDevAppRoutes = () => devAppRoutesPromise ??= hasAppDir && appDir ? appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : Promise.resolve([]);
-							const devPageRouteDataKinds = /* @__PURE__ */ new Map();
-							const classifyDevPageRoute = (route) => {
-								const cached = devPageRouteDataKinds.get(route.filePath);
-								if (cached) return cached;
-								let dataKind = "none";
-								try {
-									const source = fs.readFileSync(route.filePath, "utf8");
-									dataKind = hasExportedName(source, "getStaticProps") ? "static" : hasExportedName(source, "getServerSideProps") ? "server" : "none";
-								} catch {}
-								devPageRouteDataKinds.set(route.filePath, dataKind);
-								return dataKind;
-							};
+							const classifyDevPageRoute = (route) => classifyDevPageFile(route.filePath);
 							const pipelineDeps = {
 								basePath: bp,
 								trailingSlash: nextConfig?.trailingSlash ?? false,
@@ -3079,7 +3225,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 								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, nextConfig?.reactStrictMode === true, nextConfig?.expireTime, nextConfig?.crossOrigin, devBuildId)
+									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, nextConfig?.reactStrictMode === true, nextConfig?.expireTime, nextConfig?.crossOrigin, devBuildId, middlewarePath ? compileClientMiddlewareMatchers(extractMiddlewareMatcherConfig(middlewarePath)) : void 0, classifyDevPageRoute)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();
@@ -3276,8 +3422,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				const serverDefines = { ...nextConfig.compilerDefineServer };
 				serverDefines["process.env.NEXT_RUNTIME"] = JSON.stringify("nodejs");
 				serverDefines["process.env.NEXT_PHASE"] = "globalThis.__VINEXT_NEXT_PHASE";
-				const sharedRevalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
-				if (sharedRevalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(sharedRevalidateSecret);
+				if (revalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(revalidateSecret);
 				if (previewBuildCredentials) {
 					serverDefines["process.env.__VINEXT_PREVIEW_MODE_ID"] = JSON.stringify(previewBuildCredentials.id);
 					serverDefines["process.env.__VINEXT_PREVIEW_MODE_SIGNING_KEY"] = JSON.stringify(previewBuildCredentials.signingKey);
@@ -3452,7 +3597,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					sequential: true,
 					order: "post",
 					handler() {
-						if (buildIdWritten) return;
+						if (buildIdWritten || !isServerEnvironment(this.environment)) return;
 						buildIdWritten = true;
 						const outDir = path.join(root, "dist", "server");
 						fs.mkdirSync(outDir, { recursive: true });
@@ -3664,14 +3809,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0,
 							crossOrigin: nextConfig.crossOrigin ?? ""
 						});
-						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
-						if (hasAppDir && hasPagesDir && buildSession) setPagesClientAssetsBuildMetadata(buildSession, pagesClientAssetsModule);
-					}
-					if (pagesClientAssetsModule === null) {
-						if (pagesClientAssetsOutputDirs.size === 0) return;
-						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
-						if (buildSession) pagesClientAssetsModule = takePagesClientAssetsBuildMetadata(buildSession);
 					}
+					if (pagesClientAssetsModule === null && pagesClientAssetsOutputDirs.size === 0) return;
 					if (pagesClientAssetsModule === null) {
 						const emptyModule = buildPagesClientAssetsModule({});
 						for (const outputDir of pagesClientAssetsOutputDirs) writePagesClientAssetsModuleIfMissing(outputDir, emptyModule);
@@ -3743,6 +3882,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		},
 		createWasmModuleImportPlugin(),
+		createOgHarfbuzzPlugin(),
 		{
 			name: "vinext:og-font-patch",
 			enforce: "pre",
@@ -3843,6 +3983,27 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin());
 	} else if (manualUseCachePluginPromise) plugins.push(manualUseCachePluginPromise);
+	plugins.push({
+		name: "vinext:plain-pages-build-config",
+		apply: "build",
+		enforce: "post",
+		config: {
+			order: "post",
+			handler(config) {
+				if (!hasPlainPagesBuildEnvironments) return;
+				if (config.build?.watch || config.build?.ssr || config.build?.lib || getBuildBundlerOptions(config.build)?.input !== void 0) {
+					for (const name of ["client", "ssr"]) if (originalPlainPagesEnvironments?.[name]) config.environments[name] = originalPlainPagesEnvironments[name];
+					else delete config.environments?.[name];
+					return;
+				}
+				return { builder: {
+					...config.builder,
+					sharedConfigBuild: true
+				} };
+			}
+		}
+	});
+	plugins.push(buildLifecyclePlugins[1]);
 	return plugins;
 }
 /**