react-cosmos-shared2
Advanced tools
Comparing version 5.0.0-alpha.20 to 5.0.0-alpha.25
@@ -26,3 +26,3 @@ "use strict"; | ||
// in the future this will need to be redesign to handle merge conflicts | ||
const baseObj = baseValue; | ||
const baseObj = typeof baseValue === 'object' && baseValue !== null ? baseValue : {}; | ||
return extendWithValues(baseObj, value.values); | ||
@@ -35,3 +35,3 @@ } | ||
// in the future this will need to be redesign to handle merge conflicts | ||
const baseArr = baseValue; | ||
const baseArr = Array.isArray(baseValue) ? baseValue : []; | ||
return value.values.map((v, idx) => extendWithValue(baseArr[idx], v)); | ||
@@ -38,0 +38,0 @@ } |
{ | ||
"name": "react-cosmos-shared2", | ||
"version": "5.0.0-alpha.20", | ||
"version": "5.0.0-alpha.25", | ||
"description": "Code shared between Cosmos packages", | ||
@@ -12,3 +12,3 @@ "repository": "https://github.com/react-cosmos/react-cosmos/tree/master/packages/react-cosmos-shared2", | ||
}, | ||
"gitHead": "420d4140bad0c5807173d0963276c497d2ba805f" | ||
"gitHead": "b1e068e933102eab84cc4d0cfe988ee8977bb80d" | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
31443