diff --git a/.travis.yml b/.travis.yml index ea3ec10..1803e3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,17 +5,9 @@ os: language: node_js node_js: - node - - '10' - - '9' - - '8' - - '7' - - '6' - - '5' - - '4' - - '0.12' - - '0.10' + - '14' + - '12' matrix: fast_finish: true allow_failures: - node_js: 'node' - - node_js: '0.8' diff --git a/index.js b/index.js index 08db87a..f721e05 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,7 @@ /*! * merge-deep * - * Copyright (c) 2014-2015, Jon Schlinkert. + * Copyright (c) 2014-2021, Jon Schlinkert. * Licensed under the MIT License. */ @@ -55,7 +55,7 @@ function hasOwn(obj, key) { } function isObject(val) { - return typeOf(val) === 'object' || typeOf(val) === 'function'; + return typeOf(val) === 'object' || typeOf(val) === 'function' || typeOf(val) === "regexp" || typeOf(val) === "date"; } function isValidKey(key) { diff --git a/package.json b/package.json index ad300ff..7fd0afe 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "merge-deep", "description": "Recursively merge values in a javascript object.", - "version": "3.0.3", + "version": "4.0.0", "homepage": "https://github.com/jonschlinkert/merge-deep", "author": "Jon Schlinkert (https://github.com/jonschlinkert)", "repository": "jonschlinkert/merge-deep", @@ -14,15 +14,15 @@ ], "main": "index.js", "engines": { - "node": ">=0.10.0" + "node": ">=12.0.0" }, "scripts": { "test": "mocha" }, "dependencies": { "arr-union": "^3.1.0", - "clone-deep": "^0.2.4", - "kind-of": "^3.0.2" + "clone-deep": "^4.0.1", + "kind-of": "^6.0.3" }, "devDependencies": { "gulp-format-md": "^0.1.7",