build

Author: dwightjack

dist/utils.js

@@ -109,24 +109,19 @@ var withDefault = function withDefault(type) {
         warn(this._vueTypes_name + " - invalid default value: \"" + def + "\"", def);
         return this;
       }
-<<<<<<< HEAD
 
-      this.default = isArray(def) || (0, _isPlainObject.default)(def) ? function () {
-        return def;
-      } : def;
-=======
       if (isArray(def)) {
         this.default = function () {
-          return [].concat(def);
+          return def.concat();
         };
-      } else if ((0, _lodash2.default)(def)) {
+      } else if ((0, _isPlainObject.default)(def)) {
         this.default = function () {
           return Object.assign({}, def);
         };
       } else {
         this.default = def;
       }
->>>>>>> 5769a2c3b502e79499fbd1de6a4c2542b7ea4d7e
+
       return this;
     },
     enumerable: false,

es/utils.js

@@ -78,15 +78,10 @@ export var withDefault = function withDefault(type) {
         warn(this._vueTypes_name + " - invalid default value: \"" + def + "\"", def);
         return this;
       }
-<<<<<<< HEAD
 
-      this.default = isArray(def) || isPlainObject(def) ? function () {
-        return def;
-      } : def;
-=======
       if (isArray(def)) {
         this.default = function () {
-          return [].concat(def);
+          return def.concat();
         };
       } else if (isPlainObject(def)) {
         this.default = function () {
@@ -95,7 +90,7 @@ export var withDefault = function withDefault(type) {
       } else {
         this.default = def;
       }
->>>>>>> 5769a2c3b502e79499fbd1de6a4c2542b7ea4d7e
+
       return this;
     },
     enumerable: false,