Merge branch 'main' into aws-lite

architect · Jan 24, 2024 · 22abe80 · 22abe80
2 parents 1889fa3 + a5ab7be
commit 22abe80
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/_changelog.md b/_changelog.md
@@ -13,6 +13,27 @@
 
 ---
 
+## [6.0.6] 2024-01-11
+
+### Added
+
+- Added JPEG2000 file format support; fixes #1474
+
+
+### Fixed
+
+- Fixed AVIF file format support; thanks @jessehattabaugh
+
+---
+
+## [6.0.5] 2024-01-11
+
+### Added
+
+- Added AVIF file format support
+
+---
+
 ## [6.0.4] 2023-11-20
 
 ### Fixed

diff --git a/scripts/common-mime-type-list.js b/scripts/common-mime-type-list.js
@@ -67,10 +67,14 @@ module.exports = [
   'font/ttf',
   'font/woff',
   'font/woff2',
+  'image/avif',
   'image/gif',
   'image/jp2',
   'image/jpeg',
   'image/jpg',
+  'image/jpg2',
+  'image/jpm',
+  'image/jpx',
   'image/pjpeg',
   'image/png',
   'image/svg+xml',
@@ -99,6 +103,7 @@ module.exports = [
   'text/x-vcalendar',
   'text/x-vcard',
   'text/xml',
+  'video/mj2',
   'video/mp4',
   'video/webm',
   'video/x-ms-asf',

diff --git a/src/lib/binary-extensions.js b/src/lib/binary-extensions.js
diff --git a/src/lib/binary-types.js b/src/lib/binary-types.js
@@ -18,13 +18,17 @@ module.exports = [
   'font/woff',
   'font/woff2',
   // Images
+  'image/avif',
   'image/bmp',
   'image/gif',
-  'image/heic',
   'image/heic-sequence',
-  'image/heif',
+  'image/heic',
   'image/heif-sequence',
+  'image/heif',
+  'image/jp2',
   'image/jpeg',
+  'image/jpg',
+  'image/jpg2',
   'image/png',
   'image/tiff',
   'image/vnd.microsoft.icon',
@@ -40,13 +44,14 @@ module.exports = [
   'audio/x-midi',
   'audio/x-wav',
   // Video
+  'video/3gpp-tt',
   'video/3gpp',
   'video/3gpp2',
-  'video/3gpp-tt',
   'video/h264',
   'video/h265',
   'video/h266',
   'video/jpeg2000',
+  'video/mj2',
   'video/mp2t',
   'video/mp4',
   'video/mpeg',

diff --git a/src/lib/common-mime-types.js b/src/lib/common-mime-types.js
@@ -81,12 +81,16 @@ module.exports = {
   ttf: `${d}/ttf`,
   woff: `${d}/woff`,
   woff2: `${d}/woff2`,
+  avif: `${c}/avif`,
   gif: `${c}/gif`,
   jp2: `${c}/jp2`,
   jpg2: `${c}/jp2`,
   jpeg: `${c}/jpeg`,
   jpg: `${c}/jpeg`,
   jpe: `${c}/jpeg`,
+  jpm: `${c}/jpm`,
+  jpx: `${c}/jpx`,
+  jpf: `${c}/jpx`,
   png: `${c}/png`,
   svg: `${c}/svg+xml`,
   svgz: `${c}/svg+xml`,
@@ -125,6 +129,8 @@ module.exports = {
   dic: `${f}/x-c`,
   vcs: `${f}/x-vcalendar`,
   vcf: `${f}/x-vcard`,
+  mj2: `${g}/mj2`,
+  mjp2: `${g}/mj2`,
   mp4: `${g}/mp4`,
   mp4v: `${g}/mp4`,
   mpg4: `${g}/mp4`,