Skip to content

Commit

Permalink
Merge branch 'feature/upgrade-fix-dependencies' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
joelpurra committed Jan 31, 2020
2 parents 94d6dfc + c0eb9a9 commit 7a767a0
Show file tree
Hide file tree
Showing 106 changed files with 12,103 additions and 7,078 deletions.
116 changes: 95 additions & 21 deletions .eslintrc
Expand Up @@ -4,33 +4,82 @@
},
"parser": "babel-eslint",
"plugins": [
"compat",
"compat"
],
"extends": [
"standard",
"standard"
],
"globals": {
"browser": false,
"browser": false
},
"settings": {
"react": {
"pragma": "React",
"version": "16"
}
},
"rules": {
"block-scoped-var": "error",
"brace-style": "off",
"camelcase": "error",
"comma-dangle": ["error", "always-multiline"],
"camelcase": [
"error",
{
"allow": [
"^UNSAFE_"
]
}
],
"comma-dangle": [
"error",
"always-multiline"
],
"compat/compat": "error",
"complexity": ["off", 5],
"consistent-this": ["error", "self"],
"complexity": [
"off",
5
],
"consistent-this": [
"error",
"self"
],
"curly": "error",
"dot-notation": ["error", { "allowKeywords": true }],
"dot-notation": [
"error",
{
"allowKeywords": true
}
],
"eol-last": "off",
"eqeqeq": "error",
"guard-for-in": "off",
"indent": ["error", 4, { "MemberExpression": 1 }],
"jsx-quotes": ["error", "prefer-double"],
"max-depth": ["off", 4],
"max-len": ["off", 80, 4],
"max-params": ["off", 3],
"max-statements": ["off", 10],
"indent": [
"error",
4,
{
"MemberExpression": 1
}
],
"jsx-quotes": [
"error",
"prefer-double"
],
"max-depth": [
"off",
4
],
"max-len": [
"off",
80,
4
],
"max-params": [
"off",
3
],
"max-statements": [
"off",
10
],
"new-cap": "error",
"new-parens": "error",
"no-alert": "error",
Expand Down Expand Up @@ -84,25 +133,50 @@
"no-underscore-dangle": "off",
"no-unreachable": "error",
"no-unused-expressions": "error",
"no-unused-vars": ["warn", { "vars": "all", "args": "all", "argsIgnorePattern": "req|res|next" }],
"no-unused-vars": [
"warn",
{
"vars": "all",
"args": "all",
"argsIgnorePattern": "req|res|next"
}
],
"no-use-before-define": "off",
"no-var": "warn",
"no-with": "error",
"one-var": ["warn", "never"],
"operator-linebreak": ["error", "before"],
"one-var": [
"warn",
"never"
],
"operator-linebreak": [
"error",
"before"
],
"prefer-const": "error",
"promise/always-return": "error",
"promise/catch-or-return": "error",
"promise/no-native": "off",
"promise/no-return-wrap": "error",
"promise/param-names": "error",
"quote-props": "off",
"quotes": ["error", "double"],
"quotes": [
"error",
"double"
],
"radix": "off",
"semi": ["error", "always"],
"space-before-function-paren": ["error", "never"],
"semi": [
"error",
"always"
],
"space-before-function-paren": [
"error",
"never"
],
"spaced-comment": "off",
"strict": ["error", "global"],
"strict": [
"error",
"global"
],
"use-isnan": "error",
"valid-typeof": "off",
"wrap-iife": "error",
Expand Down

0 comments on commit 7a767a0

Please sign in to comment.