fix(hmr): properly force hmr full component props update

fix #1942
vuejs · Aug 24, 2020 · 499bc0b · 499bc0b
1 parent 57642fa
commit 499bc0b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
@@ -153,7 +153,12 @@ export function updateProps(
  const rawCurrentProps = toRaw(props)
  const [options] = normalizePropsOptions(instance.type)
 
- if ((optimized || patchFlag > 0) && !(patchFlag & PatchFlags.FULL_PROPS)) {
+ if (
+ // always force full diff if hmr is enabled
+ !(__DEV__ && instance.type.__hmrId) &&
+ (optimized || patchFlag > 0) &&
+ !(patchFlag & PatchFlags.FULL_PROPS)
+ ) {
  if (patchFlag & PatchFlags.PROPS) {
  // Compiler-generated props & no keys change, just set the updated
  // the props.

diff --git a/packages/runtime-core/src/renderer.ts b/packages/runtime-core/src/renderer.ts
@@ -1451,9 +1451,6 @@ function baseCreateRenderer(
  nextVNode: VNode,
  optimized: boolean
  ) => {
- if (__DEV__ && instance.type.__hmrId) {
- optimized = false
- }
  nextVNode.component = instance
  const prevProps = instance.vnode.props
  instance.vnode = nextVNode