Revert unnecessary SVG routing workarounds - only keep the S3 content-type fix

Author: kof

apps/builder/app/routes/cgi.asset.$.ts

@@ -8,7 +8,6 @@ import {
   decodePathFragment,
 } from "@webstudio-is/sdk";
 import { fileUploadPath } from "~/shared/asset-client";
-import env from "~/env/env.server";
 
 // This route serves generic assets without processing
 export const loader = async ({ request }: LoaderFunctionArgs) => {
@@ -26,38 +25,6 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
     });
   }
 
-  // In production, proxy to the storage origin (R2/S3)
-  if (env.RESIZE_ORIGIN !== undefined) {
-    const assetUrl = new URL(env.RESIZE_ORIGIN + url.pathname);
-
-    const response = await fetch(assetUrl.href, {
-      headers: {
-        accept: request.headers.get("accept") ?? "",
-        "accept-encoding": request.headers.get("accept-encoding") ?? "",
-      },
-    });
-
-    if (!response.ok) {
-      console.error(
-        `Request to asset url ${assetUrl.href} responded with status = ${response.status}`
-      );
-      throw new Response("Not found", {
-        status: response.status,
-      });
-    }
-
-    // Override content-type from storage with correct MIME type based on filename
-    const contentType = getMimeTypeByFilename(name);
-    const responseHeaders = new Headers(response.headers);
-    responseHeaders.set("content-type", contentType);
-    responseHeaders.set("Access-Control-Allow-Origin", url.origin);
-
-    return new Response(response.body, {
-      status: response.status,
-      headers: responseHeaders,
-    });
-  }
-
   // Support absolute urls locally
   if (URL.canParse(name)) {
     return fetch(name);

apps/builder/app/routes/cgi.image.$.ts

@@ -71,8 +71,8 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 
   if (env.RESIZE_ORIGIN !== undefined) {
     const imgHref = wsImageLoader({
-      ...imageParameters,
       src: name,
+      ...imageParameters,
       format: "auto",
     });
 

packages/image/src/image-loaders.ts

@@ -35,11 +35,6 @@ export const wsImageLoader: ImageLoader = (props) => {
     src = src.slice("/cgi/asset".length);
   }
 
-  // Route SVGs through /cgi/asset/ to avoid image optimization
-  if (src.toLowerCase().endsWith(".svg")) {
-    return `/cgi/asset/${encodePathFragment(src)}`;
-  }
-
   const resultUrl = new URL("/cgi/image/", NON_EXISTING_DOMAIN);
 
   if (props.format !== "raw") {

packages/sdk/src/assets.test.ts

@@ -461,20 +461,11 @@ describe("allowed-file-types", () => {
 
     test("generates correct URL for image assets", () => {
       const url = getAssetUrl(mockImageAsset, "https://example.com");
-      expect(url.href).toBe("https://example.com/cgi/image/photo.jpg");
+      expect(url.href).toBe(
+        "https://example.com/cgi/image/photo.jpg?format=raw"
+      );
       expect(url.pathname).toBe("/cgi/image/photo.jpg");
-      expect(url.search).toBe("");
-    });
-
-    test("generates correct URL for SVG assets via asset route", () => {
-      const svgAsset = {
-        ...mockImageAsset,
-        name: "icon.svg",
-        format: "svg",
-      };
-      const url = getAssetUrl(svgAsset, "https://example.com");
-      expect(url.href).toBe("https://example.com/cgi/asset/icon.svg");
-      expect(url.pathname).toBe("/cgi/asset/icon.svg");
+      expect(url.search).toBe("?format=raw");
     });
 
     test("generates correct URL for video assets", () => {

packages/sdk/src/assets.ts

@@ -410,11 +410,8 @@ export const getAssetUrl = (asset: Asset, origin: string): URL => {
   let path: string;
   const assetType = detectAssetType(asset.name);
 
-  // Route SVGs to the asset endpoint to avoid image optimization
-  if (asset.name.toLowerCase().endsWith(".svg")) {
-    path = `/cgi/asset/${asset.name}`;
-  } else if (assetType === "image") {
-    path = `/cgi/image/${asset.name}`;
+  if (assetType === "image") {
+    path = `/cgi/image/${asset.name}?format=raw`;
   } else if (assetType === "video") {
     path = `/cgi/video/${asset.name}`;
   } else {