Fix style

2020-06-24 16:30:00 +01:00 · 2020-06-24 16:30:00 +01:00 · 4b35d635c9
commit 4b35d635c9
parent 4d782e59af 0cc791da64
11 changed files with 313 additions and 182 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -1,39 +1,7 @@
 module.exports = {
-    parser: "@typescript-eslint/parser",
-    parserOptions: {
-        sourceType: "module",
-    },
-    env: {
-        browser: true,
-        jest: true,
-    },
-    extends: ["eslint:recommended", "google"],
-    plugins: [
-        "jest",
+    "extends": [
+        "matrix-org/ts",
+        "matrix-org/react",
    ],
-    rules: {
-        "max-len": ["error", {
-            code: 90,
-            ignoreComments: true,
-        }],
-        curly: ["error", "multi-line"],
-        "prefer-const": ["error"],
-        "comma-dangle": ["error", {
-            arrays: "always-multiline",
-            objects: "always-multiline",
-            imports: "always-multiline",
-            exports: "always-multiline",
-            functions: "always-multiline",
-        }],
-        quotes: ["single"],
-        "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
-        "camelcase": ["error", { properties: "always" } ],
-        "no-multi-spaces": ["error", { "ignoreEOLComments": true }],
-        "space-before-function-paren": ["error", {
-            "anonymous": "never",
-            "named": "never",
-            "asyncArrow": "always",
-        }],
-        "arrow-parens": "error",
-    }
 }
+
--- a/package.json
+++ b/package.json
@ -1,59 +1,60 @@
 {
-  "name": "matrix.to",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.3.2",
-    "@testing-library/user-event": "^7.1.2",
-    "@types/jest": "^24.0.0",
-    "@types/node": "^12.0.0",
-    "@types/react": "^16.9.0",
-    "@types/react-dom": "^16.9.0",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
-    "react-scripts": "3.4.1",
-    "typescript": "~3.7.2"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "lint-staged": {
-    "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
+    "name": "matrix.to",
+    "version": "0.1.0",
+    "private": true,
+    "dependencies": {
+        "@testing-library/jest-dom": "^4.2.4",
+        "@testing-library/react": "^9.3.2",
+        "@testing-library/user-event": "^7.1.2",
+        "@types/jest": "^24.0.0",
+        "@types/node": "^12.0.0",
+        "@types/react": "^16.9.0",
+        "@types/react-dom": "^16.9.0",
+        "react": "^16.13.1",
+        "react-dom": "^16.13.1",
+        "react-scripts": "3.4.1",
+        "typescript": "~3.7.2"
+    },
+    "scripts": {
+        "start": "react-scripts start",
+        "build": "react-scripts build",
+        "test": "react-scripts test",
+        "eject": "react-scripts eject",
+        "lint:fix": "eslint src/**/*.ts src/**/*.tsx --fix"
+    },
+    "lint-staged": {
+        "src/**/*.{js,jsx,ts,tsx}": [
+            "eslint",
+            "prettier --write --tab-width 4",
+            "git add"
+        ],
+        "src/**/*.{json,css,scss,md}": [
+            "prettier --write --tab-width 4",
+            "git add"
+        ]
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "lint-staged"
+        }
+    },
+    "browserslist": {
+        "production": [
+            ">0.2%",
+            "not dead",
+            "not op_mini all"
+        ],
+        "development": [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 safari version"
+        ]
+    },
+    "devDependencies": {
+        "eslint-config-matrix-org": "^0.1.0",
+        "husky": "^4.2.5",
+        "lint-staged": "^10.2.7",
+        "node-sass": "^4.14.1",
+        "prettier": "^2.0.5"
    }
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {
-    "@types/classnames": "^2.2.10",
-    "@typescript-eslint/parser": "^3.0.2",
-    "classnames": "^2.2.6",
-    "husky": "^4.2.5",
-    "lint-staged": "^10.2.7",
-    "node-sass": "^4.14.1",
-    "prettier": "^2.0.5"
-  }
 }
--- a/src/App.scss
+++ b/src/App.scss
@ -15,19 +15,19 @@ limitations under the License.
 */

@mixin spacer {
-  width: 100%;
-  flex-grow: 1;
-  flex-shrink: 0;
+    width: 100%;
+    flex-grow: 1;
+    flex-shrink: 0;
 }

 .topSpacer {
-  @include spacer;
+    @include spacer;

-  height: 30vh;
+    height: 30vh;
 }

 .bottomSpacer {
-  @include spacer;
+    @include spacer;

-  height: 10vh;
+    height: 10vh;
 }
--- a/src/App.tsx
+++ b/src/App.tsx
@ -19,13 +19,13 @@ import "./App.scss";

 import SingleColumn from "./layouts/SingleColumn";

-function App() {
-  return (
-    <SingleColumn>
-      <div className="topSpacer" />
-      <div className="bottomSpacer" />
-    </SingleColumn>
-  );
-}
+const App: React.FC = () => {
+    return (
+        <SingleColumn>
+            <div className="topSpacer" />
+            <div className="bottomSpacer" />
+        </SingleColumn>
+    );
+};

 export default App;
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@ -20,42 +20,44 @@ import classnames from "classnames";
 import "./Button.scss";

 interface IProps extends React.ButtonHTMLAttributes<Element> {
-  // Briefly display these instead of the children onClick
-  flashChildren?: React.ReactNode;
+    // Briefly display these instead of the children onClick
+    flashChildren?: React.ReactNode;
 }

 /**
 * Like a normal button except it will flash content when clicked.
 */
-export default ({
-  onClick,
-  children,
-  flashChildren,
-  className,
-  ...restProps
+const Button: React.FC<IProps> = ({
+    onClick,
+    children,
+    flashChildren,
+    className,
+    ...restProps
 }: IProps) => {
-  const [wasClicked, setWasClicked] = React.useState(false);
+    const [wasClicked, setWasClicked] = React.useState(false);

-  const wrappedOnClick: React.MouseEventHandler = (e) => {
-    if (onClick) {
-      onClick(e);
-    }
+    const wrappedOnClick: React.MouseEventHandler = (e) => {
+        if (onClick) {
+            onClick(e);
+        }

-    setWasClicked(true);
-    window.setTimeout(() => {
-      setWasClicked(false);
-    }, 1000);
-  };
+        setWasClicked(true);
+        window.setTimeout(() => {
+            setWasClicked(false);
+        }, 1000);
+    };

-  const content = wasClicked ? flashChildren : children;
+    const content = wasClicked ? flashChildren : children;

-  const classNames = classnames("button", className, {
-    buttonHighlight: wasClicked,
-  });
+    const classNames = classnames("button", className, {
+        buttonHighlight: wasClicked,
+    });

-  return (
-    <button className={classNames} onClick={wrappedOnClick} {...restProps}>
-      {content}
-    </button>
-  );
+    return (
+        <button className={classNames} onClick={wrappedOnClick} {...restProps}>
+            {content}
+        </button>
+    );
 };
+
+export default Button;
--- a/src/components/Tile.tsx
+++ b/src/components/Tile.tsx
@ -19,9 +19,11 @@ import React from "react";
 import "./Tile.scss";

 interface IProps {
-  children: React.ReactNode;
+    children: React.ReactNode;
 }

-export default (props: IProps) => {
-  return <div className="tile">{props.children}</div>;
+const Tile: React.FC<IProps> = (props: IProps) => {
+    return <div className="tile">{props.children}</div>;
 };
+
+export default Tile;
--- a/src/index.scss
+++ b/src/index.scss
@ -19,8 +19,8 @@ limitations under the License.
 // CSS reset

 * {
-  box-sizing: border-box;
-  margin: 0;
+    box-sizing: border-box;
+    margin: 0;
 }

 // Styling for universal elements
@ -28,19 +28,19 @@ limitations under the License.
 html,
 body,
 #root {
-  height: 100%;
-  width: 100%;
+    height: 100%;
+    width: 100%;

-  font-family: Helvetica Neue;
-  font-style: normal;
+    font-family: Helvetica Neue;
+    font-style: normal;

-  background-color: $app-background;
-  color: $font;
+    background-color: $app-background;
+    color: $font;
 }

 h1 {
-  font-weight: bold;
-  font-size: 24px;
-  line-height: 32px;
-  text-align: center;
+    font-weight: bold;
+    font-size: 24px;
+    line-height: 32px;
+    text-align: center;
 }
--- a/src/index.tsx
+++ b/src/index.tsx
@ -4,8 +4,8 @@ import "./index.scss";
 import App from "./App";

 ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById("root")
+    <React.StrictMode>
+        <App />
+    </React.StrictMode>,
+    document.getElementById("root")
 );
--- a/src/layouts/SingleColumn.scss
+++ b/src/layouts/SingleColumn.scss
@ -1,11 +1,11 @@
 .singleColumnLayout {
-  height: 100%;
+    height: 100%;

-  padding: 0 1em;
-  margin: 0 auto;
+    padding: 0 1em;
+    margin: 0 auto;

-  max-width: 550px;
+    max-width: 550px;

-  display: flex;
-  flex-direction: column;
+    display: flex;
+    flex-direction: column;
 }
--- a/src/layouts/SingleColumn.tsx
+++ b/src/layouts/SingleColumn.tsx
@ -19,9 +19,11 @@ import React from "react";
 import "./SingleColumn.scss";

 interface IProps {
-  children?: React.ReactNode;
+    children?: React.ReactNode;
 }

-export default (props: IProps) => {
-  return <div className="singleColumnLayout">{props.children}</div>;
+const SingleColumn: React.FC<IProps> = (props: IProps) => {
+    return <div className="singleColumnLayout">{props.children}</div>;
 };
+
+export default SingleColumn;
--- a/yarn.lock
+++ b/yarn.lock
@ -1574,6 +1574,11 @@
  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
  integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==

+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
 "@types/minimatch@*":
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@ -1676,6 +1681,18 @@
    regexpp "^3.0.0"
    tsutils "^3.17.1"

+"@typescript-eslint/eslint-plugin@^3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.4.0.tgz#8378062e6be8a1d049259bdbcf27ce5dfbeee62b"
+  integrity sha512-wfkpiqaEVhZIuQRmudDszc01jC/YR7gMSxa6ulhggAe/Hs0KVIuo9wzvFiDbG3JD5pRFQoqnf4m7REDsUvBnMQ==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "3.4.0"
+    debug "^4.1.1"
+    functional-red-black-tree "^1.0.1"
+    regexpp "^3.0.0"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
+
 "@typescript-eslint/experimental-utils@2.34.0":
  version "2.34.0"
  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
@ -1686,13 +1703,13 @@
    eslint-scope "^5.0.0"
    eslint-utils "^2.0.0"

-"@typescript-eslint/experimental-utils@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.1.0.tgz#2d5dba7c2ac2a3da3bfa3f461ff64de38587a872"
-  integrity sha512-Zf8JVC2K1svqPIk1CB/ehCiWPaERJBBokbMfNTNRczCbQSlQXaXtO/7OfYz9wZaecNvdSvVADt6/XQuIxhC79w==
+"@typescript-eslint/experimental-utils@3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.4.0.tgz#8a44dfc6fb7f1d071937b390fe27608ebda122b8"
+  integrity sha512-rHPOjL43lOH1Opte4+dhC0a/+ks+8gOBwxXnyrZ/K4OTAChpSjP76fbI8Cglj7V5GouwVAGaK+xVwzqTyE/TPw==
  dependencies:
    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "3.1.0"
+    "@typescript-eslint/typescript-estree" "3.4.0"
    eslint-scope "^5.0.0"
    eslint-utils "^2.0.0"

@ -1706,14 +1723,14 @@
    "@typescript-eslint/typescript-estree" "2.34.0"
    eslint-visitor-keys "^1.1.0"

-"@typescript-eslint/parser@^3.0.2":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.1.0.tgz#9c02ba5d88ad2355672f39e6cd4176f172dd47f8"
-  integrity sha512-NcDSJK8qTA2tPfyGiPes9HtVKLbksmuYjlgGAUs7Ld2K0swdWibnCq9IJx9kJN8JJdgUJSorFiGaPHBgH81F/Q==
+"@typescript-eslint/parser@^3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.4.0.tgz#fe52b68c5cb3bba3f5d875bd17adb70420d49d8d"
+  integrity sha512-ZUGI/de44L5x87uX5zM14UYcbn79HSXUR+kzcqU42gH0AgpdB/TjuJy3m4ezI7Q/jk3wTQd755mxSDLhQP79KA==
  dependencies:
    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "3.1.0"
-    "@typescript-eslint/typescript-estree" "3.1.0"
+    "@typescript-eslint/experimental-utils" "3.4.0"
+    "@typescript-eslint/typescript-estree" "3.4.0"
    eslint-visitor-keys "^1.1.0"

 "@typescript-eslint/typescript-estree@2.34.0":
@ -1729,10 +1746,10 @@
    semver "^7.3.2"
    tsutils "^3.17.1"

-"@typescript-eslint/typescript-estree@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.1.0.tgz#eaff52d31e615e05b894f8b9d2c3d8af152a5dd2"
-  integrity sha512-+4nfYauqeQvK55PgFrmBWFVYb6IskLyOosYEmhH3mSVhfBp9AIJnjExdgDmKWoOBHRcPM8Ihfm2BFpZf0euUZQ==
+"@typescript-eslint/typescript-estree@3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.4.0.tgz#6a787eb70b48969e4cd1ea67b057083f96dfee29"
+  integrity sha512-zKwLiybtt4uJb4mkG5q2t6+W7BuYx2IISiDNV+IY68VfoGwErDx/RfVI7SWL4gnZ2t1A1ytQQwZ+YOJbHHJ2rw==
  dependencies:
    debug "^4.1.1"
    eslint-visitor-keys "^1.1.0"
@ -2183,7 +2200,7 @@ array-unique@^0.3.2:
  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=

-array.prototype.flat@^1.2.1:
+array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
@ -2326,7 +2343,7 @@ babel-code-frame@^6.22.0:
    esutils "^2.0.2"
    js-tokens "^3.0.2"

-babel-eslint@10.1.0:
+babel-eslint@10.1.0, babel-eslint@^10.0.1, babel-eslint@^10.1.0:
  version "10.1.0"
  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
@ -4217,6 +4234,42 @@ escodegen@^1.11.0, escodegen@^1.9.1:
  optionalDependencies:
    source-map "~0.6.1"

+eslint-config-esnext@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-esnext/-/eslint-config-esnext-4.1.0.tgz#8695b858fcf40d28c1aedca181f700528c7b60c6"
+  integrity sha512-GhfVEXdqYKEIIj7j+Fw2SQdL9qyZMekgXfq6PyXM66cQw0B435ddjz3P3kxOBVihMRJ0xGYjosaveQz5Y6z0uA==
+  dependencies:
+    babel-eslint "^10.0.1"
+    eslint "^6.8.0"
+    eslint-plugin-babel "^5.2.1"
+    eslint-plugin-import "^2.14.0"
+
+eslint-config-google@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a"
+  integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
+
+eslint-config-matrix-org@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.0.tgz#6ca245d4f63b781e6d3223d014bc66141235a694"
+  integrity sha512-oxsXK5i4AHSbA9122U9OCfenL21cPzw2byZiktTSC1I21kSNSxFOfdunv5ua9zGpajwQEg2o35Yrnro5N5WqQg==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "^3.4.0"
+    "@typescript-eslint/parser" "^3.4.0"
+    babel-eslint "^10.1.0"
+    eslint-config-google "^0.14.0"
+    eslint-config-recommended "^4.1.0"
+    eslint-plugin-babel "^5.3.0"
+    typescript "^3.9.5"
+
+eslint-config-node@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-node/-/eslint-config-node-4.1.0.tgz#fc1f13946d83766d6b83b0e67699e2071a56f417"
+  integrity sha512-Wz17xV5O2WFG8fGdMYEBdbiL6TL7YNJSJvSX9V4sXQownewfYmoqlly7wxqLkOUv/57pq6LnnotMiQQrrPjCqQ==
+  dependencies:
+    eslint "^6.8.0"
+    eslint-config-esnext "^4.1.0"
+
 eslint-config-react-app@^5.2.1:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz#698bf7aeee27f0cea0139eaef261c7bf7dd623df"
@ -4224,6 +4277,26 @@ eslint-config-react-app@^5.2.1:
  dependencies:
    confusing-browser-globals "^1.0.9"

+eslint-config-react-native@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-native/-/eslint-config-react-native-4.1.0.tgz#63e9401c7fac146804785f609e7df8f15b3e04eb"
+  integrity sha512-kNND+cs+ztawH7wgajf/K6FfNshjlDsFDAkkFZF9HAXDgH1w1sNMIfTfwzufg0hOcSK7rbiL4qbG/gg/oR507Q==
+  dependencies:
+    eslint "^6.8.0"
+    eslint-config-esnext "^4.1.0"
+    eslint-plugin-react "^7.19.0"
+    eslint-plugin-react-native "^3.8.1"
+
+eslint-config-recommended@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-recommended/-/eslint-config-recommended-4.1.0.tgz#1adff90e0716d439be471d192977f233de171a46"
+  integrity sha512-2evA0SX1VqtyFiExmBI2WAO4XQCKlr7wmNELE8rcT5PyZY2ixsY881ofVZWKuI/dywpgLiES1gR/XUQcnVLRzQ==
+  dependencies:
+    eslint "^6.8.0"
+    eslint-config-esnext "^4.1.0"
+    eslint-config-node "^4.1.0"
+    eslint-config-react-native "^4.1.0"
+
 eslint-import-resolver-node@^0.3.2:
  version "0.3.3"
  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
@ -4232,6 +4305,14 @@ eslint-import-resolver-node@^0.3.2:
    debug "^2.6.9"
    resolve "^1.13.1"

+eslint-import-resolver-node@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.13.1"
+
 eslint-loader@3.0.3:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.3.tgz#e018e3d2722381d982b1201adb56819c73b480ca"
@ -4243,7 +4324,7 @@ eslint-loader@3.0.3:
    object-hash "^2.0.1"
    schema-utils "^2.6.1"

-eslint-module-utils@^2.4.1:
+eslint-module-utils@^2.4.1, eslint-module-utils@^2.6.0:
  version "2.6.0"
  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
@ -4251,6 +4332,13 @@ eslint-module-utils@^2.4.1:
    debug "^2.6.9"
    pkg-dir "^2.0.0"

+eslint-plugin-babel@^5.2.1, eslint-plugin-babel@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.0.tgz#2e7f251ccc249326da760c1a4c948a91c32d0023"
+  integrity sha512-HPuNzSPE75O+SnxHIafbW5QB45r2w78fxqwK3HmjqIUoPfPzVrq6rD+CINU3yzoDSzEhUkX07VUphbF73Lth/w==
+  dependencies:
+    eslint-rule-composer "^0.3.0"
+
 eslint-plugin-flowtype@4.6.0:
  version "4.6.0"
  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz#82b2bd6f21770e0e5deede0228e456cb35308451"
@ -4276,6 +4364,25 @@ eslint-plugin-import@2.20.1:
    read-pkg-up "^2.0.0"
    resolve "^1.12.0"

+eslint-plugin-import@^2.14.0:
+  version "2.21.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.21.2.tgz#8fef77475cc5510801bedc95f84b932f7f334a7c"
+  integrity sha512-FEmxeGI6yaz+SnEB6YgNHlQK1Bs2DKLM+YF+vuTk5H8J9CLbJLtlPvRFgZZ2+sXiKAlN5dpdlrWOjK8ZoZJpQA==
+  dependencies:
+    array-includes "^3.1.1"
+    array.prototype.flat "^1.2.3"
+    contains-path "^0.1.0"
+    debug "^2.6.9"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.3"
+    eslint-module-utils "^2.6.0"
+    has "^1.0.3"
+    minimatch "^3.0.4"
+    object.values "^1.1.1"
+    read-pkg-up "^2.0.0"
+    resolve "^1.17.0"
+    tsconfig-paths "^3.9.0"
+
 eslint-plugin-jsx-a11y@6.2.3:
  version "6.2.3"
  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa"
@ -4296,6 +4403,18 @@ eslint-plugin-react-hooks@^1.6.1:
  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz#6210b6d5a37205f0b92858f895a4e827020a7d04"
  integrity sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA==

+eslint-plugin-react-native-globals@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz#ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"
+  integrity sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==
+
+eslint-plugin-react-native@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz#92811e37191ecb0d29c0f0a0c9e5c943ee573821"
+  integrity sha512-6Z4s4nvgFRdda/1s1+uu4a6EMZwEjjJ9Bk/1yBImv0fd9U2CsGu2cUakAtV83cZKhizbWhSouXoaK4JtlScdFg==
+  dependencies:
+    eslint-plugin-react-native-globals "^0.1.1"
+
 eslint-plugin-react@7.19.0:
  version "7.19.0"
  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666"
@ -4314,6 +4433,28 @@ eslint-plugin-react@7.19.0:
    string.prototype.matchall "^4.0.2"
    xregexp "^4.3.0"

+eslint-plugin-react@^7.19.0:
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3"
+  integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==
+  dependencies:
+    array-includes "^3.1.1"
+    doctrine "^2.1.0"
+    has "^1.0.3"
+    jsx-ast-utils "^2.2.3"
+    object.entries "^1.1.1"
+    object.fromentries "^2.0.2"
+    object.values "^1.1.1"
+    prop-types "^15.7.2"
+    resolve "^1.15.1"
+    string.prototype.matchall "^4.0.2"
+    xregexp "^4.3.0"
+
+eslint-rule-composer@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
+  integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
+
 eslint-scope@^4.0.3:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@ -4349,7 +4490,7 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==

-eslint@^6.6.0:
+eslint@^6.6.0, eslint@^6.8.0:
  version "6.8.0"
  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
@ -9611,7 +9752,7 @@ resolve@1.15.0:
  dependencies:
    path-parse "^1.0.6"

-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
  version "1.17.0"
  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@ -10820,6 +10961,16 @@ ts-pnp@^1.1.6:
  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==

+tsconfig-paths@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
+  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
 tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
  version "1.13.0"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
@ -10889,6 +11040,11 @@ typedarray@^0.0.6:
  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

+typescript@^3.9.5:
+  version "3.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
+  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
+
 typescript@~3.7.2:
  version "3.7.5"
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"