Skip to content

Commit 3091db7

Browse files
authored
Merge pull request #27685 from element-hq/t3chguy/fix-init-unsafe-code
Ensure we do not load matrix-react-sdk is a manner which can white-screen
2 parents 6452f27 + 9955321 commit 3091db7

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/vector/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ limitations under the License.
1919
*/
2020

2121
import { logger } from "matrix-js-sdk/src/logger";
22-
import { extractErrorMessageFromError } from "matrix-react-sdk/src/components/views/dialogs/ErrorDialog";
2322

2423
// These are things that can run before the skin loads - be careful not to reference the react-sdk though.
2524
import { parseQsFromFragment } from "./url_utils";
@@ -120,6 +119,7 @@ async function start(): Promise<void> {
120119
showError,
121120
showIncompatibleBrowser,
122121
_t,
122+
extractErrorMessageFromError,
123123
} = await import(
124124
/* webpackChunkName: "init" */
125125
/* webpackPreload: true */

src/vector/init.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,5 @@ export async function loadModules(): Promise<void> {
143143
}
144144

145145
export { _t } from "../languageHandler";
146+
147+
export { extractErrorMessageFromError } from "matrix-react-sdk/src/components/views/dialogs/ErrorDialog";

0 commit comments

Comments
 (0)