From 4f43735dad4555a881817e62308df562324bb1cb Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 21 Sep 2022 10:32:23 +0100
Subject: [PATCH] fix(nuxt): allow auto-import component with same filename

---
 packages/nuxt/src/components/loader.ts                |  2 +-
 .../fixtures/basic/components/Nested/SugarCounter.vue | 11 +++++++++++
 test/fixtures/basic/pages/index.vue                   |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/basic/components/Nested/SugarCounter.vue

diff --git a/packages/nuxt/src/components/loader.ts b/packages/nuxt/src/components/loader.ts
index ee0a86b5bf0..517db352acc 100644
--- a/packages/nuxt/src/components/loader.ts
+++ b/packages/nuxt/src/components/loader.ts
@@ -65,7 +65,7 @@ export const loaderPlugin = createUnplugin((options: LoaderOptions) => {
       const s = new MagicString(code)
 
       // replace `_resolveComponent("...")` to direct import
-      s.replace(/(?<=[ (])_?resolveComponent\(\s*["'](lazy-|Lazy)?([^'"]*?)["'][\s,]*\)/g, (full, lazy, name) => {
+      s.replace(/(?<=[ (])_?resolveComponent\(\s*["'](lazy-|Lazy)?([^'"]*?)["'][\s,]*[^)]*\)/g, (full, lazy, name) => {
         const component = findComponent(components, name, options.mode)
         if (component) {
           let identifier = map.get(component) || `__nuxt_component_${num++}`
diff --git a/test/fixtures/basic/components/Nested/SugarCounter.vue b/test/fixtures/basic/components/Nested/SugarCounter.vue
new file mode 100644
index 00000000000..224dca4e5e2
--- /dev/null
+++ b/test/fixtures/basic/components/Nested/SugarCounter.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps({
+  count: Number
+})
+</script>
+
+<template>
+  <div>
+    <SugarCounter :count="count" />
+  </div>
+</template>
diff --git a/test/fixtures/basic/pages/index.vue b/test/fixtures/basic/pages/index.vue
index 69856bb302b..74c7e04fb33 100644
--- a/test/fixtures/basic/pages/index.vue
+++ b/test/fixtures/basic/pages/index.vue
@@ -12,7 +12,7 @@
     <NuxtLink to="/">
       Link
     </NuxtLink>
-    <SugarCounter :count="12" />
+    <NestedSugarCounter :count="12" />
     <CustomComponent />
     <component :is="`test${'-'.toString()}global`" />
     <component :is="`with${'-'.toString()}suffix`" />