From cbb704fb24ae062aa19040d7c114d0682afda9f9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Mar 2022 21:46:47 +0000 Subject: [PATCH 1/6] Upgrade matrix-js-sdk to 16.0.1-rc.1 --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 76f9a433ea..30dd183e85 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "maplibre-gl": "^1.15.2", "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90", "matrix-events-sdk": "^0.0.1-beta.7", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "16.0.1-rc.1", "matrix-widget-api": "^0.1.0-beta.18", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index 8c237e9e64..0b375b60d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6275,9 +6275,10 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "16.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ee9eccb85afd1b8ee55b16e017d062271f6c66f3" +matrix-js-sdk@16.0.1-rc.1: + version "16.0.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.1-rc.1.tgz#103417643c62a7e6daec6620063648da25c42407" + integrity sha512-yAKgp1sVoSKuSUX482yBzexj9A7o06D64/LEjozNjN5kfTzF5jUZogRukI9JXp8z3n/ORZGosdLT2hJYGYrkjg== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" From 629e938cad3a64e5d14548206f7508152e5ab6b2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Mar 2022 21:48:20 +0000 Subject: [PATCH 2/6] Prepare changelog for v3.42.1-rc.1 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a50e17b108..ba3cac6c70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +Changes in [3.42.1-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.1-rc.1) (2022-03-22) +=============================================================================================================== + Changes in [3.42.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.0) (2022-03-15) ===================================================================================================== From 00d32482fac6e81cf409344131ba9f7708b9a962 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Mar 2022 21:48:22 +0000 Subject: [PATCH 3/6] v3.42.1-rc.1 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 30dd183e85..557e5d0dad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.42.0", + "version": "3.42.1-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { @@ -25,7 +25,7 @@ "bin": { "reskindex": "scripts/reskindex.js" }, - "main": "./src/index.ts", + "main": "./lib/index.ts", "matrix_src_main": "./src/index.ts", "matrix_lib_main": "./lib/index.ts", "matrix_lib_typings": "./lib/index.d.ts", @@ -235,5 +235,6 @@ "text", "json" ] - } + }, + "typings": "./lib/index.d.ts" } From d7c1a6f33e1e14e73ef9d9527cc63d7c0f7941a4 Mon Sep 17 00:00:00 2001 From: Germain Date: Mon, 28 Mar 2022 12:41:36 +0100 Subject: [PATCH 4/6] [Release] Add null-guard for appEvent in PersistentApp (#8176) --- src/components/views/elements/PersistentApp.tsx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/views/elements/PersistentApp.tsx b/src/components/views/elements/PersistentApp.tsx index 4883f50251..fd78237bfb 100644 --- a/src/components/views/elements/PersistentApp.tsx +++ b/src/components/views/elements/PersistentApp.tsx @@ -41,15 +41,20 @@ export default class PersistentApp extends React.Component { this.room = context.getRoom(this.props.persistentRoomId); } - private get app(): IApp { + private get app(): IApp | null { // get the widget data const appEvent = WidgetUtils.getRoomWidgets(this.room).find(ev => ev.getStateKey() === this.props.persistentWidgetId, ); - return WidgetUtils.makeAppConfig( - appEvent.getStateKey(), appEvent.getContent(), appEvent.getSender(), - this.room.roomId, appEvent.getId(), - ); + + if (appEvent) { + return WidgetUtils.makeAppConfig( + appEvent.getStateKey(), appEvent.getContent(), appEvent.getSender(), + this.room.roomId, appEvent.getId(), + ); + } else { + return null; + } } public render(): JSX.Element { From eb51ba1d2ae34268028092bbb574e1711ed02f72 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 28 Mar 2022 16:16:39 +0100 Subject: [PATCH 5/6] Upgrade matrix-js-sdk to 16.0.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 557e5d0dad..448618cca5 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "maplibre-gl": "^1.15.2", "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90", "matrix-events-sdk": "^0.0.1-beta.7", - "matrix-js-sdk": "16.0.1-rc.1", + "matrix-js-sdk": "16.0.1", "matrix-widget-api": "^0.1.0-beta.18", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index 0b375b60d2..55eb8e8027 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6275,10 +6275,10 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -matrix-js-sdk@16.0.1-rc.1: - version "16.0.1-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.1-rc.1.tgz#103417643c62a7e6daec6620063648da25c42407" - integrity sha512-yAKgp1sVoSKuSUX482yBzexj9A7o06D64/LEjozNjN5kfTzF5jUZogRukI9JXp8z3n/ORZGosdLT2hJYGYrkjg== +matrix-js-sdk@16.0.1: + version "16.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.1.tgz#9b389ef16677ba648efad2929a7802af6f1dc81f" + integrity sha512-GRYZY7JZRqsVFa2nKO2qJbU4gQail2+1PgX2QDcibWizTL5Gh8YS384twprpIKqzdLHJ3d7H7A0L+uqc562ZsQ== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" From cc296ef3da8305c482767e9833cbee7a901b9aa7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 28 Mar 2022 16:17:36 +0100 Subject: [PATCH 6/6] v3.42.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 448618cca5..de1fb2804e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.42.1-rc.1", + "version": "3.42.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {