@rebask/core 0.3.0 → 0.4.0

package/dist/components/image.d.ts

@@ -1,7 +1,20 @@
-import type { ImageProps } from "../lib/image-optimization/get-img-props.js";
-export type { ImageProps } from "../lib/image-optimization/get-img-props.js";
+import type { ImageProps, PlaceholderValue } from "../lib/image-optimization/get-img-props.js";
+export type { ImageProps };
 /**
  * The `Image` component is used to optimize images.
  */
-export declare function Image(props: ImageProps): import("react").JSX.Element;
+export declare const Image: import("react").ForwardRefExoticComponent<Omit<import("react").DetailedHTMLProps<import("react").ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, "alt" | "height" | "loading" | "ref" | "src" | "srcSet" | "width"> & {
+    src: string | import("../lib/image-optimization/get-img-props.js").StaticImport;
+    alt: string;
+    width?: number | `${number}`;
+    height?: number | `${number}`;
+    fill?: boolean;
+    loader?: import("../lib/image-optimization/get-img-props.js").ImageLoader;
+    quality?: number | `${number}`;
+    preload?: boolean;
+    loading?: "eager" | "lazy" | undefined;
+    placeholder?: PlaceholderValue;
+    blurDataURL?: string;
+    unoptimized?: boolean;
+} & import("react").RefAttributes<HTMLImageElement>>;
 //# sourceMappingURL=image.d.ts.map

package/dist/components/image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/components/image.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACX,UAAU,EAIV,MAAM,4CAA4C,CAAA;AAGnD,YAAY,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAA;AAyO5E;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,+BAyDtC"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/components/image.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACX,UAAU,EAGV,gBAAgB,EAChB,MAAM,4CAA4C,CAAA;AAMnD,YAAY,EAAE,UAAU,EAAE,CAAA;AA2O1B;;GAEG;AACH,eAAO,MAAM,KAAK;;;;;;;;;;;;;oDA0ChB,CAAA"}

package/dist/components/image.js

@@ -1,36 +1,34 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { forwardRef, useCallback, useEffect, useRef, useState } from "react";
 import ReactDOM from "react-dom";
 import { getImgProps } from "../lib/image-optimization/get-img-props.js";
 import { imageConfigDefault } from "../lib/image-optimization/image-config.js";
 import { warnOnce } from "../lib/image-optimization/warn-once.js";
-// Get image config from injected global (via Vite define) or default.
 // Vite replaces __REBASK_IMAGE_OPTS at build time.
 function getImageConfig() {
     try {
-        // @ts-expect-error - __REBASK_IMAGE_OPTS is injected at build time by Vite
-        const configEnv = __REBASK_IMAGE_OPTS;
-        if (configEnv && typeof configEnv === "string") {
-            return JSON.parse(configEnv);
-        }
+        // @ts-expect-error - injected at build time by Vite
+        return JSON.parse(__REBASK_IMAGE_OPTS);
     }
     catch {
-        // __REBASK_IMAGE_OPTS not defined (plugin not configured), fall through to default
+        return imageConfigDefault;
     }
-    return imageConfigDefault;
 }
+const config = getImageConfig();
+const VALID_POSITIONS = ["absolute", "fixed", "relative"];
 // See https://stackoverflow.com/q/39777833/266535 for why we use this ref
 // handler instead of the img's onLoad attribute.
-function handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized, sizesInput) {
-    const src = img?.src;
-    if (!img || img["data-loaded-src"] === src) {
+function handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized, sizesInput, fill) {
+    const src = img.src;
+    if (img["data-loaded-src"] === src)
         return;
-    }
     img["data-loaded-src"] = src;
-    const p = "decode" in img ? img.decode() : Promise.resolve();
-    p.catch(() => { }).then(() => {
-        if (!img.parentElement || !img.isConnected) {
+    img
+        .decode()
+        .catch(() => { })
+        .then(() => {
+        if (!img.isConnected) {
             // Exit early in case of race condition:
             // - onload() is called
             // - decode() is called but incomplete
@@ -41,26 +39,21 @@ function handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized
         if (placeholder !== "empty") {
             setBlurComplete(true);
         }
-        if (onLoadRef?.current) {
+        if (onLoadRef.current) {
             // Since we don't have the SyntheticEvent here,
             // we must create one with the same shape.
             // See https://reactjs.org/docs/events.html
             const event = new Event("load");
             Object.defineProperty(event, "target", { writable: false, value: img });
-            let prevented = false;
             let stopped = false;
             onLoadRef.current({
-                ...event,
                 nativeEvent: event,
                 currentTarget: img,
                 target: img,
-                isDefaultPrevented: () => prevented,
+                isDefaultPrevented: () => event.defaultPrevented,
                 isPropagationStopped: () => stopped,
                 persist: () => { },
-                preventDefault: () => {
-                    prevented = true;
-                    event.preventDefault();
-                },
+                preventDefault: () => event.preventDefault(),
                 stopPropagation: () => {
                     stopped = true;
                     event.stopPropagation();
@@ -69,7 +62,7 @@ function handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized
         }
         if (import.meta.env.DEV) {
             const origSrc = new URL(src, "http://n").searchParams.get("url") || src;
-            if (img.getAttribute("data-nimg") === "fill") {
+            if (fill) {
                 if (!unoptimized && (!sizesInput || sizesInput === "100vw")) {
                     const widthViewportRatio = img.getBoundingClientRect().width / window.innerWidth;
                     if (widthViewportRatio < 0.6) {
@@ -83,9 +76,8 @@ function handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized
                 }
                 if (img.parentElement) {
                     const { position } = window.getComputedStyle(img.parentElement);
-                    const valid = ["absolute", "fixed", "relative"];
-                    if (!valid.includes(position)) {
-                        warnOnce(`Image with src "${origSrc}" has "fill" and parent element with invalid "position". Provided "${position}" should be one of ${valid.map(String).join(",")}.`);
+                    if (!VALID_POSITIONS.includes(position)) {
+                        warnOnce(`Image with src "${origSrc}" has "fill" and parent element with invalid "position". Provided "${position}" should be one of ${VALID_POSITIONS.join(",")}.`);
                     }
                 }
                 if (img.height === 0) {
@@ -94,21 +86,27 @@ function handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized
             }
             const heightModified = img.height.toString() !== img.getAttribute("height");
             const widthModified = img.width.toString() !== img.getAttribute("width");
-            if ((heightModified && !widthModified) || (!heightModified && widthModified)) {
+            if (heightModified !== widthModified) {
                 warnOnce(`Image with src "${origSrc}" has either width or height modified, but not the other. If you use CSS to change the size of your image, also include the styles 'width: "auto"' or 'height: "auto"' to maintain the aspect ratio.`);
             }
         }
     });
 }
-function getDynamicProps(fetchPriority) {
-    // React 19 always uses camelCase
-    return { fetchPriority };
-}
-function ImageElement({ src, srcSet, sizes, height, width, decoding, className, style, fetchPriority, placeholder, loading, unoptimized, fill: _fill, onLoadRef, setBlurComplete, setShowAltText, sizesInput, onLoad: _onLoad, onError, ...rest }) {
-    const ownRef = useCallback((img) => {
-        if (!img) {
-            return;
+function ImageElement({ src, srcSet, sizes, height, width, decoding, className, style, fetchPriority, placeholder, loading, unoptimized, fill, onLoadRef, setBlurComplete, setShowAltText, sizesInput, forwardedRef, onError, ...rest }) {
+    const imgRef = useRef(null);
+    const setRef = useCallback((img) => {
+        imgRef.current = img;
+        if (typeof forwardedRef === "function") {
+            forwardedRef(img);
+        }
+        else if (forwardedRef) {
+            forwardedRef.current = img;
         }
+    }, [forwardedRef]);
+    useEffect(() => {
+        const img = imgRef.current;
+        if (!img)
+            return;
         if (onError) {
             // If the image has an error before react hydrates, then the error is lost.
             // The workaround is to wait until the image is mounted which is after hydration,
@@ -121,15 +119,15 @@ function ImageElement({ src, srcSet, sizes, height, width, decoding, className,
             if (!src) {
                 console.error(`Image is missing required "src" property:`, img);
             }
-            if (img.getAttribute("alt") === null) {
+            if (!img.hasAttribute("alt")) {
                 console.error(`Image is missing required "alt" property. Please add Alternative Text to describe the image for screen readers and search engines.`);
             }
         }
         if (img.complete) {
-            handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized, sizesInput);
+            handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized, sizesInput, fill);
         }
-    }, [src, placeholder, onLoadRef, setBlurComplete, onError, unoptimized, sizesInput]);
-    return (_jsx("img", { ...rest, ...getDynamicProps(fetchPriority), alt: rest.alt, 
+    }, []);
+    return (_jsx("img", { ...rest, fetchPriority: fetchPriority, 
         // It's intended to keep `loading` before `src` because React updates
         // props in order which causes Safari/Firefox to not lazy load properly.
         // See https://github.com/facebook/react/issues/25883
@@ -140,9 +138,9 @@ function ImageElement({ src, srcSet, sizes, height, width, decoding, className,
         // updated by React. That causes multiple unnecessary requests if `srcSet`
         // and `sizes` are defined.
         // This bug cannot be reproduced in Chrome or Firefox.
-        sizes: sizes, srcSet: srcSet, src: src, ref: ownRef, onLoad: (event) => {
+        sizes: sizes, srcSet: srcSet, src: src, ref: setRef, onLoad: (event) => {
             const img = event.currentTarget;
-            handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized, sizesInput);
+            handleLoading(img, placeholder, onLoadRef, setBlurComplete, unoptimized, sizesInput, fill);
         }, onError: (event) => {
             // if the real image fails to load, this will ensure "alt" is visible
             setShowAltText(true);
@@ -158,7 +156,7 @@ function ImageElement({ src, srcSet, sizes, height, width, decoding, className,
 /**
  * The `Image` component is used to optimize images.
  */
-export function Image(props) {
+export const Image = forwardRef(function Image(props, forwardedRef) {
     const { onLoad } = props;
     const onLoadRef = useRef(onLoad);
     useEffect(() => {
@@ -166,37 +164,21 @@ export function Image(props) {
     }, [onLoad]);
     const [blurComplete, setBlurComplete] = useState(false);
     const [showAltText, setShowAltText] = useState(false);
-    const config = useMemo(() => getImageConfig(), []);
     const { props: imgAttributes, meta: imgMeta } = getImgProps(props, {
         imgConf: config,
         blurComplete,
         showAltText,
     });
-    const { sizes, crossOrigin, referrerPolicy, fetchPriority } = imgAttributes;
-    // Add preload for priority images
-    useEffect(() => {
-        if (!imgMeta.preload)
-            return;
+    if (imgMeta.preload) {
+        const { sizes, crossOrigin, referrerPolicy, fetchPriority } = imgAttributes;
         ReactDOM.preload(imgAttributes.src, {
             as: "image",
             imageSrcSet: imgAttributes.srcSet,
             imageSizes: sizes,
-            crossOrigin: crossOrigin,
-            referrerPolicy: referrerPolicy,
-            ...(fetchPriority
-                ? {
-                    fetchPriority: fetchPriority,
-                }
-                : {}),
+            crossOrigin,
+            referrerPolicy,
+            fetchPriority,
         });
-    }, [
-        imgMeta.preload,
-        imgAttributes.src,
-        imgAttributes.srcSet,
-        sizes,
-        crossOrigin,
-        referrerPolicy,
-        fetchPriority,
-    ]);
-    return (_jsx(ImageElement, { ...imgAttributes, unoptimized: imgMeta.unoptimized, placeholder: imgMeta.placeholder, fill: imgMeta.fill, onLoadRef: onLoadRef, setBlurComplete: setBlurComplete, setShowAltText: setShowAltText, sizesInput: props.sizes }));
-}
+    }
+    return (_jsx(ImageElement, { ...imgAttributes, unoptimized: imgMeta.unoptimized, placeholder: imgMeta.placeholder, fill: imgMeta.fill, onLoadRef: onLoadRef, setBlurComplete: setBlurComplete, setShowAltText: setShowAltText, sizesInput: props.sizes, forwardedRef: forwardedRef }));
+});

package/dist/components/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../src/components/link.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAO,MAAM,OAAO,CAAA;AAEvD,OAAO,EAKN,KAAK,aAAa,EAClB,MAAM,0BAA0B,CAAA;AAIjC,MAAM,WAAW,SAAU,SAAQ,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,aAAa;IACzF,IAAI,EAAE,MAAM,CAAA;IACZ,qEAAqE;IACrE,MAAM,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,wBAAgB,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,EAAE,SAAS,+BA2GjF"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../src/components/link.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAO,MAAM,OAAO,CAAA;AAEvD,OAAO,EAKN,KAAK,aAAa,EAClB,MAAM,0BAA0B,CAAA;AAIjC,MAAM,WAAW,SAAU,SAAQ,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,aAAa;IACzF,IAAI,EAAE,MAAM,CAAA;IACZ,qEAAqE;IACrE,MAAM,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,wBAAgB,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,EAAE,SAAS,+BA6GjF"}

package/dist/components/link.js

@@ -56,8 +56,12 @@ export function Link({ href, prefetch, scroll, onClick, ref, ...props }) {
         }
         return listenLinkViewport(link, onPrefetchStatic);
     }, [router, prefetch]);
-    // Prefetch this link again after an invalidation
-    useOnCacheInvalidation(prefetchLink);
+    useOnCacheInvalidation((invalidation) => {
+        // Path invalidations already refresh active segments and links re-check on intent. Tags can
+        // affect any link's data, so only tags need this eager pass.
+        if (invalidation.tags.length > 0)
+            prefetchLink();
+    });
     // The persistent observer only fires on intersection changes, so a link that stays in view across
     // a navigation keeps a dropped shell otherwise.
     useEffect(prefetchLink, [router, prefetch, pathname]);

package/dist/lib/image-optimization/fetch-remote-image.d.ts

@@ -0,0 +1,17 @@
+import type { ImageConfigComplete } from "./image-config.js";
+type RemoteImageConfig = Pick<ImageConfigComplete, "remotePatterns" | "dangerouslyAllowLocalIP" | "maximumRedirects" | "maximumResponseBody">;
+export type RemoteImageCacheControl = {
+    maxAge: number | undefined;
+    browserMaxAge: number | undefined;
+    sharedMaxAge: number | undefined;
+    noStore: boolean;
+    private: boolean;
+    noCache: boolean;
+};
+export declare const PUBLIC_IMAGE_CACHE_CONTROL: RemoteImageCacheControl;
+export declare function fetchRemoteImage(href: string, config: RemoteImageConfig): Promise<{
+    buffer: Buffer;
+    cacheControl: RemoteImageCacheControl;
+}>;
+export {};
+//# sourceMappingURL=fetch-remote-image.d.ts.map

package/dist/lib/image-optimization/fetch-remote-image.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-remote-image.d.ts","sourceRoot":"","sources":["../../../src/lib/image-optimization/fetch-remote-image.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAS5D,KAAK,iBAAiB,GAAG,IAAI,CAC5B,mBAAmB,EACnB,gBAAgB,GAAG,yBAAyB,GAAG,kBAAkB,GAAG,qBAAqB,CACzF,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,0BAA0B,EAAE,uBAOxC,CAAA;AAwGD,wBAAsB,gBAAgB,CACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,iBAAiB,GACvB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,uBAAuB,CAAA;CAAE,CAAC,CAiEpE"}

package/dist/lib/image-optimization/fetch-remote-image.js

@@ -0,0 +1,157 @@
+import { lookup } from "node:dns/promises";
+import { request as httpRequest } from "node:http";
+import { request as httpsRequest } from "node:https";
+import { isIP } from "node:net";
+import { ImageError, INVALID_UPSTREAM, NOT_ALLOWED, TIMED_OUT } from "./image-error.js";
+import { isPrivateIp } from "./is-private-ip.js";
+import { hasRemoteMatch } from "./match-patterns.js";
+import { readBody } from "./read-body.js";
+const TIMEOUT_MS = 7000;
+const REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);
+export const PUBLIC_IMAGE_CACHE_CONTROL = {
+    maxAge: undefined,
+    browserMaxAge: undefined,
+    sharedMaxAge: undefined,
+    noStore: false,
+    private: false,
+    noCache: false,
+};
+function parseCacheControl(cacheControl) {
+    let maxAge;
+    let sMaxAge;
+    let noStore = false;
+    let privateCache = false;
+    let noCache = false;
+    for (const directive of cacheControl?.split(",") ?? []) {
+        const [rawKey, rawValue] = directive.trim().split("=", 2);
+        if (!rawKey)
+            continue;
+        const key = rawKey.trim().toLowerCase();
+        const parsed = rawValue ? parseInt(rawValue.replace(/"/g, "").trim(), 10) : Number.NaN;
+        const validAge = !Number.isNaN(parsed);
+        if (key === "max-age" && validAge) {
+            maxAge = parsed;
+        }
+        else if (key === "s-maxage" && validAge) {
+            sMaxAge = parsed;
+        }
+        else if (key === "no-store") {
+            noStore = true;
+        }
+        else if (key === "private") {
+            privateCache = true;
+        }
+        else if (key === "no-cache") {
+            noCache = true;
+        }
+    }
+    return {
+        maxAge: sMaxAge ?? maxAge,
+        browserMaxAge: maxAge,
+        sharedMaxAge: sMaxAge,
+        noStore,
+        private: privateCache,
+        noCache,
+    };
+}
+async function resolveAddresses(hostname) {
+    const literalFamily = isIP(hostname);
+    if (literalFamily) {
+        return [{ address: hostname, family: literalFamily }];
+    }
+    try {
+        return await lookup(hostname, { all: true });
+    }
+    catch {
+        throw new ImageError(400, INVALID_UPSTREAM);
+    }
+}
+// Pin the connection to the addresses checked above so a second DNS lookup cannot rebind.
+function createPinnedLookup(hostname, addresses) {
+    return (name, options, callback) => {
+        if (name !== hostname) {
+            const error = new Error(`Unexpected lookup for ${name}`);
+            error.code = "ENOTFOUND";
+            callback(error, [], 0);
+            return;
+        }
+        const family = typeof options.family === "number" ? options.family : 0;
+        const matched = family ? addresses.filter((address) => address.family === family) : addresses;
+        if (matched.length === 0) {
+            const error = new Error(`No address available for ${hostname}`);
+            error.code = "ENOTFOUND";
+            callback(error, [], 0);
+            return;
+        }
+        if (options.all) {
+            callback(null, matched);
+        }
+        else {
+            callback(null, matched[0].address, matched[0].family);
+        }
+    };
+}
+function requestImage(url, hostname, addresses, signal) {
+    return new Promise((resolve, reject) => {
+        const request = url.protocol === "https:" ? httpsRequest : httpRequest;
+        const req = request(url, {
+            lookup: isIP(hostname) ? undefined : createPinnedLookup(hostname, addresses),
+            signal,
+            headers: { accept: "*/*", "accept-encoding": "identity", "user-agent": "rebask" },
+        }, resolve);
+        req.on("error", reject);
+        req.end();
+    });
+}
+export async function fetchRemoteImage(href, config) {
+    let current = new URL(href);
+    for (let redirects = 0; redirects <= config.maximumRedirects; redirects++) {
+        if (!hasRemoteMatch(config.remotePatterns, current)) {
+            throw new ImageError(400, NOT_ALLOWED);
+        }
+        const hostname = current.hostname.replace(/^\[|\]$/g, "");
+        const addresses = await resolveAddresses(hostname);
+        if (!config.dangerouslyAllowLocalIP &&
+            addresses.some((address) => isPrivateIp(address.address))) {
+            throw new ImageError(400, NOT_ALLOWED);
+        }
+        const signal = AbortSignal.timeout(TIMEOUT_MS);
+        let response;
+        try {
+            response = await requestImage(current, hostname, addresses, signal);
+        }
+        catch {
+            if (signal.aborted) {
+                throw new ImageError(504, TIMED_OUT);
+            }
+            throw new ImageError(400, INVALID_UPSTREAM);
+        }
+        const statusCode = response.statusCode ?? 0;
+        const location = response.headers.location;
+        if (REDIRECT_STATUSES.has(statusCode) && location) {
+            response.destroy();
+            if (redirects === config.maximumRedirects) {
+                throw new ImageError(508, INVALID_UPSTREAM);
+            }
+            let next;
+            try {
+                next = new URL(location, current);
+            }
+            catch {
+                throw new ImageError(400, INVALID_UPSTREAM);
+            }
+            if (next.protocol !== "http:" && next.protocol !== "https:") {
+                throw new ImageError(400, NOT_ALLOWED);
+            }
+            current = next;
+            continue;
+        }
+        if (statusCode < 200 || statusCode >= 300) {
+            response.destroy();
+            throw new ImageError(400, INVALID_UPSTREAM);
+        }
+        const buffer = await readBody(response, config.maximumResponseBody, signal);
+        return { buffer, cacheControl: parseCacheControl(response.headers["cache-control"]) };
+    }
+    throw new ImageError(508, INVALID_UPSTREAM);
+}

package/dist/lib/image-optimization/get-img-props.d.ts

@@ -1,12 +1,10 @@
 import type { CSSProperties, JSX } from "react";
-import type { ImageConfigComplete, ImageLoaderProps } from "./image-config.js";
+import type { ImageBlur, ImageConfigComplete, ImageLoaderProps } from "./image-config.js";
 export interface StaticImageData {
     src: string;
     height: number;
     width: number;
-    blurDataURL?: string;
-    blurWidth?: number;
-    blurHeight?: number;
+    blur?: ImageBlur;
 }
 export interface StaticRequire {
     default: StaticImageData;
@@ -44,7 +42,7 @@ export type PlaceholderStyle = Partial<Pick<CSSProperties, "backgroundSize" | "b
 /**
  * A shared function, used on both client and server, to generate the props for <img>.
  */
-export declare function getImgProps({ src, sizes, unoptimized, preload, loading, className, quality, width, height, fill, style, onLoad: _onLoad, placeholder, blurDataURL, fetchPriority, decoding, ...rest }: ImageProps, _state: {
+export declare function getImgProps({ src, sizes, unoptimized, preload, loading, className, quality, width, height, fill, style, loader: loaderProp, placeholder, blurDataURL, fetchPriority, decoding, ...rest }: ImageProps, _state: {
     imgConf: ImageConfigComplete;
     showAltText?: boolean;
     blurComplete?: boolean;

package/dist/lib/image-optimization/get-img-props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-img-props.d.ts","sourceRoot":"","sources":["../../../src/lib/image-optimization/get-img-props.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-img-props.d.ts","sourceRoot":"","sources":["../../../src/lib/image-optimization/get-img-props.ts"],"names":[],"mappings":"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"}