vinext 1.2.0 → 1.2.1

package/README.md

@@ -1048,7 +1048,7 @@ Or add it to your `package.json` as a file dependency:
 }
 ```
 
-vinext has peer dependencies on `react ^19.2.6`, `react-dom ^19.2.6`, `react-server-dom-webpack ^19.2.6`, and `vite ^8.0.0`. Then replace `next` with `vinext` in your scripts and run as normal.
+vinext has peer dependencies on `react ^19.3.1`, `react-dom ^19.3.1`, `react-server-dom-webpack ^19.3.1`, and `vite ^8.0.0`. Then replace `next` with `vinext` in your scripts and run as normal.
 
 ## Contributing
 

package/dist/build/output-root-externals.d.ts

@@ -0,0 +1,21 @@
+import MagicString from "magic-string";
+//#region src/build/output-root-externals.d.ts
+/**
+ * Rewrite external virtual ids into imports of files that live at a fixed
+ * place relative to the output root.
+ *
+ * Some server modules (the cacheability manifest, the pregenerated concrete
+ * paths, the Pages client assets) are written beside the server entry, and
+ * deploy steps can rewrite them after the build. Rolldown leaves a relative
+ * external specifier exactly as written, but it can move the importing module
+ * into any chunk, for example a shared chunk under `_next/static/` when the
+ * entry becomes a facade. Keeping the virtual id external and resolving it
+ * against each chunk's own location keeps the import pointing at the file.
+ *
+ * `targets` maps each external id to its file path relative to the output root.
+ */
+export declare function rewriteOutputRootExternals(code: string, chunkFileName: string, targets: ReadonlyMap<string, string>): {
+  code: string;
+  map: ReturnType<MagicString["generateMap"]>;
+} | null;
+//#endregion

package/dist/build/output-root-externals.js

@@ -0,0 +1,40 @@
+import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { escapeRegExp } from "../utils/regex.js";
+import MagicString from "magic-string";
+//#region src/build/output-root-externals.ts
+/**
+* Rewrite external virtual ids into imports of files that live at a fixed
+* place relative to the output root.
+*
+* Some server modules (the cacheability manifest, the pregenerated concrete
+* paths, the Pages client assets) are written beside the server entry, and
+* deploy steps can rewrite them after the build. Rolldown leaves a relative
+* external specifier exactly as written, but it can move the importing module
+* into any chunk, for example a shared chunk under `_next/static/` when the
+* entry becomes a facade. Keeping the virtual id external and resolving it
+* against each chunk's own location keeps the import pointing at the file.
+*
+* `targets` maps each external id to its file path relative to the output root.
+*/
+function rewriteOutputRootExternals(code, chunkFileName, targets) {
+	let output = null;
+	const chunkDir = path.posix.dirname(chunkFileName);
+	for (const [id, target] of targets) {
+		if (!code.includes(id)) continue;
+		let specifier = path.posix.relative(chunkDir, target);
+		if (!specifier.startsWith(".")) specifier = `./${specifier}`;
+		const quotedId = new RegExp(`(["'])${escapeRegExp(id)}\\1`, "g");
+		for (const match of code.matchAll(quotedId)) {
+			output ??= new MagicString(code);
+			const quote = match[1];
+			output.overwrite(match.index, match.index + match[0].length, quote + specifier + quote);
+		}
+	}
+	if (output === null) return null;
+	return {
+		code: output.toString(),
+		map: output.generateMap({ hires: "boundary" })
+	};
+}
+//#endregion
+export { rewriteOutputRootExternals };

package/dist/build/prerender-paths.js

@@ -3,11 +3,11 @@ import { findDir } from "../utils/project.js";
 import { BLOCKED_PAGES, PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
 import { VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import "../server/headers.js";
 import { matchHeaders, matchesRewriteSource } from "../config/config-matchers.js";
 import { loadNextConfig, resolveNextConfig } from "../config/next-config.js";
 import { appRouteHasMainTreeLoadingBoundary, appRouter, matchAppRoute } from "../routing/app-router.js";
 import { apiRouter, matchRoute, pagesRouter } from "../routing/pages-router.js";
-import "../server/headers.js";
 import { matchesMiddlewarePathname } from "../server/middleware-matcher.js";
 import { extractLocaleFromUrl, normalizeDefaultLocalePathname } from "../server/pages-i18n.js";
 import { classifyAppRoute, classifyAppRouteHandler, classifyPagesRoute, extractExportConstString, extractMiddlewareMatcherConfig, getAppRouteRenderEntryPath } from "./report.js";

package/dist/build/prerender.js

@@ -3,8 +3,8 @@ import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-
 import { isUnknownRecord } from "../utils/record.js";
 import { BLOCKED_PAGES } from "../shims/constants.js";
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
-import { appRouteLayoutStaticParamsGroups } from "../routing/app-router.js";
 import { NEXT_CACHE_TAGS_HEADER, VINEXT_METADATA_ROUTE_CACHE_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_PRERENDER_METADATA_ROUTES_PATH, VINEXT_PRERENDER_RENDER_ERROR_HEADER, VINEXT_PRERENDER_SPECIAL_ERROR_HEADER } from "../server/headers.js";
+import { appRouteLayoutStaticParamsGroups } from "../routing/app-router.js";
 import { extractLocaleFromUrl } from "../server/pages-i18n.js";
 import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";

package/dist/check.js

@@ -3,10 +3,9 @@ import path from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { detectPackageManager, findDir, findViteConfigPath } from "./utils/project.js";
 import { normalizePageExtensions } from "./routing/file-matcher.js";
 import { POSTCSS_CONFIG_FILES } from "./plugins/postcss.js";
-import { unwrapExpression } from "./plugins/ast-utils.js";
+import { parseProgram, unwrapExpression } from "./plugins/ast-utils.js";
 import { require_ignore } from "./deps/.pnpm/ignore@5.3.2/deps/ignore/index.js";
 import fs from "node:fs";
-import { parseAst } from "vite";
 //#region src/check.ts
 /**
 * vinext check — compatibility scanner for Next.js apps
@@ -813,7 +812,7 @@ function propertyKeyName(prop) {
 * object — top-level keys plus, for each object-valued property, its child keys
 * (used for dot-notation options like `experimental.ppr`).
 *
-* Uses Vite's `parseAst` (the bundled oxc parser) instead of scanning text, so
+* Uses Vite's bundled oxc parser instead of scanning text, so
 * comments, string values, and other non-key mentions of an option name are
 * never mistaken for a real config option. Returns empty sets if the file cannot
 * be parsed — the check is advisory, so a parse failure simply reports nothing.
@@ -824,7 +823,7 @@ function collectConfigKeys(source) {
 	let pageExtensions;
 	let program;
 	try {
-		program = parseAst(source, { lang: "ts" });
+		program = parseProgram(source, { lang: "ts" });
 	} catch {
 		return {
 			top,
@@ -971,7 +970,7 @@ function isNextConfigWithCjsGlobals(rel, content) {
 	if (/^next\.config\.(?:ts|mts|cjs)$/.test(rel)) return true;
 	if (rel !== "next.config.js") return false;
 	try {
-		return !parseAst(content).body.some((node) => node.type === "ImportDeclaration" || node.type.startsWith("Export"));
+		return !parseProgram(content).body.some((node) => node.type === "ImportDeclaration" || node.type.startsWith("Export"));
 	} catch {
 		return false;
 	}
@@ -984,7 +983,7 @@ function isNextConfigWithCjsGlobals(rel, content) {
 function exportsPostcssPluginsOnlyObject(content) {
 	let program;
 	try {
-		program = parseAst(content, { lang: "ts" });
+		program = parseProgram(content, { lang: "ts" });
 	} catch {
 		return false;
 	}

package/dist/cli-dev-config.js

@@ -28,7 +28,7 @@ function claimViteCliDevInvocation(root, isRestart = false, isReserved = false)
 	return true;
 }
 function applyDevServerDefaults(server, options) {
-	server.port = options.port ?? server.port ?? 3e3;
+	if (options.port !== void 0) server.port = options.port;
 	server.host = options.hostname ?? server.host ?? "localhost";
 }
 function createDevServerLifecyclePlugin(options, isEnabled) {
@@ -114,7 +114,7 @@ function configureDevServerLifecycle(server) {
 	const listenServer = server.listen.bind(server);
 	server.listen = async (port, isRestart) => {
 		if (server.config.server.middlewareMode || process.env.VINEXT_NO_DEV_LOCK === "1") return listenServer(port, isRestart);
-		const configuredPort = port ?? server.config.server.port ?? 3e3;
+		const configuredPort = port ?? server.config.server.port;
 		const hostname = normalizeDevServerHostname(server.config.server.host);
 		const displayHostname = hostname === "0.0.0.0" ? "localhost" : hostname;
 		const restartingLock = activeDevServerLocks.get(root);
@@ -155,7 +155,7 @@ function configureDevServerLifecycle(server) {
 	};
 	server.httpServer?.on("listening", () => {
 		if (!activeLock) return;
-		const port = server.config.server.port ?? 3e3;
+		const port = server.config.server.port;
 		const hostname = normalizeDevServerHostname(server.config.server.host);
 		const displayHostname = hostname === "0.0.0.0" ? "localhost" : hostname;
 		const lock = activeLock;

package/dist/cli.js

@@ -364,7 +364,7 @@ function printHelp(cmd) {
     --version      Show version
 
   Examples:
-    vinext dev                         Start dev server on port 3000
+    vinext dev                         Start dev server
     vinext dev --port 4000             Start dev server on port 4000
     vinext build                       Build for production
     vinext typegen                     Generate route helper types

package/dist/config/config-matchers.js

@@ -3,6 +3,7 @@ import { buildRequestHeadersFromMiddlewareResponse, getUnconsumedMiddlewareReque
 import { analyzeRegexSafety } from "../utils/regex-safety.js";
 import { normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { attachRequestCfMetadata } from "../server/request-pipeline.js";
 import { substituteDestinationParams, substituteRedirectDestinationQuery } from "./destination-params.js";
 //#region src/config/config-matchers.ts
 /**
@@ -296,13 +297,17 @@ function applyMiddlewareRequestHeaders(middlewareHeaders, request) {
 	const nextHeaders = buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareHeaders);
 	const unconsumedRequestHeaders = getUnconsumedMiddlewareRequestHeaders(middlewareHeaders);
 	for (const key of Object.keys(middlewareHeaders)) if (key.startsWith("x-middleware-") && key !== "x-middleware-cache" && !unconsumedRequestHeaders.has(key)) delete middlewareHeaders[key];
-	if (nextHeaders) request = new Request(request.url, {
-		method: request.method,
-		headers: nextHeaders,
-		body: request.body,
-		signal: request.signal,
-		duplex: request.body ? "half" : void 0
-	});
+	if (nextHeaders) {
+		const source = request;
+		request = new Request(request.url, {
+			method: request.method,
+			headers: nextHeaders,
+			body: request.body,
+			signal: request.signal,
+			duplex: request.body ? "half" : void 0
+		});
+		attachRequestCfMetadata(request, source);
+	}
 	return {
 		request,
 		postMwReqCtx: requestContextFromRequest(request)