fix(nuxt): resolve auto-imports in layers (#3035)

Co-authored-by: Eduardo San Martin Morote <[email protected]>

Author: rijkvanzanten

package.json

@@ -76,7 +76,6 @@
     ]
   },
   "resolutions": {
-    "@nuxt/kit": "^3.9.0",
     "@nuxt/schema": "^3.9.0"
   },
   "pnpm": {

packages/nuxt/playground/layers/layer-domain/nuxt.config.ts

@@ -0,0 +1 @@
+export default defineNuxtConfig({})

packages/nuxt/playground/layers/layer-domain/stores/basic.ts

@@ -0,0 +1,5 @@
+export const useBasicStore = defineStore('layer-basic', () => {
+  const count = ref(0)
+
+  return { count }
+})

packages/nuxt/playground/pages/index.vue

@@ -3,8 +3,9 @@
 
 const counter = useCounter()
 
-useTestStore()
-useSomeStoreStore()
+useTestStore() // ~/domain/one/stores/testStore.ts
+useSomeStoreStore() // ~/stores/nested/some-stores.ts
+const layerStore = useBasicStore() // ~~/layers/layer-domain/stores/basic.ts
 
 // await useAsyncData('counter', () => counter.asyncIncrement().then(() => true))
 
@@ -17,5 +18,7 @@ if (import.meta.server) {
   <div>
     <p>Count: {{ counter.$state.count }}</p>
     <button @click="counter.increment()">+</button>
+
+    <p>Layer store: {{ layerStore.count }}</p>
   </div>
 </template>

packages/nuxt/src/module.ts

@@ -7,6 +7,7 @@ import {
   addImports,
   createResolver,
   addImportsDir,
+  getLayerDirectories,
 } from '@nuxt/kit'
 import type { NuxtModule } from '@nuxt/schema'
 import { fileURLToPath } from 'node:url'
@@ -73,8 +74,12 @@ const module: NuxtModule<ModuleOptions> = defineNuxtModule<ModuleOptions>({
     }
 
     if (options.storesDirs) {
+      const layers = getLayerDirectories(nuxt)
+
       for (const storeDir of options.storesDirs) {
-        addImportsDir(resolve(nuxt.options.rootDir, storeDir))
+        for (const layer of layers) {
+          addImportsDir(resolve(layer.app, storeDir))
+        }
       }
     }
   },

packages/nuxt/test/nuxt.spec.ts

@@ -33,4 +33,8 @@ describe('Nuxt', async () => {
     expect(html).not.toContain('I should not be serialized or hydrated')
     expect(html).toContain('skipHydrate-wrapped state is correct')
   })
+
+  it('can auto import from layers', async () => {
+    expect(await $fetch('/')).toContain('Layer store: 0')
+  })
 })