Thanks to visit codestin.com
Credit goes to github.com

Skip to content

detect more image types #830

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

Merged
merged 2 commits into from
Aug 1, 2025
Merged

detect more image types #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca7e3aa
detect more image types
vicb Jul 31, 2025
a9f499c
fixup! reject non image/...
vicb Aug 1, 2025
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
7 changes: 7 additions & 0 deletions .changeset/lucky-cups-live.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@opennextjs/cloudflare": patch
---

detect more image types

Sync of <https://github.com/vercel/next.js/pull/82118>
38 changes: 33 additions & 5 deletions packages/cloudflare/src/cli/templates/images.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,16 @@ export async function fetchImage(fetcher: Fetcher | undefined, imageUrl: string,
}

if (!contentType) {
// Fallback to the sanitized upstream header when the type can not be detected
// Fallback to upstream header when the type can not be detected
// https://github.com/vercel/next.js/blob/d76f0b1/packages/next/src/server/image-optimizer.ts#L748
const header = imgResponse.headers.get("content-type") ?? "";
if (header.startsWith("image/") && !header.includes(",")) {
contentType = header;
}
contentType = imgResponse.headers.get("content-type") ?? "";
}

// Sanitize the content type:
// - Accept images only
// - Reject multiple content types
if (!contentType.startsWith("image/") || contentType.includes(",")) {
contentType = undefined;
}

if (contentType && !(contentType === SVG && !__IMAGES_ALLOW_SVG__)) {
Expand Down Expand Up @@ -167,12 +171,17 @@ const AVIF = "image/avif";
const WEBP = "image/webp";
const PNG = "image/png";
const JPEG = "image/jpeg";
const JXL = "image/jxl";
const JP2 = "image/jp2";
const HEIC = "image/heic";
const GIF = "image/gif";
const SVG = "image/svg+xml";
const ICO = "image/x-icon";
const ICNS = "image/x-icns";
const TIFF = "image/tiff";
const BMP = "image/bmp";
// pdf will be rejected (not an `image/...` type)
const PDF = "application/pdf";

/**
* Detects the content type by looking at the first few bytes of a file
Expand Down Expand Up @@ -216,6 +225,25 @@ export function detectContentType(buffer: Uint8Array) {
if ([0x42, 0x4d].every((b, i) => buffer[i] === b)) {
return BMP;
}
if ([0xff, 0x0a].every((b, i) => buffer[i] === b)) {
return JXL;
}
if (
[0x00, 0x00, 0x00, 0x0c, 0x4a, 0x58, 0x4c, 0x20, 0x0d, 0x0a, 0x87, 0x0a].every((b, i) => buffer[i] === b)
) {
return JXL;
}
if ([0, 0, 0, 0, 0x66, 0x74, 0x79, 0x70, 0x68, 0x65, 0x69, 0x63].every((b, i) => !b || buffer[i] === b)) {
return HEIC;
}
if ([0x25, 0x50, 0x44, 0x46, 0x2d].every((b, i) => buffer[i] === b)) {
return PDF;
}
if (
[0x00, 0x00, 0x00, 0x0c, 0x6a, 0x50, 0x20, 0x20, 0x0d, 0x0a, 0x87, 0x0a].every((b, i) => buffer[i] === b)
) {
return JP2;
}
}

declare global {
Expand Down