@qzsy/vinext 0.1.122 → 0.1.123

package/dist/server/app-router-entry.d.ts

@@ -5,6 +5,18 @@ type WorkerAssetEnv = {
   ASSETS?: {
     fetch(request: Request): Promise<Response> | Response;
   };
+  IMAGES?: {
+    input(stream: ReadableStream): {
+      transform(options: Record<string, unknown>): {
+        output(options: {
+          format: string;
+          quality: number;
+        }): Promise<{
+          response(): Response;
+        }>;
+      };
+    };
+  };
 };
 declare const _default: {
   fetch(request: Request, env?: WorkerAssetEnv, ctx?: ExecutionContextLike): Promise<Response>;

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

@@ -7,6 +7,7 @@ import { bufferRequestBodyForHeaderClone, cloneRequestWithHeaders, filterInterna
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { finalizeMissingStaticAssetResponse, resolveStaticAssetSignal } from "./worker-utils.js";
 import { readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { handleAppRouterImageOptimizationRequest } from "./app-router-image-optimization.js";
 import rscHandler, { __assetPrefix, __basePath } from "virtual:vinext-rsc-entry";
 import { registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 //#region src/server/app-router-entry.ts
@@ -33,6 +34,11 @@ async function handleRequest(request, env, ctx) {
 		if (prerenderRouteParamsHeader !== null) filteredHeaders.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
 		request = cloneRequestWithHeaders(request, filteredHeaders);
 	}
+	const imageResponse = await handleAppRouterImageOptimizationRequest(request, {
+		basePath: __workerBasePath,
+		env: env ?? {}
+	});
+	if (imageResponse) return imageResponse;
 	const handleFn = () => rscHandler(request, ctx);
 	const result = await (ctx ? runWithExecutionContext(ctx, handleFn) : handleFn());
 	if (result instanceof Response) {

package/dist/server/app-router-image-optimization.d.ts

@@ -0,0 +1,37 @@
+import { ImageConfig } from "./image-optimization.js";
+
+//#region src/server/app-router-image-optimization.d.ts
+type AssetFetcher = {
+  fetch(request: Request): Promise<Response> | Response;
+};
+type ImagesBinding = {
+  input(stream: ReadableStream): {
+    transform(options: Record<string, unknown>): {
+      output(options: {
+        format: string;
+        quality: number;
+      }): Promise<{
+        response(): Response;
+      }>;
+    };
+  };
+};
+type AppRouterImageOptimizationEnv = {
+  ASSETS?: AssetFetcher;
+  IMAGES?: ImagesBinding;
+};
+/** Build image security/size config from Vite `define` env vars baked at build time. */
+declare function createImageConfigFromEnv(): ImageConfig;
+/**
+ * Serve `/_next/image` from the Worker ASSETS binding when available.
+ *
+ * The default App Router worker entry delegates here before the RSC handler so
+ * production requests do not fall through to the dev-style redirect path (which
+ * can emit http:// Locations behind TLS-terminating proxies).
+ */
+declare function handleAppRouterImageOptimizationRequest(request: Request, options: {
+  basePath: string;
+  env: AppRouterImageOptimizationEnv;
+}): Promise<Response | null>;
+//#endregion
+export { AppRouterImageOptimizationEnv, createImageConfigFromEnv, handleAppRouterImageOptimizationRequest };

package/dist/server/app-router-image-optimization.js

@@ -0,0 +1,40 @@
+import { stripBasePath } from "../utils/base-path.js";
+import { cloneRequestWithUrl } from "./request-pipeline.js";
+import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, handleImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
+//#region src/server/app-router-image-optimization.ts
+/** Build image security/size config from Vite `define` env vars baked at build time. */
+function createImageConfigFromEnv() {
+	return {
+		deviceSizes: JSON.parse(process.env.__VINEXT_IMAGE_DEVICE_SIZES ?? JSON.stringify(DEFAULT_DEVICE_SIZES)),
+		imageSizes: JSON.parse(process.env.__VINEXT_IMAGE_SIZES ?? JSON.stringify(DEFAULT_IMAGE_SIZES)),
+		qualities: JSON.parse(process.env.__VINEXT_IMAGE_QUALITIES ?? "null") ?? void 0,
+		dangerouslyAllowSVG: process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_SVG === "true",
+		dangerouslyAllowLocalIP: process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP === "true"
+	};
+}
+/**
+* Serve `/_next/image` from the Worker ASSETS binding when available.
+*
+* The default App Router worker entry delegates here before the RSC handler so
+* production requests do not fall through to the dev-style redirect path (which
+* can emit http:// Locations behind TLS-terminating proxies).
+*/
+async function handleAppRouterImageOptimizationRequest(request, options) {
+	const url = new URL(request.url);
+	const strippedPathname = stripBasePath(url.pathname, options.basePath);
+	if (!isImageOptimizationPath(strippedPathname) || !options.env.ASSETS) return null;
+	const imageRequest = strippedPathname === url.pathname ? request : cloneRequestWithUrl(request, new URL(`${strippedPathname}${url.search}`, url).href);
+	const imageConfig = createImageConfigFromEnv();
+	const allowedWidths = [...imageConfig.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...imageConfig.imageSizes ?? DEFAULT_IMAGE_SIZES];
+	const handlers = { fetchAsset: (path) => Promise.resolve(options.env.ASSETS.fetch(new Request(new URL(path, request.url)))) };
+	const imagesBinding = options.env.IMAGES;
+	if (imagesBinding) handlers.transformImage = async (body, { width, format, quality }) => {
+		return (await imagesBinding.input(body).transform(width > 0 ? { width } : {}).output({
+			format,
+			quality
+		})).response();
+	};
+	return handleImageOptimization(imageRequest, handlers, allowedWidths, imageConfig);
+}
+//#endregion
+export { createImageConfigFromEnv, handleAppRouterImageOptimizationRequest };

package/dist/server/app-rsc-handler.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";

package/package.json

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