From 0e82ea847ffac442bcf1a6627b0854a0909ba516 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Thu, 28 Feb 2019 17:35:46 +0100 Subject: [PATCH] Removed conflicts rules --- .eslintrc | 7 +------ yarn.lock | 11 ++--------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.eslintrc b/.eslintrc index ba8397d9..2e86f4d9 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,8 +5,7 @@ "prettier/babel", "prettier/flowtype", "prettier/react", - "plugin:flowtype/recommended", - "plugin:jest/recommended", + "plugin:jest/recommended" ], "globals": { "LOCAL": true, @@ -28,11 +27,7 @@ "react/forbid-prop-types": 0, "react/destructuring-assignment": 0, "react/jsx-one-expression-per-line": 0, - "react/jsx-indent": [2, 4], - "react/jsx-indent-props": [2, 4], "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"]}], - "indent": [2, 4, { "SwitchCase": 1 }], - "no-confusing-arrow": [2,{ "allowParens": true }], "no-console": 0, "no-alert": 0, "no-prototype-builtins": 0, diff --git a/yarn.lock b/yarn.lock index 43629046..c2b51971 100644 --- a/yarn.lock +++ b/yarn.lock @@ -725,7 +725,7 @@ pirates "^4.0.0" source-map-support "^0.5.9" -"@babel/runtime@^7.0.0": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.3.1": version "7.3.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83" integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g== @@ -745,13 +745,6 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.3.1": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83" - integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g== - dependencies: - regenerator-runtime "^0.12.0" - "@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2": version "7.2.2" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907" @@ -3030,7 +3023,7 @@ concat-stream@1.6.0, concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@1.6.2: +concat-stream@1.6.2, concat-stream@^1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==