Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Fix proxied image asset src handling (#5833)
Oleg Isonene76c25966980
diff --git a/packages/image/src/image-loader.test.ts b/packages/image/src/image-loader.test.tsindex f6b5e784d2..d8f1017a2e 100644--- a/packages/image/src/image-loader.test.ts+++ b/packages/image/src/image-loader.test.ts@@ -40,6 +40,26 @@ describe("Asset image transforms", () => {})).toEqual("/cgi/image/my-image.webp?width=128&quality=100&format=auto");});++ test("strip /cgi/image from src", () => {+ expect(+ wsImageLoader({+ width: 128,+ src: "/cgi/image/my-image.webp?format=raw",+ quality: 100,+ })+ ).toEqual("/cgi/image/my-image.webp?width=128&quality=100&format=auto");+ });++ test("decodes proxied asset src before rebuilding image url", () => {+ expect(+ wsImageLoader({+ width: 128,+ src: "/cgi/image/my%20image.webp?format=raw",+ quality: 100,+ })+ ).toEqual("/cgi/image/my%20image.webp?width=128&quality=100&format=auto");+ });});describe("Remote src image transforms", () => {diff --git a/packages/image/src/image-loaders.ts b/packages/image/src/image-loaders.tsindex 8e614ff295..ec3a0db8a7 100644--- a/packages/image/src/image-loaders.ts+++ b/packages/image/src/image-loaders.ts@@ -14,6 +14,16 @@ const encodePathFragment = (fragment: string) => {return encodeURIComponent(fragment).replace(/%2F/g, "/");};+const getImageSource = (src: string) => {+ if (src.startsWith("/cgi/asset")) {+ return decodeURIComponent(src.slice("/cgi/asset".length).split("?")[0]);+ }+ if (src.startsWith("/cgi/image")) {+ return decodeURIComponent(src.slice("/cgi/image".length).split("?")[0]);+ }+ return src;+};+/*** Default image loader in case of no loader provided* https://developers.cloudflare.com/images/image-resizing/url-format/@@ -29,11 +39,8 @@ export const wsImageLoader: ImageLoader = (props) => {);}- // support both "/cgi/asset/name" and "name" as inputs- let src = props.src;- if (src.startsWith("/cgi/asset")) {- src = src.slice("/cgi/asset".length);- }+ // support proxied asset/image urls and plain asset names as inputs+ const src = getImageSource(props.src);const resultUrl = new URL("/cgi/image/", NON_EXISTING_DOMAIN);