Merge pull request #6814 from matrix-org/dbkr/yarnupgrade_20210914

yarn upgrade
2021-09-15 17:53:05 +01:00 · 2021-09-15 17:53:05 +01:00 · 9bff6afd11
parent eaab8e1570 22500a2e29
commit 9bff6afd11
2 changed files with 563 additions and 539 deletions
--- a/package.json
+++ b/package.json
@ -178,6 +178,9 @@
    "typescript": "4.3.5",
    "walk": "^2.3.14"
  },
+  "resolutions": {
+    "@types/react": "17.0.14"
+  },
  "jest": {
    "testEnvironment": "./__test-utils__/environment.js",
    "testMatch": [
--- a/yarn.lock
+++ b/yarn.lock