diff --git a/.codeclimate.yml b/.codeclimate.yml index 19b881c0e..61eb80fc9 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,4 +1,4 @@ -engines: +plugins: duplication: enabled: true config: @@ -14,10 +14,6 @@ engines: csslint: enabled: true -ratings: # enables GPA rating - paths: - - "**.css" - - "**.js" - -exclude_paths: +exclude_patterns: - "tests/" +- "interface/client/lib/signatures.js" diff --git a/.eslintrc.json b/.eslintrc.json index a50ac6d26..25fed0b03 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,7 +3,8 @@ "extends": [ "plugin:prettier/recommended", "eslint:recommended", - "plugin:react/recommended" + "plugin:react/recommended", + "prettier" ], "globals": { "i18n": true, diff --git a/package.json b/package.json index 1d4bc4f52..a81037e81 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "electron": "1.8.8", "electron-builder": "^20.17.2", "eslint": "^4.19.1", - "eslint-config-prettier": "^2.9.0", + "eslint-config-prettier": "^3.1.0", "eslint-plugin-import": "^2.12.0", "eslint-plugin-prettier": "^2.6.0", "eslint-plugin-react": "^7.8.2", diff --git a/yarn.lock b/yarn.lock index 379dc8142..b0295349a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2511,11 +2511,11 @@ escodegen@1.x.x: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^2.9.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.10.0.tgz#ec07bc1d01f87d09f61d3840d112dc8a9791e30b" +eslint-config-prettier@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.1.0.tgz#2c26d2cdcfa3a05f0642cd7e6e4ef3316cdabfa2" dependencies: - get-stdin "^5.0.1" + get-stdin "^6.0.0" eslint-import-resolver-node@^0.3.1: version "0.3.2" @@ -3305,9 +3305,9 @@ get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" -get-stdin@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" +get-stdin@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" get-stream@^2.2.0: version "2.3.1"