[FIX] Merge conflict

README.md

@@ -84,6 +84,13 @@ svgLoader({
 })
 ```
 
+### Skip SVGO for a single file
+SVGO can be explicitly disabled for one file by adding the `?skipsvgo` suffix:
+```js
+import IconWithoutOptimizer from './my-icon.svg?skipsvgo'
+// <IconWithoutOptimizer />
+```
+
 ### Use with TypeScript
 If you use the loader in a Typescript project, you'll need to import your svg files with the `?component` param: `import MyIcon from './my-icon.svg?component'`.
 

cypress/integration/spec.js

@@ -45,6 +45,16 @@ describe('Vite SVG Loader', () => {
     cy.get('#raw').contains('<?xml version="1.0"?>')
   })
 
+  it('uses svgo', () => {
+    cy.get('#component svg')
+      .should('not.have.attr', 'id') // Should be stripped by svgo
+  })
+
+  it('supports ?skipsvgo param', () => {
+    cy.get('#skipsvgo svg')
+      .should('have.attr', 'id')
+  })
+
   it('ignores root files references', () => {
     cy.get('#root img')
       .should('exist')

examples/vue/src/App.vue

@@ -3,6 +3,7 @@ import { defineAsyncComponent } from 'vue'
 
 import HelloWorld from './components/HelloWorld.vue'
 import Test from './assets/test.svg'
+import TestSkipSvgo from './assets/test.svg?skipsvgo'
 import testUrl from './assets/test.svg?url'
 import testRaw from './assets/test.svg?raw'
 
@@ -23,6 +24,10 @@ const Async = defineAsyncComponent(() => import(`./assets/${name}.svg`))
     <Async />
   </div>
 
+  <div id="skipsvgo">
+    <TestSkipSvgo />
+  </div>
+
   <div id="url">
     {{ testUrl }}
   </div>

index.d.ts

@@ -1,12 +1,13 @@
+import { Plugin } from 'vite'
+import { OptimizeOptions } from 'svgo'
+import { FunctionalComponent, SVGAttributes } from 'vue'
+
 declare module 'vite-svg-loader' {
-  import { Plugin } from 'vite'
-  import { OptimizeOptions } from 'svgo'
   function svgLoader(options?: { svgoConfig?: OptimizeOptions, svgo?: boolean, defaultImport?: 'url' | 'raw' | 'component' }): Plugin
   export default svgLoader
 }
 
 declare module '*.svg?component' {
-  import { FunctionalComponent, SVGAttributes } from 'vue'
   const src: FunctionalComponent<SVGAttributes>
   export default src
 }
@@ -20,3 +21,8 @@ declare module '*.svg?raw' {
   const src: string
   export default src
 }
+
+declare module '*.svg?skipsvgo' {
+  const src: FunctionalComponent<SVGAttributes>
+  export default src
+}

index.js

@@ -5,7 +5,7 @@ const { optimize } = require('svgo')
 module.exports = function svgLoader (options = {}) {
   const { svgoConfig, svgo, defaultImport } = options
 
-  const svgRegex = /\.svg(\?(raw|component))?$/
+  const svgRegex = /\.svg(\?(raw|component|skipsvgo))?$/
 
   return {
     name: 'svg-loader',
@@ -29,14 +29,15 @@ module.exports = function svgLoader (options = {}) {
       try {
         svg = await fs.readFile(path, 'utf-8')
       } catch (ex) {
-        return // File couldn't be loaded, fallback to default loader
+        console.warn('\n', `${id} couldn't be loaded by vite-svg-loader, fallback to default loader`)
+        return
       }
 
       if (importType === 'raw') {
         return `export default ${JSON.stringify(svg)}`
       }
 
-      if (svgo !== false) {
+      if (svgo !== false && query !== 'skipsvgo') {
         svg = optimize(svg, {
           ...svgoConfig,
           path

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-svg-loader",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "Vite plugin to load SVG files as Vue components",
   "keywords": [
     "vite",