fix: merge custom queries rather than appending (vuejs#1911)

freddy38510 · Nov 17, 2022 · dccffeb · dccffeb
1 parent 0debd36
commit dccffeb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -75,11 +75,12 @@ export default function loader(
     sourceMap,
     rootContext,
     resourcePath,
-    resourceQuery = '',
+    resourceQuery: _resourceQuery = '',
   } = loaderContext
 
-  const rawQuery = resourceQuery.slice(1)
+  const rawQuery = _resourceQuery.slice(1)
   const incomingQuery = qs.parse(rawQuery)
+  const resourceQuery = rawQuery ? `&${rawQuery}` : ''
   const options = (loaderUtils.getOptions(loaderContext) ||
     {}) as VueLoaderOptions
 

diff --git a/test/fixtures/custom-query.vue b/test/fixtures/custom-query.vue
@@ -0,0 +1,5 @@
+<script lang="ts">
+import BasicComponent from './basic.vue?custom=true'
+
+export default BasicComponent
+</script>
diff --git a/test/script.spec.ts b/test/script.spec.ts
@@ -11,3 +11,11 @@ test('named exports', async () => {
 test('experimental <script setup>', async () => {
   await mockBundleAndRun({ entry: 'ScriptSetup.vue' })
 })
+
+test('should handle custom resource query', async () => {
+  const { exports } = await mockBundleAndRun({
+    entry: 'custom-query.vue',
+  })
+
+  expect(exports.default.data().msg).toBe('Hello from Component A!')
+})