Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

fix(nuxt): use deep assignment for app.config hmr #6788

Merged
merged 4 commits into from
Aug 22, 2022
Merged

fix(nuxt): use deep assignment for app.config hmr #6788

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ed49f9
fix(nuxt): use deep assignment for app.config hmr
pi0 Aug 19, 2022
d6cb9eb
revert key related change
pi0 Aug 22, 2022
ca1f3a2
revert
pi0 Aug 22, 2022
d5b0196
better object chck
pi0 Aug 22, 2022
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
15 changes: 12 additions & 3 deletions packages/nuxt/src/app/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ if (process.dev) {
function applyHMR (newConfig: AppConfig) {
const appConfig = useAppConfig()
if (newConfig && appConfig) {
for (const key in newConfig) {
(appConfig as any)[key] = (newConfig as any)[key]
}
deepAssign(appConfig, newConfig)
for (const key in appConfig) {
if (!(key in newConfig)) {
delete (appConfig as any)[key]
Expand All @@ -31,6 +29,17 @@ if (process.dev) {
}
}

function deepAssign (obj: any, newObj: any) {
for (const key in newObj) {
const val = newObj[key]
if (val !== null && typeof val === 'object') {
deepAssign(obj[key], val)
} else {
obj[key] = val
}
}
}

// Vite
if (import.meta.hot) {
import.meta.hot.accept((newModule) => {
Expand Down