vinext 0.1.3 → 0.1.4

package/dist/index.js

@@ -5,7 +5,7 @@ import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, n
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
-import { proxyExternalRequest } from "./config/config-matchers.js";
+import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
@@ -31,7 +31,7 @@ import { planRouteClassificationInjection } from "./build/route-classification-i
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.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 { getViteMajorVersion } from "./utils/vite-version.js";
+import { getDepOptimizeNodeEnvOptions, getViteMajorVersion, serializeViteDefine } from "./utils/vite-version.js";
 import { createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
@@ -63,7 +63,7 @@ import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassTildeImporter } from "./plugins/sass.js";
 import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
-import { stripServerExports } from "./plugins/strip-server-exports.js";
+import { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
@@ -78,7 +78,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { loadEnv, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
-import { randomBytes, randomUUID } from "node:crypto";
+import { createHash, randomBytes, randomUUID } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
 import tsconfigPaths from "vite-tsconfig-paths";
@@ -162,6 +162,19 @@ function resolveTsconfigPathCandidate(candidate) {
 	for (const item of candidates) if (fs.existsSync(item) && fs.statSync(item).isFile()) return item;
 	return null;
 }
+/**
+* Normalize a tsconfig `extends` field into a list of specifier strings.
+*
+* TypeScript 5.0+ allows `extends` to be either a string or an array of
+* strings. Matches Next.js's handling in
+* packages/next/src/build/next-config-ts/transpile-config.ts, where parents
+* are iterated in order and later entries override earlier ones.
+*/
+function normalizeTsconfigExtends(extendsField) {
+	if (typeof extendsField === "string") return [extendsField];
+	if (Array.isArray(extendsField)) return extendsField.filter((value) => typeof value === "string");
+	return [];
+}
 function resolveTsconfigExtends(configPath, specifier) {
 	const fromDir = path.dirname(configPath);
 	if (specifier.startsWith(".") || specifier.startsWith("/") || specifier.startsWith("\\")) return resolveTsconfigPathCandidate(path.resolve(fromDir, specifier));
@@ -221,9 +234,12 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 	}
 	if (!parsed) return {};
 	let aliases = {};
-	if (typeof parsed.extends === "string") {
-		const extendedPath = resolveTsconfigExtends(normalizedPath, parsed.extends);
-		if (extendedPath) aliases = loadTsconfigPathAliases(extendedPath, projectRoot, seen);
+	for (const extendsSpecifier of normalizeTsconfigExtends(parsed.extends)) {
+		const extendedPath = resolveTsconfigExtends(normalizedPath, extendsSpecifier);
+		if (extendedPath) aliases = {
+			...aliases,
+			...loadTsconfigPathAliases(extendedPath, projectRoot, seen)
+		};
 	}
 	const compilerOptions = isUnknownRecord(parsed.compilerOptions) ? parsed.compilerOptions : null;
 	const pathsConfig = compilerOptions && isUnknownRecord(compilerOptions.paths) ? compilerOptions.paths : null;
@@ -288,6 +304,14 @@ const RESOLVED_INSTRUMENTATION_CLIENT = `\0${VIRTUAL_INSTRUMENTATION_CLIENT}.mjs
 /** Image file extensions handled by the vinext:image-imports plugin.
 *  Shared between the Rolldown hook filter and the transform handler regex. */
 const IMAGE_EXTS = "png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?";
+function createStaticImageAsset(imagePath) {
+	const source = fs.readFileSync(imagePath);
+	const extension = path.extname(imagePath);
+	return {
+		fileName: `media/${path.basename(imagePath, extension)}.${createHash("sha256").update(source).digest("hex").slice(0, 8)}${extension}`,
+		source
+	};
+}
 /**
 * Absolute path to vinext's shims directory, with a trailing slash. Normalized
 * to forward slashes because it is prefix-matched against Vite module ids (which
@@ -394,6 +418,7 @@ function vinext(options = {}) {
 	const viteMajorVersion = getViteMajorVersion();
 	let root;
 	let pagesDir;
+	let canonicalPagesDir;
 	let appDir;
 	let hasAppDir = false;
 	let hasPagesDir = false;
@@ -413,6 +438,19 @@ function vinext(options = {}) {
 	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => tryRealpathSync(p) ?? p;
+	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
+	const canonicalizePageTransformPath = (modulePath) => {
+		const cached = pageTransformCanonicalPaths.get(modulePath);
+		if (cached) return cached;
+		const canonicalPath = canonicalize(modulePath);
+		pageTransformCanonicalPaths.set(modulePath, canonicalPath);
+		return canonicalPath;
+	};
+	const isWithinPagesDirectory = (modulePath) => modulePath === pagesDir || modulePath.startsWith(`${pagesDir}/`) || modulePath === canonicalPagesDir || modulePath.startsWith(`${canonicalPagesDir}/`);
+	const isApiPage = (canonicalId) => {
+		const relativePath = fileMatcher.stripExtension(canonicalId.slice(canonicalPagesDir.length));
+		return relativePath === "/api" || relativePath.startsWith("/api/");
+	};
 	const dynamicShimPaths = new Set([
 		resolveShimModulePath(shimsDir, "headers"),
 		resolveShimModulePath(shimsDir, "server"),
@@ -481,6 +519,9 @@ function vinext(options = {}) {
 		});
 	}
 	const imageImportDimCache = /* @__PURE__ */ new Map();
+	const staticImageAssets = /* @__PURE__ */ new Map();
+	const staticImageImportsByModule = /* @__PURE__ */ new Map();
+	const writtenStaticImageFiles = /* @__PURE__ */ new Set();
 	let mdxDelegate = null;
 	let mdxDelegatePromise = null;
 	let hasUserMdxPlugin = false;
@@ -572,6 +613,7 @@ function vinext(options = {}) {
 					else baseDir = root;
 				}
 				pagesDir = path.posix.join(baseDir, "pages");
+				canonicalPagesDir = canonicalize(pagesDir);
 				appDir = path.posix.join(baseDir, "app");
 				hasPagesDir = fs.existsSync(pagesDir);
 				hasAppDir = !options.disableAppRouter && fs.existsSync(appDir);
@@ -605,7 +647,10 @@ function vinext(options = {}) {
 				clientInjectModule = instrumentationClientInjects.length ? generateInstrumentationClientInjectModule(instrumentationClientInjects, instrumentationClientPath, INSTRUMENTATION_CLIENT_EMPTY_MODULE) : null;
 				if (env?.command === "build") await writeRouteTypes();
 				const defines = getNextPublicEnvDefines();
-				if (!config.define || typeof config.define !== "object" || !("process.env.NODE_ENV" in config.define)) defines["process.env.NODE_ENV"] = JSON.stringify(resolvedNodeEnv);
+				const userNodeEnvDefine = config.define?.["process.env.NODE_ENV"];
+				const hasUserNodeEnvDefine = Object.hasOwn(config.define ?? {}, "process.env.NODE_ENV");
+				const nodeEnvDefine = hasUserNodeEnvDefine ? serializeViteDefine(userNodeEnvDefine) : JSON.stringify(resolvedNodeEnv);
+				if (!hasUserNodeEnvDefine) defines["process.env.NODE_ENV"] = nodeEnvDefine;
 				for (const [key, value] of Object.entries(nextConfig.env)) {
 					if (key === "NODE_ENV") continue;
 					defines[`process.env.${key}`] = JSON.stringify(value);
@@ -836,10 +881,15 @@ function vinext(options = {}) {
 						if (shimBase !== void 0) return resolveShimModulePath(shimsDir, shimBase);
 					}
 				};
+				const depOptimizeNodeEnvOptions = getDepOptimizeNodeEnvOptions(viteMajorVersion, nodeEnvDefine);
 				viteConfig.optimizeDeps = {
 					exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["@tailwindcss/oxide"]),
 					...incomingInclude.length > 0 ? { include: incomingInclude } : {},
-					rolldownOptions: { plugins: [depOptimizeAliasPlugin] }
+					...depOptimizeNodeEnvOptions,
+					rolldownOptions: {
+						...depOptimizeNodeEnvOptions.rolldownOptions,
+						plugins: [depOptimizeAliasPlugin]
+					}
 				};
 				const pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
 				if (hasAppDir) {
@@ -861,7 +911,9 @@ function vinext(options = {}) {
 							} },
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
-								entries: optimizeEntries
+								entries: optimizeEntries,
+								include: [...new Set([...incomingInclude, "react-server-dom-webpack/static.edge"])],
+								...depOptimizeNodeEnvOptions
 							},
 							build: {
 								outDir: options.rscOutDir ?? "dist/server",
@@ -878,7 +930,8 @@ function vinext(options = {}) {
 							} },
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true ? SSR_EXTERNAL_REACT_ENTRIES : []),
-								entries: optimizeEntries
+								entries: optimizeEntries,
+								...depOptimizeNodeEnvOptions
 							},
 							build: {
 								outDir: options.ssrOutDir ?? "dist/server/ssr",
@@ -951,7 +1004,10 @@ function vinext(options = {}) {
 							],
 							noExternal: true
 						},
-						optimizeDeps: { exclude: ["ipaddr.js"] },
+						optimizeDeps: {
+							exclude: ["ipaddr.js"],
+							...depOptimizeNodeEnvOptions
+						},
 						build: {
 							outDir: "dist/server",
 							...withBuildBundlerOptions(viteMajorVersion, {
@@ -1435,6 +1491,51 @@ function vinext(options = {}) {
 				});
 				installDevStackSourcemapMiddleware(server);
 				return () => {
+					const viteFilesystemMiddlewares = server.middlewares.stack.filter(({ handle }) => {
+						const name = typeof handle === "function" ? handle.name : "";
+						return name === "viteServePublicMiddleware" || name === "viteServeStaticMiddleware";
+					}).map(({ handle }) => handle).filter((handle) => typeof handle === "function");
+					const serveRewrittenViteFilesystemRoute = async (req, res, requestPathname, stagedHeaders) => {
+						const originalUrl = req.url;
+						const originalStatusCode = res.statusCode;
+						const originalStatusMessage = res.statusMessage;
+						const originalHeaders = res.getHeaders();
+						req.url = requestPathname;
+						for (const [key, value] of Object.entries(stagedHeaders)) res.setHeader(key, value);
+						const restore = () => {
+							req.url = originalUrl;
+							res.statusCode = originalStatusCode;
+							res.statusMessage = originalStatusMessage;
+							for (const key of Object.keys(res.getHeaders())) res.removeHeader(key);
+							for (const [key, value] of Object.entries(originalHeaders)) if (value !== void 0) res.setHeader(key, value);
+						};
+						try {
+							for (const middleware of viteFilesystemMiddlewares) if (await new Promise((resolve, reject) => {
+								let settled = false;
+								const settle = (value, error) => {
+									if (settled) return;
+									settled = true;
+									res.off("finish", onServed);
+									res.off("close", onServed);
+									if (error) reject(error);
+									else resolve(value);
+								};
+								const onServed = () => settle("served");
+								res.once("finish", onServed);
+								res.once("close", onServed);
+								middleware(req, res, (error) => settle("next", error));
+								if (res.writableEnded) settle("served");
+							}) === "served") {
+								req.url = originalUrl;
+								return true;
+							}
+						} catch (error) {
+							restore();
+							throw error;
+						}
+						restore();
+						return false;
+					};
 					if (instrumentationPath && !hasAppDir) runInstrumentation(getPagesRunner(), instrumentationPath).catch((err) => {
 						console.error("[vinext] Instrumentation error:", err);
 					});
@@ -1556,6 +1657,7 @@ function vinext(options = {}) {
 									return;
 								}
 							}
+							if (hasCloudflarePlugin) return next();
 							let isDataReq = false;
 							if (isNextDataPathname(pathname)) {
 								const devBuildId = nextConfig?.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development";
@@ -1575,10 +1677,17 @@ function vinext(options = {}) {
 									return;
 								}
 							}
-							if (pathname.includes(".") && !pathname.endsWith(".html")) return next();
-							if (hasCloudflarePlugin) return next();
+							const filePathMatchesRewrite = [
+								...nextConfig?.rewrites.beforeFiles ?? [],
+								...nextConfig?.rewrites.afterFiles ?? [],
+								...nextConfig?.rewrites.fallback ?? []
+							].some((rewrite) => matchesRewriteSource(pathname, rewrite, {
+								basePath: bp,
+								hadBasePath: true
+							}));
+							if (pathname.includes(".") && !pathname.endsWith(".html") && !filePathMatchesRewrite) return next();
 							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
-							const isDataRequest = rawHeaders.get("x-nextjs-data") === "1";
+							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
@@ -1649,6 +1758,10 @@ function vinext(options = {}) {
 										externalInit.duplex = "half";
 									}
 									return proxyExternalRequest(new Request(new URL(url, requestOrigin), externalInit), externalUrl);
+								},
+								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase) => {
+									if (phase === "direct" || req.method !== "GET" && req.method !== "HEAD" || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
+									return serveRewrittenViteFilesystemRoute(req, res, requestPathname, stagedHeaders);
 								}
 							});
 							if (pipelineResult.type === "response") {
@@ -1713,6 +1826,42 @@ function vinext(options = {}) {
 				};
 			}
 		},
+		{
+			name: "vinext:validate-page-exports",
+			transform: { handler(code, id) {
+				if (this.environment?.name !== "client") return null;
+				if (!hasPagesDir || id.startsWith("\0") || !hasExportAllCandidate(code)) return null;
+				const modulePath = stripViteModuleQuery(id);
+				if (!isWithinPagesDirectory(modulePath)) return null;
+				const canonicalId = canonicalizePageTransformPath(modulePath);
+				if (!isWithinPagesDirectory(canonicalId)) return null;
+				if (!fileMatcher.isPageFile(canonicalId)) return null;
+				if (isApiPage(canonicalId)) return null;
+				validatePageExports(code);
+				return null;
+			} }
+		},
+		{
+			name: "vinext:strip-server-exports",
+			transform: { handler(code, id) {
+				if (this.environment?.name !== "client") return null;
+				if (!hasPagesDir || id.startsWith("\0") || !hasServerExportCandidate(code)) return null;
+				const modulePath = stripViteModuleQuery(id);
+				if (!isWithinPagesDirectory(modulePath)) return null;
+				const canonicalId = canonicalizePageTransformPath(modulePath);
+				if (!isWithinPagesDirectory(canonicalId)) return null;
+				if (!fileMatcher.isPageFile(canonicalId)) return null;
+				const relativePath = canonicalId.slice(canonicalPagesDir.length);
+				if (isApiPage(canonicalId)) return null;
+				if (/^\/(?:_app|_document|_error)(?:\.[^/]*)?$/.test(relativePath)) return null;
+				const result = stripServerExports(code);
+				if (!result) return null;
+				return {
+					code: result,
+					map: null
+				};
+			} }
+		},
 		{
 			name: "vinext:validate-server-only-client-imports",
 			transform: {
@@ -1729,26 +1878,6 @@ function vinext(options = {}) {
 				}
 			}
 		},
-		{
-			name: "vinext:strip-server-exports",
-			transform: {
-				filter: { id: /\.(tsx?|jsx?|mjs)$/ },
-				handler(code, id) {
-					if (this.environment?.name !== "client") return null;
-					if (!hasPagesDir) return null;
-					if (!id.startsWith(pagesDir)) return null;
-					const relativePath = id.slice(pagesDir.length);
-					if (relativePath.startsWith("/api/") || relativePath === "/api") return null;
-					if (/\/_(?:app|document|error)\b/.test(relativePath)) return null;
-					const result = stripServerExports(code);
-					if (!result) return null;
-					return {
-						code: result,
-						map: null
-					};
-				}
-			}
-		},
 		{
 			name: "vinext:remove-console",
 			apply: "build",
@@ -1792,16 +1921,36 @@ function vinext(options = {}) {
 			name: "vinext:image-imports",
 			enforce: "pre",
 			_dimCache: imageImportDimCache,
+			buildStart() {
+				imageImportDimCache.clear();
+				staticImageAssets.clear();
+			},
+			watchChange(id) {
+				imageImportDimCache.delete(id);
+				staticImageAssets.delete(id);
+				staticImageImportsByModule.delete(id);
+			},
 			resolveId: {
-				filter: { id: /\?vinext-meta$/ },
+				filter: { id: /\?vinext-(?:image-url|meta)$/ },
 				handler(source, _importer) {
-					if (!source.endsWith("?vinext-meta")) return null;
-					return `\0vinext-image-meta:${source.replace("?vinext-meta", "")}`;
+					if (source.endsWith("?vinext-image-url")) return `\0vinext-image-url:${source.slice(0, -17)}`;
+					if (source.endsWith("?vinext-meta")) return `\0vinext-image-meta:${source.slice(0, -12)}`;
+					return null;
 				}
 			},
 			async load(id) {
+				if (id.startsWith("\0vinext-image-url:")) {
+					const imagePath = id.replace("\0vinext-image-url:", "");
+					this.addWatchFile(imagePath);
+					if (this.environment.config.command === "serve") return `import url from ${JSON.stringify(imagePath + "?url")}; export default url;`;
+					const asset = createStaticImageAsset(imagePath);
+					staticImageAssets.set(imagePath, asset);
+					const builtFileName = `${resolveAssetsDir(nextConfig.assetPrefix)}/${asset.fileName}`;
+					return `export default ${JSON.stringify(renderVinextBuiltUrl(builtFileName, nextConfig.assetPrefix, nextConfig.deploymentId))};`;
+				}
 				if (!id.startsWith("\0vinext-image-meta:")) return null;
 				const imagePath = id.replace("\0vinext-image-meta:", "");
+				this.addWatchFile(imagePath);
 				const cache = imageImportDimCache;
 				let dims = cache.get(imagePath);
 				if (!dims) try {
@@ -1842,6 +1991,7 @@ function vinext(options = {}) {
 					}
 					const s = new MagicString(code);
 					let hasChanges = false;
+					const imageImports = /* @__PURE__ */ new Set();
 					for (const node of ast.body) {
 						if (node.type !== "ImportDeclaration") continue;
 						const importNode = node;
@@ -1857,18 +2007,45 @@ function vinext(options = {}) {
 						const dir = path.dirname(id);
 						const absImagePath = normalizePathSeparators(path.resolve(dir, importPath));
 						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(importPath)};\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")};\nconst ${varName} = { src: ${urlVar}, width: ${metaVar}.width, height: ${metaVar}.height };`;
 						s.overwrite(importNode.start, importNode.end, replacement);
 						hasChanges = true;
 					}
-					if (!hasChanges) return null;
+					if (!hasChanges) {
+						staticImageImportsByModule.delete(id);
+						return null;
+					}
+					staticImageImportsByModule.set(id, imageImports);
 					return {
 						code: s.toString(),
 						map: s.generateMap({ hires: "boundary" })
 					};
 				}
+			},
+			writeBundle: {
+				sequential: true,
+				order: "post",
+				handler(outputOptions) {
+					if (this.environment?.name !== "client") return;
+					const clientOutDir = outputOptions.dir ? path.resolve(root, outputOptions.dir) : path.resolve(root, options.clientOutDir ?? "dist/client");
+					const assetsDir = resolveAssetsDir(nextConfig.assetPrefix);
+					const activeImagePaths = new Set(Array.from(staticImageImportsByModule.values()).flatMap((imports) => [...imports]));
+					const nextWrittenFiles = /* @__PURE__ */ new Set();
+					for (const imagePath of activeImagePaths) {
+						if (!fs.existsSync(imagePath)) continue;
+						const asset = staticImageAssets.get(imagePath) ?? createStaticImageAsset(imagePath);
+						const outputPath = path.join(clientOutDir, assetsDir, asset.fileName);
+						fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+						fs.writeFileSync(outputPath, asset.source);
+						nextWrittenFiles.add(outputPath);
+					}
+					for (const outputPath of writtenStaticImageFiles) if (!nextWrittenFiles.has(outputPath)) fs.rmSync(outputPath, { force: true });
+					writtenStaticImageFiles.clear();
+					for (const outputPath of nextWrittenFiles) writtenStaticImageFiles.add(outputPath);
+				}
 			}
 		},
 		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),

package/dist/plugins/dynamic-preload-metadata.js

@@ -1,4 +1,5 @@
 import { isUnknownRecord } from "../utils/record.js";
+import { hasTrailingComma } from "../utils/has-trailing-comma.js";
 import { relativeWithinRoot, tryRealpathSync } from "../build/ssr-manifest.js";
 import path from "node:path";
 import { parseAst } from "vite";
@@ -281,15 +282,12 @@ function appendObjectProperty(output, objectNode, property) {
 	output.appendLeft(propertyEnd, `, ${property}`);
 	return true;
 }
-function stripComments(source) {
-	return source.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/[^\n]*/g, "");
-}
 function insertSecondOptionsArgument(output, code, callNode, firstArg, optionsLiteral) {
 	const callEnd = getNumber(callNode, "end");
 	const firstArgEnd = getNumber(firstArg, "end");
 	if (callEnd === null || firstArgEnd === null) return false;
 	const closeParen = callEnd - 1;
-	const separator = stripComments(code.slice(firstArgEnd, closeParen)).trimEnd().endsWith(",") ? " " : ", ";
+	const separator = hasTrailingComma(code.slice(firstArgEnd, closeParen)) ? " " : ", ";
 	output.appendLeft(closeParen, `${separator}${optionsLiteral}`);
 	return true;
 }

package/dist/plugins/fonts.js

@@ -1,4 +1,5 @@
 import { escapeRegExp } from "../utils/regex.js";
+import { lastSignificantChar } from "../utils/has-trailing-comma.js";
 import { buildFallbackFontFace, getFallbackFontOverrideMetrics } from "../build/google-fonts/fallback-metrics.js";
 import { validateGoogleFontOptions } from "../build/google-fonts/validate.js";
 import { getFontAxes } from "../build/google-fonts/get-axes.js";
@@ -552,8 +553,8 @@ function createGoogleFontsPlugin(fontGoogleShimPath, shimsDir) {
 					if (validatedFontStyle) internalFontProperties.push(`fontStyle: ${JSON.stringify(validatedFontStyle)}`);
 					const injectedProperties = [`_vinext: { font: { ${internalFontProperties.join(", ")} } }`];
 					const closingBrace = optionsStr.lastIndexOf("}");
-					const beforeBrace = optionsStr.slice(0, closingBrace).trim();
-					const separator = beforeBrace.endsWith("{") || beforeBrace.endsWith(",") ? "" : ", ";
+					const lastChar = lastSignificantChar(optionsStr.slice(0, closingBrace));
+					const separator = lastChar === "{" || lastChar === "," ? "" : ", ";
 					const replacement = `${calleeSource}(${optionsStr.slice(0, closingBrace) + separator + injectedProperties.join(", ") + optionsStr.slice(closingBrace)})`;
 					s.overwrite(callStart, callEnd, replacement);
 					overwrittenRanges.push([callStart, callEnd]);
@@ -688,8 +689,8 @@ function createLocalFontsPlugin(shimsDir) {
 					if (familyPayloadInsertions.has(insertAt)) continue;
 					const optionsStr = code.slice(objRange[0], objRange[1]);
 					if (/(?:^|[,{])\s*_vinext\s*:/.test(optionsStr)) continue;
-					const beforeClosingBrace = optionsStr.slice(0, -1).trim();
-					const separator = beforeClosingBrace.endsWith("{") || beforeClosingBrace.endsWith(",") ? "" : ", ";
+					const lastChar = lastSignificantChar(optionsStr.slice(0, -1));
+					const separator = lastChar === "{" || lastChar === "," ? "" : ", ";
 					s.appendLeft(insertAt, `${separator}_vinext: { font: { family: ${JSON.stringify(bindingName)} } }`);
 					familyPayloadInsertions.add(insertAt);
 					hasChanges = true;

package/dist/plugins/strip-server-exports.d.ts

@@ -1,13 +1,15 @@
 //#region src/plugins/strip-server-exports.d.ts
+declare function hasServerExportCandidate(code: string): boolean;
+declare function hasExportAllCandidate(code: string): boolean;
+declare function validatePageExports(code: string): void;
 /**
- * Strip server-only data-fetching exports (getServerSideProps,
- * getStaticProps, getStaticPaths) from page modules for the client
- * bundle. Uses Vite's parseAst (Rollup/acorn) for correct handling
- * of all export patterns including function expressions, arrow
- * functions with TS return types, and re-exports.
+ * Strip server-only Pages Router data-fetching exports and their unique
+ * dependency graph from browser bundles.
  *
- * Modeled after Next.js's SWC `next-ssg-transform`.
+ * Ported from Next.js:
+ * - test/unit/babel-plugin-next-ssg-transform.test.ts
+ * - crates/next-custom-transforms/src/transforms/strip_page_exports.rs
  */
 declare function stripServerExports(code: string): string | null;
 //#endregion
-export { stripServerExports };
+export { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };