Skip to content

Commit

Permalink
Adds prettier; bump to 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
joncursi committed Oct 8, 2018
1 parent 0876813 commit c02424a
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 69 deletions.
1 change: 0 additions & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
engines:
markdownlint:
enabled: true
Expand Down
5 changes: 2 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ machine:
node:
version: 10.6.0
services:
- docker
timezone:
America/New_York
- docker
timezone: America/New_York
dependencies:
cache_directories:
- node_modules
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('./index.json');
module.exports = require("./index.json");
74 changes: 16 additions & 58 deletions index.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"plugin:jest/recommended",
"plugin:jsx-a11y/recommended",
"plugin:lodash/recommended",
"plugin:react/recommended"
"plugin:react/recommended",
"prettier"
],
"parser": "babel-eslint",
"parserOptions": {
Expand All @@ -28,43 +29,26 @@
"lodash",
"new-with-error",
"no-loops",
"prettier",
"promise",
"react",
"security",
"you-dont-need-lodash-underscore"
],
"rules": {
"filenames/match-regex": 2,
"filenames/match-exported": [
2,
[
"camel",
"pascal"
],
"\\.(android|ios)$"
],
"flowtype/delimiter-dangle": [
2,
"always-multiline"
],
"flowtype/require-return-type": [
2,
"always"
],
"filenames/match-exported": [2, ["camel", "pascal"], "\\.(android|ios)$"],
"flowtype/delimiter-dangle": [2, "always-multiline"],
"flowtype/require-return-type": [2, "always"],
"flowtype/require-valid-file-annotation": [
2,
"always",
{
"annotationStyle": "block"
}
],
"flowtype/require-variable-type": [
0
],
"flowtype/semi": [
2,
"always"
],
"flowtype/require-variable-type": [0],
"flowtype/semi": [2, "always"],
"flowtype/sort-keys": [
2,
"asc",
Expand All @@ -73,10 +57,7 @@
"natural": false
}
],
"flowtype/type-id-match": [
2,
"^([A-Z][a-z]*)+FlowType$"
],
"flowtype/type-id-match": [2, "^([A-Z][a-z]*)+FlowType$"],
"flowtype-errors/show-errors": 2,
"function-paren-newline": 0,
"immutable/no-let": 0,
Expand All @@ -92,24 +73,14 @@
"import/no-extraneous-dependencies": [
2,
{
"devDependencies": [
"**/*.tests.js",
"**/tests.js",
"scripts/*.js"
]
"devDependencies": ["**/*.tests.js", "**/tests.js", "scripts/*.js"]
}
],
"import/no-named-as-default": 0,
"import/order": [
"error",
{
"groups": [
"builtin",
"external",
"parent",
"sibling",
"index"
],
"groups": ["builtin", "external", "parent", "sibling", "index"],
"newlines-between": "always"
}
],
Expand Down Expand Up @@ -143,6 +114,7 @@
"enforceForRenamedProperties": true
}
],
"prettier/prettier": "error",
"promise/always-return": "error",
"promise/avoid-new": "warn",
"promise/catch-or-return": "error",
Expand All @@ -156,20 +128,13 @@
"react/jsx-filename-extension": [
1,
{
"extensions": [
".js"
]
"extensions": [".js"]
}
],
"react/sort-comp": [
2,
{
"order": [
"static-methods",
"lifecycle",
"everything-else",
"render"
],
"order": ["static-methods", "lifecycle", "everything-else", "render"],
"groups": {
"static-methods": [
"props",
Expand Down Expand Up @@ -248,15 +213,8 @@
"settings": {
"eslint-plugin-disable": {
"paths": {
"filenames": [
"**/*.tests.js",
"**/tests.js"
],
"flowtype": [
"**/*.tests.js",
"**/tests.js",
"scripts/*.js"
]
"filenames": ["**/*.tests.js", "**/tests.js"],
"flowtype": ["**/*.tests.js", "**/tests.js", "scripts/*.js"]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion intl.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('./intl.json');
module.exports = require("./intl.json");
4 changes: 1 addition & 3 deletions intl.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"plugins": [
"react-intl"
],
"plugins": ["react-intl"],
"rules": {
"react-intl/string-is-marked-for-translation": "error"
}
Expand Down
21 changes: 19 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"babel-eslint": "10.0.1",
"eslint": "5.6.1",
"eslint-config-airbnb": "17.1.0",
"eslint-config-prettier": "3.1.0",
"eslint-plugin-disable": "1.0.2",
"eslint-plugin-filenames": "1.3.2",
"eslint-plugin-flowtype": "2.50.3",
Expand All @@ -23,21 +24,37 @@
"eslint-plugin-lodash": "3.1.0",
"eslint-plugin-new-with-error": "2.0.0",
"eslint-plugin-no-loops": "0.3.0",
"eslint-plugin-prettier": "3.0.0",
"eslint-plugin-promise": "4.0.1",
"eslint-plugin-react": "7.11.1",
"eslint-plugin-react-intl": "1.1.2",
"eslint-plugin-security": "1.4.0",
"eslint-plugin-you-dont-need-lodash-underscore": "6.4.0"
},
"description": "✅ Shared ESLint configuration for Cheddur",
"devDependencies": {},
"devDependencies": {
"husky": "1.1.1",
"lint-staged": "7.3.0",
"prettier": "1.14.3"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"homepage": "https://github.com/cheddur/eslint-config#readme",
"keywords": [
"eslint",
"eslintconfig",
"cheddur"
],
"license": "UNLICENSED",
"lint-staged": {
"*.{js,json,css,md}": [
"prettier --write",
"git add"
]
},
"main": "index.js",
"name": "@cheddur/eslint-config",
"peerDependencies": {
Expand All @@ -52,5 +69,5 @@
"test": "docker run --interactive --tty --env CODECLIMATE_CODE=\"$PWD\" --volume \"$PWD\":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc etops/codeclimate analyze",
"prepush": "npm test -- *.md"
},
"version": "2.105.0"
"version": "3.0.0"
}

0 comments on commit c02424a

Please sign in to comment.