Merge pull request #46 from nxmad/main

Skip public dir imports
jpkleemans · Apr 24, 2022 · 61a7a62 · 61a7a62
2 parents 1a2b719 + df456c1
commit 61a7a62
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/cypress/integration/spec.js b/cypress/integration/spec.js
@@ -44,4 +44,12 @@ describe('Vite SVG Loader', () => {
   it('supports ?raw param', () => {
     cy.get('#raw').contains('<?xml version="1.0"?>')
   })
+
+  it('ignores root files references', () => {
+    cy.get('#root img')
+      .should('exist')
+      .and(($img) => {
+        expect($img[0].width).to.equal(355)
+      })
+  })
 })
diff --git a/examples/vue/public/root.svg b/examples/vue/public/root.svg
diff --git a/examples/vue/src/App-url.vue b/examples/vue/src/App-url.vue
@@ -35,5 +35,9 @@ const Async = defineAsyncComponent(() => import(`./assets/circle.svg?component`)
     {{ testRaw }}
   </div>
 
+  <div id="root">
+    <img src="/root.svg" />
+  </div>
+
   <HelloWorld msg="Hello Vue 3 + Vite" />
 </template>
diff --git a/examples/vue/src/App.vue b/examples/vue/src/App.vue
@@ -31,5 +31,9 @@ const Async = defineAsyncComponent(() => import(`./assets/${name}.svg`))
     {{ testRaw }}
   </div>
 
+  <div id="root">
+    <img src="/root.svg" />
+  </div>
+
   <HelloWorld msg="Hello Vue 3 + Vite" />
 </template>
diff --git a/index.js b/index.js
@@ -5,14 +5,21 @@ const { optimize: optimizeSvg } = require('svgo')
 module.exports = function svgLoader (options = {}) {
   const { svgoConfig, svgo, defaultImport } = options
 
+  let viteConfig = {}
   const svgRegex = /\.svg(\?(raw|component))?$/
 
   return {
     name: 'svg-loader',
     enforce: 'pre',
 
+    configResolved (config) {
+      viteConfig = config
+    },
+
     async load (id) {
-      if (!id.match(svgRegex)) {
+      const isRootRef = viteConfig.command === 'build' && !id.startsWith(viteConfig.root)
+
+      if (!id.match(svgRegex) || isRootRef) {
         return
       }