Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-16 21:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(kit): refactor some configs with defu (#1459)

Browse Source
This commit is contained in:
Levi (Nguyễn Lương Huy) 2021-10-26 16:47:30 +07:00 committed by GitHub
parent d2cc9e4bd0
commit 3761b064d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/kit/src/config/schema/_app.ts
View File

@ -247,18 +247,15 @@ export default {
*/ */
loadingIndicator: { loadingIndicator: {
$resolve: (val, get) => { $resolve: (val, get) => {
if (typeof val === 'string') { val = typeof val === 'string' ? { name: val } : val
val = { name: val } return defu(val, {
}
return {
name: 'default', name: 'default',
color: get('loading.color') || '#D3D3D3', color: get('loading.color') || '#D3D3D3',
color2: '#F5F5F5', color2: '#F5F5F5',
background: (get('manifest') && get('manifest.theme_color')) || 'white', background: (get('manifest') && get('manifest.theme_color')) || 'white',
dev: get('dev'), dev: get('dev'),
loading: get('messages.loading'), loading: get('messages.loading')
...val })
}
} }
}, },
@ -272,14 +269,18 @@ export default {
* @see [vue@3 documentation](https://v3.vuejs.org/guide/transitions-enterleave.html) * @see [vue@3 documentation](https://v3.vuejs.org/guide/transitions-enterleave.html)
* @version 2 * @version 2
*/ */
pageTransition: { pageTransition: {
$resolve: val => typeof val === 'string' ? { name: val } : val, $resolve: (val, get) => {
name: 'page', val = typeof val === 'string' ? { name: val } : val
mode: 'out-in', return defu(val, {
appear: { $resolve: (val, get) => (get('render.ssr') === false) ? true : Boolean(val) }, name: 'page',
appearClass: 'appear', mode: 'out-in',
appearActiveClass: 'appear-active', appear: get('render.ssr') === false || Boolean(val),
appearToClass: 'appear-to' appearClass: 'appear',
appearActiveClass: 'appear-active',
appearToClass: 'appear-to'
})
}
}, },
/** /**
@ -293,9 +294,13 @@ export default {
* @version 2 * @version 2
*/ */
layoutTransition: { layoutTransition: {
$resolve: val => typeof val === 'string' ? { name: val } : val, $resolve: val => {
name: 'layout', val = typeof val === 'string' ? { name: val } : val
mode: 'out-in' return defu(val, {
name: 'layout',
mode: 'out-in'
})
}
}, },
/** /**