Skip to content

Commit

Permalink
Add prettier config and run on all files
Browse files Browse the repository at this point in the history
  • Loading branch information
mortnod committed Jul 9, 2019
1 parent 5c3df45 commit 1db7abb
Show file tree
Hide file tree
Showing 14 changed files with 65 additions and 58 deletions.
4 changes: 2 additions & 2 deletions flowtype/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module.exports = {
extends: ['plugin:flowtype/recommended'],
parser: 'babel-eslint',
rules: {
'react/forbid-prop-types': ['warn']
}
'react/forbid-prop-types': ['warn'],
},
};
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: ["./javascript", "./prettier"].map(require.resolve)
extends: ['./javascript', './prettier'].map(require.resolve),
};
8 changes: 4 additions & 4 deletions javascript/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const jsRules = require("./rules");
const jsRules = require('./rules');

module.exports = {
extends: ["airbnb-base", "plugin:import/errors", "plugin:import/warnings"],
parser: "babel-eslint",
rules: jsRules
extends: ['airbnb-base', 'plugin:import/errors', 'plugin:import/warnings'],
parser: 'babel-eslint',
rules: jsRules,
};
6 changes: 3 additions & 3 deletions javascript/rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
'import/order': [
'error',
{
groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index']
}
]
groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
},
],
};
4 changes: 2 additions & 2 deletions prettier-flowtype/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
extends: ["prettier/flowtype"],
parser: "babel-eslint"
extends: ['prettier/flowtype'],
parser: 'babel-eslint',
};
4 changes: 2 additions & 2 deletions prettier-react/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
extends: ["prettier/react"],
parser: "babel-eslint"
extends: ['prettier/react'],
parser: 'babel-eslint',
};
6 changes: 3 additions & 3 deletions prettier-typescript/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
parser: "@typescript-eslint/parser", // Specifies the ESLint parser
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
extends: [
"prettier/@typescript-eslint" // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
]
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
],
};
7 changes: 7 additions & 0 deletions prettier.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
printWidth: 80,
singleQuote: true,
trailingComma: 'all',
bracketSpacing: true,
jsxBracketSameLine: true,
};
4 changes: 2 additions & 2 deletions prettier/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = {
extends: [
"plugin:prettier/recommended" // enables-eslint-plugin-prettier, sets the prettier/prettier rule to "error", extends eslint-config-prettier so that we can set prettier options in .prettierrc
'plugin:prettier/recommended', // enables-eslint-plugin-prettier, sets the prettier/prettier rule to "error", extends eslint-config-prettier so that we can set prettier options in .prettierrc
],
// "plugins": [
// "prettier", enabled by the plugin;prettier/recommneded extension
// ],
parser: "babel-eslint"
parser: 'babel-eslint',
};
14 changes: 7 additions & 7 deletions react-flow-recommended/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
extends: [
"../javascript",
"../react",
"../flowtype",
"../prettier",
"../prettier-react/",
"../prettier-flowtype/"
].map(require.resolve)
'../javascript',
'../react',
'../flowtype',
'../prettier',
'../prettier-react/',
'../prettier-flowtype/',
].map(require.resolve),
};
10 changes: 5 additions & 5 deletions react-recommended/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
extends: [
"../javascript",
"../react",
"../prettier",
"../prettier-react/"
].map(require.resolve)
'../javascript',
'../react',
'../prettier',
'../prettier-react/',
].map(require.resolve),
};
14 changes: 7 additions & 7 deletions react-typescript-recommended/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
extends: [
"../javascript",
"../react",
"../typescript",
"../prettier",
"../prettier-react/",
"../prettier-typescript/"
].map(require.resolve)
'../javascript',
'../react',
'../typescript',
'../prettier',
'../prettier-react/',
'../prettier-typescript/',
].map(require.resolve),
};
22 changes: 11 additions & 11 deletions react/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ module.exports = {
extends: [
'airbnb',
'plugin:react/recommended',
'plugin:jsx-a11y/recommended'
'plugin:jsx-a11y/recommended',
],
parser: 'babel-eslint',
rules: Object.assign({}, jsRules, {
// Because Flow can infer default props based on which props are listed in `defaultProps` we disable forbudDefaultForRequired
'react/require-default-props': [
2,
{
forbidDefaultForRequired: false
}
forbidDefaultForRequired: false,
},
],
// We want to encourage destructuring, but in order to do this incrementally we'll onyl warng about it.
// See https://github.com/yannickcr/eslint-plugin-react/issues/1731 for more info.
Expand All @@ -28,19 +28,19 @@ module.exports = {
'static-methods',
'lifecycle',
'everything-else',
'render'
]
}
'render',
],
},
],
'jsx-a11y/label-has-for': [
2,
{
required: {
every: ['id']
every: ['id'],
},
allowChildren: false
}
allowChildren: false,
},
],
'react/no-did-mount-set-state': ['off']
})
'react/no-did-mount-set-state': ['off'],
}),
};
18 changes: 9 additions & 9 deletions typescript/index.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module.exports = {
parser: "@typescript-eslint/parser", // Specifies the ESLint parser
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
extends: [
"plugin:@typescript-eslint/recommended" // Uses the recommended rules from the @typescript-eslint/eslint-plugin
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
],
rules: {
"@typescript-eslint/indent": ["error", 2],
"@typescript-eslint/camelcase": false
'@typescript-eslint/indent': ['error', 2],
'@typescript-eslint/camelcase': false,
},
settings: {
"import/resolver": {
'import/resolver': {
node: {
extensions: [".js", ".jsx", ".ts", ".tsx"]
}
}
}
extensions: ['.js', '.jsx', '.ts', '.tsx'],
},
},
},
};

0 comments on commit 1db7abb

Please sign in to comment.