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

fix(schema): resolve user-provided `serverDir` relative to root (#28700)

This commit is contained in:
Julien Huang 2024-08-26 15:14:24 +02:00 committed by GitHub
parent 49121e768d
commit cfd9bf61f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
import { existsSync } from 'node:fs' import { existsSync } from 'node:fs'
import { readdir } from 'node:fs/promises' import { readdir } from 'node:fs/promises'
import { defineUntypedSchema } from 'untyped' import { defineUntypedSchema } from 'untyped'
import { basename, relative, resolve } from 'pathe' import { basename, join, relative, resolve } from 'pathe'
import { isDebug, isDevelopment, isTest } from 'std-env' import { isDebug, isDevelopment, isTest } from 'std-env'
import { defu } from 'defu' import { defu } from 'defu'
import { findWorkspaceDir } from 'pkg-types' import { findWorkspaceDir } from 'pkg-types'
@ -156,9 +156,12 @@ export default defineUntypedSchema({
*/ */
serverDir: { serverDir: {
$resolve: async (val: string | undefined, get): Promise<string> => { $resolve: async (val: string | undefined, get): Promise<string> => {
const isV4 = ((await get('future') as Record<string, unknown>).compatibilityVersion === 4) if (val) {
const rootDir = await get('rootDir') as string
return resolve(isV4 ? await get('rootDir') as string : await get('srcDir') as string, val ?? 'server') return resolve(rootDir, val)
}
const isV4 = (await get('future') as Record<string, unknown>).compatibilityVersion === 4
return join(isV4 ? await get('rootDir') as string : await get('srcDir') as string, 'server')
}, },
}, },