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
refactor: pass wsImageLoader directly (#4567)
Bogdan Chadkin78d98a551966
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex 395d2d4d92..8cbfa07fbe 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -6,7 +6,6 @@ import type { Build } from "@webstudio-is/project-build";import type { Project } from "@webstudio-is/project";import { theme, Box, type CSS, Flex, Grid } from "@webstudio-is/design-system";import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";-import { createImageLoader } from "@webstudio-is/image";import { registerContainers, createObjectPool } from "~/shared/sync";import {ServerSyncStorage,@@ -31,7 +30,6 @@ import {subscribeResources,$authTokenPermissions,$publisherHost,- $imageLoader,$isDesignMode,$isContentMode,$userPlanFeatures,@@ -236,7 +234,6 @@ export const Builder = ({// additional data stores$project.set(project);$publisherHost.set(publisherHost);- $imageLoader.set(createImageLoader({}));$authPermit.set(authPermit);$authToken.set(authToken);$userPlanFeatures.set(userPlanFeatures);diff --git a/apps/builder/app/builder/features/marketplace/card.tsx b/apps/builder/app/builder/features/marketplace/card.tsxindex 65a9bccd18..e2a78291bd 100644--- a/apps/builder/app/builder/features/marketplace/card.tsx+++ b/apps/builder/app/builder/features/marketplace/card.tsx@@ -1,5 +1,4 @@import { forwardRef } from "react";-import { useStore } from "@nanostores/react";import {Flex,Text,@@ -8,9 +7,8 @@ import {css,rawTheme,} from "@webstudio-is/design-system";-import { Image } from "@webstudio-is/image";+import { Image, wsImageLoader } from "@webstudio-is/image";import { SpinnerIcon } from "@webstudio-is/icons";-import { $imageLoader } from "~/shared/nano-states";const focusOutline = focusRingStyle();@@ -60,7 +58,6 @@ type ThumbnailProps = {};const Thumbnail = ({ image, state, alt }: ThumbnailProps) => {- const imageLoader = useStore($imageLoader);return (<Flex className={imageContainerStyle()}>{image === "" || image === undefined ? (@@ -79,7 +76,7 @@ const Thumbnail = ({ image, state, alt }: ThumbnailProps) => {<Imagesrc={image.name}width={rawTheme.spacing[28]}- loader={imageLoader}+ loader={wsImageLoader}className={imageStyle({ hasAsset: true })}/>)}diff --git a/apps/builder/app/builder/features/pages/search-preview.tsx b/apps/builder/app/builder/features/pages/search-preview.tsxindex 0cd3385718..bf9cab85aa 100644--- a/apps/builder/app/builder/features/pages/search-preview.tsx+++ b/apps/builder/app/builder/features/pages/search-preview.tsx@@ -1,7 +1,5 @@-import { useStore } from "@nanostores/react";import { Box, Flex, Grid } from "@webstudio-is/design-system";-import { Image } from "@webstudio-is/image";-import { $imageLoader } from "~/shared/nano-states";+import { Image, wsImageLoader } from "@webstudio-is/image";import { formatUrl, truncateByWords, truncate } from "./social-utils";/**@@ -67,8 +65,6 @@ const VerticalThreePointIcon = () => ();export const SearchPreview = (props: SearchPreviewProps) => {- const imageLoader = useStore($imageLoader);-return (<Gridgap={1}@@ -99,7 +95,7 @@ export const SearchPreview = (props: SearchPreviewProps) => {<Imagewidth={18}height={18}- loader={imageLoader}+ loader={wsImageLoader}src={props.faviconUrl}/></Flex>diff --git a/apps/builder/app/builder/features/pages/social-preview.tsx b/apps/builder/app/builder/features/pages/social-preview.tsxindex 08902b5f8e..3fe15a86b0 100644--- a/apps/builder/app/builder/features/pages/social-preview.tsx+++ b/apps/builder/app/builder/features/pages/social-preview.tsx@@ -1,8 +1,6 @@import { Box, Grid, Label, css, theme } from "@webstudio-is/design-system";-import { Image } from "@webstudio-is/image";+import { Image, wsImageLoader } from "@webstudio-is/image";import { truncateByWords, truncate } from "./social-utils";-import { useStore } from "@nanostores/react";-import { $imageLoader } from "~/shared/nano-states";type SocialPreviewProps = {ogImageUrl?: string;@@ -33,8 +31,6 @@ export const SocialPreview = ({ogTitle,ogUrl,}: SocialPreviewProps) => {- const imageLoader = useStore($imageLoader);-return (<Grid gap={1}><Label>Social Sharing Preview</Label>@@ -49,7 +45,7 @@ export const SocialPreview = ({><Imagesrc={ogImageUrl}- loader={imageLoader}+ loader={wsImageLoader}className={imgStyle({hasImage:ogImageUrl === undefined || ogImageUrl === "" ? false : true,diff --git a/apps/builder/app/builder/features/project-settings/section-general.tsx b/apps/builder/app/builder/features/project-settings/section-general.tsxindex 6695f7b517..b08025d19d 100644--- a/apps/builder/app/builder/features/project-settings/section-general.tsx+++ b/apps/builder/app/builder/features/project-settings/section-general.tsx@@ -17,15 +17,10 @@ import {TextArea,} from "@webstudio-is/design-system";import { InfoCircleIcon } from "@webstudio-is/icons";-import { ImageControl } from "./image-control";-import { Image } from "@webstudio-is/image";+import { Image, wsImageLoader } from "@webstudio-is/image";import type { ProjectMeta } from "@webstudio-is/sdk";-import {- $assets,- $imageLoader,- $pages,- $userPlanFeatures,-} from "~/shared/nano-states";+import { ImageControl } from "./image-control";+import { $assets, $pages, $userPlanFeatures } from "~/shared/nano-states";import { serverSyncStore } from "~/shared/sync";import { sectionSpacing } from "./utils";import { CodeEditor } from "~/builder/shared/code-editor";@@ -96,7 +91,6 @@ export const SectionGeneral = () => {const assets = useStore($assets);const asset = assets.get(meta.faviconAssetId ?? "");const favIconUrl = asset ? `${asset.name}` : undefined;- const imageLoader = useStore($imageLoader);const handleSave = <Name extends keyof ProjectMeta>(name: keyof ProjectMeta@@ -176,7 +170,7 @@ export const SectionGeneral = () => {height={72}className={imgStyle()}src={favIconUrl}- loader={imageLoader}+ loader={wsImageLoader}/><Grid gap={2}>diff --git a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx b/apps/builder/app/builder/features/project-settings/section-marketplace.tsxindex 46a8f48bf9..35020cf797 100644--- a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx+++ b/apps/builder/app/builder/features/project-settings/section-marketplace.tsx@@ -16,22 +16,17 @@ import {Select,Box,} from "@webstudio-is/design-system";-import { ImageControl } from "./image-control";-import {- $assets,- $imageLoader,- $marketplaceProduct,- $project,-} from "~/shared/nano-states";-import { Image } from "@webstudio-is/image";-import { useIds } from "~/shared/form-utils";+import { Image, wsImageLoader } from "@webstudio-is/image";import { useState } from "react";import {MarketplaceProduct,marketplaceCategories,} from "@webstudio-is/project-build";-import { serverSyncStore } from "~/shared/sync";+import { ImageControl } from "./image-control";+import { $assets, $marketplaceProduct, $project } from "~/shared/nano-states";+import { useIds } from "~/shared/form-utils";import { MarketplaceApprovalStatus } from "@webstudio-is/project";+import { serverSyncStore } from "~/shared/sync";import { trpcClient } from "~/shared/trpc/trpc-client";import { rightPanelWidth, sectionSpacing } from "./utils";@@ -123,7 +118,6 @@ const useMarketplaceApprovalStatus = () => {export const SectionMarketplace = () => {const project = useStore($project);- const imageLoader = useStore($imageLoader);const approval = useMarketplaceApprovalStatus();const [data, setData] = useState(() => $marketplaceProduct.get());const ids = useIds([@@ -221,7 +215,7 @@ export const SectionMarketplace = () => {hasAsset: asset !== undefined,})}src={asset ? `${asset.name}` : undefined}- loader={imageLoader}+ loader={wsImageLoader}/></Box>diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsxindex 22f4e2d055..63db974353 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx@@ -1,13 +1,13 @@import { useStore } from "@nanostores/react";import type { Assets } from "@webstudio-is/sdk";-import { Image as WebstudioImage } from "@webstudio-is/image";+import { Image as WebstudioImage, wsImageLoader } from "@webstudio-is/image";import { styled, theme } from "@webstudio-is/design-system";import {StyleValue,toValue,type StyleProperty,} from "@webstudio-is/css-engine";-import { $assets, $imageLoader } from "~/shared/nano-states";+import { $assets } from "~/shared/nano-states";import brokenImage from "~/shared/images/broken-image-placeholder.svg";import { toPascalCase } from "../../shared/keyword-utils";import { useComputedStyles } from "../../shared/model";@@ -115,7 +115,6 @@ type RepeatedProperty = (typeof repeatedProperties)[number];export const BackgroundThumbnail = ({ index }: { index: number }) => {const assets = useStore($assets);- const imageLoader = useStore($imageLoader);const styles = useComputedStyles(repeatedProperties);const [backgroundImage] = styles;const backgroundImageValue = getComputedRepeatedItem(backgroundImage, index);@@ -131,7 +130,7 @@ export const BackgroundThumbnail = ({ index }: { index: number }) => {return (<StyledWebstudioImagekey={asset.id}- loader={imageLoader}+ loader={wsImageLoader}src={asset.name}width={thumbSize}optimize={true}@@ -146,7 +145,7 @@ export const BackgroundThumbnail = ({ index }: { index: number }) => {return (<StyledWebstudioImagekey={backgroundImageValue.value.url}- loader={imageLoader}+ loader={wsImageLoader}src={backgroundImageValue.value.url}width={thumbSize}optimize={true}diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsxindex 49fcd70da9..1fab484c41 100644--- a/apps/builder/app/builder/shared/assets/use-assets.tsx+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx@@ -1,4 +1,5 @@import { useMemo } from "react";+import { computed } from "nanostores";import { useStore } from "@nanostores/react";import warnOnce from "warn-once";import type { Asset } from "@webstudio-is/sdk";@@ -19,9 +20,7 @@ import {$uploadingFilesDataStore,type UploadingFileData,} from "~/shared/nano-states";-import { computed } from "nanostores";import { serverSyncStore } from "~/shared/sync";-import {getFileName,getMimeType,@@ -29,9 +28,8 @@ import {getSha256HashOfFile,uploadingFileDataToAsset,} from "./asset-utils";-import { Image } from "@webstudio-is/image";+import { Image, wsImageLoader } from "@webstudio-is/image";import invariant from "tiny-invariant";-import { $imageLoader } from "~/shared/nano-states";import { fetch } from "~/shared/fetch.client";export const deleteAssets = (assetIds: Asset["id"][]) => {@@ -251,8 +249,6 @@ const imageWidth = css({});const ToastImageInfo = ({ objectURL }: { objectURL: string }) => {- const imageLoader = useStore($imageLoader);-return (<Box css={{ width: theme.spacing[18] }}><Image@@ -260,7 +256,7 @@ const ToastImageInfo = ({ objectURL }: { objectURL: string }) => {src={objectURL}optimize={false}width={64}- loader={imageLoader}+ loader={wsImageLoader}/></Box>);diff --git a/apps/builder/app/builder/shared/image-manager/image.tsx b/apps/builder/app/builder/shared/image-manager/image.tsxindex 59f51c86b4..e073bd694b 100644--- a/apps/builder/app/builder/shared/image-manager/image.tsx+++ b/apps/builder/app/builder/shared/image-manager/image.tsx@@ -1,8 +1,4 @@-import { useStore } from "@nanostores/react";--import { Image as WebstudioImage } from "@webstudio-is/image";--import { $imageLoader } from "~/shared/nano-states";+import { Image as WebstudioImage, wsImageLoader } from "@webstudio-is/image";type ImageProps = {assetId: string;@@ -22,7 +18,6 @@ export const Image = ({width,}: ImageProps) => {const optimize = objectURL === undefined;- const imageLoader = useStore($imageLoader);// Avoid image flickering on switching from preview to asset (during upload)// Possible optimisation, we can set it to "sync" only if asset.path has changed or add isNew prop to UploadedAssetContainer@@ -43,7 +38,7 @@ export const Image = ({maxWidth: "100%",}}key={assetId}- loader={imageLoader}+ loader={wsImageLoader}decoding={decoding}src={src}width={width}diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex a8e1bf2cf5..68aeb640c9 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -8,6 +8,7 @@ import {coreMetas,corePropsMetas,} from "@webstudio-is/react-sdk";+import { wsImageLoader } from "@webstudio-is/image";import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";import * as baseComponents from "@webstudio-is/sdk-components-react";import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";@@ -61,7 +62,6 @@ import { subscribeInstanceHovering } from "./instance-hovering";import { useHashLinkSync } from "~/shared/pages";import { useMount } from "~/shared/hook-utils/use-mount";import { subscribeInterceptedEvents } from "./interceptor";-import { createImageLoader } from "@webstudio-is/image";import { subscribeCommands } from "~/canvas/shared/commands";import { updateCollaborativeInstanceRect } from "./collaborative-instance";import { $params } from "./stores";@@ -102,7 +102,6 @@ const useElementsTree = (const page = useStore($selectedPage);const isPreviewMode = useStore($isPreviewMode);const rootInstanceId = page?.rootInstanceId ?? "";- const imageLoader = useMemo(() => createImageLoader({}), []);if (typeof window === "undefined") {// @todo remove after https://github.com/webstudio-is/webstudio/issues/1313 now its needed to be sure that no leaks exists@@ -120,7 +119,7 @@ const useElementsTree = (value={{renderer: isPreviewMode ? "preview" : "canvas",assetBaseUrl: params.assetBaseUrl,- imageLoader,+ imageLoader: wsImageLoader,resources: {},}}>@@ -135,14 +134,7 @@ const useElementsTree = (})}</ReactSdkContext.Provider>);- }, [- params,- instances,- rootInstanceId,- components,- isPreviewMode,- imageLoader,- ]);+ }, [params, instances, rootInstanceId, components, isPreviewMode]);};const DesignMode = () => {diff --git a/apps/builder/app/dashboard/projects/thumbnail.tsx b/apps/builder/app/dashboard/projects/thumbnail.tsxindex a7a3801d9b..be58f02903 100644--- a/apps/builder/app/dashboard/projects/thumbnail.tsx+++ b/apps/builder/app/dashboard/projects/thumbnail.tsx@@ -1,5 +1,5 @@-import { forwardRef, useMemo } from "react";-import { createImageLoader, Image } from "@webstudio-is/image";+import { forwardRef } from "react";+import { Image, wsImageLoader } from "@webstudio-is/image";import { css, theme, textVariants } from "@webstudio-is/design-system";const abbrStyle = css(textVariants.brandThumbnailLargeDefault, {@@ -74,10 +74,9 @@ export const ThumbnailLinkWithImage = forwardRef<HTMLAnchorElement,{ name: string; to: string }>(({ name, to }, ref) => {- const imageLoader = useMemo(() => createImageLoader({}), []);return (<a ref={ref} href={to} className={imageContainerStyle()} tabIndex={-1}>- <Image src={name} loader={imageLoader} className={imageStyle()} />+ <Image src={name} loader={wsImageLoader} className={imageStyle()} /></a>);});@@ -90,7 +89,6 @@ export const ThumbnailWithImage = forwardRef<onClick: React.MouseEventHandler<HTMLDivElement>;}>(({ name, onClick }, ref) => {- const imageLoader = useMemo(() => createImageLoader({}), []);return (<divref={ref}@@ -98,7 +96,7 @@ export const ThumbnailWithImage = forwardRef<className={imageContainerStyle()}tabIndex={-1}>- <Image src={name} loader={imageLoader} className={imageStyle()} />+ <Image src={name} loader={wsImageLoader} className={imageStyle()} /></div>);});diff --git a/apps/builder/app/routes/cgi.image.$.ts b/apps/builder/app/routes/cgi.image.$.tsindex 6b89e2badb..910827c07a 100644--- a/apps/builder/app/routes/cgi.image.$.ts+++ b/apps/builder/app/routes/cgi.image.$.ts@@ -1,11 +1,11 @@import { createReadStream, existsSync } from "node:fs";import { join } from "node:path";+import { z } from "zod";import { createReadableStreamFromReadable } from "@remix-run/node";import type { LoaderFunctionArgs } from "@remix-run/server-runtime";+import { wsImageLoader } from "@webstudio-is/image";import env from "~/env/env.server";import { getImageNameAndType } from "~/builder/shared/assets/asset-utils";-import { z } from "zod";-import { createImageLoader } from "@webstudio-is/image";const ImageParams = z.object({width: z.string().transform((value) => Math.round(parseFloat(value))),@@ -72,9 +72,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {}if (env.RESIZE_ORIGIN !== undefined) {- const imageLoader = createImageLoader({});-- const imgHref = imageLoader({+ const imgHref = wsImageLoader({src: name,...imageParameters,format: "auto",diff --git a/apps/builder/app/shared/nano-states/misc.ts b/apps/builder/app/shared/nano-states/misc.tsindex d76ce59276..a2f726361c 100644--- a/apps/builder/app/shared/nano-states/misc.ts+++ b/apps/builder/app/shared/nano-states/misc.ts@@ -19,7 +19,6 @@ import type { Style } from "@webstudio-is/css-engine";import type { Project } from "@webstudio-is/project";import type { MarketplaceProduct } from "@webstudio-is/project-build";import type { TokenPermissions } from "@webstudio-is/authorization-token";-import { createImageLoader, type ImageLoader } from "@webstudio-is/image";import type { DragStartPayload } from "~/canvas/shared/use-drag-drop";import { type InstanceSelector } from "../tree-utils";import type { HtmlTags } from "html-tags";@@ -35,8 +34,6 @@ export const $project = atom<Project | undefined>();export const $publisherHost = atom<string>("wstd.work");-export const $imageLoader = atom<ImageLoader>(createImageLoader({}));-export const $publishedOrigin = computed([$project, $publisherHost],(project, publisherHost) => `https://${project?.domain}.${publisherHost}`diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 7cae6fa35e..e4af2bfedc 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -49,7 +49,7 @@ import {replaceFormActionsWithResources,} from "@webstudio-is/sdk";import type { Data } from "@webstudio-is/http-client";-import { createImageLoader } from "@webstudio-is/image";+import { wsImageLoader } from "@webstudio-is/image";import { LOCAL_DATA_FILE } from "./config";import {createFileIfNotExists,@@ -447,11 +447,10 @@ export const prebuild = async (options: {}const assetOrigin = `https://${domain}.${appDomain}`;- const imageLoader = createImageLoader({});for (const asset of siteData.assets) {if (asset.type === "image") {- const imagePath = imageLoader({+ const imagePath = wsImageLoader({src: asset.name,format: "raw",});diff --git a/packages/image/src/image-dev.stories.tsx b/packages/image/src/image-dev.stories.tsxindex 8a11a4d4e0..b54dac9745 100644--- a/packages/image/src/image-dev.stories.tsx+++ b/packages/image/src/image-dev.stories.tsx@@ -2,7 +2,7 @@import type * as React from "react";import type { Meta, StoryFn } from "@storybook/react";-import { Image as ImagePrimitive, createImageLoader } from "./";+import { Image as ImagePrimitive, wsImageLoader } from "./";// to not allow include local assets everywhere, just enable it for this file// eslint-disable-next-line @typescript-eslint/ban-ts-comment@@ -29,12 +29,6 @@ const imageSrc = USE_CLOUDFLARE_IMAGE_TRANSFORM? REMOTE_SELF_DOMAIN_IMAGE: localLogoImage;-const imageLoader = createImageLoader({- imageBaseUrl: USE_CLOUDFLARE_IMAGE_TRANSFORM- ? "https://webstudio.is/cdn-cgi/image/"- : "",-});-const ImageBase: StoryFn<React.ForwardRefExoticComponent<Omit<ImageProps, "loader"> & {@@ -52,7 +46,7 @@ const ImageBase: StoryFn<<ImagePrimitive{...args}optimize={true}- loader={imageLoader}+ loader={wsImageLoader}style={style}/>);diff --git a/packages/image/src/image-loader.test.ts b/packages/image/src/image-loader.test.tsindex 8211b3c66b..1de8203010 100644--- a/packages/image/src/image-loader.test.ts+++ b/packages/image/src/image-loader.test.ts@@ -1,5 +1,5 @@import { describe, test, expect } from "vitest";-import { createImageLoader } from "./image-loaders";+import { wsImageLoader } from "./image-loaders";const decodePathFragment = (fragment: string) => {return decodeURIComponent(fragment);@@ -12,10 +12,9 @@ const encodePathFragment = (fragment: string) => {describe("Asset image transforms", () => {test("width is number", () => {const imageBaseUrl = "/cgi/image/";- const loader = createImageLoader({});const assetName = "Привет_Мир__2F__BQNEuP8O9N79eVwPfbBJg.webp";- const result = loader({+ const result = wsImageLoader({width: 128,src: assetName,quality: 100,@@ -36,11 +35,10 @@ describe("Asset image transforms", () => {describe("Remote src image transforms", () => {test("width is number", () => {const imageBaseUrl = "/cgi/image/";- const loader = createImageLoader({});const remoteSrc = "https://example.com/lo%3Fgo.webp?a=1";- const result = loader({+ const result = wsImageLoader({width: 128,src: remoteSrc,quality: 100,@@ -61,13 +59,12 @@ describe("Remote src image transforms", () => {test("Double encoded fragment", () => {const imageBaseUrl = "/cgi/image/";- const loader = createImageLoader({});const remoteSrc = encodePathFragment("https://ex%2Fample.com/lo%3Fgo.webp?a=1");- const result = loader({+ const result = wsImageLoader({width: 128,src: remoteSrc,quality: 100,diff --git a/packages/image/src/image-loaders.ts b/packages/image/src/image-loaders.tsindex 01570dc928..56bb619f8f 100644--- a/packages/image/src/image-loaders.ts+++ b/packages/image/src/image-loaders.ts@@ -1,10 +1,6 @@import warnOnce from "warn-once";import { allSizes, type ImageLoader } from "./image-optimize";-export type ImageLoaderOptions = {- imageBaseUrl?: string;-};-const NON_EXISTING_DOMAIN = "https://a3cbcbec-cdb1-4ea4-ad60-43c795308ddc.ddc";const joinPath = (...segments: string[]) => {@@ -22,42 +18,48 @@ const encodePathFragment = (fragment: string) => {* Default image loader in case of no loader provided* https://developers.cloudflare.com/images/image-resizing/url-format/**/-export const createImageLoader =- (_loaderOptions: ImageLoaderOptions): ImageLoader =>- (props) => {- const width = props.format === "raw" ? 16 : props.width;- const quality = props.format === "raw" ? 100 : props.quality;- const { format, src } = props;-- if (process.env.NODE_ENV !== "production") {- warnOnce(- allSizes.includes(width) === false,- "Width must be only from allowed values"- );- }+export const wsImageLoader: ImageLoader = (props) => {+ const width = props.format === "raw" ? 16 : props.width;+ const quality = props.format === "raw" ? 100 : props.quality;+ const { format, src } = props;- const resultUrl = new URL("/cgi/image/", NON_EXISTING_DOMAIN);+ if (process.env.NODE_ENV !== "production") {+ warnOnce(+ allSizes.includes(width) === false,+ "Width must be only from allowed values"+ );+ }- if (format !== "raw") {- resultUrl.searchParams.set("width", width.toString());- resultUrl.searchParams.set("quality", quality.toString());+ const resultUrl = new URL("/cgi/image/", NON_EXISTING_DOMAIN);- if (props.height != null) {- resultUrl.searchParams.set("height", props.height.toString());- }+ if (format !== "raw") {+ resultUrl.searchParams.set("width", width.toString());+ resultUrl.searchParams.set("quality", quality.toString());- if (props.fit != null) {- resultUrl.searchParams.set("fit", props.fit);- }+ if (props.height != null) {+ resultUrl.searchParams.set("height", props.height.toString());}- resultUrl.searchParams.set("format", format ?? "auto");-- resultUrl.pathname = joinPath(resultUrl.pathname, encodePathFragment(src));- if (resultUrl.href.startsWith(NON_EXISTING_DOMAIN)) {- return `${resultUrl.pathname}?${resultUrl.searchParams.toString()}`;+ if (props.fit != null) {+ resultUrl.searchParams.set("fit", props.fit);}+ }+ resultUrl.searchParams.set("format", format ?? "auto");++ resultUrl.pathname = joinPath(resultUrl.pathname, encodePathFragment(src));++ if (resultUrl.href.startsWith(NON_EXISTING_DOMAIN)) {+ return `${resultUrl.pathname}?${resultUrl.searchParams.toString()}`;+ }++ // Cloudflare docs say that we don't need to urlencode the path params+ return resultUrl.href;+};++type ImageLoaderOptions = {+ imageBaseUrl?: string;+};- // Cloudflare docs say that we don't need to urlencode the path params- return resultUrl.href;- };+export const createImageLoader = (+ _loaderOptions: ImageLoaderOptions+): ImageLoader => wsImageLoader;diff --git a/packages/image/src/image-optimize.test.ts b/packages/image/src/image-optimize.test.tsindex 67d0f9e2bd..7463b8ccea 100644--- a/packages/image/src/image-optimize.test.ts+++ b/packages/image/src/image-optimize.test.ts@@ -1,6 +1,6 @@import { describe, test, expect } from "vitest";import { getImageAttributes } from "./image-optimize";-import { createImageLoader } from "./image-loaders";+import { wsImageLoader } from "./image-loaders";describe("Image optimizations applied", () => {test("width is number, create pixel density descriptor 'x'", () => {@@ -11,7 +11,7 @@ describe("Image optimizations applied", () => {srcSet: undefined,sizes: undefined,quality: 100,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`@@ -31,7 +31,7 @@ describe("Image optimizations applied", () => {srcSet: undefined,sizes: undefined,quality: 100,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`@@ -51,7 +51,7 @@ describe("Image optimizations applied", () => {srcSet: undefined,sizes: undefined,quality: 90,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`@@ -71,7 +71,7 @@ describe("Image optimizations applied", () => {srcSet: undefined,sizes: "100vw",quality: 70,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`@@ -91,7 +91,7 @@ describe("Image optimizations applied", () => {srcSet: undefined,sizes: "100vw",quality: 70,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`@@ -136,7 +136,7 @@ describe("Image optimizations not applied", () => {srcSet: undefined,sizes: undefined,quality: 100,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`@@ -154,7 +154,7 @@ describe("Image optimizations not applied", () => {srcSet: undefined,sizes: undefined,quality: 100,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`@@ -172,7 +172,7 @@ describe("Image optimizations not applied", () => {srcSet: "user-defined-srcset",sizes: undefined,quality: 100,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`@@ -191,7 +191,7 @@ describe("Image optimizations not applied", () => {srcSet: undefined,sizes: undefined,quality: 100,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`undefined`);@@ -205,7 +205,7 @@ describe("Image optimizations not applied", () => {srcSet: undefined,sizes: undefined,quality: 100,- loader: createImageLoader({}),+ loader: wsImageLoader,});expect(imgAttr).toMatchInlineSnapshot(`undefined`);