Skip to content

Commit

Permalink
add prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
kremalicious committed Aug 19, 2019
1 parent 9385d71 commit faf1e86
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "./index.js"
}
"extends": ["./index.js", "prettier/standard", "plugin:prettier/recommended"]
}
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"semi": false,
"singleQuote": true,
"trailingComma": "none"
}
60 changes: 30 additions & 30 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
module.exports = {
extends: [
'eslint:recommended',
'plugin:security/recommended',
'standard'
],
extends: ['eslint:recommended', 'plugin:security/recommended', 'standard'],

'plugins': ['security'],
plugins: ['security'],

rules: {
'indent': [2, 4, { 'SwitchCase': 1, 'VariableDeclarator': 1 }],
'space-before-function-paren': [2, { 'anonymous': 'never', 'named': 'never' }],
rules: {
indent: [2, 4, { SwitchCase: 1, VariableDeclarator: 1 }],
'space-before-function-paren': [2, { anonymous: 'never', named: 'never' }],

// Prefer destructuring from arrays and objects
// https://eslint.org/docs/rules/prefer-destructuring
'prefer-destructuring': ['error', {
VariableDeclarator: {
array: false,
object: true
},
AssignmentExpression: {
array: true,
object: true
}
}, {
enforceForRenamedProperties: false
}],
// Prefer destructuring from arrays and objects
// https://eslint.org/docs/rules/prefer-destructuring
'prefer-destructuring': [
'error',
{
VariableDeclarator: {
array: false,
object: true
},
AssignmentExpression: {
array: true,
object: true
}
},
{
enforceForRenamedProperties: false
}
],

// Enforce consistent spacing inside braces
// https://eslint.org/docs/rules/object-curly-spacing
'object-curly-spacing': ['error', 'always'],
// Enforce consistent spacing inside braces
// https://eslint.org/docs/rules/object-curly-spacing
'object-curly-spacing': ['error', 'always'],

// Disable detect-object-injection
// https://github.com/nodesecurity/eslint-plugin-security/issues/21
'security/detect-object-injection': 0
}
// Disable detect-object-injection
// https://github.com/nodesecurity/eslint-plugin-security/issues/21
'security/detect-object-injection': 0
}
}
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"description": "ESLint configuration for all of Ocean Protocol's JavaScript",
"main": "index.js",
"scripts": {
"test": "eslint .",
"test": "eslint --ignore-path .gitignore --ext .js .",
"format": "prettier --ignore-path .gitignore --write '**/*.js'",
"release": "release-it --non-interactive",
"changelog": "auto-changelog -p"
},
Expand All @@ -31,6 +32,9 @@
},
"devDependencies": {
"auto-changelog": "^1.15.0",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-prettier": "^3.1.0",
"prettier": "^1.18.2",
"release-it": "^12.3.5"
},
"repository": {
Expand Down
24 changes: 12 additions & 12 deletions react.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
const base = require('./index.js')

const reactRules = {
'jsx-quotes': ['error', 'prefer-double'],
'react/jsx-indent': [2, 4],
'react/jsx-indent-props': [2, 4]
'jsx-quotes': ['error', 'prefer-double'],
'react/jsx-indent': [2, 4],
'react/jsx-indent-props': [2, 4]
}

module.exports = {
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:security/recommended',
'standard',
'standard-react'
],
'plugins': ['security'],
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:security/recommended',
'standard',
'standard-react'
],
plugins: ['security'],

rules: Object.assign({}, base.rules, reactRules)
rules: Object.assign({}, base.rules, reactRules)
}

0 comments on commit faf1e86

Please sign in to comment.