Skip to content

Commit

Permalink
Merge branch 'develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeldzjap committed Sep 11, 2020
2 parents 1499450 + d59d11e commit b339ecf
Show file tree
Hide file tree
Showing 19 changed files with 4,875 additions and 1,906 deletions.
360 changes: 15 additions & 345 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
"es6": true,
"jest/globals": true
},
"extends": [
"eslint:recommended",
"plugin:jest/recommended",
"plugin:@typescript-eslint/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 6,
Expand All @@ -21,353 +16,28 @@
"@typescript-eslint",
"jest"
],
"extends": [
"eslint:recommended",
"plugin:jest/recommended",
"plugin:eslint-comments/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended",
"prettier/standard",
"prettier/@typescript-eslint"
],
"rules": {
"accessor-pairs": "warn",
"array-bracket-newline": ["error", "consistent"],
"array-bracket-spacing": ["error", "never"],
"array-callback-return": "warn",
"arrow-body-style": ["warn", "as-needed"],
"arrow-parens": ["error", "as-needed"],
"arrow-spacing": "error",
"block-scoped-var": "error",
"block-spacing": "error",
"brace-style": [
"error",
"1tbs",
{"allowSingleLine": true}
],
"callback-return": "warn",
"camelcase": [
"warn",
{"properties": "never"}
],
"capitalized-comments": [
"warn",
"always",
{
"line": {
"ignorePattern": "pragma",
"ignoreInlineComments": true,
"ignoreConsecutiveComments": true
},
"block": {
"ignoreInlineComments": true,
"ignoreConsecutiveComments": true
}
}
],
"comma-dangle": [
"error",
{
"arrays": "only-multiline",
"objects": "only-multiline",
"imports": "only-multiline",
"exports": "only-multiline",
"functions": "ignore"
}
],
"comma-spacing": [
"error",
{"before": false, "after": true}
],
"comma-style": ["error", "last"],
"complexity": ["warn", 20],
"computed-property-spacing": ["error", "never"],
"consistent-return": "warn",
"consistent-this": ["error", "self"],
"curly": ["error", "multi-line"],
"default-case": [
"warn",
{"commentPattern": "^no default$"}
],
"dot-location": [
"warn",
"property"
],
"dot-notation": "error",
"eol-last": ["error", "always"],
"eqeqeq": [
"error",
"always",
{"null": "ignore"}
],
"for-direction": "error",
"func-call-spacing": ["error", "never"],
"func-names": ["warn", "as-needed"],
"func-style": [
"error",
"declaration",
{"allowArrowFunctions": true}
],
"function-paren-newline": ["error", "consistent"],
"generator-star-spacing": "error",
"getter-return": "error",
"global-require": "warn",
"handle-callback-err": "warn",
"implicit-arrow-linebreak": ["error", "beside"],
"indent": [
"error",
4,
{"SwitchCase": 1}
],
"jsx-quotes": ["error", "prefer-double"],
"key-spacing": [
"error",
{"beforeColon": false, "mode": "strict"}
],
"keyword-spacing": [
"error",
{"before": true, "after": true}
],
"linebreak-style": ["error", "unix"],
"lines-around-comment": [
"error",
{
"beforeBlockComment": true,
"allowBlockStart": true,
"allowBlockEnd": true,
"allowClassStart": false,
"allowClassEnd": false,
"allowObjectStart": true,
"allowObjectEnd": true,
"allowArrayStart": true,
"allowArrayEnd": true,
"ignorePattern": "pragma"
}
],
"lines-between-class-members": [
"error",
"always",
{"exceptAfterSingleLine": true}
],
"max-depth": ["warn", 2],
"max-len": [
"warn",
{"code": 80, "comments": 80, "ignoreUrls": true}
],
"max-lines": [
"warn",
{"max": 300, "skipBlankLines": true, "skipComments": true}
],
"max-nested-callbacks": ["warn", 4],
"max-params": ["warn", 3],
"max-statements": [
"warn",
20,
{"ignoreTopLevelFunctions": true}
],
"multiline-ternary": ["error", "always-multiline"],
"newline-per-chained-call": [
"warn",
{"ignoreChainWithDepth": 2}
],
"no-alert": "error",
"no-array-constructor": "warn",
"no-buffer-constructor": "error",
"no-caller": "error",
"no-confusing-arrow": "warn",
"no-div-regex": "error",
"no-duplicate-imports": [
"error",
{"includeExports": true}
],
"no-else-return": [
"error",
{"allowElseIf": false}
],
"no-empty-function": [
"error",
{"allow": ["arrowFunctions"]}
],
"no-eq-null": "error",
"no-eval": "error",
"no-extend-native": "warn",
"no-extra-bind": "error",
"no-extra-label": "error",
"no-floating-decimal": "warn",
"no-implicit-globals": "error",
"no-implied-eval": "error",
"no-invalid-this": "warn",
"no-iterator": "error",
"no-labels": "warn",
"no-lone-blocks": "error",
"no-lonely-if": "error",
"no-loop-func": "error",
"no-magic-numbers": "warn",
"no-mixed-requires": "error",
"no-multi-spaces": "error",
"no-multi-str": "error",
"no-multiple-empty-lines": [
"error",
{"max": 2, "maxEOF": 1, "maxBOF": 0}
],
"no-negated-condition": "warn",
"no-nested-ternary": "warn",
"no-new": "warn",
"no-new-func": "error",
"no-new-object": "error",
"no-new-require": "error",
"no-new-wrappers": "error",
"no-octal-escape": "error",
"no-param-reassign": "warn",
"no-path-concat": "error",
"no-process-env": "warn",
"no-process-exit": "warn",
"no-proto": "error",
"no-return-assign": "error",
"no-return-await": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-shadow-restricted-names": "error",
"no-sync": "warn",
"no-template-curly-in-string": "error",
"no-throw-literal": "error",
"no-trailing-spaces": "warn",
"no-undef": "off",
"no-undef-init": "error",
"no-undefined": "error",
"no-unmodified-loop-condition": "error",
"no-unneeded-ternary": "error",
"no-unused-expressions": [
"error",
{"allowShortCircuit": true, "allowTernary": true}
],
"no-unused-vars": [
"warn",
{"ignoreRestSiblings": true}
],
"no-use-before-define": [
"warn",
{"functions": false}
],
"no-useless-call": "error",
"no-useless-computed-key": "error",
"no-useless-concat": "error",
"no-useless-constructor": "error",
"no-useless-rename": "error",
"no-useless-return": "warn",
"no-var": "error",
"no-void": "error",
"no-whitespace-before-property": "error",
"no-with": "error",
"object-curly-newline": [
"error",
{"consistent": true}
],
"object-curly-spacing": ["error", "never"],
"object-property-newline": [
"error",
{"allowAllPropertiesOnSameLine": true}
],
"object-shorthand": ["error", "always"],
"one-var": [
"error",
{"initialized": "never"}
],
"one-var-declaration-per-line": ["error", "initializations"],
"operator-assignment": ["warn", "always"],
"operator-linebreak": ["error", "before"],
"padded-blocks": [
"warn",
{"blocks": "never", "classes": "always", "switches": "never"}
],
"prefer-arrow-callback": "warn",
"prefer-const": "error",
"prefer-destructuring": [
"warn",
{
"VariableDeclarator": {"object": true, "array": false},
"AssignmentExpression": {"object": true, "array": false}
},
{"enforceForRenamedProperties": false}
],
"prefer-promise-reject-errors": "warn",
"prefer-rest-params": "warn",
"prefer-spread": "warn",
"prefer-template": "warn",
"quote-props": [
"error",
"as-needed",
{"keywords": true, "numbers": true}
],
"quotes": ["error", "single"],
"radix": [
"error",
"as-needed"
],
"rest-spread-spacing": ["error", "never"],
"require-await": "error",
"prettier/prettier": "error",
"require-jsdoc": [
"warn",
"error",
{
"require": {
"FunctionDeclaration": true,
"MethodDefinition": false,
"ClassDeclaration": false,
"MethodDefinition": true,
"ClassDeclaration": true,
"ArrowFunctionExpression": true,
"FunctionExpression": false
"FunctionExpression": true
}
}
],
"semi": ["error", "always"],
"semi-spacing": [
"error",
{"before": false, "after": true}
],
"semi-style": ["error", "last"],
"space-before-blocks": "error",
"space-before-function-paren": [
"error",
{"anonymous": "always", "named": "never", "asyncArrow": "always"}
],
"space-in-parens": "error",
"space-infix-ops": [
"error",
{"int32Hint": false}
],
"space-unary-ops": "error",
"spaced-comment": [
"error",
"always",
{
"line": {"exceptions": ["-"], "markers": ["/"]},
"block": {"exceptions": ["*"]}
}
],
"strict": ["error", "never"],
"switch-colon-spacing": "error",
"symbol-description": "error",
"template-curly-spacing": "error",
"template-tag-spacing": "error",
"unicode-bom": ["error", "never"],
"valid-jsdoc": [
"warn",
{
"prefer": {
"arg": "param",
"argument": "param",
"class": "constructor",
"return": "returns",
"virtual": "abstract"
},
"preferType": {
"Boolean": "boolean",
"Number": "number",
"object": "Object",
"String": "string"
},
"requireReturn": false,
"matchDescription": ".+",
"requireParamDescription": false,
"requireReturnDescription": false
}
],
"vars-on-top": "warn",
"wrap-iife": [
"error",
"any"
],
"yield-star-spacing": "error"
]
}
}
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/.scannerwork
/coverage
/dist
npm-debug.log
.DS_Store
.rpt2_cache
.DS_Store
.eslintcache
npm-debug.log
Loading

0 comments on commit b339ecf

Please sign in to comment.