Skip to content

Commit 107c458

Browse files
committed
Merge updates from project template
Signed-off-by: Kevin Locke <[email protected]>
2 parents a43da9f + 897ea39 commit 107c458

File tree

5 files changed

+6
-16
lines changed

5 files changed

+6
-16
lines changed

.eslintrc.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,13 @@ rules:
9292
## Requires operator at the beginning of the line in multiline statements
9393
# Airbnb prevents breaks around =, suggesting (). I don't see the advantage.
9494
operator-linebreak: [2, "before"]
95-
## allow use of spread operator, which is not supported in Node v4
96-
prefer-spread: 0
9795
## no space before function, eg. 'function()'
9896
space-before-function-paren: [2, "never"]
9997

10098
# ECMAScript 6 Rules
10199
# list: https://github.com/eslint/eslint/tree/master/docs/rules#ecmascript-6
102100
## require parentheses around arrow function arguments (as Node core does)
103101
arrow-parens: [2, "always"]
104-
## Prefer destructuring from arrays and objects
105-
# Disabled since unsupported on Node < 6
106-
prefer-destructuring: 0
107-
## Suggest using the rest parameters instead of arguments
108-
# Disabled since unsupported on Node < 6
109-
prefer-rest-params: 0
110102

111103
# eslint-plugin-import
112104
## Allow requiring devDependencies in test, test-bin, and test-lib

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ language: node_js
44
# Update engines.node in package.json if removing old versions.
55
node_js:
66
- node
7-
- 4
7+
- 6
88

99
# If the package has OS-dependent features, uncomment this.
1010
#os:

appveyor.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
# Update engines.node in package.json if removing old versions.
55
environment:
66
matrix:
7-
- nodejs_version: "4"
8-
# npm 6.0.0 fails on Node 4
9-
# Note: Can't use carat version https://github.com/npm/npm/issues/17297
10-
npm_version: ">=5 <6"
7+
- nodejs_version: "6"
8+
npm_version: "latest"
119
# Empty version installs most recent version available
1210
- nodejs_version: ""
1311
npm_version: "latest"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"rimraf": "^2.2.0"
6060
},
6161
"engines": {
62-
"node": ">=4",
62+
"node": ">=6",
6363
"npm": ">=1.3.7"
6464
},
6565
"greenkeeper": {

test/helper-unhandled-rejection.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ if (typeof process !== 'undefined') {
2727
});
2828
} else {
2929
const oldOHR = window.onunhandledrejection;
30-
window.onunhandledrejection = function(evt) {
31-
if (typeof oldOHR === 'function') { oldOHR.apply(this, arguments); }
30+
window.onunhandledrejection = function(evt, ...args) {
31+
if (typeof oldOHR === 'function') { oldOHR.apply(this, args); }
3232
throw evt.detail.reason;
3333
};
3434
}

0 commit comments

Comments
 (0)