From c14333c540010fff20c2e056269b54d683b1a088 Mon Sep 17 00:00:00 2001 From: Ajay Bura <32841439+ajbura@users.noreply.github.com> Date: Mon, 31 Mar 2025 19:10:24 +1100 Subject: [PATCH 1/2] remove libolm related code (#2300) --- contrib/nginx/cinny.domain.tld.conf | 1 - docker-nginx.conf | 1 - netlify.toml | 5 ----- package-lock.json | 1 - package.json | 1 - vite.config.js | 10 ---------- 6 files changed, 19 deletions(-) diff --git a/contrib/nginx/cinny.domain.tld.conf b/contrib/nginx/cinny.domain.tld.conf index 0b6c8aad..02c7ead9 100644 --- a/contrib/nginx/cinny.domain.tld.conf +++ b/contrib/nginx/cinny.domain.tld.conf @@ -23,7 +23,6 @@ server { rewrite ^/config.json$ /config.json break; rewrite ^/manifest.json$ /manifest.json break; - rewrite ^.*/olm.wasm$ /olm.wasm break; rewrite ^/sw.js$ /sw.js break; rewrite ^/pdf.worker.min.js$ /pdf.worker.min.js break; diff --git a/docker-nginx.conf b/docker-nginx.conf index fca10746..a2dbeba0 100644 --- a/docker-nginx.conf +++ b/docker-nginx.conf @@ -8,7 +8,6 @@ server { rewrite ^/config.json$ /config.json break; rewrite ^/manifest.json$ /manifest.json break; - rewrite ^.*/olm.wasm$ /olm.wasm break; rewrite ^/sw.js$ /sw.js break; rewrite ^/pdf.worker.min.js$ /pdf.worker.min.js break; diff --git a/netlify.toml b/netlify.toml index 1b192bec..a8710303 100644 --- a/netlify.toml +++ b/netlify.toml @@ -13,11 +13,6 @@ to = "/sw.js" status = 200 -[[redirects]] - from = "*/olm.wasm" - to = "/olm.wasm" - status = 200 - force = true [[redirects]] from = "/pdf.worker.min.js" diff --git a/package-lock.json b/package-lock.json index ac6f5d30..416d2741 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,6 @@ "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "1.3.0", "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.0.3", "@fontsource/inter": "4.5.14", - "@matrix-org/olm": "3.2.15", "@tanstack/react-query": "5.24.1", "@tanstack/react-query-devtools": "5.24.1", "@tanstack/react-virtual": "3.2.0", diff --git a/package.json b/package.json index dbc5e105..c0517521 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "1.3.0", "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.0.3", "@fontsource/inter": "4.5.14", - "@matrix-org/olm": "3.2.15", "@tanstack/react-query": "5.24.1", "@tanstack/react-query-devtools": "5.24.1", "@tanstack/react-virtual": "3.2.0", diff --git a/vite.config.js b/vite.config.js index 2771538c..9c8d88bc 100644 --- a/vite.config.js +++ b/vite.config.js @@ -11,10 +11,6 @@ import buildConfig from './build.config'; const copyFiles = { targets: [ - { - src: 'node_modules/@matrix-org/olm/olm.wasm', - dest: '', - }, { src: 'node_modules/pdfjs-dist/build/pdf.worker.min.mjs', dest: '', @@ -50,12 +46,6 @@ export default defineConfig({ server: { port: 8080, host: true, - proxy: { - '^\\/.*?\\/olm\\.wasm$': { - target: 'http://localhost:8080', - rewrite: () => '/olm.wasm', - }, - }, }, plugins: [ topLevelAwait({ From 225894d3270186b2d8820fa9fd59c413d6f3e6a7 Mon Sep 17 00:00:00 2001 From: Krishan <33421343+kfiven@users.noreply.github.com> Date: Mon, 31 Mar 2025 23:19:00 +1100 Subject: [PATCH 2/2] Release v4.6.0 (#2301) --- package-lock.json | 4 ++-- package.json | 2 +- src/app/pages/auth/AuthFooter.tsx | 2 +- src/app/pages/client/WelcomePage.tsx | 2 +- src/client/state/cons.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 416d2741..f85dd74d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cinny", - "version": "4.5.1", + "version": "4.6.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cinny", - "version": "4.5.1", + "version": "4.6.0", "license": "AGPL-3.0-only", "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "1.1.6", diff --git a/package.json b/package.json index c0517521..b489dc2c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cinny", - "version": "4.5.1", + "version": "4.6.0", "description": "Yet another matrix client", "main": "index.js", "type": "module", diff --git a/src/app/pages/auth/AuthFooter.tsx b/src/app/pages/auth/AuthFooter.tsx index 8cd950a4..71891a8d 100644 --- a/src/app/pages/auth/AuthFooter.tsx +++ b/src/app/pages/auth/AuthFooter.tsx @@ -15,7 +15,7 @@ export function AuthFooter() { target="_blank" rel="noreferrer" > - v4.5.1 + v4.6.0 Twitter diff --git a/src/app/pages/client/WelcomePage.tsx b/src/app/pages/client/WelcomePage.tsx index 68888a78..d2133adc 100644 --- a/src/app/pages/client/WelcomePage.tsx +++ b/src/app/pages/client/WelcomePage.tsx @@ -24,7 +24,7 @@ export function WelcomePage() { target="_blank" rel="noreferrer noopener" > - v4.5.1 + v4.6.0 } diff --git a/src/client/state/cons.js b/src/client/state/cons.js index 7f316958..c79229b9 100644 --- a/src/client/state/cons.js +++ b/src/client/state/cons.js @@ -1,5 +1,5 @@ const cons = { - version: '4.5.1', + version: '4.6.0', secretKey: { ACCESS_TOKEN: 'cinny_access_token', DEVICE_ID: 'cinny_device_id',