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.

Sign up for GitHub

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

fix(hmr): full diff props for non-sfc component #2359

Merged
merged 2 commits into from
Oct 15, 2020
Merged

fix(hmr): full diff props for non-sfc component #2359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1efde
fix(hmr): full diff props for non-sfc component
underfin Oct 12, 2020
6db61b0
refactor: update condition
underfin Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/runtime-core/src/componentProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,14 @@ export function updateProps(
const [options] = instance.propsOptions

if (
// always force full diff if hmr is enabled
!(__DEV__ && instance.type.__hmrId) &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think instead we should be checking instance.parent && instance.parent.type.__hmrId. Can you confirm that also fixes the issue?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. instance.parent && instance.parent.type.__hmrId also fix the issues.

// always force full diff in dev
// - #1942 if hmr is enabled with sfc component
// - vite#872 non-sfc component used by sfc component
!(
__DEV__ &&
(instance.type.__hmrId ||
(instance.parent && instance.parent.type.__hmrId))
) &&
(optimized || patchFlag > 0) &&
!(patchFlag & PatchFlags.FULL_PROPS)
) {
Expand Down