Skip to content

Commit f207eee

Browse files
committed
Merge updates from project template
Signed-off-by: Kevin Locke <[email protected]>
2 parents 94e3862 + 671c7df commit f207eee

File tree

4 files changed

+115
-7
lines changed

4 files changed

+115
-7
lines changed

.eslintrc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ rules:
8989
one-var: 0
9090
## require initialized variables to be declared on separate lines
9191
one-var-declaration-per-line: [2, "initializations"]
92+
## Requires operator at the beginning of the line in multiline statements
93+
# Airbnb prevents breaks around =, suggesting (). I don't see the advantage.
94+
operator-linebreak: [2, "before"]
9295
## allow use of spread operator, which is not supported in Node v4
9396
prefer-spread: 0
9497
## no space before function, eg. 'function()'

package-lock.json

Lines changed: 109 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"codecov": "^3.0.0",
5050
"coveralls": "^3.0.0",
5151
"eslint": "^4.6.1",
52-
"eslint-config-airbnb-base": "^12.0.0",
52+
"eslint-config-airbnb-base": "^13.0.0",
5353
"eslint-plugin-import": "^2.7.0",
5454
"greenkeeper-lockfile": "^1.15.1",
5555
"jsdoc": "^3.4.1",

test/helper-unhandled-rejection.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if (typeof process !== 'undefined') {
3232
throw evt.detail.reason;
3333
};
3434
}
35-
} else if (typeof console !== 'undefined' &&
36-
typeof (console.error || console.log) === 'function') {
35+
} else if (typeof console !== 'undefined'
36+
&& typeof (console.error || console.log) === 'function') {
3737
(console.error || console.log)('Unhandled rejections will be ignored!');
3838
}

0 commit comments

Comments
 (0)