styled-system
Advanced tools
Comparing version 1.0.0-10 to 1.0.0-11
@@ -57,3 +57,3 @@ 'use strict'; | ||
return Object.assign({}, a, b, Object.keys(b).reduce(function (obj, key) { | ||
return Object.assign(obj, _defineProperty({}, key, _typeof(a[key]) === 'object' ? merge(a[key], b[key]) : b[key])); | ||
return Object.assign(obj, _defineProperty({}, key, a[key] !== null && _typeof(a[key]) === 'object' ? merge(a[key], b[key]) : b[key])); | ||
}, {})); | ||
@@ -60,0 +60,0 @@ }; |
{ | ||
"name": "styled-system", | ||
"version": "1.0.0-10", | ||
"version": "1.0.0-11", | ||
"description": "Design system utilities for styled-components, glamorous, and other css-in-js libraries", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
@@ -26,3 +26,5 @@ const { breakpoints } = require('./constants') | ||
Object.assign(obj, { | ||
[key]: typeof a[key] === 'object' ? merge(a[key], b[key]) : b[key] | ||
[key]: a[key] !== null && typeof a[key] === 'object' | ||
? merge(a[key], b[key]) | ||
: b[key] | ||
}), | ||
@@ -29,0 +31,0 @@ {})) |
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
1170
39126
28