Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf(nuxt): allow hmr for server components in dev mode #21916

Merged
merged 4 commits into from Jul 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions packages/nuxt/src/app/components/nuxt-island.ts
Expand Up @@ -67,9 +67,9 @@ export default defineComponent({
const cHead = ref<Record<'link' | 'style', Array<Record<string, string>>>>({ link: [], style: [] })
useHead(cHead)

async function _fetchComponent () {
async function _fetchComponent (force = false) {
const key = `${props.name}_${hashId.value}`
if (nuxtApp.payload.data[key]) { return nuxtApp.payload.data[key] }
if (nuxtApp.payload.data[key] && !force) { return nuxtApp.payload.data[key] }

const url = `/__nuxt_island/${key}`
if (process.server && process.env.prerender) {
Expand Down Expand Up @@ -106,10 +106,10 @@ export default defineComponent({
return result
}
const key = ref(0)
async function fetchComponent () {
async function fetchComponent (force = false) {
nuxtApp[pKey] = nuxtApp[pKey] || {}
if (!nuxtApp[pKey][uid.value]) {
nuxtApp[pKey][uid.value] = _fetchComponent().finally(() => {
nuxtApp[pKey][uid.value] = _fetchComponent(force).finally(() => {
delete nuxtApp[pKey]![uid.value]
})
}
Expand All @@ -127,10 +127,17 @@ export default defineComponent({
setUid()
}

if (import.meta.hot) {
import.meta.hot.on(`nuxt-server-component:${props.name}`, () => {
fetchComponent(true)
})
}

if (process.client) {
watch(props, debounce(fetchComponent, 100))
watch(props, debounce(() => fetchComponent(), 100))
}

// TODO: allow lazy loading server islands
if (process.server || !nuxtApp.isHydrating) {
await fetchComponent()
}
Expand Down
18 changes: 17 additions & 1 deletion packages/nuxt/src/components/module.ts
@@ -1,5 +1,5 @@
import { statSync } from 'node:fs'
import { relative, resolve } from 'pathe'
import { normalize, relative, resolve } from 'pathe'
import { addPluginTemplate, addTemplate, addVitePlugin, addWebpackPlugin, defineNuxtModule, resolveAlias, updateTemplates } from '@nuxt/kit'
import type { Component, ComponentsDir, ComponentsOptions } from 'nuxt/schema'

Expand Down Expand Up @@ -227,6 +227,22 @@ export default defineNuxtModule<ComponentsOptions>({
getComponents
}))
}
if (!isServer && nuxt.options.experimental.componentIslands) {
config.plugins.push({
name: 'nuxt-server-component-hmr',
handleHotUpdate (ctx) {
const components = getComponents()
const filePath = normalize(ctx.file)
const comp = components.find(c => c.filePath === filePath)
if (comp?.mode === 'server') {
ctx.server.ws.send({
event: `nuxt-server-component:${comp.pascalName}`,
type: 'custom'
})
}
}
})
}
})
nuxt.hook('webpack:config', (configs) => {
configs.forEach((config) => {
Expand Down