cloudflare-next-intl 0.9.1 → 0.9.3

package/dist/src/image_optimizer/img_with_fallback.d.ts

@@ -0,0 +1,5 @@
+import React from "react";
+export interface ImgWithFallbackProps extends React.ImgHTMLAttributes<HTMLImageElement> {
+    originalSrc?: string;
+}
+export declare function ImgWithFallback({ originalSrc, ...imgProps }: ImgWithFallbackProps): React.JSX.Element;

package/dist/src/image_optimizer/img_with_fallback.js

@@ -0,0 +1,12 @@
+"use client";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function ImgWithFallback({ originalSrc, ...imgProps }) {
+    const onError = (event) => {
+        const img = event.currentTarget;
+        if (originalSrc && img.src !== originalSrc && !img.src.endsWith(originalSrc)) {
+            img.srcset = "";
+            img.src = originalSrc;
+        }
+    };
+    return _jsx("img", { ...imgProps, onError: onError });
+}

package/dist/src/image_optimizer/next_image_shim.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import NextImage, { getImageProps as nextGetImageProps } from "next/image";
 import { getImageBlurSvg } from "./blur_svg.js";
+import { ImgWithFallback } from "./img_with_fallback.js";
 function pickVariant(entry, requestedWidth) {
     if (!requestedWidth || !entry.variants || entry.variants.length === 0) {
         return entry;
@@ -48,14 +49,35 @@ function findEntry(srcVal) {
     }
     return undefined;
 }
-function retargetSrcSet(srcSet, fromSrc, toSrc) {
-    if (!srcSet)
-        return srcSet;
-    const fromEncoded = encodeURIComponent(fromSrc);
-    const toEncoded = encodeURIComponent(toSrc);
-    return srcSet
-        .split(fromEncoded).join(toEncoded)
-        .split(fromSrc).join(toSrc);
+function toPlainImgAttrs(resolved, src) {
+    const { src: _src, alt, width, height, fill: _fill, loader: _loader, quality: _quality, preload: _preload, priority, placeholder: _placeholder, blurDataURL: _blurDataURL, unoptimized: _unoptimized, overrideSrc: _overrideSrc, onLoadingComplete: _onLoadingComplete, layout: _layout, objectFit: _objectFit, objectPosition: _objectPosition, lazyBoundary: _lazyBoundary, lazyRoot: _lazyRoot, loading, style, className, sizes, ...rest } = resolved;
+    void _src;
+    void _fill;
+    void _loader;
+    void _quality;
+    void _preload;
+    void _placeholder;
+    void _blurDataURL;
+    void _unoptimized;
+    void _overrideSrc;
+    void _onLoadingComplete;
+    void _layout;
+    void _objectFit;
+    void _objectPosition;
+    void _lazyBoundary;
+    void _lazyRoot;
+    return {
+        ...rest,
+        src,
+        alt: alt ?? "",
+        width: width,
+        height: height,
+        className: className,
+        style: style,
+        sizes: sizes,
+        loading: priority ? "eager" : (loading ?? "lazy"),
+        fetchPriority: priority ? "high" : "auto",
+    };
 }
 function resolveProps(props) {
     let src = props.src;
@@ -107,19 +129,10 @@ export default function Image(props) {
     if (alternates.length === 0) {
         return _jsx(NextImage, { ...resolved });
     }
-    const { props: imgProps } = nextGetImageProps(resolved);
-    const primarySrc = variant?.src ?? String(imgProps.src);
+    const primarySrc = variant?.src ?? String(resolved.src);
     const originalSrc = entry?.originalSrc;
-    const onError = (event) => {
-        const img = event.currentTarget;
-        if (originalSrc && img.src !== originalSrc && !img.src.endsWith(originalSrc)) {
-            img.srcset = "";
-            img.src = originalSrc;
-        }
-    };
-    return (_jsxs("picture", { children: [alternates.map((source) => (_jsx("source", { type: source.type, sizes: imgProps.sizes, srcSet: imgProps.srcSet
-                    ? retargetSrcSet(imgProps.srcSet, primarySrc, source.src)
-                    : source.src }, source.src))), _jsx("img", { ...imgProps, alt: imgProps.alt ?? "", onError: onError })] }));
+    const imgProps = toPlainImgAttrs(resolved, primarySrc);
+    return (_jsxs("picture", { children: [alternates.map((source) => (_jsx("source", { type: source.type, sizes: imgProps.sizes, srcSet: source.src }, source.src))), _jsx(ImgWithFallback, { ...imgProps, originalSrc: originalSrc })] }));
 }
 export function getImageProps(props) {
     const resolved = resolveProps(props);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-next-intl",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Optimized Next Intl Package Special for App Router and Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",