vinext 1.2.0 → 1.2.1

package/dist/plugins/worker-use-server.js

@@ -1,10 +1,12 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { escapeRegExp } from "../utils/regex.js";
+import { parseProgramAsync } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { USE_CACHE_PLUGIN_NAME as PLUGIN_NAME } from "./use-cache-callable.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-import { parseAstAsync, transformWithOxc } from "vite";
+import { isCSSRequest, transformWithOxc } from "vite";
 //#region src/plugins/worker-use-server.ts
 const WORKER_REFERENCE_RUNTIME_ID = "\0vinext:worker-server-reference";
 const WORKER_REFERENCE_RUNTIME_ID_RE = /^\0vinext:worker-server-reference$/;
@@ -60,12 +62,14 @@ async function createWorkerUseServerPlugins(options) {
 	const browserRuntime = pathToFileURL(rscRequire.resolve("@vitejs/plugin-rsc/react/browser")).href;
 	const [transforms, rscCore] = await Promise.all([importRscModule("@vitejs/plugin-rsc/transforms"), importRscModule("@vitejs/plugin-rsc/core/plugin")]);
 	let manager;
+	let useCacheApi;
 	const useServerPlugin = {
 		name: "vinext:worker-use-server",
 		async configResolved(config) {
 			// @vitejs/plugin-rsc's plugin API (and its reference manager) lives.
 			const mainConfig = config.mainConfig;
 			manager = (await options.rscPluginModule).getPluginApi(mainConfig ?? config)?.manager;
+			useCacheApi = (mainConfig ?? config).plugins.find((plugin) => plugin.name === PLUGIN_NAME)?.api;
 		},
 		resolveId: {
 			filter: { id: WORKER_REFERENCE_RUNTIME_ID_RE },
@@ -78,7 +82,7 @@ async function createWorkerUseServerPlugins(options) {
 		transform: {
 			filter: { code: "use server" },
 			async handler(code, id) {
-				let ast = await parseAstAsync(code);
+				let ast = await parseProgramAsync(code);
 				if (!transforms.hasDirective(ast.body, "use server")) return null;
 				if (!manager) throw new Error("vinext: cannot compile a \"use server\" module in a Web Worker without @vitejs/plugin-rsc.");
 				const expanded = await withPositionedError(this, () => transforms.transformExpandExportAll({
@@ -90,12 +94,12 @@ async function createWorkerUseServerPlugins(options) {
 						if (!isPlainFilePath(target)) throw new Error(`vinext: a "use server" module imported by a Web Worker cannot \`export *\` from ${JSON.stringify(target)}; re-export its names explicitly.`);
 						this.addWatchFile(target);
 						const source = await fs.promises.readFile(target, "utf-8");
-						return parseAstAsync((await transformWithOxc(source, target, { sourcemap: false })).code);
+						return parseProgramAsync((await transformWithOxc(source, target, { sourcemap: false })).code);
 					}
 				}));
 				if (expanded) {
 					code = expanded.code;
-					ast = await parseAstAsync(code);
+					ast = await parseProgramAsync(code);
 				}
 				const { referenceKey } = manager.serverReferences.resolve(id, "rsc");
 				const runtime = uniqueBinding(code, "$$vinextWorkerReference");
@@ -111,19 +115,39 @@ async function createWorkerUseServerPlugins(options) {
 			}
 		}
 	};
+	const useCachePlugin = {
+		name: "vinext:worker-use-cache",
+		transform: {
+			filter: { code: "use cache" },
+			async handler(code, id) {
+				if (isCSSRequest(id)) return null;
+				const api = useCacheApi;
+				if (!api) throw new Error("vinext: cannot compile a \"use cache\" module in a Web Worker without vinext's \"use cache\" plugin.");
+				const runtime = uniqueBinding(code, "$$vinextWorkerReference");
+				const output = await withPositionedError(this, () => api.transformWorkerModule(code, id, (referenceId, name) => `${runtime}(${JSON.stringify(referenceId)}, ${JSON.stringify(name)})`));
+				if (!output) return null;
+				output.prepend(`import { createWorkerServerReference as ${runtime} } from ${JSON.stringify(WORKER_REFERENCE_RUNTIME_ID)};\n`);
+				return magicStringTransformResult(output);
+			}
+		}
+	};
 	const patchHook = rscCore.default().find((plugin) => plugin.name === "rsc:patch-react-server-dom-webpack")?.transform;
 	if (!patchHook || typeof patchHook !== "object") throw new Error("vinext: @vitejs/plugin-rsc no longer exposes its Flight client patch plugin.");
 	const flightClientDir = path.dirname(rscRequire.resolve("@vitejs/plugin-rsc/vendor/react-server-dom/client.browser"));
-	return [{
-		name: "vinext:worker-patch-react-server-dom",
-		transform: {
-			filter: {
-				id: new RegExp(`^${escapeRegExp(`${toSlash(flightClientDir)}/`)}`),
-				code: "__webpack_require__"
-			},
-			handler: patchHook.handler
-		}
-	}, useServerPlugin];
+	return [
+		{
+			name: "vinext:worker-patch-react-server-dom",
+			transform: {
+				filter: {
+					id: new RegExp(`^${escapeRegExp(`${toSlash(flightClientDir)}/`)}`),
+					code: "__webpack_require__"
+				},
+				handler: patchHook.handler
+			}
+		},
+		useCachePlugin,
+		useServerPlugin
+	];
 }
 //#endregion
 export { createWorkerUseServerPlugins };

package/dist/server/api-handler.js

@@ -1,13 +1,13 @@
 import { hasBasePath } from "../utils/base-path.js";
 import { matchRoute } from "../routing/pages-router.js";
 import "./server-globals.js";
+import { resolveRequestHost, resolveRequestProtocol } from "./proxy-trust.js";
 import { NextRequest } from "../shims/server.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
 import { mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { tracePagesApiHandler } from "./pages-execution-tracing.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT, resolveBodyParserConfig } from "./pages-body-parser-config.js";
 import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
-import { resolveRequestHost, resolveRequestProtocol } from "./proxy-trust.js";
 import { performOnDemandRevalidate } from "./pages-revalidate.js";
 import { attachPagesPreviewApi, attachPagesRequestCookies } from "./pages-node-compat.js";
 import { finalizeEdgeApiResponse, isEdgeApiRuntime } from "./edge-api-runtime.js";

package/dist/server/app-action-forwarding.js

@@ -1,8 +1,8 @@
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
-import { patternToNextFormat } from "../routing/route-validation.js";
 import "./headers.js";
-import { RequestCookies, ResponseCookies } from "../shims/server.js";
 import { attachRequestCfMetadata, processMiddlewareHeaders, validateCsrfOrigin } from "./request-pipeline.js";
+import { patternToNextFormat } from "../routing/route-validation.js";
+import { RequestCookies, ResponseCookies } from "../shims/server.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { getSetCookieName } from "./cookie-utils.js";
 import "../shims/internal/cookies.js";

package/dist/server/app-browser-entry.js

@@ -1,6 +1,6 @@
-import { splitPathnameForRouteMatch } from "../routing/utils.js";
 import { addBasePathToPathname, stripBasePath } from "../utils/base-path.js";
 import { VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
+import { splitPathnameForRouteMatch } from "../routing/utils.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { matchRoutePattern } from "../routing/route-pattern.js";
 import { installWindowNext, setWindowNextInternalSourcePage } from "../client/window-next.js";
@@ -15,7 +15,7 @@ import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../s
 import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
 import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
 import { BfcacheIdentityMapContext, ElementsContext, Slot, bindAppElementsRenderedSearch, setAppElementsRenderedSearch } from "../shims/slot.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, getVinextRscCompatibilityId } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId } from "./app-rsc-cache-busting.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
 import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
@@ -1122,7 +1122,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 						}
 					});
 					const rewrittenNavigationHref = navigationKind === "navigate" && HAS_CLIENT_REWRITES ? resolveLoadedHybridClientRewriteHref(currentHref, __basePath) : null;
-					const targetPathAndSearch = url.pathname + url.search;
+					const targetPathAndSearch = formatRscRequestPath(url);
 					const additionalPrefetchPathAndSearch = rewrittenNavigationHref && rewrittenNavigationHref !== currentHref ? [rewrittenNavigationHref] : [];
 					const settledPrefetchedResponse = peekSettledPrefetchResponseForNavigation({
 						additionalRscUrls: additionalPrefetchPathAndSearch,

package/dist/server/app-browser-interception-context.js

@@ -1,5 +1,5 @@
-import { normalizePathnameForRouteMatch, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
+import { normalizePathnameForRouteMatch, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { normalizePath } from "./normalize-path.js";
 import { matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternWithOptionalDynamicSegments } from "../routing/route-pattern.js";
 //#region src/server/app-browser-interception-context.ts

package/dist/server/app-browser-prefetch-response.js

@@ -1,4 +1,4 @@
-import { stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
+import { formatRscRequestPath, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { peekPrefetchResponseForNavigation } from "../shims/navigation.js";
 //#region src/server/app-browser-prefetch-response.ts
 function peekSettledPrefetchResponseForNavigation(options) {
@@ -25,7 +25,7 @@ function isSameOriginBrowserRscUrl(url, origin) {
 function canonicalizeBrowserRscResponseUrl(responseUrl, origin) {
 	try {
 		const parsed = new URL(responseUrl, origin);
-		if (parsed.origin === new URL(origin).origin) return `${parsed.pathname}${parsed.search}`;
+		if (parsed.origin === new URL(origin).origin) return formatRscRequestPath(parsed);
 	} catch {}
 	return responseUrl;
 }

package/dist/server/app-browser-state.js

@@ -1,7 +1,7 @@
-import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
 import { VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } from "./app-rsc-vary.js";
 import { NEXT_ACTION_HEADER, RSC_ACTION_HEADER } from "./headers.js";
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { normalizePath } from "./normalize-path.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";

package/dist/server/app-browser-supplemental-refresh.js

@@ -1,5 +1,5 @@
-import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { addBasePathToPathname, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { normalizePath } from "./normalize-path.js";
 import { APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_SLOT_BINDINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";

package/dist/server/app-optimistic-routing.js

@@ -1,6 +1,6 @@
 import { isUnknownRecord } from "../utils/record.js";
-import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
+import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { extractRawRoutePatternParams, matchRoutePattern } from "../routing/route-pattern.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";

package/dist/server/app-page-dispatch.js

@@ -1,8 +1,8 @@
 import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import "../utils/protocol-headers.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_INTERCEPTION_ID_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import "./headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { runInWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityPatternDynamic, readRouteCacheabilityState } from "../shims/cacheability-classification.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL } from "./app-rsc-render-mode.js";

package/dist/server/app-page-render.js

@@ -1,8 +1,8 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { bindRequestContext } from "../shims/unified-request-context.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER } from "./headers.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { isRouteCacheabilityEvaluation, recordRouteCacheabilityClientTraceMetadataMarker } from "../shims/cacheability-classification.js";
 import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, isCdnResponsePolicyHeader } from "./cache-control.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";

package/dist/server/app-pages-bridge.js

@@ -1,5 +1,5 @@
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { beginRouteCacheability } from "../shims/cacheability-classification.js";
 import { mergeHeaders } from "./worker-utils.js";
 import { pagesRouteHasPriorityOverAppRoute } from "./hybrid-route-priority.js";

package/dist/server/app-prerender-endpoints.js

@@ -1,6 +1,6 @@
 import "./headers.js";
-import { runInWorkStoreScope, runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { notFoundResponse } from "./http-error-responses.js";
+import { runInWorkStoreScope, runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { callAppPrerenderStaticParams } from "./app-prerender-static-params.js";
 //#region src/server/app-prerender-endpoints.ts
 const JSON_HEADERS = {

package/dist/server/app-render-abort-error.d.ts

@@ -1,3 +1,22 @@
 //#region src/server/app-render-abort-error.d.ts
 export declare function isAppRenderAbortError(error: unknown): boolean;
+export type RenderStreamCancellation = {
+  /** Records the reason the render's output stream ended early with. */
+  record: (reason: unknown) => void;
+  /** Whether React is reporting that recorded cancellation as an error. */
+  isReason: (error: unknown) => boolean;
+};
+/**
+ * Tracks the cancellation of a React render's output stream.
+ *
+ * React aborts the render with the cancel reason and passes it to `onError`
+ * as though the render had failed. Next.js cancels with its own
+ * `ResponseAborted`, which `isAppRenderAbortError` skips, but the reason is
+ * whatever the consumer chose: Workers runtimes cancel a disconnected
+ * response's body with their own (workerd's is `Error("Network connection
+ * lost.")`) and a tee picks its own reason for its source (Node passes both
+ * branches' reasons). So recognize the cancellation itself rather than the
+ * reason's shape.
+ */
+export declare function createRenderStreamCancellation(): RenderStreamCancellation;
 //#endregion

package/dist/server/app-render-abort-error.js

@@ -4,5 +4,35 @@ function isAppRenderAbortError(error) {
 	const name = Reflect.get(error, "name");
 	return name === "AbortError" || name === "ResponseAborted";
 }
+/**
+* Tracks the cancellation of a React render's output stream.
+*
+* React aborts the render with the cancel reason and passes it to `onError`
+* as though the render had failed. Next.js cancels with its own
+* `ResponseAborted`, which `isAppRenderAbortError` skips, but the reason is
+* whatever the consumer chose: Workers runtimes cancel a disconnected
+* response's body with their own (workerd's is `Error("Network connection
+* lost.")`) and a tee picks its own reason for its source (Node passes both
+* branches' reasons). So recognize the cancellation itself rather than the
+* reason's shape.
+*/
+function createRenderStreamCancellation() {
+	let cancelled = false;
+	let cancelReason;
+	return {
+		record: (reason) => {
+			if (cancelled) return;
+			cancelled = true;
+			cancelReason = reason;
+		},
+		isReason: (error) => {
+			if (!cancelled) return false;
+			if (Object.is(error, cancelReason)) return true;
+			if (!(error instanceof Error)) return false;
+			if (cancelReason === void 0) return error.message === "The render was aborted by the server without a reason.";
+			return typeof cancelReason === "object" && cancelReason !== null && error.message === "The render was aborted by the server with a promise.";
+		}
+	};
+}
 //#endregion
-export { isAppRenderAbortError };
+export { createRenderStreamCancellation, isAppRenderAbortError };

package/dist/server/app-request-stage-independent-entry.js

@@ -1,11 +1,11 @@
 import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import { assetPrefixPathname } from "../utils/asset-prefix.js";
-import { runWithExecutionContext } from "../shims/request-context.js";
-import "./server-globals.js";
 import "./app-rsc-vary.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "./headers.js";
 import { badRequestResponse } from "./http-error-responses.js";
-import { cloneRequestWithHeaders, filterInternalHeaders, guardProtocolRelativeUrl } from "./request-pipeline.js";
+import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, guardProtocolRelativeUrl } from "./request-pipeline.js";
+import { assetPrefixPathname } from "../utils/asset-prefix.js";
+import { runWithExecutionContext } from "../shims/request-context.js";
+import "./server-globals.js";
 import { getExplicitCdnCacheAdapter } from "../shims/cdn-cache-state.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
 import { registerLazyDataCacheHandler } from "../shims/cache-handler.js";
@@ -67,7 +67,7 @@ async function handleRequest(request, env, platformCtx, dispatchResponseStage, a
 			probeRoute = readWorkerCacheabilityProbeRoute(request);
 			const probeUrl = new URL(request.url);
 			probeUrl.searchParams.delete(VINEXT_CACHEABILITY_PROBE_QUERY_PARAM);
-			request = new Request(probeUrl, request);
+			request = cloneRequestWithUrl(request, probeUrl.href);
 		}
 	}
 	if (!didValidateCdnRequest) {

package/dist/server/app-response-stage-entry.js

@@ -1,8 +1,8 @@
 import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
-import { runWithExecutionContext } from "../shims/request-context.js";
-import { runInWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { serializeStaticFileSignalForTransport } from "./static-file-signal.js";
 import { attachRequestCfMetadata } from "./request-pipeline.js";
+import { runWithExecutionContext } from "../shims/request-context.js";
+import { runInWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { validateCdnRequest } from "./cache-control.js";
 import { ensureFetchPatch } from "../shims/fetch-cache.js";
 import { serializeImageOptimizationSignalForTransport } from "./image-optimization.js";

package/dist/server/app-route-handler-runtime.js

@@ -1,7 +1,7 @@
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { addBasePathToPathname } from "../utils/base-path.js";
-import { NextRequest, RequestCookies, sealRequestCookies, sealRequestHeaders } from "../shims/server.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
+import { NextRequest, RequestCookies, sealRequestCookies, sealRequestHeaders } from "../shims/server.js";
 import { BUILT_IN_REQUEST_PROPERTIES } from "./app-route-request-built-ins.js";
 //#region src/server/app-route-handler-runtime.ts
 const BUILT_IN_REQUEST_PROPERTY_MAP = new Map(BUILT_IN_REQUEST_PROPERTIES.map((property) => [property.key, property]));

package/dist/server/app-router-entry.js

@@ -1,11 +1,11 @@
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
-import { runWithExecutionContext } from "../shims/request-context.js";
-import "./server-globals.js";
 import "./app-rsc-vary.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM } from "./headers.js";
 import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
-import { cloneRequestWithHeaders, filterInternalHeaders, guardProtocolRelativeUrl } from "./request-pipeline.js";
+import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, guardProtocolRelativeUrl } from "./request-pipeline.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
+import { runWithExecutionContext } from "../shims/request-context.js";
+import "./server-globals.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
 import { getImageOptimizer, readImageOptimizationSignal } from "./image-optimization.js";
@@ -66,7 +66,7 @@ async function handleRequest(request, env, platformCtx) {
 			const probeUrl = new URL(request.url);
 			if (probeUrl.searchParams.has("__vinext_cacheability_probe")) {
 				probeUrl.searchParams.delete(VINEXT_CACHEABILITY_PROBE_QUERY_PARAM);
-				request = new Request(probeUrl, request);
+				request = cloneRequestWithUrl(request, probeUrl.href);
 			}
 		}
 	}

package/dist/server/app-rsc-cache-busting.d.ts

@@ -89,6 +89,22 @@ export declare function canonicalizePrewarmableRscRequestHeaders(headers: Header
  * router state is transport context and must not fragment the shared response.
  */
 export declare function canonicalizeLoadingShellRscRequestHeaders(headers: Headers): boolean;
+/**
+ * Callers pass a path (usually a parsed URL's pathname + search) or an
+ * absolute URL. A pathname can begin with "//", and resolving that as a
+ * relative reference would read its first segment as a host, so a path is
+ * appended to the base instead of resolved against it.
+ */
+export declare function parseRscRequestPath(href: string): URL;
+/**
+ * Serialize the path-absolute reference callers fetch against the app origin.
+ * A pathname that begins with "//" would serialize as a protocol-relative URL
+ * and send the request to another host, so it keeps a "/." prefix, as the
+ * WHATWG URL serializer does. URL resolution drops the dot segment, so the
+ * request still targets the same pathname on the app origin, as Next.js's
+ * full-URL fetch does.
+ */
+export declare function formatRscRequestPath(url: URL): string;
 export declare function createRscRequestUrl(href: string, headers: Headers): Promise<string>;
 /** Build the definitive full-route RSC URL shared by prefetch and navigation. */
 export declare function createCanonicalRscRequestUrl(href: string): string;

package/dist/server/app-rsc-cache-busting.js

@@ -218,33 +218,50 @@ function canonicalizeLoadingShellRscRequestHeaders(headers) {
 	headers.delete(VINEXT_CLIENT_REUSE_MANIFEST_HEADER);
 	return true;
 }
-function toRscRequestPath(href) {
+const RSC_REQUEST_URL_BASE = "http://vinext.local";
+/**
+* Callers pass a path (usually a parsed URL's pathname + search) or an
+* absolute URL. A pathname can begin with "//", and resolving that as a
+* relative reference would read its first segment as a host, so a path is
+* appended to the base instead of resolved against it.
+*/
+function parseRscRequestPath(href) {
 	const hashIndex = href.indexOf("#");
-	return hashIndex === -1 ? href : href.slice(0, hashIndex);
+	const beforeHash = hashIndex === -1 ? href : href.slice(0, hashIndex);
+	if (beforeHash.startsWith("/") || beforeHash.startsWith("\\")) return new URL(`${RSC_REQUEST_URL_BASE}${beforeHash}`);
+	return new URL(beforeHash, RSC_REQUEST_URL_BASE);
+}
+/**
+* Serialize the path-absolute reference callers fetch against the app origin.
+* A pathname that begins with "//" would serialize as a protocol-relative URL
+* and send the request to another host, so it keeps a "/." prefix, as the
+* WHATWG URL serializer does. URL resolution drops the dot segment, so the
+* request still targets the same pathname on the app origin, as Next.js's
+* full-URL fetch does.
+*/
+function formatRscRequestPath(url) {
+	return `${url.pathname.startsWith("//") ? `/.${url.pathname}` : url.pathname}${url.search}`;
 }
 async function createRscRequestUrl(href, headers) {
-	const url = new URL(toRscRequestPath(href), "http://vinext.local");
+	const url = parseRscRequestPath(href);
 	if (typeof window !== "undefined" && process.env.NODE_ENV === "production" && process.env.__NEXT_CONFIG_OUTPUT === "export") {
 		const basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
 		const isBasePathRoot = basePath !== "" && url.pathname === basePath;
 		if (url.pathname.endsWith("/")) url.pathname += "index.txt";
 		else url.pathname += isBasePathRoot ? "/index.txt" : ".txt";
-		return `${url.pathname}${url.search}`;
+		return formatRscRequestPath(url);
 	}
 	setRscCacheBustingSearchParam(url, await computeRscCacheBustingSearchParam(headers));
-	return `${url.pathname}${url.search}`;
+	return formatRscRequestPath(url);
 }
 /** Build the definitive full-route RSC URL shared by prefetch and navigation. */
 function createCanonicalRscRequestUrl(href) {
-	const url = new URL(toRscRequestPath(href), "http://vinext.local");
+	const url = parseRscRequestPath(href);
 	setRscCacheBustingSearchParam(url, "");
-	return `${url.pathname}${url.search}`;
+	return formatRscRequestPath(url);
 }
 function createServerActionRequestUrl(href) {
-	const hashIndex = href.indexOf("#");
-	const beforeHash = hashIndex === -1 ? href : href.slice(0, hashIndex);
-	const url = new URL(beforeHash, "http://vinext.local");
-	return `${url.pathname}${url.search}`;
+	return formatRscRequestPath(parseRscRequestPath(href));
 }
 async function createRscRedirectLocation(location, request) {
 	const requestUrl = new URL(request.url);
@@ -309,4 +326,4 @@ async function resolveInvalidRscCacheBustingRequest(options) {
 	});
 }
 //#endregion
-export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };
+export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };

package/dist/server/app-rsc-handler.js

@@ -4,17 +4,17 @@ import { PRERENDER_REVALIDATE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROU
 import { buildRequestHeadersFromMiddlewareResponse, hasMiddlewareRequestHeaderOverrides } from "../utils/middleware-request-headers.js";
 import { requestContextFromRequest } from "../config/request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
+import "./app-rsc-vary.js";
+import { ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_REWRITTEN_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
+import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
+import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute } from "./request-pipeline.js";
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
-import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import "./app-rsc-vary.js";
-import { ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_REWRITTEN_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
 import { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { isInterceptionMatchedUrlPath, normalizePath } from "./normalize-path.js";
-import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
-import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, normalizeTrailingSlashPathname, resolvePublicFileRoute } from "./request-pipeline.js";
 import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
 import { buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./pages-data-route.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";

package/dist/server/app-rsc-request-normalization.js

@@ -1,11 +1,11 @@
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
-import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERCEPTION_ID_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "./app-rsc-vary.js";
 import { VINEXT_CLIENT_REUSE_MANIFEST_HEADER } from "./headers.js";
-import { normalizePath } from "./normalize-path.js";
 import { badRequestResponse, notFoundResponse } from "./http-error-responses.js";
 import { guardProtocolRelativeUrl } from "./request-pipeline.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
+import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
+import { normalizePath } from "./normalize-path.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, parseAppRscRenderMode } from "./app-rsc-render-mode.js";
 import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, stripRscSuffix } from "./app-rsc-cache-busting.js";

package/dist/server/app-rsc-response-stage.js

@@ -1,10 +1,10 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import "./headers.js";
-import { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders } from "./request-pipeline.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
+import { runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { applyEffectiveRequestCookieHeader, getDraftModeCookieHeader, headersContextFromRequest, restoreDraftModeTransition } from "../shims/headers.js";
 import { ensureFetchPatch, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { traceFindPageComponents } from "./pages-execution-tracing.js";

package/dist/server/app-server-action-execution.js

@@ -3,12 +3,12 @@ import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { isExternalUrl } from "../utils/external-url.js";
-import { splitPathSegments } from "../routing/utils.js";
 import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { NEXT_ROUTER_STATE_TREE_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
 import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-error-responses.js";
 import { attachRequestCfMetadata, validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
+import { splitPathSegments } from "../routing/utils.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
 import { isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
 import { _drainPendingRevalidations, getAndClearActionRevalidationKind } from "../shims/cache-request-state.js";

package/dist/server/app-ssr-entry.js

@@ -1,6 +1,6 @@
-import "./server-globals.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped, repeatedSlashRedirectResponse } from "./open-redirect.js";
+import "./server-globals.js";
 import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
 import { onRenderDynamicLatched } from "../shims/internal/headers-state.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
@@ -18,7 +18,7 @@ import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheIdentityMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { getNextErrorDigest } from "./next-error-digest.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
-import { isAppRenderAbortError } from "./app-render-abort-error.js";
+import { createRenderStreamCancellation, isAppRenderAbortError } from "./app-render-abort-error.js";
 import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { createNavigationRuntimeRenderedSearchScript, createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, waitAtLeastOneReactRenderTask } from "./app-ssr-stream.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
@@ -251,6 +251,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				const bootstrapModuleUrl = extractBootstrapModuleUrl(await import.meta.viteRsc.loadBootstrapScriptContent("index"));
 				const errorMetaRenderer = createSsrErrorMetaRenderer({ basePath: options?.basePath });
 				const pprFallbackShellSignal = options?.pprFallbackShellSignal;
+				const htmlCancellation = createRenderStreamCancellation();
 				let reactLinkHeader = "";
 				const maxHeadersLength = options?.reactMaxHeadersLength ?? DEFAULT_REACT_MAX_HEADERS_LENGTH;
 				const captureHeaders = maxHeadersLength > 0;
@@ -268,7 +269,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					maxHeadersLength: captureHeaders ? maxHeadersLength : void 0,
 					onError(error) {
 						if (pprFallbackShellSignal && isPprFallbackShellAbortError(error)) return;
-						if (isAppRenderAbortError(error)) return void 0;
+						if (isAppRenderAbortError(error) || htmlCancellation.isReason(error)) return;
 						errorMetaRenderer.capture(error);
 						const instrumentationDigest = options?.onSsrError?.(error);
 						if (typeof instrumentationDigest === "string") return instrumentationDigest;
@@ -342,7 +343,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				const getBeforeInteractiveHeadHTML = () => renderBeforeInteractiveInlineScripts(beforeInteractiveInlineScripts);
 				if (shouldDelayInitialHtmlPull) await waitAtLeastOneReactRenderTask();
 				return {
-					htmlStream: deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML, getBeforeInteractiveHeadHTML, inlineCssManifest, inlineCssFontStyles, inlineCssFontStyleFallbackHTML, options?.scriptNonce)), cleanup),
+					htmlStream: deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML, getBeforeInteractiveHeadHTML, inlineCssManifest, inlineCssFontStyles, inlineCssFontStyleFallbackHTML, options?.scriptNonce)), cleanup, void 0, htmlCancellation.record),
 					metadataReady: Promise.resolve(),
 					renderComplete,
 					capturedRscData: options?.capturedRscDataRef?.value ?? null,

package/dist/server/app-visited-response-cache.js

@@ -1,6 +1,6 @@
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
+import { parseRscRequestPath, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { resolveCachedRscResponseExpiresAt } from "../shims/navigation.js";
 //#region src/server/app-visited-response-cache.ts
 const VISITED_RESPONSE_CACHE_TTL = 3e5;
@@ -27,7 +27,7 @@ function isVisitedResponseCacheEntryFresh(entry, options) {
 }
 function normalizeVisitedResponseCacheLookupUrl(rscUrl) {
 	try {
-		const url = new URL(rscUrl, "http://vinext.local");
+		const url = parseRscRequestPath(rscUrl);
 		stripRscCacheBustingSearchParam(url);
 		return `${url.pathname}${url.search}`;
 	} catch {