fix: 🐛 Copy output of unsupported images

✅Closes: #82

Author: dc7290

__tests__/cli/cache/index.test.ts

@@ -58,6 +58,7 @@ describe('Cache', () => {
           cacheMeasurement,
           nonCacheMeasurement,
           errorMeasurement,
+          pushInvalidFormatAssets: () => undefined,
           cliProgressBarIncrement,
           originalFilePath: path.join(srcDir, item.src),
           ...item,
@@ -75,6 +76,7 @@ describe('Cache', () => {
           cacheMeasurement,
           nonCacheMeasurement,
           errorMeasurement,
+          pushInvalidFormatAssets: () => undefined,
           cliProgressBarIncrement,
           originalFilePath: path.join(srcDir, item.src),
           ...item,

__tests__/cli/image-optimize/fixtures/default.svg

@@ -47,4 +47,10 @@ describe('Image optimization.', () => {
     expect(exist('default_1920_75.avif')).toBeTruthy()
     expect(exist('default_3840_75.avif')).toBeTruthy()
   })
+
+  test('svg images copied', () => {
+    expect(exist('default_10_75.svg')).toBeTruthy()
+    expect(exist('default_1920_75.svg')).toBeTruthy()
+    expect(exist('default_3840_75.svg')).toBeTruthy()
+  })
 })

__tests__/cli/image-optimize/index.test.ts

@@ -13,3 +13,6 @@
 {"output":"/results/images/default_10_75.avif","src":"/default.avif","width":10,"quality":75,"extension":"avif"}
 {"output":"/results/images/default_1920_75.avif","src":"/default.avif","width":1920,"quality":75,"extension":"avif"}
 {"output":"/results/images/default_3840_75.avif","src":"/default.avif","width":3840,"quality":75,"extension":"avif"}
+{"output":"/results/images/default_10_75.svg","src":"/default.svg","width":10,"quality":75,"extension":"svg"}
+{"output":"/results/images/default_1920_75.svg","src":"/default.svg","width":1920,"quality":75,"extension":"svg"}
+{"output":"/results/images/default_3840_75.svg","src":"/default.svg","width":3840,"quality":75,"extension":"svg"}

__tests__/cli/image-optimize/manifest.json

@@ -15,6 +15,8 @@ const files = [
   'images/img_1920_75.webp',
   'images/img_2048_75.webp',
   'images/img_3840_75.webp',
+  'images/img_1920_75.svg',
+  'images/img_3840_75.svg',
   'og_1920_75.webp',
   'og_3840_75.webp',
 ]

__tests__/e2e/index.test.ts

@@ -18,6 +18,9 @@ const IndexPage = () => {
       {/* Static image */}
       <Image src="/images/img.png" width={1920} height={1280} sizes="(min-width: 768px) 720px, 85vw" />
 
+      {/* Invalid format image */}
+      <Image src="/images/img.svg" width={1920} height={1280} />
+
       {/* External image */}
       <Image src="https://next-export-optimize-images.vercel.app/og.png" width={1920} height={1280} />
 

__tests__/e2e/pages/index.jsx

@@ -2,14 +2,14 @@
   "name": "next-export-optimize-images",
   "version": "1.5.0",
   "description": "Optimize images at build time with Next.js.",
-  "homepage": "https://next-export-optimize-images.vercel.app",
   "keywords": [
     "next.js",
     "static",
     "export",
     "image",
     "optimization"
   ],
+  "homepage": "https://next-export-optimize-images.vercel.app",
   "bugs": {
     "url": "https://github.com/dc7290/next-export-optimize-images/issues"
   },
@@ -41,7 +41,8 @@
     "test:components:watch": "jest --watch __tests__/components",
     "pretest:e2e": "yarn pretest",
     "test:e2e": "jest __tests__/e2e",
-    "semantic-release": "SKIP_BY_SEMANTIC_RELEASE=true semantic-release"
+    "semantic-release": "SKIP_BY_SEMANTIC_RELEASE=true semantic-release",
+    "typecheck": "yarn tsc --noEmit"
   },
   "lint-staged": {
     "*.{ts,tsx}": [

__tests__/e2e/public/images/img.svg

@@ -14,7 +14,7 @@ type ExternalImagesDownloaderArgs = {
 const externalImagesDownloader = async ({ terse = false, manifest, destDir }: ExternalImagesDownloaderArgs) => {
   if (!terse) {
     // eslint-disable-next-line no-console
-    console.log('Download external images.')
+    console.log('\n- Download external images -')
   }
 
   const promises: Promise<void>[] = []

package.json

@@ -22,6 +22,7 @@ type GetOptimizeResultProps = {
   cacheMeasurement: () => void
   nonCacheMeasurement: () => void
   errorMeasurement: () => void
+  pushInvalidFormatAssets: (asset: string) => void
   cliProgressBarIncrement: () => void
   originalFilePath: string
   sharpOptions?: Config['sharpOptions']
@@ -36,6 +37,7 @@ export const getOptimizeResult: GetOptimizeResult = async ({
   cacheMeasurement,
   nonCacheMeasurement,
   errorMeasurement,
+  pushInvalidFormatAssets,
   cliProgressBarIncrement,
   originalFilePath,
   output,
@@ -102,13 +104,23 @@ export const getOptimizeResult: GetOptimizeResult = async ({
       cliProgressBarIncrement()
     } catch (error) {
       console.warn(error)
+      cliProgressBarIncrement()
       errorMeasurement()
     }
   } else {
-    console.warn(
-      `${originalFilePath}: Not an allowed format.\`${extension}\`\nGive \`unoptimize\`prop to /next/image to disable optimization.`
-    )
-    errorMeasurement()
+    try {
+      const filePath = path.join(destDir, output)
+      await fs.ensureFile(filePath)
+
+      await fs.copy(originalFilePath, filePath)
+
+      pushInvalidFormatAssets(originalFilePath)
+      cliProgressBarIncrement()
+    } catch (error) {
+      console.warn(error)
+      cliProgressBarIncrement()
+      errorMeasurement()
+    }
   }
 }
 
@@ -137,6 +149,8 @@ export const optimizeImages = async ({ manifestJsonPath, noCache, config, terse
   }
 
   if (!terse) {
+    // eslint-disable-next-line no-console
+    console.log(`\n- Image Optimization -`)
     cliProgressBarStart(manifest.length)
   }
 
@@ -152,10 +166,12 @@ export const optimizeImages = async ({ manifestJsonPath, noCache, config, terse
   let measuredCache = 0
   let measuredNonCache = 0
   let measuredError = 0
+  const invalidFormatAssets = new Set<string>([])
 
   const cacheMeasurement = () => (measuredCache += 1)
   const nonCacheMeasurement = () => (measuredNonCache += 1)
   const errorMeasurement = () => (measuredError += 1)
+  const pushInvalidFormatAssets = (asset: string) => invalidFormatAssets.add(asset)
 
   for (const item of manifest) {
     const originalFilePath = path.join(destDir, item.src)
@@ -169,6 +185,7 @@ export const optimizeImages = async ({ manifestJsonPath, noCache, config, terse
         cacheMeasurement,
         nonCacheMeasurement,
         errorMeasurement,
+        pushInvalidFormatAssets,
         cliProgressBarIncrement: terse ? () => undefined : cliProgressBarIncrement,
         originalFilePath,
         sharpOptions: config.sharpOptions ?? {},
@@ -185,11 +202,18 @@ export const optimizeImages = async ({ manifestJsonPath, noCache, config, terse
 
   if (!terse) {
     // eslint-disable-next-line no-console
-    console.log(
-      `Cache assets: ${measuredCache}, NonCache assets: ${measuredNonCache}, Error assets: ${measuredError}\n`,
-      '\x1b[35m\nSuccessful optimization!',
-      '\x1b[39m'
-    )
+    console.log(`Cache assets: ${measuredCache}, NonCache assets: ${measuredNonCache}, Error assets: ${measuredError}`)
+
+    if (invalidFormatAssets.size !== 0) {
+      // eslint-disable-next-line no-console
+      console.log(
+        `\nThe following images is in a non-optimized format and a simple copy was applied.\n`,
+        Array.from(invalidFormatAssets).join('\n')
+      )
+    }
+
+    // eslint-disable-next-line no-console
+    console.log('\x1b[35m\nSuccessful optimization!', '\x1b[39m')
   }
 }