fix: resolve id when icon name includes . in icon props (#324)

unplugin · Nov 13, 2023 · 29fcd04 · 29fcd04
1 parent 86b8200
commit 29fcd04
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/examples/vite-svelte/src/App.svelte b/examples/vite-svelte/src/App.svelte
@@ -3,7 +3,7 @@
   import MdiStore24Hour from 'virtual:icons/mdi/store-24-hour'
   import MdiAlarmOff from 'virtual:icons/mdi/alarm-off'
   import IconParkAbnormal from 'virtual:icons/icon-park/abnormal'
-  import RawMdiAlarmOff from 'virtual:icons/mdi/alarm-off?raw&width=4em&height=4em'
+  import RawMdiAlarmOff from 'virtual:icons/mdi/alarm-off?raw&width=4.25rem&height=4.25rem'
   import RawMdiAlarmOff2 from 'virtual:icons/mdi/alarm-off?raw&width=1em&height=1em'
 </script>
 

diff --git a/examples/vite-vue3/App.vue b/examples/vite-vue3/App.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import MdiStore24Hour from 'virtual:icons/mdi/store-24-hour'
-import MdiAlarmOff from 'virtual:icons/mdi/alarm-off?width=4em&height=4em'
+import MdiAlarmOff from 'virtual:icons/mdi/alarm-off?width=4.25rem&height=4.25rem'
 import MdiAlarmOff2 from 'virtual:icons/mdi/alarm-off?width=1em&height=1em'
-import RawMdiAlarmOff from 'virtual:icons/mdi/alarm-off?raw&width=4em&height=4em'
+import RawMdiAlarmOff from 'virtual:icons/mdi/alarm-off?raw&width=4.25rem&height=4.25rem'
 import RawMdiAlarmOff2 from 'virtual:icons/mdi/alarm-off?raw&width=1em&height=1em'
 import RawMdiAlarmOff3 from 'virtual:icons/mdi/alarm-off?raw&width=unset&height=unset'
 </script>
@@ -65,7 +65,7 @@ import RawMdiAlarmOff3 from 'virtual:icons/mdi/alarm-off?raw&width=unset&height=
       <span v-html="RawMdiAlarmOff" />
       <div>
         <code style="opacity: 0.5">import RawMdiAlarmOff from
-          'virtual:icons/mdi/alarm-off?raw&width=4em&height=4em'</code>
+          'virtual:icons/mdi/alarm-off?raw&width=4.25rem&height=4.25rem'</code>
         <pre>{{ RawMdiAlarmOff }}</pre>
       </div>
       <span v-html="RawMdiAlarmOff2" />

diff --git a/src/index.ts b/src/index.ts
@@ -11,9 +11,12 @@ const unplugin = createUnplugin<Options | undefined>((options = {}) => {
     enforce: 'pre',
     resolveId(id) {
       if (isIconPath(id)) {
-        const res = normalizeIconPath(id)
+        const normalizedId = normalizeIconPath(id)
+        // fix issue 322
+        const queryIndex = normalizedId.indexOf('?')
+        const res = `${(queryIndex > -1 ? normalizedId.slice(0, queryIndex) : normalizedId)
           .replace(/\.\w+$/i, '')
-          .replace(/^\//, '')
+          .replace(/^\//, '')}${queryIndex > -1 ? `?${normalizedId.slice(queryIndex)}` : ''}`
         const resolved = resolveIconsPath(res)
         // accept raw compiler from query params
         const compiler = resolved?.query?.raw === 'true' ? 'raw' : options.compiler