Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support custom domains for images #208

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added support custom domains for images #208

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2e21b0
added support for custom domain for images
mihailShumilov Feb 20, 2024
0553aec
remove console.log
mihailShumilov Feb 20, 2024
7a409a9
Merge branch 'Niels-IO:master' into master
mihailShumilov May 29, 2024
3fd1c54
add mobile image support
mihailShumilov May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions example/src/ExportedImage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ const generateImageURL = (
correctedPath = basePath + correctedPath;
}
}
const imagesDomain = process.env.nextImageExportOptimizer_imagesDomain;
if(imagesDomain) {
correctedPath = imagesDomain + correctedPath;
}

const exportFolderName =
process.env.nextImageExportOptimizer_exportFolderName ||
Expand All @@ -89,7 +93,7 @@ const generateImageURL = (
}${exportFolderName}/${filename}-opt-${width}.${processedExtension.toUpperCase()}`;

// if the generatedImageURL is not starting with a slash, then we add one as long as it is not a remote image
if (!isRemoteImage && generatedImageURL.charAt(0) !== "/") {
if (!isRemoteImage && generatedImageURL.charAt(0) !== "/" && !imagesDomain) {
generatedImageURL = "/" + generatedImageURL;
}
return generatedImageURL;
Expand Down Expand Up @@ -130,14 +134,19 @@ const optimizedLoader = ({
src,
width,
basePath,
mobileSrc
}: {
src: string | StaticImageData;
width: number;
basePath: string | undefined;
mobileSrc?: string | StaticImageData | undefined;
}) => {
const isStaticImage = typeof src === "object";
const isStaticMobileImage = typeof mobileSrc === "object";
const _src = isStaticImage ? src.src : src;
const _mobileSrc = isStaticMobileImage ? mobileSrc.src : mobileSrc;
const originalImageWidth = (isStaticImage && src.width) || undefined;
const originalMobileImageWidth = (isStaticMobileImage && mobileSrc.width) || undefined;

// if it is a static image, we can use the width of the original image to generate a reduced srcset that returns
// the same image url for widths that are larger than the original image
Expand All @@ -164,6 +173,9 @@ const optimizedLoader = ({
}

if (nextLargestSize !== null) {
if(nextLargestSize <= 828 && _mobileSrc) {
return generateImageURL(_mobileSrc, nextLargestSize, basePath);
}
return generateImageURL(_src, nextLargestSize, basePath);
}
}
Expand Down Expand Up @@ -192,12 +204,14 @@ export interface ExportedImageProps
extends Omit<ImageProps, "src" | "loader" | "quality"> {
src: string | StaticImageData;
basePath?: string;
mobileSrc?: string | StaticImageData;
}

const ExportedImage = forwardRef<HTMLImageElement | null, ExportedImageProps>(
(
{
src,
mobileSrc,
priority = false,
loading,
className,
Expand Down Expand Up @@ -292,7 +306,7 @@ const ExportedImage = forwardRef<HTMLImageElement | null, ExportedImageProps>(
loader={
imageError || unoptimized === true
? fallbackLoader
: (e) => optimizedLoader({ src, width: e.width, basePath })
: (e) => optimizedLoader({ src, width: e.width, basePath, mobileSrc })
}
blurDataURL={automaticallyCalculatedBlurDataURL}
onError={(error) => {
Expand Down