From 481f67514b7c34a3321cc9e2dbe773a5937d6928 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 23 Jul 2021 16:12:07 +0100
Subject: [PATCH 1/2] Update matrix-org-eslint-plugin and tighten max warning
 limit

Whilst it is down, make the most of it!
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1208b99df1..0043362eb8 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
     "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development --disable-host-check",
     "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
-    "lint:js": "eslint src",
+    "lint:js": "eslint --max-warnings 0 src",
     "lint:js-fix": "eslint --fix src",
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
diff --git a/yarn.lock b/yarn.lock
index 911f00cdb8..a186abfcf5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4252,8 +4252,8 @@ eslint-config-google@^0.14.0:
   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
 
 "eslint-plugin-matrix-org@github:matrix-org/eslint-plugin-matrix-org#main":
-  version "0.3.2"
-  resolved "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/8529f1d77863db6327cf1a1a4fa65d06cc26f91b"
+  version "0.3.3"
+  resolved "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"
 
 eslint-plugin-react-hooks@^4.2.0:
   version "4.2.0"
@@ -7331,8 +7331,8 @@ matrix-mock-request@^1.2.3:
     counterpart "^0.18.6"
     diff-dom "^4.2.2"
     diff-match-patch "^1.0.5"
-    emojibase-data "^6.2.0"
-    emojibase-regex "^5.1.3"
+    emojibase-data "^5.1.1"
+    emojibase-regex "^4.1.1"
     escape-html "^1.0.3"
     file-saver "^2.0.5"
     filesize "6.1.0"

From 940f44c6d358d460b082f026e520170c1581f9ae Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 23 Jul 2021 18:25:34 +0100
Subject: [PATCH 2/2] manually revert bit of yarn going mad

---
 yarn.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a186abfcf5..e85f75b40d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7331,8 +7331,8 @@ matrix-mock-request@^1.2.3:
     counterpart "^0.18.6"
     diff-dom "^4.2.2"
     diff-match-patch "^1.0.5"
-    emojibase-data "^5.1.1"
-    emojibase-regex "^4.1.1"
+    emojibase-data "^6.2.0"
+    emojibase-regex "^5.1.3"
     escape-html "^1.0.3"
     file-saver "^2.0.5"
     filesize "6.1.0"