vinext 0.0.49 → 0.0.50

package/dist/index.js

@@ -3,10 +3,11 @@ import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { createValidFileMatcher } from "./routing/file-matcher.js";
 import { hasBasePath, removeTrailingSlash } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
+import { INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-request-headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { isExternalUrl, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.js";
-import { INTERNAL_HEADERS, filterInternalHeaders, isOpenRedirectShaped } from "./server/request-pipeline.js";
+import { filterInternalHeaders, isOpenRedirectShaped } from "./server/request-pipeline.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
@@ -31,6 +32,7 @@ import { precompressAssets } from "./build/precompress.js";
 import { manifestFileWithBase, manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
+import { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.js";
@@ -49,7 +51,7 @@ import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
-import { loadEnv, parseAst } from "vite";
+import { loadEnv, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
 import { randomBytes } from "node:crypto";
 import MagicString from "magic-string";
@@ -184,6 +186,27 @@ function getViteMajorVersion() {
 		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
+* this module's own `package.json`, not the project root.
+*
+* Defaults to `"vinext"` on read failure so a malformed install never
+* breaks the build — only the diagnostic global loses fidelity.
+*/
+let _vinextVersionCache = null;
+function getVinextVersion() {
+	if (_vinextVersionCache !== null) return _vinextVersionCache;
+	try {
+		const pkgUrl = new URL("../package.json", import.meta.url);
+		const pkg = JSON.parse(fs.readFileSync(pkgUrl, "utf-8"));
+		_vinextVersionCache = typeof pkg.version === "string" ? pkg.version : "vinext";
+	} catch {
+		_vinextVersionCache = "vinext";
+	}
+	return _vinextVersionCache;
+}
 const _tsconfigAliasCache = /* @__PURE__ */ new Map();
 function resolveTsconfigAliases(projectRoot) {
 	if (_tsconfigAliasCache.has(projectRoot)) return _tsconfigAliasCache.get(projectRoot);
@@ -359,6 +382,24 @@ function vinext(options = {}) {
 		...viteMajorVersion >= 8 ? [] : [tsconfigPaths()],
 		reactPluginPromise,
 		commonjs(),
+		...viteMajorVersion >= 8 ? [{
+			name: "vinext:jsx-in-js",
+			enforce: "pre",
+			async transform(code, id) {
+				const cleanId = id.split("?")[0];
+				if (!/\.(m?js)$/.test(cleanId)) return;
+				if (cleanId.includes("/node_modules/")) return;
+				const result = await transformWithOxc(code, id, {
+					lang: "jsx",
+					jsx: { runtime: "automatic" },
+					sourcemap: true
+				});
+				return {
+					code: result.code,
+					map: result.map
+				};
+			}
+		}] : [],
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -441,8 +482,11 @@ function vinext(options = {}) {
 					defines["process.env.__VINEXT_IMAGE_SIZES"] = JSON.stringify(JSON.stringify(imageSizes));
 				}
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_SVG"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowSVG ?? false));
+				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowLocalIP ?? false));
 				defines["process.env.__VINEXT_DRAFT_SECRET"] = JSON.stringify(crypto.randomUUID());
 				defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
+				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
+				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
 				nextShimMap = Object.fromEntries(Object.entries({
 					"next/link": path.join(shimsDir, "link"),
 					"next/head": path.join(shimsDir, "head"),
@@ -537,7 +581,8 @@ function vinext(options = {}) {
 						external: [
 							"react",
 							"react-dom",
-							"react-dom/server"
+							"react-dom/server",
+							"ipaddr.js"
 						],
 						noExternal: true
 					} },
@@ -603,7 +648,7 @@ function vinext(options = {}) {
 						},
 						ssr: {
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
-								external: userSsrExternal === true ? true : [...userSsrExternal],
+								external: userSsrExternal === true ? true : [...userSsrExternal, "ipaddr.js"],
 								...userSsrExternal === true ? {} : { noExternal: true }
 							} },
 							optimizeDeps: {
@@ -672,7 +717,8 @@ function vinext(options = {}) {
 							external: [
 								"react",
 								"react-dom",
-								"react-dom/server"
+								"react-dom/server",
+								"ipaddr.js"
 							],
 							noExternal: true
 						},
@@ -759,9 +805,10 @@ function vinext(options = {}) {
 				}
 				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
 				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
-				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) return generateBrowserEntry();
+				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) return generateBrowserEntry(await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher));
 				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			},
+			// @vitejs/plugin-rsc runs the RSC environment build in two phases:
 			generateBundle(_options, bundle) {
 				if (this.environment?.name !== "rsc") return;
 				if (!rscClassificationManifest) return;
@@ -953,7 +1000,7 @@ function vinext(options = {}) {
 							if (typeof reasonOrHeaders === "string") headers = maybeHeaders;
 							else headers = reasonOrHeaders;
 							if (headers && typeof headers === "object" && !Array.isArray(headers)) {
-								const timingKey = Object.keys(headers).find((k) => k.toLowerCase() === "x-vinext-timing");
+								const timingKey = Object.keys(headers).find((k) => k.toLowerCase() === VINEXT_TIMING_HEADER);
 								if (timingKey) {
 									_parseTiming(headers[timingKey]);
 									delete headers[timingKey];
@@ -976,7 +1023,7 @@ function vinext(options = {}) {
 						});
 						next();
 					});
-					server.middlewares.use(async (req, res, next) => {
+					const handlePagesMiddleware = async (req, res, next) => {
 						try {
 							let url = req.url ?? "/";
 							if (!hasPagesDir) return next();
@@ -1074,7 +1121,7 @@ function vinext(options = {}) {
 							};
 							const applyMwRequestHeadersForExternalProxy = () => {
 								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-								else delete req.headers["x-vinext-mw-ctx"];
+								else delete req.headers[VINEXT_MW_CTX_HEADER];
 							};
 							if (middlewarePath) {
 								const rawProto = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim()) ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim() : "";
@@ -1110,7 +1157,7 @@ function vinext(options = {}) {
 									const currentRequestHeaders = new Headers();
 									for (const [key, value] of Object.entries(req.headers)) if (Array.isArray(value)) currentRequestHeaders.set(key, value.join(", "));
 									else if (value !== void 0) currentRequestHeaders.set(key, value);
-									middlewareRequestHeaders = buildRequestHeadersFromMiddlewareResponse(currentRequestHeaders, result.responseHeaders);
+									middlewareRequestHeaders = buildRequestHeadersFromMiddlewareResponse(currentRequestHeaders, result.responseHeaders, { preserveCredentialHeaders: Boolean(result.rewriteUrl && isExternalUrl(result.rewriteUrl)) });
 									if (middlewareRequestHeaders && !hasAppDir) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
 									if (hasAppDir) {
 										deferredMwResponseHeaders = [];
@@ -1121,15 +1168,16 @@ function vinext(options = {}) {
 									url = result.rewriteUrl;
 									req.url = url;
 								}
-								if (result.rewriteStatus) req.__vinextRewriteStatus = result.rewriteStatus;
+								const middlewareStatus = result.status ?? result.rewriteStatus;
+								if (middlewareStatus !== void 0) req.__vinextMiddlewareStatus = middlewareStatus;
 								if (hasAppDir) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
 										for (const [key, value] of result.responseHeaders) if (key !== "x-middleware-next" && key !== "x-middleware-rewrite") mwCtxEntries.push([key, value]);
 									}
-									req.headers["x-vinext-mw-ctx"] = JSON.stringify({
+									req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
 										h: mwCtxEntries,
-										s: result.rewriteStatus ?? null,
+										s: middlewareStatus ?? null,
 										r: result.rewriteUrl ?? null
 									});
 								}
@@ -1159,9 +1207,13 @@ function vinext(options = {}) {
 								return;
 							}
 							const routes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-							if (nextConfig?.rewrites.afterFiles.length) {
+							let match = matchRoute(resolvedUrl.split("?")[0], routes);
+							if ((!match || match.route.isDynamic) && nextConfig?.rewrites.afterFiles.length) {
 								const afterRewrite = applyRewrites(resolvedUrl.split("?")[0], nextConfig.rewrites.afterFiles, reqCtx);
-								if (afterRewrite) resolvedUrl = afterRewrite;
+								if (afterRewrite) {
+									resolvedUrl = afterRewrite;
+									match = matchRoute(resolvedUrl.split("?")[0], routes);
+								}
 							}
 							if (isExternalUrl(resolvedUrl)) {
 								applyDeferredMwHeaders();
@@ -1170,8 +1222,8 @@ function vinext(options = {}) {
 								return;
 							}
 							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false);
-							const mwStatus = req.__vinextRewriteStatus;
-							if (matchRoute(resolvedUrl.split("?")[0], routes)) {
+							const mwStatus = req.__vinextMiddlewareStatus;
+							if (match) {
 								applyDeferredMwHeaders();
 								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
 								await handler(req, res, resolvedUrl, mwStatus);
@@ -1198,6 +1250,9 @@ function vinext(options = {}) {
 						} catch (e) {
 							next(e);
 						}
+					};
+					server.middlewares.use((req, res, next) => {
+						handlePagesMiddleware(req, res, next);
 					});
 				};
 			}
@@ -1704,7 +1759,10 @@ function vinext(options = {}) {
 			}
 		}
 	];
-	if (rscPluginPromise) plugins.push(rscPluginPromise);
+	if (rscPluginPromise) {
+		plugins.push(rscPluginPromise);
+		plugins.push(createRscClientReferenceLoadersPlugin());
+	}
 	return plugins;
 }
 /**