From 446d944888666e48ffdab994b503fc1f9962a4d3 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Wed, 26 Oct 2022 16:41:58 +0100
Subject: [PATCH 1/3] Fix config.json failing to load for Jitsi wrapper in
 non-root deployment (#23577) (#23615)

(cherry picked from commit a3ece528e5859d8fd3eedf3b4a653d46298de1d7)

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json              | 1 +
 src/vector/jitsi/index.ts | 2 +-
 yarn.lock                 | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 21de3c6fd2..a34924d72c 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
     "@testing-library/react": "^12.1.5",
     "@types/flux": "^3.1.9",
     "@types/jest": "^29.0.0",
+    "@types/jsrsasign": "^10.5.4",
     "@types/modernizr": "^3.5.3",
     "@types/node": "^14.18.28",
     "@types/react": "^17.0.49",
diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts
index b140df45c3..b284cdcaf8 100644
--- a/src/vector/jitsi/index.ts
+++ b/src/vector/jitsi/index.ts
@@ -65,7 +65,7 @@ const setupCompleted = (async () => {
     try {
         // Queue a config.json lookup asap, so we can use it later on. We want this to be concurrent with
         // other setup work and therefore do not block.
-        const configPromise = getVectorConfig('..');
+        const configPromise = getVectorConfig();
 
         // The widget's options are encoded into the fragment to avoid leaking info to the server.
         const widgetQuery = new URLSearchParams(window.location.hash.substring(1));
diff --git a/yarn.lock b/yarn.lock
index 3f9628c7b4..1581f599fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2062,6 +2062,11 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
+"@types/jsrsasign@^10.5.4":
+  version "10.5.4"
+  resolved "https://registry.yarnpkg.com/@types/jsrsasign/-/jsrsasign-10.5.4.tgz#e8a147c70e017198fd161600e24c938af7b5ae2f"
+  integrity sha512-05S2f4lGaWgCwFHsa3OEirc4VJf/sJRfhofzxUbuFbmm6NbffPXZrnJqquQAtS3g4C8Z0L9NHgW0znmtDxNoTQ==
+
 "@types/minimatch@*":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
@@ -8172,6 +8177,7 @@ matrix-js-sdk@21.0.0:
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
+    browser-request "^0.3.3"
     bs58 "^5.0.0"
     content-type "^1.0.4"
     loglevel "^1.7.1"
@@ -8202,6 +8208,7 @@ matrix-react-sdk@3.59.0:
     "@types/ua-parser-js" "^0.7.36"
     await-lock "^2.1.0"
     blurhash "^1.1.3"
+    browser-request "^0.3.3"
     cheerio "^1.0.0-rc.9"
     classnames "^2.2.6"
     commonmark "^0.29.3"

From 0b92a7fe7ca8703b476bba7885a11e13b4f2d563 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 26 Oct 2022 16:46:29 +0100
Subject: [PATCH 2/3] Prepare changelog for v1.11.12

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 820c2ade2e..4a70708e0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.11.12](https://github.com/vector-im/element-web/releases/tag/v1.11.12) (2022-10-26)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
+
 Changes in [1.11.11](https://github.com/vector-im/element-web/releases/tag/v1.11.11) (2022-10-25)
 =================================================================================================
 

From 271d2d70785b67736229b694166a6c494dfda036 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 26 Oct 2022 16:46:30 +0100
Subject: [PATCH 3/3] v1.11.12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a34924d72c..082bf43a25 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.11.11",
+  "version": "1.11.12",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {