fix(module): invalid rootDir of layer sources (#3308)

Author: farnabaz

src/module.ts

@@ -272,7 +272,9 @@ async function processCollectionItems(nuxt: Nuxt, collections: ResolvedCollectio
 
     for await (const source of collection.source) {
       if (source.prepare) {
-        await source.prepare({ rootDir: nuxt.options.rootDir })
+        // @ts-expect-error - `__rootDir` is a private property to store the layer's cwd
+        const rootDir = collection.__rootDir || nuxt.options.rootDir
+        await source.prepare({ rootDir })
       }
 
       const { fixed } = parseSourceBase(source)

src/utils/config.ts

@@ -20,7 +20,7 @@ const defaultConfig: NuxtContentConfig = {
 
 export const defineContentConfig = createDefineConfig<NuxtContentConfig>()
 
-export async function loadContentConfig(nuxt: Nuxt, options: { defaultFallback?: boolean } = {}) {
+export async function loadContentConfig(nuxt: Nuxt) {
   const loader: typeof watchConfig = nuxt.options.dev
     ? opts => watchConfig({
       ...opts,
@@ -37,7 +37,7 @@ export async function loadContentConfig(nuxt: Nuxt, options: { defaultFallback?:
   const layers = [...nuxt.options._layers].reverse()
   const contentConfigs = await Promise.all(
     layers.map(
-      layer => loader<NuxtContentConfig>({ name: 'content', cwd: layer.config.rootDir, defaultConfig: options.defaultFallback ? defaultConfig : undefined }),
+      layer => loader<NuxtContentConfig>({ name: 'content', cwd: layer.config.rootDir, defaultConfig: { collections: {} } }),
     ),
   )
 
@@ -48,9 +48,21 @@ export async function loadContentConfig(nuxt: Nuxt, options: { defaultFallback?:
     nuxt.hook('close', () => Promise.all(contentConfigs.map(c => c.unwatch())).then(() => {}))
   }
 
-  const collectionsConfig = contentConfigs.reduce((acc, curr) => ({ ...acc, ...curr.config?.collections }), {} as Record<string, DefinedCollection>)
-  const hasNoCollections = Object.keys(collectionsConfig || {}).length === 0
+  const collectionsConfig = contentConfigs.reduce((acc, curr) => {
+    const layerCollections = curr.config?.collections || {}
+    const cwd = curr.cwd!
+
+    Object.entries(layerCollections).forEach(([name, collection]) => {
+      // @ts-expect-error - `__rootDir` is a private property to store the layer's cwd
+      collection.__rootDir = cwd
+
+      acc[name] = collection
+    })
+
+    return acc
+  }, {} as Record<string, DefinedCollection>)
 
+  const hasNoCollections = Object.keys(collectionsConfig || {}).length === 0
   if (hasNoCollections) {
     logger.warn('No content configuration found, falling back to default collection. In order to have full control over your collections, create the config file in project root. See: https://content.nuxt.com/docs/getting-started/installation')
   }

test/basic.test.ts

@@ -25,12 +25,11 @@ describe('basic', async () => {
     rootDir: fileURLToPath(new URL('./fixtures/basic', import.meta.url)),
     dev: true,
   })
-  console.log('setup')
 
   describe('`content.config.ts`', async () => {
     test('Default collection is defined', async () => {
       const rootDir = fileURLToPath(new URL('./fixtures/basic', import.meta.url))
-      const config = await loadContentConfig({ options: { _layers: [{ config: { rootDir } }] } } as Nuxt, { defaultFallback: true })
+      const config = await loadContentConfig({ options: { _layers: [{ config: { rootDir } }] } } as Nuxt)
 
       // Pages collection + info collection
       expect(config.collections.length).toBe(2)

test/empty.test.ts

@@ -35,7 +35,7 @@ describe('empty', async () => {
     })
     test('Default collection is defined', async () => {
       const rootDir = fileURLToPath(new URL('./fixtures/empty', import.meta.url))
-      const config = await loadContentConfig({ options: { _layers: [{ config: { rootDir } }] } } as Nuxt, { defaultFallback: true })
+      const config = await loadContentConfig({ options: { _layers: [{ config: { rootDir } }] } } as Nuxt)
 
       // Pages collection + info collection
       expect(config.collections.length).toBe(2)