From 14daccecfc73b88248e487b83b735f8f5771aaa7 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 23 Sep 2020 12:39:10 -0600 Subject: [PATCH 1/3] Rebrand the webpack pipeline for Element --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea53d3f616..f6faa477c3 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json", "build:types": "tsc --emitDeclarationOnly --jsx react", "dist": "scripts/package.sh", - "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,riot-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"", + "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,element-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"", "start:res": "yarn build:jitsi && node scripts/copy-res.js -w", "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development", "lint": "yarn lint:types && yarn lint:js && yarn lint:style", From b31bf6cfca25bc36bb965e18f04f770e9091d694 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 24 Sep 2020 16:19:00 +0100 Subject: [PATCH 2/3] Remove conference handler --- src/vector/app.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/vector/app.tsx b/src/vector/app.tsx index 445a37ba55..f8371db674 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -26,7 +26,6 @@ window.React = React; import url from 'url'; import * as sdk from 'matrix-react-sdk'; import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg'; -import * as VectorConferenceHandler from 'matrix-react-sdk/src/VectorConferenceHandler'; import {_td, newTranslatableError} from 'matrix-react-sdk/src/languageHandler'; import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils'; import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery"; @@ -136,7 +135,6 @@ export async function loadApp(fragParams: {}) { throw newTranslatableError(_td("Missing indexeddb worker script!")); } MatrixClientPeg.setIndexedDbWorkerScript(vectorIndexeddbWorkerScript); - CallHandler.setConferenceHandler(VectorConferenceHandler); window.addEventListener('hashchange', onHashChange); @@ -155,7 +153,6 @@ export async function loadApp(fragParams: {}) { return Date: Thu, 24 Sep 2020 16:44:05 +0100 Subject: [PATCH 3/3] This is unused now --- src/vector/app.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vector/app.tsx b/src/vector/app.tsx index f8371db674..d586f9cb35 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -33,7 +33,6 @@ import * as Lifecycle from "matrix-react-sdk/src/Lifecycle"; import type MatrixChatType from "matrix-react-sdk/src/components/structures/MatrixChat"; import {MatrixClientPeg} from 'matrix-react-sdk/src/MatrixClientPeg'; import SdkConfig from "matrix-react-sdk/src/SdkConfig"; -import CallHandler from 'matrix-react-sdk/src/CallHandler'; import {parseQs, parseQsFromFragment} from './url_utils'; import VectorBasePlatform from "./platform/VectorBasePlatform";