Skip to content

Commit

Permalink
Merge pull request #209 from MaxGenash/update-eslint-on-2.x
Browse files Browse the repository at this point in the history
Update ESLint, drop gulp, add package-lock.json to .gitignore (branch 2.x)
  • Loading branch information
junedkazi authored Sep 10, 2020
2 parents 27e5178 + 14391c4 commit 1a9fe92
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 39 deletions.
16 changes: 7 additions & 9 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"ecmaFeatures": {
"modules": true
"ecmaVersion": 2018, // suppport syntax features (like Object spread operator) up to es2018
"sourceType": "module",
"ecmaFeatures": {
"impliedStrict": true
}
},
"env": {
"node": true
},
"globals": {

"node": true,
"es2017": true // suppport globals (like Promise) up to es2017 (es2018 doesn't have new globals)
},
"rules": {
"curly": 2,
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
.idea
package-lock.json
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ node_js:
script:
- npm install
- npm install -g gulp-cli
- gulp
- npm run lint
- npm test
23 changes: 0 additions & 23 deletions gulpfile.js

This file was deleted.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"author": "Bigcommerce",
"license": "BSD-4-Clause",
"scripts": {
"lint": "eslint .",
"lint-and-fix": "eslint . --fix",
"test": "lab -l -t 90"
},
"repository": {
Expand Down Expand Up @@ -34,11 +36,8 @@
},
"devDependencies": {
"code": "^1.4.0",
"eslint": "^2.7.0",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^6.2.0",
"eslint-plugin-react": "^4.3.0",
"gulp": "^3.9.1",
"gulp-eslint": "^2.0.0",
"lab": "^13.0.1",
"sinon": "^1.17.2"
}
Expand Down
4 changes: 2 additions & 2 deletions test/helpers/pluck.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ describe('pluck helper', function() {

var context = {
users: [
{ 'user': 'barney', 'age': 36 },
{ 'user': 'fred', 'age': 40 }
{ 'user': 'barney', 'age': 36 },
{ 'user': 'fred', 'age': 40 }
]
};

Expand Down

0 comments on commit 1a9fe92

Please sign in to comment.