Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump deps #19

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bump deps #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* merge-deep <https://github.com/jonschlinkert/merge-deep>
*
* Copyright (c) 2014-2015, Jon Schlinkert.
* Copyright (c) 2014-2021, Jon Schlinkert.
* Licensed under the MIT License.
*/

Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down