add test for jp2

vercel · styfle · Jul 28, 2025 · Jun 17, 2025 · Jul 28, 2025 · Jul 28, 2025
commit 23171202528e5516c9991a965c7065c981fdd5c2
diff --git a/packages/next/src/server/image-optimizer.ts b/packages/next/src/server/image-optimizer.ts
@@ -37,6 +37,7 @@ 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'
@@ -223,50 +224,55 @@ export async function detectContentType(
   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
+  }
 
   const sharp = getSharp(null)
   const meta = await sharp(buffer)
     .metadata()
     .catch((_) => null)
-
-  if (meta?.format) {
-    switch (meta.format) {
-      case 'avif':
-        return AVIF
-      case 'webp':
-        return WEBP
-      case 'png':
-        return PNG
-      case 'jpeg':
-      case 'jpg':
-        return JPEG
-      case 'gif':
-        return GIF
-      case 'svg':
-        return SVG
-      case 'jxl':
-        return JXL
-      case 'tiff':
-      case 'tif':
-        return TIFF
-      case 'pdf':
-        return PDF
-      case 'dcraw':
-      case 'dz':
-      case 'exr':
-      case 'fits':
-      case 'heif':
-      case 'input':
-      case 'jp2':
-      case 'magick':
-      case 'openslide':
-      case 'ppm':
-      case 'rad':
-      case 'raw':
-      case 'v':
-      default:
-        return null
-    }
+  switch (meta?.format) {
+    case 'avif':
+      return AVIF
+    case 'webp':
+      return WEBP
+    case 'png':
+      return PNG
+    case 'jpeg':
+    case 'jpg':
+      return JPEG
+    case 'gif':
+      return GIF
+    case 'svg':
+      return SVG
+    case 'jxl':
+      return JXL
+    case 'jp2':
+      return JP2
+    case 'tiff':
+    case 'tif':
+      return TIFF
+    case 'pdf':
+      return PDF
+    case 'dcraw':
+    case 'dz':
+    case 'exr':
+    case 'fits':
+    case 'heif':
+    case 'input':
+    case 'magick':
+    case 'openslide':
+    case 'ppm':
+    case 'rad':
+    case 'raw':
+    case 'v':
+    default:
+      return null
   }
   return null
 }

diff --git a/test/integration/image-optimizer/app/public/test.jp2 b/test/integration/image-optimizer/app/public/test.jp2
diff --git a/test/integration/image-optimizer/test/util.ts b/test/integration/image-optimizer/test/util.ts
@@ -251,6 +251,22 @@ export function runTests(ctx: RunTestsCtx) {
     await expectWidth(res, 400)
   })
 
+  it('should maintain jp2', async () => {
+    const query = { w: ctx.w, q: 90, url: '/test.jp2' }
+    const res = await fetchViaHTTP(ctx.appPort, '/_next/image', query, {})
+    expect(res.status).toBe(200)
+    expect(res.headers.get('Content-Type')).toContain('image/jp2')
+    expect(res.headers.get('Cache-Control')).toBe(
+      `public, max-age=${isDev ? 0 : minimumCacheTTL}, must-revalidate`
+    )
+    expect(res.headers.get('Vary')).toBe('Accept')
+    expect(res.headers.get('etag')).toBeTruthy()
+    expect(res.headers.get('Content-Disposition')).toBe(
+      `${contentDispositionType}; filename="test.jp2"`
+    )
+    await expectWidth(res, 1)
+  })
+
   it('should maintain animated gif', async () => {
     const query = { w: ctx.w, q: 90, url: '/animated.gif' }
     const res = await fetchViaHTTP(ctx.appPort, '/_next/image', query, {})

diff --git a/test/unit/image-optimizer/detect-content-type.test.ts b/test/unit/image-optimizer/detect-content-type.test.ts
@@ -60,6 +60,10 @@ describe('detectContentType', () => {
     const buffer = await getImage('./images/test.jxl')
     expect(await detectContentType(buffer)).toBe('image/jxl')
   })
+  it('should return jp2', async () => {
+    const buffer = await getImage('./images/test.jp2')
+    expect(await detectContentType(buffer)).toBe('image/jp2')
+  })
   it('should return heic', async () => {
     const buffer = await getImage('./images/test.heic')
     expect(await detectContentType(buffer)).toBe('image/heic')

diff --git a/test/unit/image-optimizer/images/test.jp2 b/test/unit/image-optimizer/images/test.jp2