]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
fix: fix props option merging
authorEvan You <yyx990803@gmail.com>
Tue, 16 Oct 2018 23:16:34 +0000 (19:16 -0400)
committerEvan You <yyx990803@gmail.com>
Tue, 16 Oct 2018 23:16:34 +0000 (19:16 -0400)
packages/core/src/componentOptions.ts

index 385a2f6de86900744b5aa88df540ef72de009f67..e03cb3e7c8e18f088c9344ab5d9ad954e7b2a7b3 100644 (file)
@@ -137,7 +137,9 @@ export function resolveComponentOptionsFromClass(
     }
   }
 
-  options.props = normalizePropsOptions(options.props)
+  if (options.props) {
+    options.props = normalizePropsOptions(options.props)
+  }
 
   const ParentClass = Object.getPrototypeOf(Class)
   if (ParentClass !== Component) {