PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #27685 from element-hq/t3chguy/fix-init-unsafe-code

Browse source 
Ensure we do not load matrix-react-sdk is a manner which can white-screen
This commit is contained in:
Michael Telatynski 2024-07-09 07:57:26 +00:00 committed by GitHub
commit 3091db7bb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vector/index.ts
View file

@ -19,7 +19,6 @@ limitations under the License.
*/ */
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import { extractErrorMessageFromError } from "matrix-react-sdk/src/components/views/dialogs/ErrorDialog";
// These are things that can run before the skin loads - be careful not to reference the react-sdk though. // These are things that can run before the skin loads - be careful not to reference the react-sdk though.
import { parseQsFromFragment } from "./url_utils"; import { parseQsFromFragment } from "./url_utils";
@ -120,6 +119,7 @@ async function start(): Promise<void> {
showError, showError,
showIncompatibleBrowser, showIncompatibleBrowser,
_t, _t,
extractErrorMessageFromError,
} = await import( } = await import(
/* webpackChunkName: "init" */ /* webpackChunkName: "init" */
/* webpackPreload: true */ /* webpackPreload: true */

2
src/vector/init.tsx
View file

@ -143,3 +143,5 @@ export async function loadModules(): Promise<void> {
} }
export { _t } from "../languageHandler"; export { _t } from "../languageHandler";
export { extractErrorMessageFromError } from "matrix-react-sdk/src/components/views/dialogs/ErrorDialog";