Merge branch 'develop' into stop-sending-fallback

Signed-off-by: Aaron Raimist <[email protected]>

.eslintignore

@@ -2,3 +2,4 @@ src/component-index.js
 test/end-to-end-tests/node_modules/
 test/end-to-end-tests/element/
 test/end-to-end-tests/synapse/
+test/end-to-end-tests/lib/

.eslintrc.js

@@ -66,8 +66,8 @@ module.exports = {
     settings: {
         react: {
             version: "detect",
-        }
-    }
+        },
+    },
 };
 
 function buildRestrictedPropertiesOptions(properties, message) {

.github/workflows/develop.yml

@@ -10,7 +10,7 @@ on:
 jobs:
     end-to-end:
         runs-on: ubuntu-latest
-        env: 
+        env:
           PR_NUMBER: ${{github.event.number}}
         container: vectorim/element-web-ci-e2etests-env:latest
         steps:

.github/workflows/layered-build.yaml

@@ -1,7 +1,6 @@
 name: Layered Preview Build
 on:
     pull_request:
-        branches: [develop]
 jobs:
     build:
         runs-on: ubuntu-latest

.github/workflows/netlify.yaml

@@ -69,7 +69,7 @@ jobs:
                   NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
               timeout-minutes: 1
             - name: Edit PR Description
-              uses: velas/[email protected]
+              uses: Beakyn/gha-comment-pull-request@2167a7aee24f9e61ce76a23039f322e49a990409
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               with:

.github/workflows/notify-element-web.yml

@@ -0,0 +1,15 @@
+name: Notify element-web
+on:
+    push:
+        branches: [develop]
+jobs:
+    notify-element-web:
+        runs-on: ubuntu-latest
+        environment: develop
+        steps:
+            -   name: Notify element-web repo that a new SDK build is on develop
+                uses: peter-evans/repository-dispatch@v1
+                with:
+                    token: ${{ secrets.ELEMENT_WEB_NOTIFY_TOKEN }}
+                    repository: vector-im/element-web
+                    event-type: element-web-notify

.stylelintrc.js

@@ -11,7 +11,8 @@ module.exports = {
         "length-zero-no-unit": null,
         "rule-empty-line-before": null,
         "color-hex-length": null,
-        "max-empty-lines": null,
+        "max-empty-lines": 1,
+        "no-eol-whitespace": true,
         "number-no-trailing-zeros": null,
         "number-leading-zero": null,
         "selector-list-comma-newline-after": null,

README.md

@@ -11,7 +11,7 @@ a 'skin'. A skin provides:
  * The containing application
  * Zero or more 'modules' containing non-UI functionality
 
-As of Aug 2018, the only skin that exists is `vector-im/element-web`; it and
+As of Aug 2018, the only skin that exists is [`vector-im/element-web`](https://github.com/vector-im/element-web/); it and
 `matrix-org/matrix-react-sdk` should effectively
 be considered as a single project (for instance, matrix-react-sdk bugs
 are currently filed against vector-im/element-web rather than this project).
@@ -138,7 +138,7 @@ guide](https://classic.yarnpkg.com/docs/install) if you do not have it
 already. This project has not yet been migrated to Yarn 2, so please ensure
 `yarn --version` shows a version from the 1.x series.
 
-`matrix-react-sdk` depends on `matrix-js-sdk`. To make use of changes in the
+`matrix-react-sdk` depends on [`matrix-js-sdk`](https://github.com/matrix-org/matrix-js-sdk). To make use of changes in the
 latter and to ensure tests run against the develop branch of `matrix-js-sdk`,
 you should set up `matrix-js-sdk`:
 
@@ -158,6 +158,9 @@ cd matrix-react-sdk
 git checkout develop
 yarn link matrix-js-sdk
 yarn install
+
+# Generate the `component-index.js` file.
+yarn reskindex
 ```
 
 See the [help for `yarn link`](https://classic.yarnpkg.com/docs/cli/link) for
@@ -175,4 +178,4 @@ yarn test
 ## End-to-End tests
 
 Make sure you've got your Element development server running (by doing `yarn start` in element-web), and then in this project, run `yarn run e2etests`.
-See `test/end-to-end-tests/README.md` for more information.
+See [`test/end-to-end-tests/README.md`](https://github.com/matrix-org/matrix-react-sdk/blob/develop/test/end-to-end-tests/README.md) for more information.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.32.1",
+  "version": "3.37.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -25,7 +25,7 @@
   "bin": {
     "reskindex": "scripts/reskindex.js"
   },
-  "main": "./src/index.ts",
+  "main": "./src/index.js",
   "matrix_src_main": "./src/index.ts",
   "matrix_lib_main": "./lib/index.ts",
   "matrix_lib_typings": "./lib/index.d.ts",
@@ -57,6 +57,7 @@
     "@babel/runtime": "^7.12.5",
     "@sentry/browser": "^6.11.0",
     "@sentry/tracing": "^6.11.0",
+    "@types/geojson": "^7946.0.8",
     "await-lock": "^2.1.0",
     "blurhash": "^1.1.3",
     "browser-encrypt-attachment": "^0.3.0",
@@ -70,6 +71,7 @@
     "emojibase-data": "^6.2.0",
     "emojibase-regex": "^5.1.3",
     "escape-html": "^1.0.3",
+    "eslint-plugin-import": "^2.25.2",
     "file-saver": "^2.0.5",
     "filesize": "6.1.0",
     "flux": "2.1.1",
@@ -83,16 +85,18 @@
     "katex": "^0.12.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.20",
+    "maplibre-gl": "^1.15.2",
+    "matrix-analytics-events": "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.16",
+    "matrix-widget-api": "^0.1.0-beta.18",
     "minimist": "^1.2.5",
     "opus-recorder": "^8.0.3",
     "pako": "^2.0.3",
     "parse5": "^6.0.1",
     "png-chunks-extract": "^1.0.0",
     "posthog-js": "1.12.2",
     "prop-types": "^15.7.2",
-    "qrcode": "^1.4.4",
+    "qrcode": "1.4.4",
     "re-resizable": "^6.9.0",
     "react": "17.0.2",
     "react-beautiful-dnd": "^13.1.0",
@@ -125,7 +129,7 @@
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.10",
     "@babel/traverse": "^7.12.12",
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
     "@peculiar/webcrypto": "^1.1.4",
     "@sentry/types": "^6.10.0",
     "@sinonjs/fake-timers": "^7.0.2",
@@ -151,18 +155,18 @@
     "@types/react-transition-group": "^4.4.0",
     "@types/sanitize-html": "^2.3.1",
     "@types/zxcvbn": "^4.4.0",
-    "@typescript-eslint/eslint-plugin": "^4.17.0",
-    "@typescript-eslint/parser": "^4.17.0",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
-    "allchange": "^1.0.4",
+    "allchange": "^1.0.6",
     "babel-jest": "^26.6.3",
     "chokidar": "^3.5.1",
     "concurrently": "^5.3.0",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
     "eslint": "7.18.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945",
+    "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#48ec1e6af2cfb8310b9a6e23edf2dc7a26ddd580",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "glob": "^7.1.6",
@@ -181,7 +185,7 @@
     "stylelint": "^13.9.0",
     "stylelint-config-standard": "^20.0.0",
     "stylelint-scss": "^3.18.0",
-    "typescript": "4.3.5",
+    "typescript": "4.5.3",
     "walk": "^2.3.14"
   },
   "resolutions": {
@@ -195,6 +199,7 @@
     "testMatch": [
       "<rootDir>/test/**/*-test.[jt]s?(x)"
     ],
+    "globalSetup": "<rootDir>/test/globalSetup.js",
     "setupFiles": [
       "jest-canvas-mock"
     ],