vinext 0.0.52 → 0.0.53

package/dist/index.js

@@ -3,7 +3,7 @@ import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { 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_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
+import { INTERNAL_HEADERS, VINEXT_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";
@@ -18,6 +18,7 @@ import { logRequest, now } from "./server/request-log.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
+import { isImageOptimizationPath } from "./server/image-optimization.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
 import { scanMetadataFiles } from "./server/metadata-routes.js";
 import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
@@ -40,6 +41,7 @@ import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js"
 import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
 import { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
+import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.js";
@@ -255,6 +257,9 @@ const RESOLVED_APP_SSR_ENTRY = "\0" + VIRTUAL_APP_SSR_ENTRY;
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
 const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
+/** Virtual module for composed instrumentation-client bootstrap. */
+const VIRTUAL_INSTRUMENTATION_CLIENT = "private-next-instrumentation-client";
+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?";
@@ -353,10 +358,12 @@ function vinext(options = {}) {
 	let middlewarePath = null;
 	let instrumentationPath = null;
 	let instrumentationClientPath = null;
+	let clientInjectModule = null;
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
 	let rscCompatibilityId;
+	const draftModeSecret = randomUUID();
 	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => tryRealpathSync(p) ?? p;
@@ -536,6 +543,8 @@ function vinext(options = {}) {
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				middlewarePath = findMiddlewareFile(root, fileMatcher);
+				const instrumentationClientInjects = nextConfig.instrumentationClientInject.map((spec) => spec.startsWith("./") || spec.startsWith("../") ? path.resolve(root, spec) : spec);
+				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);
@@ -573,7 +582,6 @@ function vinext(options = {}) {
 				}
 				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_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
@@ -634,7 +642,7 @@ function vinext(options = {}) {
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
 					"vinext/html": path.resolve(__dirname, "server", "html"),
-					"private-next-instrumentation-client": instrumentationClientPath ?? path.resolve(__dirname, "client", "empty-module")
+					...clientInjectModule === null ? { "private-next-instrumentation-client": instrumentationClientPath ?? INSTRUMENTATION_CLIENT_EMPTY_MODULE } : {}
 				}).flatMap(([k, v]) => k.startsWith("next/") ? [[k, v], [`${k}.js`, v]] : [[k, v]]));
 				const pluginsFlat = [];
 				function flattenPlugins(arr) {
@@ -915,12 +923,14 @@ function vinext(options = {}) {
 						allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+						htmlLimitedBots: nextConfig?.htmlLimitedBots,
 						assetPrefix: nextConfig?.assetPrefix,
 						expireTime: nextConfig?.expireTime,
 						i18n: nextConfig?.i18n,
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root),
-						globalNotFoundPath
+						globalNotFoundPath,
+						draftModeSecret
 					}, instrumentationPath);
 				}
 				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
@@ -971,6 +981,18 @@ function vinext(options = {}) {
 		},
 		asyncHooksStubPlugin,
 		createInstrumentationClientTransformPlugin(() => instrumentationClientPath),
+		{
+			name: "vinext:instrumentation-client-inject",
+			enforce: "pre",
+			resolveId(id) {
+				if (id !== VIRTUAL_INSTRUMENTATION_CLIENT) return null;
+				return clientInjectModule !== null ? RESOLVED_INSTRUMENTATION_CLIENT : null;
+			},
+			load(id) {
+				if (id !== RESOLVED_INSTRUMENTATION_CLIENT) return null;
+				return clientInjectModule;
+			}
+		},
 		...options.experimental?.clientReferenceDedup ? [clientReferenceDedupPlugin()] : [],
 		{
 			name: "vinext:mdx",
@@ -1195,7 +1217,7 @@ function vinext(options = {}) {
 								res.end("Forbidden");
 								return;
 							}
-							if (url.split("?")[0] === "/_vinext/image") {
+							if (isImageOptimizationPath(url.split("?")[0])) {
 								const rawImgUrl = new URLSearchParams(url.split("?")[1] ?? "").get("url");
 								const imgUrl = rawImgUrl?.replaceAll("\\", "/") ?? null;
 								if (!imgUrl || !imgUrl.startsWith("/") || imgUrl.startsWith("//") || imgUrl.startsWith("/@") || imgUrl.startsWith("/__vite") || imgUrl.startsWith("/node_modules")) {
@@ -1269,6 +1291,7 @@ function vinext(options = {}) {
 							const isDataRequest = rawHeaders.get("x-nextjs-data") === "1";
 							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];
 							const requestOrigin = `http://${req.headers.host || "localhost"}`;
 							const preMiddlewareReqUrl = new URL(url, requestOrigin);
 							const preMiddlewareReqCtx = requestContextFromRequest(new Request(preMiddlewareReqUrl, { headers: nodeRequestHeaders }));
@@ -1392,7 +1415,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);
+							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null);
 							const mwStatus = req.__vinextMiddlewareStatus;
 							if (match) {
 								applyDeferredMwHeaders();