fix(optimizer): fix ?raw import and import with queries in pre-bundling

fix #1759
vitejs · Jan 28, 2021 · 2f1efa3 · 2f1efa3
1 parent 6fe72f0
commit 2f1efa3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/packages/playground/assets/__tests__/assets.spec.ts b/packages/playground/assets/__tests__/assets.spec.ts
@@ -117,3 +117,7 @@ describe('svg fragments', () => {
     expect(await img.getAttribute('src')).toMatch(/svg#icon-heart-view$/)
   })
 })
+
+test('?raw import', async () => {
+  expect(await page.textContent('.raw')).toMatch('SVG')
+})
diff --git a/packages/playground/assets/index.html b/packages/playground/assets/index.html
@@ -78,6 +78,9 @@ <h2>SVG Fragments via JS Import</h2>
   <img class="svg-frag-import" alt="" />
 </div>
 
+<h2>?raw import</h2>
+<code class="raw"></code>
+
 <script type="module">
   import './css/fonts.css'
   import './css/css-url.css'
@@ -98,6 +101,9 @@ <h2>SVG Fragments via JS Import</h2>
   text('.svg-frag-import-path', svgFrag)
   document.querySelector('.svg-frag-import').src = svgFrag + '#icon-heart-view'
 
+  import rawSvg from './nested/fragment.svg?raw'
+  text('.raw', rawSvg)
+
   function text(el, text) {
     document.querySelector(el).textContent = text
   }

diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
@@ -10,7 +10,8 @@ import {
   isDataUrl,
   isExternalUrl,
   normalizePath,
-  isObject
+  isObject,
+  cleanUrl
 } from '../utils'
 import { browserExternalId } from '../plugins/resolve'
 import {
@@ -201,6 +202,14 @@ function esbuildScanPlugin(
         ({ path }) => ({ path, external: true })
       )
 
+      // known vite query types: ?worker, ?raw
+      build.onResolve(
+        {
+          filter: /\?(worker|raw)\b/
+        },
+        ({ path }) => ({ path, external: true })
+      )
+
       // bare imports: record and externalize
       build.onResolve(
         {
@@ -259,14 +268,11 @@ function esbuildScanPlugin(
           filter: /.*/
         },
         async ({ path: id, importer }) => {
-          if (id.includes(`?worker`)) {
-            return { path: id, external: true }
-          }
           // use vite resolver to support urls and omitted extensions
           const resolved = await resolve(id, importer)
           if (resolved && resolved !== id) {
             return {
-              path: path.resolve(resolved)
+              path: path.resolve(cleanUrl(resolved))
             }
           } else {
             // resolve failed... probably usupported type