Skip to content

Commit e4b4039

Browse files
committed
run update
1 parent 0fb32a8 commit e4b4039

File tree

7 files changed

+55
-38
lines changed

7 files changed

+55
-38
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: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
2-
"ecmaFeatures": {
3-
"modules": true,
4-
"experimentalObjectRestSpread": true
5-
},
6-
72
"env": {
83
"browser": false,
94
"es6": true,
@@ -34,6 +29,7 @@
3429
"handle-callback-err": [2, "^(err|error)$" ],
3530
"indent": [2, 2, { "SwitchCase": 1 }],
3631
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
32+
"keyword-spacing": [2, { "before": true, "after": true }],
3733
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
3834
"new-parens": 2,
3935
"no-array-constructor": 2,
@@ -49,7 +45,6 @@
4945
"no-dupe-keys": 2,
5046
"no-duplicate-case": 2,
5147
"no-empty-character-class": 2,
52-
"no-empty-label": 2,
5348
"no-eval": 2,
5449
"no-ex-assign": 2,
5550
"no-extend-native": 2,
@@ -71,7 +66,7 @@
7166
"no-multi-spaces": 2,
7267
"no-multi-str": 2,
7368
"no-multiple-empty-lines": [2, { "max": 1 }],
74-
"no-native-reassign": 2,
69+
"no-native-reassign": 0,
7570
"no-negated-in-lhs": 2,
7671
"no-new": 2,
7772
"no-new-func": 2,
@@ -108,13 +103,10 @@
108103
"radix": 2,
109104
"semi": [2, "always"],
110105
"semi-spacing": [2, { "before": false, "after": true }],
111-
"space-after-keywords": [2, "always"],
112106
"space-before-blocks": [2, "always"],
113107
"space-before-function-paren": [2, "never"],
114-
"space-before-keywords": [2, "always"],
115108
"space-in-parens": [2, "never"],
116109
"space-infix-ops": 2,
117-
"space-return-throw-case": 2,
118110
"space-unary-ops": [2, { "words": true, "nonwords": false }],
119111
"spaced-comment": [0, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
120112
"use-isnan": 2,

.gitignore

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,28 @@
1+
# always ignore files
12
*.DS_Store
2-
*.DS_store
33
*.sublime-*
4-
_gh_pages
5-
bower_components
4+
5+
# test related, or directories generated by tests
6+
test/actual
7+
actual
8+
coverage
9+
.nyc*
10+
11+
# npm
612
node_modules
713
npm-debug.log
8-
actual
9-
test/actual
14+
15+
# yarn
16+
yarn.lock
17+
yarn-error.log
18+
19+
# misc
20+
_gh_pages
21+
_draft
22+
_drafts
23+
bower_components
24+
vendor
1025
temp
1126
tmp
1227
TODO.md
13-
vendor
28+
package-lock.json

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
sudo: false
2+
os:
3+
- linux
4+
- osx
25
language: node_js
36
node_js:
4-
- stable
7+
- node
8+
- '8'
9+
- '7'
10+
- '6'
511
- '5'
612
- '4'
713
- '0.12'
814
- '0.10'
9-
matrix:
10-
fast_finish: true
11-
allow_failures:
12-
- node_js: '0.10'
13-
- node_js: '0.12'

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) 2015-2016, Jon Schlinkert.
3+
Copyright (c) 2017, 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

bower.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,22 @@
3232
"prop",
3333
"properties",
3434
"values"
35+
],
36+
"version": "0.4.5",
37+
"bugs": {
38+
"url": "https://github.com/jonschlinkert/assign-deep/issues"
39+
},
40+
"files": [
41+
"index.js"
42+
],
43+
"ignore": [
44+
"actual",
45+
"bower_components",
46+
"fixtures",
47+
"node_modules",
48+
"temp",
49+
"test",
50+
"test.js",
51+
"tmp"
3552
]
3653
}

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*!
22
* assign-deep <https://github.com/jonschlinkert/assign-deep>
33
*
4-
* Copyright (c) 2015, Jon Schlinkert.
5-
* Licensed under the MIT License.
4+
* Copyright (c) 2017, Jon Schlinkert.
5+
* Released under the MIT License.
66
*/
77

88
'use strict';

0 commit comments

Comments
 (0)