@qzsy/vinext 0.1.9 → 0.1.11

package/dist/deploy.js

@@ -378,7 +378,7 @@ import { fetchWorkerFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath
 import type { PagesPipelineDeps } from "vinext/server/pages-request-pipeline";
 import { handleImageOptimization, DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath } from "vinext/server/image-optimization";
 import type { ImageConfig } from "vinext/server/image-optimization";
-import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, isOpenRedirectShaped } from "vinext/server/request-pipeline";
+import { bufferRequestBodyForHeaderClone, cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, isOpenRedirectShaped } from "vinext/server/request-pipeline";
 import { notFoundStaticAssetResponse } from "vinext/server/http-error-responses";
 import { assetPrefixPathname, isNextStaticPath } from "vinext/utils/asset-prefix";
 import { hasBasePath, stripBasePath } from "vinext/utils/base-path";
@@ -452,6 +452,7 @@ export default {
       // forged to influence routing or impersonate internal state.
       // Request.headers is immutable in Workers, so build a clean copy.
       {
+        request = await bufferRequestBodyForHeaderClone(request);
         const filteredHeaders = filterInternalHeaders(request.headers);
         request = cloneRequestWithHeaders(request, filteredHeaders);
       }

package/dist/index.js

@@ -341,6 +341,22 @@ const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 const _appBrowserServerActionClientPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-browser-server-action-client");
 const _appRscHandlerPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-rsc-handler");
 const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
+const _defaultImageLoaderShimPath = resolveShimModulePath(_shimsDir, "default-image-loader");
+/** Absolute path to `images.loaderFile` when configured; set in vinext:config. */
+let _imageLoaderFile;
+function isImageShimModule(importer) {
+	if (!importer) return false;
+	const normalized = normalizePathSeparators(importer.split("?")[0]);
+	return /\/shims\/image\.(tsx?|jsx?)$/.test(normalized);
+}
+function isDefaultImageLoaderRequest(id, importer) {
+	const cleanId = id.startsWith("\0") ? id.slice(1) : id;
+	const normalizedId = normalizePathSeparators(cleanId.split("?")[0]);
+	if (normalizedId === normalizePathSeparators(_defaultImageLoaderShimPath)) return true;
+	if (/\/shims\/default-image-loader\.(tsx?|jsx?)$/.test(normalizedId)) return true;
+	if (isImageShimModule(importer) && (cleanId === "./default-image-loader.js" || cleanId === "./default-image-loader" || cleanId === "./default-image-loader.ts" || cleanId === "./default-image-loader.tsx")) return true;
+	return false;
+}
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
 }
@@ -623,6 +639,16 @@ function vinext(options = {}) {
 			serverOnlyShimPath: resolveShimModulePath(shimsDir, "server-only")
 		}),
 		dataUrlCssPlugin(),
+		{
+			name: "vinext:image-loader-file",
+			enforce: "pre",
+			resolveId: {
+				filter: { id: /default-image-loader/ },
+				handler(id, importer) {
+					if (_imageLoaderFile && isDefaultImageLoaderRequest(id, importer)) return _imageLoaderFile;
+				}
+			}
+		},
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -827,9 +853,7 @@ function vinext(options = {}) {
 					overlay: false
 				};
 				const cssModulesOverride = config.css?.modules === false || typeof config.css?.modules === "object" && "Loader" in config.css.modules ? {} : { modules: { Loader: sassComposesLoader.Loader } };
-				const defaultImageLoaderShimPath = resolveShimModulePath(shimsDir, "default-image-loader");
-				const imageLoaderFile = nextConfig.images?.loaderFile;
-				const imageLoaderAlias = imageLoaderFile != null ? { [defaultImageLoaderShimPath]: imageLoaderFile } : {};
+				_imageLoaderFile = nextConfig.images?.loaderFile;
 				const viteConfig = {
 					appType: "custom",
 					build: {
@@ -877,8 +901,7 @@ function vinext(options = {}) {
 						alias: {
 							...tsconfigPathAliases,
 							...nextConfig.aliases,
-							...nextShimMap,
-							...imageLoaderAlias
+							...nextShimMap
 						},
 						dedupe: [
 							"react",
@@ -922,10 +945,10 @@ function vinext(options = {}) {
 				const incomingInclude = config.optimizeDeps?.include ?? [];
 				const depOptimizeAliasPlugin = {
 					name: "vinext:dep-optimize-alias",
-					resolveId(id) {
+					resolveId(id, importer) {
 						const shimBase = _reactServerShims.get(id);
 						if (shimBase !== void 0) return resolveShimModulePath(shimsDir, shimBase);
-						if (imageLoaderFile != null && id === defaultImageLoaderShimPath) return imageLoaderFile;
+						if (_imageLoaderFile && isDefaultImageLoaderRequest(id, importer)) return _imageLoaderFile;
 					}
 				};
 				const depOptimizeNodeEnvOptions = getDepOptimizeNodeEnvOptions(viteMajorVersion, nodeEnvDefine);

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

@@ -3,7 +3,7 @@ import { runWithExecutionContext } from "../shims/request-context.js";
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER } from "./headers.js";
 import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
-import { cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
+import { bufferRequestBodyForHeaderClone, cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { resolveStaticAssetSignal } from "./worker-utils.js";
 import { readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
@@ -26,6 +26,7 @@ async function handleRequest(request, env, ctx) {
 	}
 	if (isNextStaticPath(url.pathname, __workerBasePath, __workerAssetPathPrefix)) return notFoundStaticAssetResponse();
 	{
+		request = await bufferRequestBodyForHeaderClone(request);
 		const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(request);
 		const filteredHeaders = filterInternalHeaders(request.headers);
 		const prerenderRouteParamsHeader = serializePrerenderRouteParamsHeader(prerenderRouteParamsPayload);

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

@@ -4,7 +4,7 @@ import { getRequestExecutionContext } from "../shims/request-context.js";
 import { ACTION_REVALIDATED_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER } from "./headers.js";
 import { isExternalUrl, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "../config/config-matchers.js";
 import { notFoundResponse } from "./http-error-responses.js";
-import { applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute } from "./request-pipeline.js";
+import { applyConfigHeadersToResponse, bufferRequestBodyForHeaderClone, cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute } from "./request-pipeline.js";
 import { headersContextFromRequest } from "../shims/headers.js";
 import { ensureFetchPatch, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { mergeRewriteQuery } from "../utils/query.js";
@@ -18,10 +18,10 @@ import { buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./page
 import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
 import { pickRootParams, setRootParams } from "../shims/root-params.js";
+import { flattenErrorCauses } from "../utils/error-cause.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
-import { flattenErrorCauses } from "../utils/error-cause.js";
 import { finalizeAppRscResponse } from "./app-rsc-response-finalizer.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
 import { runWithPrerenderWorkUnit } from "./prerender-work-unit-setup.js";
@@ -488,6 +488,7 @@ function createAppRscHandler(options) {
 	return async function appRscHandler(rawRequest, ctx) {
 		options.registerCacheAdapters();
 		await options.ensureInstrumentation?.();
+		rawRequest = await bufferRequestBodyForHeaderClone(rawRequest);
 		const mwCtx = rawRequest.headers.get(VINEXT_MW_CTX_HEADER);
 		const hasDataRequestHeader = rawRequest.headers.get("x-nextjs-data") === "1";
 		const pagesDataUrl = new URL(rawRequest.url);

package/dist/server/request-pipeline.d.ts

@@ -161,6 +161,18 @@ declare function processMiddlewareHeaders(headers: Headers): void;
  * @returns A new Headers with internal framework headers removed
  */
 declare function filterInternalHeaders(headers: Headers): Headers;
+/**
+ * Materialize the request body before header/url cloning.
+ *
+ * `cloneRequestWithHeaders` / `cloneRequestWithUrl` can lose a streaming body
+ * on Node/undici when the input is a foreign Request or when the underlying
+ * stream was partially consumed. Server actions and route handlers both rely on
+ * the body surviving internal header filtering, so we read it once up front
+ * and rebuild a fresh Request for the rest of the pipeline.
+ *
+ * Multipart bodies are left streaming so FormData parsing still works.
+ */
+declare function bufferRequestBodyForHeaderClone(request: Request): Promise<Request>;
 /**
  * Clone a Request while overriding headers, preserving metadata when possible.
  *
@@ -184,4 +196,4 @@ declare function cloneRequestWithHeaders(request: Request, headers: Headers): Re
  */
 declare function cloneRequestWithUrl(request: Request, url: string): Request;
 //#endregion
-export { HeaderRecord, INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateServerActionPayload };
+export { HeaderRecord, INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, bufferRequestBodyForHeaderClone, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateServerActionPayload };

package/dist/server/request-pipeline.js

@@ -365,6 +365,56 @@ function getRequestCf(request) {
 	const cf = Reflect.get(request, "cf");
 	return cf === void 0 ? void 0 : cf;
 }
+const METHODS_THAT_MAY_HAVE_BODY = new Set([
+	"POST",
+	"PUT",
+	"PATCH",
+	"DELETE"
+]);
+/**
+* Materialize the request body before header/url cloning.
+*
+* `cloneRequestWithHeaders` / `cloneRequestWithUrl` can lose a streaming body
+* on Node/undici when the input is a foreign Request or when the underlying
+* stream was partially consumed. Server actions and route handlers both rely on
+* the body surviving internal header filtering, so we read it once up front
+* and rebuild a fresh Request for the rest of the pipeline.
+*
+* Multipart bodies are left streaming so FormData parsing still works.
+*/
+async function bufferRequestBodyForHeaderClone(request) {
+	if (!METHODS_THAT_MAY_HAVE_BODY.has(request.method.toUpperCase())) return request;
+	if (request.body === null) return request;
+	if ((request.headers.get("content-type") ?? "").startsWith("multipart/form-data")) return request;
+	try {
+		const bytes = await request.arrayBuffer();
+		const init = {
+			method: request.method,
+			headers: request.headers,
+			body: bytes,
+			redirect: request.redirect,
+			referrer: request.referrer,
+			referrerPolicy: request.referrerPolicy,
+			signal: request.signal,
+			credentials: request.credentials,
+			integrity: request.integrity,
+			keepalive: request.keepalive,
+			mode: request.mode,
+			cache: request.cache
+		};
+		if (bytes.byteLength > 0) init.duplex = "half";
+		const buffered = new Request(request.url, init);
+		const cf = getRequestCf(request);
+		if (cf !== void 0) Object.defineProperty(buffered, "cf", {
+			value: cf,
+			enumerable: true,
+			configurable: true
+		});
+		return buffered;
+	} catch {
+		return request;
+	}
+}
 /**
 * Clone a Request while overriding headers, preserving metadata when possible.
 *
@@ -444,4 +494,4 @@ function cloneRequestWithUrl(request, url) {
 	return cloned;
 }
 //#endregion
-export { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateServerActionPayload };
+export { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, bufferRequestBodyForHeaderClone, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateServerActionPayload };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qzsy/vinext",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {