Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 05:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(schema): don't use app/ as srcDir if it doesn't exist (#28176)

Browse Source
This commit is contained in:
Daniel Roe 2024-07-16 15:12:31 +01:00 committed by GitHub
parent eac0734a3b
commit 874829434d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nuxt/test/app.test.ts
View File

@ -19,7 +19,7 @@ describe('resolveApp', () => {
{
"components": [],
"configs": [],
"dir": "<rootDir>/app",
"dir": "<rootDir>",
"errorComponent": "<repoRoot>/packages/nuxt/src/app/components/nuxt-error-page.vue",
"extensions": [
".js",

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

@ -118,15 +118,17 @@ export default defineUntypedSchema({
}
const srcDir = resolve(rootDir, 'app')
if (!existsSync(srcDir)) {
return rootDir
}
const srcDirFiles = new Set<string>()
if (existsSync(srcDir)) {
const files = await readdir(srcDir).catch(() => [])
for (const file of files) {
if (file !== 'spa-loading-template.html' && !file.startsWith('router.options')) {
srcDirFiles.add(file)
}
}
}
if (srcDirFiles.size === 0) {
for (const file of ['app.vue', 'App.vue']) {
if (existsSync(resolve(rootDir, file))) {

6
packages/schema/test/folder-structure.spec.ts
View File

@ -1,10 +1,14 @@
import { describe, expect, it } from 'vitest'
import { describe, expect, it, vi } from 'vitest'
import { applyDefaults } from 'untyped'
import { normalize } from 'pathe'
import { NuxtConfigSchema } from '../src'
import type { NuxtOptions } from '../src'
vi.mock('node:fs', () => ({
existsSync: (id: string) => id.endsWith('app'),
}))
describe('nuxt folder structure', () => {
it('should resolve directories for v3 setup correctly', async () => {
const result = await applyDefaults(NuxtConfigSchema, {})