commit bb599de8d242358ff6f17357f752696c063cce52
parent 6ce9b4df8383f21a77dacd54aaaf64877224d1df
Author: MTRNord <mtrnord1@gmail.com>
Date: Mon, 8 May 2023 00:14:59 +0200
Fix rust-sdk issues by using a custom build
Diffstat:
9 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -19,7 +19,6 @@ jobs:
export NODE_OPTIONS="--max_old_space_size=4096"
npm install
npx browserslist@latest --update-db
- patch node_modules/@matrix-org/matrix-sdk-crypto-js/pkg/matrix_sdk_crypto_js.js < .github/crypto-dep.patch
npm run build -- --base /cetirizine/
npm run build-storybook -- --disable-telemetry -o dist/storybook
diff --git a/.github/workflows/percy.yaml b/.github/workflows/percy.yaml
@@ -16,7 +16,6 @@ jobs:
export NODE_OPTIONS="--max_old_space_size=4096"
npm install
npx browserslist@latest --update-db
- patch node_modules/@matrix-org/matrix-sdk-crypto-js/pkg/matrix_sdk_crypto_js.js < .github/crypto-dep.patch
- run: |
export NODE_OPTIONS="--max_old_space_size=4096"
npm run storybook -- --no-open &
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+@mtrnord:registry=https://npm.pkg.github.com
+\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
@@ -9,7 +9,7 @@
"version": "0.1.0",
"dependencies": {
"@lexical/react": "^0.10.0",
- "@matrix-org/matrix-sdk-crypto-js": "^0.1.0-alpha.8",
+ "@mtrnord/matrix-sdk-crypto-js": "0.1.0-alpha.2",
"dompurify": "^3.0.3",
"events": "^3.3.0",
"highlight.js": "^11.8.0",
@@ -3024,14 +3024,6 @@
"yjs": ">=13.5.22"
}
},
- "node_modules/@matrix-org/matrix-sdk-crypto-js": {
- "version": "0.1.0-alpha.8",
- "resolved": "https://registry.npmjs.org/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.8.tgz",
- "integrity": "sha512-hdmbbGXKrN6JNo3wdBaR5Zs3lXlzllT3U43ViNTlabB3nKkOZQnEAN/Isv+4EQSgz1+8897veI9Q8sqlQX22oA==",
- "engines": {
- "node": ">= 10"
- }
- },
"node_modules/@mdx-js/react": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz",
@@ -3049,6 +3041,12 @@
"react": ">=16"
}
},
+ "node_modules/@mtrnord/matrix-sdk-crypto-js": {
+ "version": "0.1.0-alpha.2",
+ "resolved": "https://npm.pkg.github.com/download/@mtrnord/matrix-sdk-crypto-js/0.1.0-alpha.2/4987f82000c8b0ab77e22997550ddc65ea339a8c",
+ "integrity": "sha512-Z0l12AVDjDd6ukTkaGhbVxp9Au4nVBP8jo+OMP0bUpqsUSKQQU4UZlCM0/e8Qe/vV8VBTN+EAiOnTB0eEAO+dw==",
+ "license": "Apache-2.0"
+ },
"node_modules/@ndelangen/get-tarball": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/@ndelangen/get-tarball/-/get-tarball-3.0.7.tgz",
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
"type": "module",
"dependencies": {
"@lexical/react": "^0.10.0",
- "@matrix-org/matrix-sdk-crypto-js": "^0.1.0-alpha.8",
+ "@mtrnord/matrix-sdk-crypto-js": "0.1.0-alpha.2",
"dompurify": "^3.0.3",
"events": "^3.3.0",
"highlight.js": "^11.8.0",
diff --git a/src/app/sdk/client.ts b/src/app/sdk/client.ts
@@ -29,10 +29,10 @@ import {
deleteDB,
openDB
} from "idb";
-import { DeviceId, DeviceLists, KeysBackupRequest, KeysUploadRequest, OlmMachine, RequestType, RoomId, RoomMessageRequest, SignatureUploadRequest, UserId } from "@matrix-org/matrix-sdk-crypto-js";
-import { KeysQueryRequest } from "@matrix-org/matrix-sdk-crypto-js";
-import { KeysClaimRequest } from "@matrix-org/matrix-sdk-crypto-js";
-import { ToDeviceRequest } from "@matrix-org/matrix-sdk-crypto-js";
+import { DeviceId, DeviceLists, KeysBackupRequest, KeysUploadRequest, OlmMachine, RequestType, RoomId, RoomMessageRequest, SignatureUploadRequest, UserId } from "@mtrnord/matrix-sdk-crypto-js";
+import { KeysQueryRequest } from "@mtrnord/matrix-sdk-crypto-js";
+import { KeysClaimRequest } from "@mtrnord/matrix-sdk-crypto-js";
+import { ToDeviceRequest } from "@mtrnord/matrix-sdk-crypto-js";
export interface MatrixClientEvents {
// Used to notify about changes to the room list
diff --git a/src/app/sdk/room.ts b/src/app/sdk/room.ts
@@ -2,7 +2,7 @@ import EventEmitter from "events";
import { IRoomEvent, IRoomStateEvent, isRoomAvatarEvent, isRoomCreateEvent, isRoomTopicEvent, isSpaceChildEvent, isSpaceParentEvent } from "./api/apiTypes";
import { MatrixClient } from "./client";
import { useEffect, useState } from "react";
-import { EncryptionAlgorithm, EncryptionSettings, RoomId } from "@matrix-org/matrix-sdk-crypto-js";
+import { EncryptionAlgorithm, EncryptionSettings, RoomId } from "@mtrnord/matrix-sdk-crypto-js";
export interface RoomEvents {
// Used to notify about changes to the event list
diff --git a/src/main.tsx b/src/main.tsx
@@ -1,4 +1,4 @@
-import { LoggerLevel, Tracing, initAsync, start } from "@matrix-org/matrix-sdk-crypto-js";
+import { LoggerLevel, Tracing, initAsync, start } from "@mtrnord/matrix-sdk-crypto-js";
import React from 'react'
import { createRoot } from 'react-dom/client';
import './index.scss';
diff --git a/src/pages/MainPage.tsx b/src/pages/MainPage.tsx
@@ -13,7 +13,7 @@ import UnknownEvent, { RedactedEvent, UndecryptableEvent } from '../components/e
import MemberEvent from '../components/events/memberEvent';
import { IRoomEvent, IRoomMemberEvent } from '../app/sdk/api/apiTypes';
import Linkify from 'linkify-react';
-import { RoomId } from '@matrix-org/matrix-sdk-crypto-js';
+import { RoomId } from '@mtrnord/matrix-sdk-crypto-js';
type ChatViewProps = {
/**
