Fix rust-sdk issues by using a custom build

MTRNord · May 7, 2023 · bb599de · bb599de
1 parent 6ce9b4d
commit bb599de
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 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
diff --git a/package-lock.json b/package-lock.json
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 = {
     /**
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@mtrnord:registry=https://npm.pkg.github.com