Page MenuHomePhorge
Files F32223233

D7089.1765208069.diff
No OneTemporary
Actions

Size
8 KB
Referenced Files
None
Subscribers
None

D7089.1765208069.diff
View Options

diff --git a/.npmrc b/.npmrc
deleted file mode 100644
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-@matrix-org:registry=https://gitlab.matrix.org/api/v4/projects/27/packages/npm/
diff --git a/keyserver/flow-typed/npm/@matrix-org/olm_vx.x.x.js b/keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
rename from keyserver/flow-typed/npm/@matrix-org/olm_vx.x.x.js
rename to keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
--- a/keyserver/flow-typed/npm/@matrix-org/olm_vx.x.x.js
+++ b/keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js
@@ -1,7 +1,7 @@
// flow-typed signature: 085f002da86534cfd8cee47ffa99dd67
-// flow-typed version: <<STUB>>/@matrix-org/olm_v3.2.4/flow_v0.182.0
+// flow-typed version: <<STUB>>/@commapp/olm_v3.2.4/flow_v0.182.0
-declare module '@matrix-org/olm' {
+declare module '@commapp/olm' {
/*
Copyright 2020 The Matrix.org Foundation C.I.C.
diff --git a/keyserver/package.json b/keyserver/package.json
--- a/keyserver/package.json
+++ b/keyserver/package.json
@@ -41,7 +41,7 @@
},
"dependencies": {
"@babel/runtime": "^7.13.10",
- "@matrix-org/olm": "3.2.14",
+ "@commapp/olm": "0.0.1",
"@parse/node-apn": "^3.2.0",
"@vingle/bmp-js": "^0.2.5",
"JSONStream": "^1.3.5",
diff --git a/keyserver/src/keyserver.js b/keyserver/src/keyserver.js
--- a/keyserver/src/keyserver.js
+++ b/keyserver/src/keyserver.js
@@ -1,6 +1,6 @@
// @flow
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
import cluster from 'cluster';
import cookieParser from 'cookie-parser';
import express from 'express';
diff --git a/keyserver/src/responders/user-responders.js b/keyserver/src/responders/user-responders.js
--- a/keyserver/src/responders/user-responders.js
+++ b/keyserver/src/responders/user-responders.js
@@ -1,6 +1,6 @@
// @flow
-import type { Utility as OlmUtility } from '@matrix-org/olm';
+import type { Utility as OlmUtility } from '@commapp/olm';
import invariant from 'invariant';
import { getRustAPI } from 'rust-node-addon';
import { ErrorTypes, SiweMessage } from 'siwe';
diff --git a/keyserver/src/scripts/generate-olm-config.js b/keyserver/src/scripts/generate-olm-config.js
--- a/keyserver/src/scripts/generate-olm-config.js
+++ b/keyserver/src/scripts/generate-olm-config.js
@@ -1,6 +1,6 @@
// @flow
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
import fs from 'fs';
import path from 'path';
import uuid from 'uuid';
diff --git a/keyserver/src/utils/olm-utils.js b/keyserver/src/utils/olm-utils.js
--- a/keyserver/src/utils/olm-utils.js
+++ b/keyserver/src/utils/olm-utils.js
@@ -1,7 +1,7 @@
// @flow
-import olm from '@matrix-org/olm';
-import type { Utility as OlmUtility } from '@matrix-org/olm';
+import olm from '@commapp/olm';
+import type { Utility as OlmUtility } from '@commapp/olm';
import invariant from 'invariant';
import { importJSON } from './import-json.js';
diff --git a/keyserver/src/utils/olm-utils.test.js b/keyserver/src/utils/olm-utils.test.js
--- a/keyserver/src/utils/olm-utils.test.js
+++ b/keyserver/src/utils/olm-utils.test.js
@@ -1,6 +1,6 @@
// @flow
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
import { getOlmUtility } from '../utils/olm-utils.js';
diff --git a/web/account/log-in-form.react.js b/web/account/log-in-form.react.js
--- a/web/account/log-in-form.react.js
+++ b/web/account/log-in-form.react.js
@@ -1,6 +1,6 @@
// @flow
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
import { useConnectModal } from '@rainbow-me/rainbowkit';
import * as React from 'react';
import { useDispatch } from 'react-redux';
diff --git a/web/flow-typed/npm/@matrix-org/olm_vx.x.x.js b/web/flow-typed/npm/@commapp/olm_vx.x.x.js
rename from web/flow-typed/npm/@matrix-org/olm_vx.x.x.js
rename to web/flow-typed/npm/@commapp/olm_vx.x.x.js
--- a/web/flow-typed/npm/@matrix-org/olm_vx.x.x.js
+++ b/web/flow-typed/npm/@commapp/olm_vx.x.x.js
@@ -1,7 +1,7 @@
// flow-typed signature: 085f002da86534cfd8cee47ffa99dd67
-// flow-typed version: <<STUB>>/@matrix-org/olm_v3.2.4/flow_v0.182.0
+// flow-typed version: <<STUB>>/@commapp/olm_v3.2.4/flow_v0.182.0
-declare module '@matrix-org/olm' {
+declare module '@commapp/olm' {
/*
Copyright 2020 The Matrix.org Foundation C.I.C.
diff --git a/web/olm/olm-utils.js b/web/olm/olm-utils.js
--- a/web/olm/olm-utils.js
+++ b/web/olm/olm-utils.js
@@ -1,6 +1,6 @@
// @flow
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
declare var olmFilename: string;
diff --git a/web/olm/olm.test.js b/web/olm/olm.test.js
--- a/web/olm/olm.test.js
+++ b/web/olm/olm.test.js
@@ -1,6 +1,6 @@
// @flow
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
describe('olm.Account', () => {
it('should construct an empty olm.Account', async () => {
diff --git a/web/package.json b/web/package.json
--- a/web/package.json
+++ b/web/package.json
@@ -35,6 +35,7 @@
},
"dependencies": {
"@babel/runtime": "^7.13.10",
+ "@commapp/olm": "0.0.1",
"@emoji-mart/data": "^1.1.2",
"@emoji-mart/react": "^1.1.1",
"@fortawesome/fontawesome-svg-core": "1.2.25",
@@ -57,7 +58,6 @@
"lib": "0.0.1",
"localforage": "^1.10.0",
"lodash": "^4.17.21",
- "@matrix-org/olm": "3.2.14",
"react": "18.1.0",
"react-circular-progressbar": "^2.0.2",
"react-color": "^2.13.0",
diff --git a/web/selectors/socket-selectors.js b/web/selectors/socket-selectors.js
--- a/web/selectors/socket-selectors.js
+++ b/web/selectors/socket-selectors.js
@@ -1,6 +1,6 @@
// @flow
-import olm from '@matrix-org/olm';
+import olm from '@commapp/olm';
import { createSelector } from 'reselect';
import {
diff --git a/web/webpack.config.cjs b/web/webpack.config.cjs
--- a/web/webpack.config.cjs
+++ b/web/webpack.config.cjs
@@ -52,7 +52,7 @@
new CopyPlugin({
patterns: [
{
- from: 'node_modules/@matrix-org/olm/olm.wasm',
+ from: 'node_modules/@commapp/olm/olm.wasm',
to: path.join(__dirname, 'dist'),
},
],
@@ -66,7 +66,7 @@
new CopyPlugin({
patterns: [
{
- from: 'node_modules/@matrix-org/olm/olm.wasm',
+ from: 'node_modules/@commapp/olm/olm.wasm',
to: path.join(__dirname, 'dist', 'olm.[contenthash:12].wasm'),
},
],
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -1719,6 +1719,11 @@
stream-browserify "^3.0.0"
util "^0.12.4"
+"@commapp/olm@0.0.1":
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/@commapp/olm/-/olm-0.0.1.tgz#dde22c2fef48520db3ec73a23874e1f5b7e4c905"
+ integrity sha512-AmxDY/LR98OPYPL3ZMnWBAHoapxgIIScP4xrt8OHj97RTajgijSD5MV6lQnQKWxCGK+u97IKXjijvpThCfcFdQ==
+
"@commapp/sqlcipher-amalgamation@^4.4.3-a":
version "4.4.3-a"
resolved "https://registry.yarnpkg.com/@commapp/sqlcipher-amalgamation/-/sqlcipher-amalgamation-4.4.3-a.tgz#39c297132b9ad02358bf022a164bfc03292ecce1"
@@ -3728,11 +3733,6 @@
semver "^7.3.5"
tar "^6.1.11"
-"@matrix-org/olm@3.2.14":
- version "3.2.14"
- resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz#acd96c00a881d0f462e1f97a56c73742c8dbc984"
- integrity sha1-rNlsAKiB0PRi4fl6Vsc3QsjbyYQ=
-
"@metamask/safe-event-emitter@2.0.0", "@metamask/safe-event-emitter@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c"
@@ -17777,9 +17777,9 @@
resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
-"olm@git+https://gitlab.matrix.org/matrix-org/olm.git#v3.2.14":
+"olm@git+https://github.com/CommE2E/olm.git#v0.0.1":
version "0.0.0"
- resolved "git+https://gitlab.matrix.org/matrix-org/olm.git#5efd38c990b1238236f4e573fba8835dc400982a"
+ resolved "git+https://github.com/CommE2E/olm.git#081fa7fda77586568f581a89a854a01844634995"
on-finished@2.4.1:
version "2.4.1"
@@ -19408,7 +19408,6 @@
react-native-flipper@^0.164.0, "react-native-flipper@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.1.tgz":
version "1.1.1"
- uid f8cae15d883ffc0abc663b5eaaa711fcc64bb5c2
resolved "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.1.tgz#f8cae15d883ffc0abc663b5eaaa711fcc64bb5c2"
react-native-floating-action@^1.22.0:

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 8, 3:34 PM (8 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5848854
Default Alt Text
D7089.1765208069.diff (8 KB)

Event Timeline