Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(schema): handle backwards compat for `dir.app`

This commit is contained in:
Daniel Roe 2024-06-19 14:32:55 +01:00
parent 6dcbf7e3f7
commit a0d5145095
No known key found for this signature in database
GPG Key ID: 3714AB03996F442B
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/schema/src/config/common.ts
View File

@ -301,7 +301,8 @@ export default defineUntypedSchema({
$resolve: async (val: string | undefined, get) => {
const isV4 = (await get('future') as Record<string, unknown>).compatibilityVersion === 4
if (isV4) {
return resolve(await get('srcDir') as string, val || '.')
const [srcDir, rootDir] = await Promise.all([get('srcDir') as Promise<string>, get('rootDir') as Promise<string>])
return resolve(await get('srcDir') as string, val || (srcDir === rootDir ? 'app' : '.'))
}
return val || 'app'
},