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

fix(nuxt3): change entry to use asynchronous import (#2223)

Browse Source 
Co-authored-by: Marsel Shayhin <phoenix.apps@yahoo.com>
This commit is contained in:
Marsel Shayhin (Phoenix Apps) 2021-12-24 01:20:54 +03:00 committed by GitHub
parent afcaaff57d
commit 04b6466d37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
packages/nuxt3/src/app/bootstrap.ts Normal file
View File

@ -0,0 +1,66 @@
import { createSSRApp, createApp, nextTick } from 'vue'
import { createNuxtApp, applyPlugins, normalizePlugins, CreateOptions } from '#app'
import '#build/css'
// @ts-ignore
import _plugins from '#build/plugins'
// @ts-ignore
import RootComponent from '#build/root-component.mjs'
// @ts-ignore
import AppComponent from '#build/app-component.mjs'
let entry: Function
const plugins = normalizePlugins(_plugins)
if (process.server) {
entry = async function createNuxtAppServer (ssrContext: CreateOptions['ssrContext'] = {}) {
const vueApp = createApp(RootComponent)
vueApp.component('App', AppComponent)
const nuxt = createNuxtApp({ vueApp, ssrContext })
await applyPlugins(nuxt, plugins)
await nuxt.hooks.callHook('app:created', vueApp)
return vueApp
}
}
if (process.client) {
// TODO: temporary webpack 5 HMR fix
// https://github.com/webpack-contrib/webpack-hot-middleware/issues/390
// @ts-ignore
if (process.dev && import.meta.webpackHot) {
// @ts-ignore
import.meta.webpackHot.accept()
}
entry = async function initApp () {
const isSSR = Boolean(window.__NUXT__?.serverRendered)
const vueApp = isSSR ? createSSRApp(RootComponent) : createApp(RootComponent)
vueApp.component('App', AppComponent)
const nuxt = createNuxtApp({ vueApp })
await applyPlugins(nuxt, plugins)
await nuxt.hooks.callHook('app:created', vueApp)
await nuxt.hooks.callHook('app:beforeMount', vueApp)
nuxt.hooks.hookOnce('page:finish', () => {
nuxt.isHydrating = false
})
vueApp.mount('#__nuxt')
await nuxt.hooks.callHook('app:mounted', vueApp)
await nextTick()
}
entry().catch((error) => {
console.error('Error while mounting app:', error) // eslint-disable-line no-console
})
}
export default (ctx?: CreateOptions['ssrContext']) => entry(ctx)

67
packages/nuxt3/src/app/entry.ts
View File

@ -1,66 +1,11 @@
import { createSSRApp, createApp, nextTick } from 'vue' import { CreateOptions } from '#app'
import { createNuxtApp, applyPlugins, normalizePlugins, CreateOptions } from '#app'
import '#build/css'
// @ts-ignore
import _plugins from '#build/plugins'
// @ts-ignore
import RootComponent from '#build/root-component.mjs'
// @ts-ignore
import AppComponent from '#build/app-component.mjs'
let entry: Function const entry = process.server
? (ctx?: CreateOptions['ssrContext']) => import('#app/bootstrap').then(m => m.default(ctx))
const plugins = normalizePlugins(_plugins) : () => import('#app/bootstrap').then(m => m.default)
if (process.server) {
entry = async function createNuxtAppServer (ssrContext: CreateOptions['ssrContext'] = {}) {
const vueApp = createApp(RootComponent)
vueApp.component('App', AppComponent)
const nuxt = createNuxtApp({ vueApp, ssrContext })
await applyPlugins(nuxt, plugins)
await nuxt.hooks.callHook('app:created', vueApp)
return vueApp
}
}
if (process.client) { if (process.client) {
// TODO: temporary webpack 5 HMR fix entry()
// https://github.com/webpack-contrib/webpack-hot-middleware/issues/390
// @ts-ignore
if (process.dev && import.meta.webpackHot) {
// @ts-ignore
import.meta.webpackHot.accept()
}
entry = async function initApp () {
const isSSR = Boolean(window.__NUXT__?.serverRendered)
const vueApp = isSSR ? createSSRApp(RootComponent) : createApp(RootComponent)
vueApp.component('App', AppComponent)
const nuxt = createNuxtApp({ vueApp })
await applyPlugins(nuxt, plugins)
await nuxt.hooks.callHook('app:created', vueApp)
await nuxt.hooks.callHook('app:beforeMount', vueApp)
nuxt.hooks.hookOnce('page:finish', () => {
nuxt.isHydrating = false
})
vueApp.mount('#__nuxt')
await nuxt.hooks.callHook('app:mounted', vueApp)
await nextTick()
}
entry().catch((error) => {
console.error('Error while mounting app:', error) // eslint-disable-line no-console
})
} }
export default (ctx?: CreateOptions['ssrContext']) => entry(ctx) export default entry