chore: use injectQuery

vitejs · Apr 30, 2023 · 354c779 · 354c779
1 parent bcf7899
commit 354c779
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/packages/vite/src/node/plugins/assetImportMetaUrl.ts b/packages/vite/src/node/plugins/assetImportMetaUrl.ts
@@ -1,11 +1,11 @@
 import path from 'node:path'
 import MagicString from 'magic-string'
 import { stripLiteral } from 'strip-literal'
-import { getQuery } from 'ufo'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
 import type { ResolveFn } from '../'
 import {
+  injectQuery,
   isParentDirectory,
   normalizePath,
   slash,
@@ -59,7 +59,7 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
             let [pureUrl, queryString = ''] = rawUrl.split('?')
             if (queryString) {
               pureUrl += '`'
-              queryString = '?' + queryString.replace(/`$/, '')
+              queryString = '?' + queryString.slice(0, -1)
             }
             const ast = this.parse(pureUrl)
             const templateLiteral = (ast as any).body[0].expression
@@ -71,15 +71,11 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
                 continue
               }
 
-              const query = getQuery(queryString)
               const globOptions = {
                 eager: true,
                 import: 'default',
-                query: {
-                  // A hack to allow 'as' & 'query' exist at the same time
-                  url: '',
-                  ...query,
-                },
+                // A hack to allow 'as' & 'query' exist at the same time
+                query: injectQuery(queryString, 'url'),
               }
               // Note: native import.meta.url is not supported in the baseline
               // target so we use the global location here. It can be