From: Evan You <yyx990803@gmail.com>
Date: Tue, 16 Oct 2018 23:16:34 +0000 (-0400)
Subject: fix: fix props option merging
X-Git-Tag: v3.0.0-alpha.0~1100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=456ee13ec9b3a03b8fc7a62e7091deba2448f0bc;p=thirdparty%2Fvuejs%2Fcore.git

fix: fix props option merging
---

diff --git a/packages/core/src/componentOptions.ts b/packages/core/src/componentOptions.ts
index 385a2f6de8..e03cb3e7c8 100644
--- a/packages/core/src/componentOptions.ts
+++ b/packages/core/src/componentOptions.ts
@@ -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) {