matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-09 10:22:46 +03:00
Code Activity

Use globalThis instead of global (#3763)

Browse Source 
Switches use of `global` to `globalThis`, which is better supported when building with modern build tools like Vite.

Refs #2903

Signed-off-by: Damon Vestervand <damon@beyondwork.ai>
Signed-off-by: Damon <damon@vestervand.net>
This commit is contained in:
Damon (Toal-Rossi) Vestervand
2023-10-02 14:04:05 +02:00
committed by GitHub
parent ff53557957
commit 66251e0855
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/olm-loader.ts
View File

@@ -20,7 +20,7 @@ import { logger } from "../src/logger";
// try to load the olm library. // try to load the olm library.
try { try {
// eslint-disable-next-line @typescript-eslint/no-var-requires // eslint-disable-next-line @typescript-eslint/no-var-requires
global.Olm = require("@matrix-org/olm"); globalThis.Olm = require("@matrix-org/olm");
logger.log("loaded libolm"); logger.log("loaded libolm");
} catch (e) { } catch (e) {
logger.warn("unable to run crypto tests: libolm not available", e); logger.warn("unable to run crypto tests: libolm not available", e);

8
src/browser-index.ts
View File

@@ -24,15 +24,15 @@ declare global {
/* eslint-enable no-var */ /* eslint-enable no-var */
} }
if (global.__js_sdk_entrypoint) { if (globalThis.__js_sdk_entrypoint) {
throw new Error("Multiple matrix-js-sdk entrypoints detected!"); throw new Error("Multiple matrix-js-sdk entrypoints detected!");
} }
global.__js_sdk_entrypoint = true; globalThis.__js_sdk_entrypoint = true;
// just *accessing* indexedDB throws an exception in firefox with indexeddb disabled. // just *accessing* indexedDB throws an exception in firefox with indexeddb disabled.
let indexedDB: IDBFactory | undefined; let indexedDB: IDBFactory | undefined;
try { try {
indexedDB = global.indexedDB; indexedDB = globalThis.indexedDB;
} catch (e) {} } catch (e) {}
// if our browser (appears to) support indexeddb, use an indexeddb crypto store. // if our browser (appears to) support indexeddb, use an indexeddb crypto store.
@@ -44,4 +44,4 @@ if (indexedDB) {
// It's awkward, but required. // It's awkward, but required.
export * from "./matrix"; export * from "./matrix";
export default matrixcs; // keep export for browserify package deps export default matrixcs; // keep export for browserify package deps
global.matrixcs = matrixcs; globalThis.matrixcs = matrixcs;

6
src/crypto/crypto.ts
View File

@@ -16,9 +16,9 @@ limitations under the License.
import { logger } from "../logger"; import { logger } from "../logger";
export let crypto = global.window?.crypto; export let crypto = globalThis.window?.crypto;
export let subtleCrypto = global.window?.crypto?.subtle ?? global.window?.crypto?.webkitSubtle; export let subtleCrypto = globalThis.window?.crypto?.subtle ?? global.window?.crypto?.webkitSubtle;
export let TextEncoder = global.window?.TextEncoder; export let TextEncoder = globalThis.window?.TextEncoder;
/* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-var-requires */
if (!crypto) { if (!crypto) {

2
src/crypto/index.ts
View File

@@ -134,7 +134,7 @@ export const verificationMethods = {
export type VerificationMethod = keyof typeof verificationMethods | string; export type VerificationMethod = keyof typeof verificationMethods | string;
export function isCryptoAvailable(): boolean { export function isCryptoAvailable(): boolean {
return Boolean(global.Olm); return Boolean(globalThis.Olm);
} }
// minimum time between attempting to unwedge an Olm session, if we succeeded // minimum time between attempting to unwedge an Olm session, if we succeeded