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

Use Prettier #1071

Merged
merged 3 commits into from Nov 6, 2018
Merged

Use Prettier #1071

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
033df8b
Use Prettier
timdorr Nov 6, 2018
73e3a16
Make sure linting and formatting are part of the testing process.
timdorr Nov 6, 2018
1849851
Run prettier on existing code.
timdorr Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintrc
View file
Open in desktop
Expand Up @@ -3,7 +3,8 @@
"extends": [
"eslint:recommended",
"plugin:import/recommended",
"plugin:react/recommended"
"plugin:react/recommended",
"plugin:prettier/recommended"
],
"parserOptions": {
"ecmaVersion": 6,
Expand Down
4 changes: 4 additions & 0 deletions .prettierrc
View file
Open in desktop
@@ -0,0 +1,4 @@
{
"semi": false,
"singleQuote": true
}
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@ env:
- REACT=16.6
sudo: false
script:
- npm run lint
- npm run test
- npm test
after_success:
- npm run coverage
45 changes: 45 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -34,8 +34,10 @@
"build:umd:min": "cross-env NODE_ENV=production rollup -c -o dist/react-redux.min.js",
"build": "npm run build:commonjs && npm run build:es && npm run build:umd && npm run build:umd:min",
"clean": "rimraf lib dist es coverage",
"format": "prettier --write '{src,test}/**/*.js'",
"lint": "eslint src test/utils test/components",
"prepare": "npm run clean && npm run build",
"pretest": "npm run lint",
"test": "node ./test/run-tests.js",
"coverage": "codecov"
},
Expand Down Expand Up @@ -68,12 +70,15 @@
"cross-spawn": "^6.0.5",
"es3ify": "^0.2.0",
"eslint": "^4.19.1",
"eslint-config-prettier": "^3.1.0",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-prettier": "^3.0.0",
"eslint-plugin-react": "^7.9.1",
"glob": "^7.1.1",
"jest": "^23.6.0",
"jest-dom": "^1.12.0",
"npm-run": "^5.0.1",
"prettier": "1.14.3",
"react": "^16.6.0",
"react-dom": "^16.6.0",
"react-testing-library": "^5.0.0",
Expand Down