Comparing version 4.2.2 to 4.3.1
@@ -0,1 +1,9 @@ | ||
# [4.3.1](https://github.com/TehShrike/deepmerge/releases/tag/v4.3.1) | ||
- Fix type definition for arrayMerge options. [#239](https://github.com/TehShrike/deepmerge/pull/239) | ||
# [4.3.0](https://github.com/TehShrike/deepmerge/releases/tag/v4.3.0) | ||
- Avoid thrown errors if the target doesn't have `propertyIsEnumerable`. [#252](https://github.com/TehShrike/deepmerge/pull/252) | ||
# [4.2.2](https://github.com/TehShrike/deepmerge/releases/tag/v4.2.2) | ||
@@ -2,0 +10,0 @@ |
@@ -55,3 +55,3 @@ 'use strict'; | ||
? Object.getOwnPropertySymbols(target).filter(function(symbol) { | ||
return target.propertyIsEnumerable(symbol) | ||
return Object.propertyIsEnumerable.call(target, symbol) | ||
}) | ||
@@ -58,0 +58,0 @@ : [] |
@@ -59,3 +59,3 @@ (function (global, factory) { | ||
? Object.getOwnPropertySymbols(target).filter(function(symbol) { | ||
return target.propertyIsEnumerable(symbol) | ||
return Object.propertyIsEnumerable.call(target, symbol) | ||
}) | ||
@@ -62,0 +62,0 @@ : [] |
@@ -6,3 +6,3 @@ declare function deepmerge<T>(x: Partial<T>, y: Partial<T>, options?: deepmerge.Options): T; | ||
export interface Options { | ||
arrayMerge?(target: any[], source: any[], options?: Options): any[]; | ||
arrayMerge?(target: any[], source: any[], options?: ArrayMergeOptions): any[]; | ||
clone?: boolean; | ||
@@ -12,2 +12,6 @@ customMerge?: (key: string, options?: Options) => ((x: any, y: any) => any) | undefined; | ||
} | ||
export interface ArrayMergeOptions { | ||
isMergeableObject(value: object): boolean; | ||
cloneUnlessOtherwiseSpecified(value: object, options?: Options): object; | ||
} | ||
@@ -14,0 +18,0 @@ export function all (objects: object[], options?: Options): object; |
@@ -30,3 +30,3 @@ var defaultIsMergeableObject = require('is-mergeable-object') | ||
? Object.getOwnPropertySymbols(target).filter(function(symbol) { | ||
return target.propertyIsEnumerable(symbol) | ||
return Object.propertyIsEnumerable.call(target, symbol) | ||
}) | ||
@@ -33,0 +33,0 @@ : [] |
@@ -12,3 +12,3 @@ { | ||
], | ||
"version": "4.2.2", | ||
"version": "4.3.1", | ||
"homepage": "https://github.com/TehShrike/deepmerge", | ||
@@ -32,3 +32,3 @@ "repository": { | ||
"is-mergeable-object": "1.1.0", | ||
"is-plain-object": "^2.0.4", | ||
"is-plain-object": "^5.0.0", | ||
"jsmd": "^1.0.2", | ||
@@ -43,4 +43,3 @@ "rollup": "^1.23.1", | ||
}, | ||
"license": "MIT", | ||
"dependencies": {} | ||
"license": "MIT" | ||
} |
@@ -169,3 +169,3 @@ # deepmerge | ||
```js | ||
const isPlainObject = require('is-plain-object') | ||
const { isPlainObject } = require('is-plain-object') | ||
@@ -172,0 +172,0 @@ function SuperSpecial() { |
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
31157
11
353