Skip to content

Commit 3ea7bdf

Browse files
committed
run update
1 parent d04f06c commit 3ea7bdf

File tree

7 files changed

+122
-102
lines changed

7 files changed

+122
-102
lines changed

.editorconfig

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
# http://editorconfig.org
1+
# http://editorconfig.org/
22
root = true
33

44
[*]
5-
indent_style = space
6-
end_of_line = lf
75
charset = utf-8
6+
end_of_line = lf
87
indent_size = 2
9-
trim_trailing_whitespace = true
8+
indent_style = space
109
insert_final_newline = true
10+
trim_trailing_whitespace = true
1111

12-
[*.md]
13-
trim_trailing_whitespace = false
14-
insert_final_newline = false
15-
16-
[**/{actual,fixtures,expected}/**]
17-
trim_trailing_whitespace = false
18-
insert_final_newline = false
19-
20-
[**/templates/**]
12+
[{**/{actual,fixtures,expected,templates}/**,*.md}]
2113
trim_trailing_whitespace = false
2214
insert_final_newline = false

.eslintrc.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
2-
"ecmaFeatures": {
3-
"modules": true,
4-
"experimentalObjectRestSpread": true
5-
},
2+
"extends": [
3+
"eslint:recommended"
4+
],
65

76
"env": {
87
"browser": false,
@@ -11,6 +10,15 @@
1110
"mocha": true
1211
},
1312

13+
"parserOptions":{
14+
"ecmaVersion": 9,
15+
"sourceType": "module",
16+
"ecmaFeatures": {
17+
"modules": true,
18+
"experimentalObjectRestSpread": true
19+
}
20+
},
21+
1422
"globals": {
1523
"document": false,
1624
"navigator": false,

.gitignore

Lines changed: 24 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,30 @@
1-
# Numerous always-ignore extensions
1+
# always ignore files
22
*.DS_Store
3-
*.csv
4-
*.dat
5-
*.diff
6-
*.err
7-
*.gz
8-
*.log
9-
*.orig
10-
*.out
11-
*.pid
12-
*.rar
13-
*.rej
14-
*.seed
15-
*.swo
16-
*.swp
17-
*.vi
18-
*.yo-rc.json
19-
*.zip
20-
*~
21-
.ruby-version
22-
lib-cov
23-
npm-debug.log
3+
.idea
4+
.vscode
5+
*.sublime-*
246

25-
# Always-ignore dirs
26-
/bower_components/
27-
/node_modules/
28-
/temp/
29-
/tmp/
30-
/vendor/
31-
_gh_pages
7+
# test related, or directories generated by tests
8+
test/actual
9+
actual
10+
coverage
11+
.nyc*
3212

33-
# OS or Editor folders
34-
*.esproj
35-
*.komodoproject
36-
.komodotools
37-
*.sublime-*
38-
._*
39-
.cache
40-
.DS_Store
41-
.idea
42-
.project
43-
.settings
44-
.tmproj
45-
nbproject
46-
Thumbs.db
13+
# npm
14+
node_modules
15+
npm-debug.log
4716

48-
# grunt-html-validation
49-
validation-status.json
50-
validation-report.json
17+
# yarn
18+
yarn.lock
19+
yarn-error.log
5120

5221
# misc
53-
TODO.md
22+
_gh_pages
23+
_draft
24+
_drafts
25+
bower_components
26+
vendor
27+
temp
28+
tmp
29+
TODO.md
30+
package-lock.json

.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
sudo: false
2+
os:
3+
- linux
4+
- osx
25
language: node_js
36
node_js:
4-
- stable
7+
- node
8+
- '10'
9+
- '9'
10+
- '8'
11+
- '7'
12+
- '6'
513
- '5'
614
- '4'
715
- '0.12'
816
- '0.10'
917
matrix:
1018
fast_finish: true
1119
allow_failures:
12-
- node_js: '0.10'
20+
- node_js: '0.8'

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2015, Jon Schlinkert.
3+
Copyright (c) 2014-present, Jon Schlinkert.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
# merge-deep [![NPM version](https://img.shields.io/npm/v/merge-deep.svg?style=flat)](https://www.npmjs.com/package/merge-deep) [![NPM downloads](https://img.shields.io/npm/dm/merge-deep.svg?style=flat)](https://npmjs.org/package/merge-deep) [![Build Status](https://img.shields.io/travis/jonschlinkert/merge-deep.svg?style=flat)](https://travis-ci.org/jonschlinkert/merge-deep)
1+
# merge-deep [![NPM version](https://img.shields.io/npm/v/merge-deep.svg?style=flat)](https://www.npmjs.com/package/merge-deep) [![NPM monthly downloads](https://img.shields.io/npm/dm/merge-deep.svg?style=flat)](https://npmjs.org/package/merge-deep) [![NPM total downloads](https://img.shields.io/npm/dt/merge-deep.svg?style=flat)](https://npmjs.org/package/merge-deep) [![Linux Build Status](https://img.shields.io/travis/jonschlinkert/merge-deep.svg?style=flat&label=Travis)](https://travis-ci.org/jonschlinkert/merge-deep)
22

33
> Recursively merge values in a javascript object.
44
5+
Please consider following this project's author, [Jon Schlinkert](https://github.com/jonschlinkert), and consider starring the project to show your :heart: and support.
6+
57
## Install
68

79
Install with [npm](https://www.npmjs.com/):
810

911
```sh
10-
$ npm install merge-deep --save
12+
$ npm install --save merge-deep
1113
```
1214

1315
Based on [mout's](https://github.com/mout/mout) implementation of merge
@@ -21,55 +23,70 @@ merge({a: {b: {c: 'c', d: 'd'}}}, {a: {b: {e: 'e', f: 'f'}}});
2123
//=> { a: { b: { c: 'c', d: 'd', e: 'e', f: 'f' } } }
2224
```
2325

24-
## Related projects
26+
## About
2527

26-
You might also be interested in these projects:
28+
<details>
29+
<summary><strong>Contributing</strong></summary>
2730

28-
* [assign-deep](https://www.npmjs.com/package/assign-deep): Deeply assign the enumerable properties and/or es6 Symbol properies of source objects to the target… [more](https://www.npmjs.com/package/assign-deep) | [homepage](https://github.com/jonschlinkert/assign-deep)
29-
* [defaults-deep](https://www.npmjs.com/package/defaults-deep): Like `extend` but recursively copies only the missing properties/values to the target object. | [homepage](https://github.com/jonschlinkert/defaults-deep)
30-
* [extend-shallow](https://www.npmjs.com/package/extend-shallow): Extend an object with the properties of additional objects. node.js/javascript util. | [homepage](https://github.com/jonschlinkert/extend-shallow)
31-
* [merge-deep](https://www.npmjs.com/package/merge-deep): Recursively merge values in a javascript object. | [homepage](https://github.com/jonschlinkert/merge-deep)
32-
* [mixin-deep](https://www.npmjs.com/package/mixin-deep): Deeply mix the properties of objects into the first object. Like merge-deep, but doesn't clone. | [homepage](https://github.com/jonschlinkert/mixin-deep)
33-
* [omit-deep](https://www.npmjs.com/package/omit-deep): Recursively omit the specified key or keys from an object. | [homepage](https://github.com/jonschlinkert/omit-deep)
34-
35-
## Contributing
31+
Pull requests and stars are always welcome. For bugs and feature requests, [please create an issue](../../issues/new).
3632

37-
Pull requests and stars are always welcome. For bugs and feature requests, [please create an issue](https://github.com/jonschlinkert/merge-deep/issues/new).
33+
</details>
3834

39-
## Building docs
35+
<details>
36+
<summary><strong>Running Tests</strong></summary>
4037

41-
Generate readme and API documentation with [verb](https://github.com/verbose/verb):
38+
Running and reviewing unit tests is a great way to get familiarized with a library and its API. You can install dependencies and run tests with the following command:
4239

4340
```sh
44-
$ npm install verb && npm run docs
41+
$ npm install && npm test
4542
```
4643

47-
Or, if [verb](https://github.com/verbose/verb) is installed globally:
44+
</details>
4845

49-
```sh
50-
$ verb
51-
```
46+
<details>
47+
<summary><strong>Building docs</strong></summary>
5248

53-
## Running tests
49+
_(This project's readme.md is generated by [verb](https://github.com/verbose/verb-generate-readme), please don't edit the readme directly. Any changes to the readme must be made in the [.verb.md](.verb.md) readme template.)_
5450

55-
Install dev dependencies:
51+
To generate the readme, run the following command:
5652

5753
```sh
58-
$ npm install -d && npm test
54+
$ npm install -g verbose/verb#dev verb-generate-readme && verb
5955
```
6056

61-
## Author
57+
</details>
58+
59+
### Related projects
60+
61+
You might also be interested in these projects:
62+
63+
* [assign-deep](https://www.npmjs.com/package/assign-deep): Deeply assign the enumerable properties and/or es6 Symbol properies of source objects to the target… [more](https://github.com/jonschlinkert/assign-deep) | [homepage](https://github.com/jonschlinkert/assign-deep)
64+
* [defaults-deep](https://www.npmjs.com/package/defaults-deep): Like `extend` but recursively copies only the missing properties/values to the target object. | [homepage](https://github.com/jonschlinkert/defaults-deep)
65+
* [extend-shallow](https://www.npmjs.com/package/extend-shallow): Extend an object with the properties of additional objects. node.js/javascript util. | [homepage](https://github.com/jonschlinkert/extend-shallow)
66+
* [merge-deep](https://www.npmjs.com/package/merge-deep): Recursively merge values in a javascript object. | [homepage](https://github.com/jonschlinkert/merge-deep)
67+
* [mixin-deep](https://www.npmjs.com/package/mixin-deep): Deeply mix the properties of objects into the first object. Like merge-deep, but doesn't clone. | [homepage](https://github.com/jonschlinkert/mixin-deep)
68+
* [omit-deep](https://www.npmjs.com/package/omit-deep): Recursively omit the specified key or keys from an object. | [homepage](https://github.com/jonschlinkert/omit-deep)
69+
70+
### Contributors
71+
72+
| **Commits** | **Contributor** |
73+
| --- | --- |
74+
| 29 | [jonschlinkert](https://github.com/jonschlinkert) |
75+
| 4 | [doowb](https://github.com/doowb) |
76+
77+
### Author
6278

6379
**Jon Schlinkert**
6480

65-
* [github/jonschlinkert](https://github.com/jonschlinkert)
66-
* [twitter/jonschlinkert](http://twitter.com/jonschlinkert)
81+
* [LinkedIn Profile](https://linkedin.com/in/jonschlinkert)
82+
* [GitHub Profile](https://github.com/jonschlinkert)
83+
* [Twitter Profile](https://twitter.com/jonschlinkert)
6784

68-
## License
85+
### License
6986

70-
Copyright © 2016, [Jon Schlinkert](https://github.com/jonschlinkert).
71-
Released under the [MIT license](https://github.com/jonschlinkert/merge-deep/blob/master/LICENSE).
87+
Copyright © 2018, [Jon Schlinkert](https://github.com/jonschlinkert).
88+
Released under the [MIT License](LICENSE).
7289

7390
***
7491

75-
_This file was generated by [verb](https://github.com/verbose/verb), v0.9.0, on April 13, 2016._
92+
_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.6.0, on July 11, 2018._

bower.json

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
"index.js"
1212
],
1313
"dependencies": {
14-
"clone-deep": "^0.1.1",
15-
"is-plain-object": "^2.0.0"
14+
"arr-union": "^3.1.0",
15+
"clone-deep": "^0.2.4",
16+
"kind-of": "^3.0.2"
1617
},
1718
"devDependencies": {
18-
"mocha": "^2.2.5",
19-
"should": "^6.0.3"
19+
"gulp-format-md": "^0.1.7",
20+
"mocha": "^2.4.5"
2021
},
2122
"keywords": [
2223
"clone",
@@ -38,5 +39,22 @@
3839
"props",
3940
"value",
4041
"values"
42+
],
43+
"version": "3.0.0",
44+
"bugs": {
45+
"url": "https://github.com/jonschlinkert/merge-deep/issues"
46+
},
47+
"files": [
48+
"index.js"
49+
],
50+
"ignore": [
51+
"actual",
52+
"bower_components",
53+
"fixtures",
54+
"node_modules",
55+
"temp",
56+
"test",
57+
"test.js",
58+
"tmp"
4159
]
42-
}
60+
}

0 commit comments

Comments
 (0)