fix: decode URI encoded paths before resolving

Closes #84
JonasKruckenberg · May 3, 2021 · 36636e5 · 36636e5
1 parent 71d0ff3
commit 36636e5
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 2 deletions.
diff --git a/packages/rollup/src/__tests__/__fixtures__/with space.png b/packages/rollup/src/__tests__/__fixtures__/with space.png
diff --git a/...ain-test-ts-rollup-plugin-imagetools-import-with-space-in-identifier-1-snap.png b/...ain-test-ts-rollup-plugin-imagetools-import-with-space-in-identifier-1-snap.png
diff --git a/packages/rollup/src/__tests__/main.test.ts b/packages/rollup/src/__tests__/main.test.ts
@@ -230,6 +230,21 @@ describe('rollup-plugin-imagetools', () => {
         const files = await getFiles(bundle, '**.png') as OutputAsset[]
         expect(files[0].source).toMatchImageSnapshot()
     })
+
+    test('import with space in identifier', async () => {
+        const bundle = await rollup({
+            plugins: [
+                testEntry(`
+                    import Image from "./with space.png?w=300"
+                    export default Image
+                `),
+                imagetools()
+            ]
+        })
+
+        const files = await getFiles(bundle, '**.png') as OutputAsset[]
+        expect(files[0].source).toMatchImageSnapshot()
+    })
 
     test('non existent file', async () => {
         const p = rollup({

diff --git a/packages/rollup/src/index.ts b/packages/rollup/src/index.ts
@@ -40,7 +40,7 @@ export function imagetools(userOptions: Partial<PluginOptions> = {}): Plugin {
             const parameters = parseURL(src)
             const imageConfigs = resolveConfigs(parameters)
 
-            const img = loadImage(src.pathname)
+            const img = loadImage(decodeURIComponent(src.pathname))
 
             const outputMetadatas = []
 

diff --git a/packages/vite/src/__tests__/__fixtures__/with space.png b/packages/vite/src/__tests__/__fixtures__/with space.png
diff --git a/...shots__/main-test-ts-vite-imagetools-import-with-space-in-identifier-1-snap.png b/...shots__/main-test-ts-vite-imagetools-import-with-space-in-identifier-1-snap.png
diff --git a/packages/vite/src/__tests__/main.test.ts b/packages/vite/src/__tests__/main.test.ts
@@ -289,6 +289,23 @@ describe('vite-imagetools', () => {
         expect(files[0].source).toMatchImageSnapshot()
     })
 
+    test('import with space in identifier', async () => {
+        const bundle = await build({
+            logLevel: 'warn',
+            build: { write: false },
+            plugins: [
+                testEntry(`
+                    import Image from "./with space.png?w=300"
+                    export default Image
+                `),
+                imagetools()
+            ]
+        }) as RollupOutput | RollupOutput[]
+
+        const files = getFiles(bundle, '**.png') as OutputAsset[]
+        expect(files[0].source).toMatchImageSnapshot()
+    })
+
     test('non existent file', async () => {
         const p = build({
             logLevel: 'warn',

diff --git a/packages/vite/src/index.ts b/packages/vite/src/index.ts
@@ -42,7 +42,7 @@ export function imagetools(userOptions: Partial<PluginOptions> = {}): Plugin {
             const parameters = parseURL(src)
             const imageConfigs = resolveConfigs(parameters)
 
-            const img = loadImage(src.pathname)
+            const img = loadImage(decodeURIComponent(src.pathname))
 
             const outputMetadatas = []