Skip to content

Commit 1a9fe92

Browse files
authored
Merge pull request #209 from MaxGenash/update-eslint-on-2.x
Update ESLint, drop gulp, add package-lock.json to .gitignore (branch 2.x)
2 parents 27e5178 + 14391c4 commit 1a9fe92

File tree

6 files changed

+15
-39
lines changed

6 files changed

+15
-39
lines changed

.eslintrc

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
{
22
"parserOptions": {
3-
"ecmaVersion": 6,
4-
"sourceType": "module"
5-
},
6-
"ecmaFeatures": {
7-
"modules": true
3+
"ecmaVersion": 2018, // suppport syntax features (like Object spread operator) up to es2018
4+
"sourceType": "module",
5+
"ecmaFeatures": {
6+
"impliedStrict": true
7+
}
88
},
99
"env": {
10-
"node": true
11-
},
12-
"globals": {
13-
10+
"node": true,
11+
"es2017": true // suppport globals (like Promise) up to es2017 (es2018 doesn't have new globals)
1412
},
1513
"rules": {
1614
"curly": 2,

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
node_modules
2+
.idea
3+
package-lock.json

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ node_js:
66
script:
77
- npm install
88
- npm install -g gulp-cli
9-
- gulp
9+
- npm run lint
1010
- npm test

gulpfile.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"author": "Bigcommerce",
77
"license": "BSD-4-Clause",
88
"scripts": {
9+
"lint": "eslint .",
10+
"lint-and-fix": "eslint . --fix",
911
"test": "lab -l -t 90"
1012
},
1113
"repository": {
@@ -34,11 +36,8 @@
3436
},
3537
"devDependencies": {
3638
"code": "^1.4.0",
37-
"eslint": "^2.7.0",
39+
"eslint": "^6.8.0",
3840
"eslint-config-airbnb": "^6.2.0",
39-
"eslint-plugin-react": "^4.3.0",
40-
"gulp": "^3.9.1",
41-
"gulp-eslint": "^2.0.0",
4241
"lab": "^13.0.1",
4342
"sinon": "^1.17.2"
4443
}

test/helpers/pluck.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ describe('pluck helper', function() {
1414

1515
var context = {
1616
users: [
17-
{ 'user': 'barney', 'age': 36 },
18-
{ 'user': 'fred', 'age': 40 }
17+
{ 'user': 'barney', 'age': 36 },
18+
{ 'user': 'fred', 'age': 40 }
1919
]
2020
};
2121

0 commit comments

Comments
 (0)