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

fix(nuxt): improve hmr for pages macros (#8940)

Browse Source 
Co-authored-by: Daniel Roe <daniel@roe.dev>
This commit is contained in:
Anthony Fu 2022-11-16 01:15:44 +08:00 committed by GitHub
parent 3fc29b98e6
commit f1ae40fc4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
packages/nuxt/src/pages/page-meta.ts
View File

@ -13,6 +13,25 @@ export interface PageMetaPluginOptions {
sourcemap?: boolean sourcemap?: boolean
} }
const CODE_EMPTY = `
const __nuxt_page_meta = {}
export default __nuxt_page_meta
`
const CODE_HMR = `
// Vite
if (import.meta.hot) {
import.meta.hot.accept(mod => {
Object.assign(__nuxt_page_meta, mod)
})
}
// Webpack
if (import.meta.webpackHot) {
import.meta.webpackHot.accept((err) => {
if (err) { window.location = window.location.href }
})
}`
export const PageMetaPlugin = createUnplugin((options: PageMetaPluginOptions) => { export const PageMetaPlugin = createUnplugin((options: PageMetaPluginOptions) => {
return { return {
name: 'nuxt:pages-macros-transform', name: 'nuxt:pages-macros-transform',
@ -88,7 +107,7 @@ export const PageMetaPlugin = createUnplugin((options: PageMetaPluginOptions) =>
} }
if (!hasMacro && !code.includes('export { default }') && !code.includes('__nuxt_page_meta')) { if (!hasMacro && !code.includes('export { default }') && !code.includes('__nuxt_page_meta')) {
s.overwrite(0, code.length, 'export default {}') s.overwrite(0, code.length, CODE_EMPTY + (options.dev ? CODE_HMR : ''))
return result() return result()
} }
@ -117,7 +136,7 @@ export const PageMetaPlugin = createUnplugin((options: PageMetaPluginOptions) =>
const meta = node.arguments[0] as Expression & { start: number, end: number } const meta = node.arguments[0] as Expression & { start: number, end: number }
let contents = `const __nuxt_page_meta = ${code!.slice(meta.start, meta.end) || '{}'}\nexport default __nuxt_page_meta` let contents = `const __nuxt_page_meta = ${code!.slice(meta.start, meta.end) || '{}'}\nexport default __nuxt_page_meta` + (options.dev ? CODE_HMR : '')
function addImport (name: string | false) { function addImport (name: string | false) {
if (name && importMap.has(name)) { if (name && importMap.has(name)) {
@ -147,10 +166,22 @@ export const PageMetaPlugin = createUnplugin((options: PageMetaPluginOptions) =>
}) })
if (!s.hasChanged() && !code.includes('__nuxt_page_meta')) { if (!s.hasChanged() && !code.includes('__nuxt_page_meta')) {
s.overwrite(0, code.length, 'export default {}') s.overwrite(0, code.length, CODE_EMPTY + (options.dev ? CODE_HMR : ''))
} }
return result() return result()
},
vite: {
handleHotUpdate: {
order: 'pre',
handler: ({ modules }) => {
// Remove macro file from modules list to prevent HMR overrides
const index = modules.findIndex(i => i.id?.includes('?macro=true'))
if (index !== -1) {
modules.splice(index, 1)
}
}
}
} }
} }
}) })