From 850d6a40cc859539f79947d53c2dc9230ef75c99 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 19 Dec 2022 18:43:42 +0000 Subject: [PATCH] Simplify build process * We don't need to check out the js-sdk separately anymore * Remove the vite proxying: there's no need since Matrix HSes allow cross origin requests. This will let us move the default homeserver config to the config file (in a separate PR...) * Remove the product name variable which just set it to the default anyway --- scripts/dockerbuild.sh | 12 ------------ vite.config.js | 5 ----- 2 files changed, 17 deletions(-) diff --git a/scripts/dockerbuild.sh b/scripts/dockerbuild.sh index cda60c2..cef7e48 100755 --- a/scripts/dockerbuild.sh +++ b/scripts/dockerbuild.sh @@ -2,19 +2,7 @@ set -ex -export VITE_DEFAULT_HOMESERVER=https://call.ems.host -export VITE_PRODUCT_NAME="Element Call" - -git clone https://github.com/matrix-org/matrix-js-sdk.git -cd matrix-js-sdk -yarn install -yarn run build -yarn link - -cd ../element-call - export VITE_APP_VERSION=$(git describe --tags --abbrev=0) -yarn link matrix-js-sdk yarn install yarn run build diff --git a/vite.config.js b/vite.config.js index 772bce6..c56eac6 100644 --- a/vite.config.js +++ b/vite.config.js @@ -35,11 +35,6 @@ export default defineConfig(({ mode }) => { }, }), ], - server: { - proxy: { - "/_matrix": env.VITE_DEFAULT_HOMESERVER || "http://localhost:8008", - }, - }, resolve: { alias: { // matrix-widget-api has its transpiled lib/index.js as its entry point,