Skip to content

Use prettier with eslint #369

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

Merged
merged 3 commits into from
May 25, 2017
Merged

Use prettier with eslint #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8df10a6
Use prettier with eslint
gpbl May 25, 2017
e830e4f
Remove codeclimate
gpbl May 25, 2017
eadc8e5
Remove codeclimate from circleci
gpbl May 25, 2017
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
12 changes: 10 additions & 2 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
{
"parser": "babel-eslint",
"plugins": [
"react"
"prettier"
],
"extends": [
"airbnb",
"prettier"
"prettier",
"prettier/react"
],
"rules": {
"prettier/prettier": [
"warn",
{
"singleQuote": true,
"trailingComma": "es5"
}
],
"no-console": [
"error",
{
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Check out the [examples](http://react-day-picker.js.org/examples) to see its fea
[![npm version](https://img.shields.io/npm/v/react-day-picker.svg?style=flat-square)](https://www.npmjs.com/package/react-day-picker)
[![CircleCI](https://img.shields.io/circleci/project/github/gpbl/react-day-picker/master.svg?style=flat-square)](https://circleci.com/gh/gpbl/react-day-picker)
[![coveralls](https://img.shields.io/coveralls/gpbl/react-day-picker.svg?style=flat-square)](https://coveralls.io/r/gpbl/react-day-picker?branch=master)
[![Code Climate](https://img.shields.io/codeclimate/github/gpbl/react-day-picker.svg?style=flat-square)](https://codeclimate.com/github/gpbl/react-day-picker)
[![npm downloads](https://img.shields.io/npm/dm/react-day-picker.svg?style=flat-square)](http://npm-stat.com/charts.html?package=react-day-picker)

## Quick start
Expand Down
1 change: 0 additions & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
- run:
name: Upload coverage info
command: |
yarn run codeclimate < ./coverage/lcov.info
yarn run coveralls < ./coverage/lcov.info
- store_test_results:
path: reports/
Expand Down
10 changes: 4 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"clean": "rimraf coverage lib",
"lint": "eslint src test",
"dtslint": "dtslint types",
"prettify": "prettier --write --single-quote --trailing-comma=\"es5\" \"{src,test,examples/src}/**/*.js\"",
"precommit": "lint-staged",
"test": "mocha --compilers js:babel-core/register --require ./test/setup.js --recursive",
"test:watch": "npm test -- --watch",
Expand All @@ -40,8 +39,7 @@
"docs:build": "npm run docs:prepare && gitbook build",
"docs:serve": "gitbook serve",
"docs:publish": "npm run docs:clean && npm run docs:build && npm run examples:build && rimraf _book/examples && mv examples/built _book/examples && cd _book && ECHO react-day-picker.js.org > CNAME && git init && git commit --allow-empty -m 'Update docs and examples' && git checkout -b gh-pages && touch .nojekyll && git add . && git commit -am 'Update docs and examples' && git push git@github.com:gpbl/react-day-picker gh-pages --force",
"coveralls": "coveralls < ./coverage/lcov.info",
"codeclimate": "codeclimate-test-reporter < ./coverage/lcov.info"
"coveralls": "coveralls < ./coverage/lcov.info"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -82,7 +80,6 @@
"chai": "3.5.0",
"chai-enzyme": "0.7.1",
"cheerio": "0.22.0",
"codeclimate-test-reporter": "^0.4.1",
"coveralls": "2.13.1",
"dtslint": "^0.1.2",
"enzyme": "2.8.2",
Expand All @@ -91,6 +88,7 @@
"eslint-config-prettier": "2.1.1",
"eslint-plugin-import": "2.3.0",
"eslint-plugin-jsx-a11y": "^5.0.3",
"eslint-plugin-prettier": "^2.1.1",
"eslint-plugin-react": "7.0.1",
"gitbook-cli": "2.3.0",
"husky": "0.13.3",
Expand Down Expand Up @@ -120,8 +118,8 @@
"precommit": "lint-staged",
"lint-staged": {
"*.js": [
"npm run prettify",
"eslint . --fix --cache",
"git add"
]
}
}
}
41 changes: 20 additions & 21 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2023,6 +2023,13 @@ eslint-plugin-jsx-a11y@^5.0.3:
emoji-regex "^6.1.0"
jsx-ast-utils "^1.4.0"

eslint-plugin-prettier@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.1.1.tgz#2fb7e2ab961f2b61d2c8cf91bc17716ca8c53868"
dependencies:
fast-diff "^1.1.1"
jest-docblock "^20.0.1"

eslint-plugin-react@7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.0.1.tgz#e78107e1e559c6e2b17786bb67c2e2a010ad0d2f"
Expand Down Expand Up @@ -2186,6 +2193,10 @@ extsprintf@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"

fast-diff@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.1.tgz#0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b"

fast-levenshtein@~2.0.4:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
Expand Down Expand Up @@ -3121,6 +3132,10 @@ istanbul@1.1.0-alpha.1:
which "^1.1.1"
wordwrap "^1.0.0"

jest-docblock@^20.0.1:
version "20.0.3"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"

jest-matcher-utils@^19.0.0:
version "19.0.0"
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d"
Expand Down Expand Up @@ -3788,7 +3803,7 @@ mocha-junit-reporter@^1.12.0, mocha-junit-reporter@^1.13.0:
mkdirp "~0.5.1"
xml "^1.0.0"

mocha@3.4.2:
mocha@3.4.2, mocha@^3.0.0:
version "3.4.2"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.4.2.tgz#d0ef4d332126dbf18d0d640c9b382dd48be97594"
dependencies:
Expand All @@ -3804,22 +3819,6 @@ mocha@3.4.2:
mkdirp "0.5.1"
supports-color "3.1.2"

mocha@^3.0.0:
version "3.4.1"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.4.1.tgz#a3802b4aa381934cacb38de70cf771621da8f9af"
dependencies:
browser-stdout "1.3.0"
commander "2.9.0"
debug "2.6.0"
diff "3.2.0"
escape-string-regexp "1.0.5"
glob "7.1.1"
growl "1.9.2"
json3 "3.3.2"
lodash.create "3.1.1"
mkdirp "0.5.1"
supports-color "3.1.2"

moment@2.18.1:
version "2.18.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
Expand Down Expand Up @@ -5090,7 +5089,7 @@ request-promise-native@^1.0.3:
stealthy-require "^1.1.0"
tough-cookie ">=2.3.0"

request@2, request@2.79.0, request@^2.47.0:
request@2, request@2.79.0, request@^2.47.0, request@^2.79.0:
version "2.79.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
dependencies:
Expand All @@ -5115,7 +5114,7 @@ request@2, request@2.79.0, request@^2.47.0:
tunnel-agent "~0.4.1"
uuid "^3.0.0"

request@^2.74.0, request@^2.79.0, request@^2.81.0:
request@^2.74.0, request@^2.81.0:
version "2.81.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
dependencies:
Expand Down Expand Up @@ -5566,7 +5565,7 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"

supports-color@3.1.2:
supports-color@3.1.2, supports-color@^3.1.0:
version "3.1.2"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
dependencies:
Expand All @@ -5576,7 +5575,7 @@ supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"

supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
supports-color@^3.1.2, supports-color@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
dependencies:
Expand Down