fix: process URLs with no query string (#403)

JonasKruckenberg · Oct 9, 2022 · 07df0fa · 07df0fa
1 parent 1ead295
commit 07df0fa
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 7 deletions.
diff --git a/.changeset/eight-timers-destroy.md b/.changeset/eight-timers-destroy.md
@@ -0,0 +1,6 @@
+---
+'rollup-plugin-imagetools': patch
+'vite-imagetools': patch
+---
+
+fix: process URLs with no query string
diff --git a/packages/rollup/README.md b/packages/rollup/README.md
@@ -100,7 +100,7 @@ ___
 
 Which paths to include when processing images.
 
-**`default`** '**\/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}?*'
+**`default`** `['**\/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}', '**\/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}?*']`
 
 ___
 

diff --git a/packages/rollup/src/__tests__/main.test.ts b/packages/rollup/src/__tests__/main.test.ts
@@ -236,7 +236,7 @@ describe('rollup-plugin-imagetools', () => {
           input: join(__dirname, '__fixtures__/index.js'),
           plugins: [
             testEntry(`
-                          import Image from "./with-metadata.png?metadata"
+                          import Image from "./with-metadata.png"
                           export default Image
                       `),
             imagetools({
@@ -368,6 +368,15 @@ describe('rollup-plugin-imagetools', () => {
     await expect(p).rejects.toBeDefined()
   })
 
+  test('not an image', async () => {
+    const p = rollup({
+      input: join(__dirname, '__fixtures__/index.js'),
+      plugins: [testEntry(`import Image from "./pexels-allec-gomes-5195763.xml"`), imagetools()]
+    })
+
+    await expect(p).rejects.toBeDefined()
+  })
+
   test('no directives', async () => {
     const p = rollup({
       input: join(__dirname, '__fixtures__/index.js'),

diff --git a/packages/rollup/src/index.ts b/packages/rollup/src/index.ts
@@ -16,7 +16,10 @@ import MagicString from 'magic-string'
 import { basename, extname, resolve, dirname } from 'path'
 
 const defaultOptions: RollupPluginOptions = {
-  include: '**/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}?*',
+  include: [
+    '**/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}',
+    '**/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}?*'
+  ],
   exclude: '',
   silent: false,
   removeMetadata: true
@@ -54,6 +57,8 @@ export function imagetools(userOptions: Partial<RollupPluginOptions> = {}): Plug
         directives = new URLSearchParams([...pluginOptions.defaultDirectives, ...srcURL.searchParams])
       }
 
+      if (!directives.toString()) return null
+
       const parameters = extractEntries(directives)
       const imageConfigs =
         pluginOptions.resolveConfigs?.(parameters, outputFormats) ?? resolveConfigs(parameters, outputFormats)

diff --git a/packages/vite/README.md b/packages/vite/README.md
@@ -93,7 +93,7 @@ ___
 What paths to exclude when processing images.
 This defaults to the public dir to mirror vites behavior.
 
-**`default`** 'public\/**\/*'
+**`default`** `'public\/**\/*'`
 
 ___
 
@@ -104,7 +104,7 @@ ___
 
 Which paths to include when processing images.
 
-**`default`** '**\/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}?*'
+**`default`** `['**\/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}', '**\/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}?*']`
 
 ___
 

diff --git a/packages/vite/src/__tests__/main.test.ts b/packages/vite/src/__tests__/main.test.ts
@@ -294,7 +294,7 @@ describe('vite-imagetools', () => {
           build: { write: false },
           plugins: [
             testEntry(`
-                            import Image from "./with-metadata.png?metadata"
+                            import Image from "./with-metadata.png"
                             window.__IMAGE__ = Image
                         `),
             imagetools({

diff --git a/packages/vite/src/index.ts b/packages/vite/src/index.ts
@@ -18,7 +18,10 @@ import MagicString from 'magic-string'
 import { VitePluginOptions } from './types'
 
 const defaultOptions: VitePluginOptions = {
-  include: '**/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}?*',
+  include: [
+    '**/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}',
+    '**/*.{heic,heif,avif,jpeg,jpg,png,tiff,webp,gif}?*'
+  ],
   exclude: 'public/**/*',
   silent: false,
   removeMetadata: true
@@ -58,6 +61,8 @@ export function imagetools(userOptions: Partial<VitePluginOptions> = {}): Plugin
         directives = new URLSearchParams([...pluginOptions.defaultDirectives, ...srcURL.searchParams])
       }
 
+      if (!directives.toString()) return null
+
       const parameters = extractEntries(directives)
       const imageConfigs =
         pluginOptions.resolveConfigs?.(parameters, outputFormats) ?? resolveConfigs(parameters, outputFormats)