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

feat(nuxt): make app.rootId optional (#22528)

Browse Source
This commit is contained in:
Damian Głowala 2023-08-12 09:19:36 +02:00 committed by GitHub
parent e93195a317
commit b5b2b47feb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/nuxt/src/app/entry.ts
View File

@ -16,7 +16,7 @@ import plugins from '#build/plugins'
// @ts-expect-error virtual file // @ts-expect-error virtual file
import RootComponent from '#build/root-component.mjs' import RootComponent from '#build/root-component.mjs'
// @ts-expect-error virtual file // @ts-expect-error virtual file
import { appRootId } from '#build/nuxt.config.mjs' import { vueAppRootContainer } from '#build/nuxt.config.mjs'
if (!globalThis.$fetch) { if (!globalThis.$fetch) {
globalThis.$fetch = $fetch.create({ globalThis.$fetch = $fetch.create({
@ -75,7 +75,7 @@ if (import.meta.client) {
try { try {
await nuxt.hooks.callHook('app:created', vueApp) await nuxt.hooks.callHook('app:created', vueApp)
await nuxt.hooks.callHook('app:beforeMount', vueApp) await nuxt.hooks.callHook('app:beforeMount', vueApp)
vueApp.mount('#' + appRootId) vueApp.mount(vueAppRootContainer)
await nuxt.hooks.callHook('app:mounted', vueApp) await nuxt.hooks.callHook('app:mounted', vueApp)
await nextTick() await nextTick()
} catch (err) { } catch (err) {

6
packages/nuxt/src/core/runtime/nitro/renderer.ts
View File

@ -117,7 +117,7 @@ const getSSRRenderer = lazyCachedFunction(async () => {
if (import.meta.dev && process.env.NUXT_VITE_NODE_OPTIONS) { if (import.meta.dev && process.env.NUXT_VITE_NODE_OPTIONS) {
renderer.rendererContext.updateManifest(await getClientManifest()) renderer.rendererContext.updateManifest(await getClientManifest())
} }
return `<${appRootTag} id="${appRootId}">${html}</${appRootTag}>` return `<${appRootTag}${appRootId ? ` id="${appRootId}"` : ''}>${html}</${appRootTag}>`
} }
return renderer return renderer
@ -132,7 +132,7 @@ const getSPARenderer = lazyCachedFunction(async () => {
const options = { const options = {
manifest, manifest,
renderToString: () => `<${appRootTag} id="${appRootId}">${spaTemplate}</${appRootTag}>`, renderToString: () => `<${appRootTag}${appRootId ? ` id="${appRootId}"` : ''}>${spaTemplate}</${appRootTag}>`,
buildAssetsURL buildAssetsURL
} }
// Create SPA renderer and cache the result for all requests // Create SPA renderer and cache the result for all requests
@ -191,7 +191,7 @@ async function getIslandContext (event: H3Event): Promise<NuxtIslandContext> {
} }
const PAYLOAD_URL_RE = process.env.NUXT_JSON_PAYLOADS ? /\/_payload(\.[a-zA-Z0-9]+)?.json(\?.*)?$/ : /\/_payload(\.[a-zA-Z0-9]+)?.js(\?.*)?$/ const PAYLOAD_URL_RE = process.env.NUXT_JSON_PAYLOADS ? /\/_payload(\.[a-zA-Z0-9]+)?.json(\?.*)?$/ : /\/_payload(\.[a-zA-Z0-9]+)?.js(\?.*)?$/
const ROOT_NODE_REGEX = new RegExp(`^<${appRootTag} id="${appRootId}">([\\s\\S]*)</${appRootTag}>$`) const ROOT_NODE_REGEX = new RegExp(`^<${appRootTag}${appRootId ? ` id="${appRootId}"` : ''}>([\\s\\S]*)</${appRootTag}>$`)
const PRERENDER_NO_SSR_ROUTES = new Set(['/index.html', '/200.html', '/404.html']) const PRERENDER_NO_SSR_ROUTES = new Set(['/index.html', '/200.html', '/404.html'])

3
packages/nuxt/src/core/templates.ts
View File

@ -339,7 +339,8 @@ export const nuxtConfigTemplate = {
`export const componentIslands = ${!!ctx.nuxt.options.experimental.componentIslands}`, `export const componentIslands = ${!!ctx.nuxt.options.experimental.componentIslands}`,
`export const remoteComponentIslands = ${ctx.nuxt.options.experimental.componentIslands === 'local+remote'}`, `export const remoteComponentIslands = ${ctx.nuxt.options.experimental.componentIslands === 'local+remote'}`,
`export const devPagesDir = ${ctx.nuxt.options.dev ? JSON.stringify(ctx.nuxt.options.dir.pages) : 'null'}`, `export const devPagesDir = ${ctx.nuxt.options.dev ? JSON.stringify(ctx.nuxt.options.dir.pages) : 'null'}`,
`export const devRootDir = ${ctx.nuxt.options.dev ? JSON.stringify(ctx.nuxt.options.rootDir) : 'null'}` `export const devRootDir = ${ctx.nuxt.options.dev ? JSON.stringify(ctx.nuxt.options.rootDir) : 'null'}`,
`export const vueAppRootContainer = ${ctx.nuxt.options.app.rootId ? `'#${ctx.nuxt.options.app.rootId}'` : `'body > ${ctx.nuxt.options.app.rootTag}'`}`
].join('\n\n') ].join('\n\n')
} }
} }

4
packages/schema/src/config/app.ts
View File

@ -173,9 +173,11 @@ export default defineUntypedSchema({
/** /**
* Customize Nuxt root element id. * Customize Nuxt root element id.
*
* @type {string | false}
*/ */
rootId: { rootId: {
$resolve: val => val || '__nuxt' $resolve: val => val === false ? false : val || '__nuxt'
}, },
/** /**