Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to eslint 4 #4738

Merged
merged 1 commit into from
Nov 1, 2017
Merged

Upgrade to eslint 4 #4738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codeclimate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ engines:
- javascript
eslint:
enabled: true
channel: "eslint-3"
channel: "eslint-4"
fixme:
enabled: true
ratings:
Expand Down
8 changes: 2 additions & 6 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ecmaFeatures:
modules: true
jsx: true

env:
amd: true
browser: true
Expand Down Expand Up @@ -72,7 +68,7 @@ rules:
no-lone-blocks: 2
no-loop-func: 2
no-magic-number: 0
no-multi-spaces: 2
no-multi-spaces: [2, {ignoreEOLComments: true}]
no-multi-str: 2
no-native-reassign: 2
no-new-func: 2
Expand Down Expand Up @@ -141,7 +137,7 @@ rules:
func-style: 0
id-length: 0
id-match: 0
indent: [2, tab]
indent: [2, tab, {flatTernaryExpressions: true}]
jsx-quotes: 0
key-spacing: 2
keyword-spacing: 2
Expand Down
27 changes: 14 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,31 @@
"url": "https://github.com/chartjs/Chart.js.git"
},
"devDependencies": {
"browserify": "^14.3.0",
"browserify-istanbul": "^2.0.0",
"bundle-collapser": "^1.2.1",
"browserify": "^14.5.0",
"browserify-istanbul": "^3.0.1",
"bundle-collapser": "^1.3.0",
"child-process-promise": "^2.2.1",
"coveralls": "^2.13.1",
"gitbook-cli": "^2.3.0",
"coveralls": "^3.0.0",
"eslint": "^4.9.0",
"gitbook-cli": "^2.3.2",
"gulp": "3.9.x",
"gulp-concat": "~2.6.x",
"gulp-connect": "~5.0.0",
"gulp-eslint": "^3.0.1",
"gulp-eslint": "^4.0.0",
"gulp-file": "^0.3.0",
"gulp-html-validator": "^0.0.5",
"gulp-insert": "~0.5.0",
"gulp-replace": "^0.5.4",
"gulp-replace": "^0.6.1",
"gulp-size": "~2.1.0",
"gulp-streamify": "^1.0.2",
"gulp-uglify": "~3.0.x",
"gulp-util": "~3.0.x",
"gulp-zip": "~4.0.0",
"jasmine": "^2.6.0",
"jasmine-core": "^2.6.2",
"karma": "^1.7.0",
"jasmine": "^2.8.0",
"jasmine-core": "^2.8.0",
"karma": "^1.7.1",
"karma-browserify": "^5.1.1",
"karma-chrome-launcher": "^2.1.1",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-firefox-launcher": "^1.0.1",
"karma-jasmine": "^1.1.0",
Expand All @@ -42,13 +43,13 @@
"pixelmatch": "^4.0.2",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.9.0",
"yargs": "^8.0.1"
"yargs": "^9.0.1"
},
"spm": {
"main": "Chart.js"
},
"dependencies": {
"chartjs-color": "~2.2.0",
"moment": "~2.18.0"
"moment": "~2.19.1"
}
}