From fff41f1f27803cd162fc5ace80d1c6f33a6b8099 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 2 May 2023 11:31:04 +0100
Subject: [PATCH 1/4] Prepare changelog for v25.1.0-rc.1

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 079dfb70c..1330fcfca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+Changes in [25.1.0-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v25.1.0-rc.1) (2023-05-02)
+============================================================================================================
+
+## 🦖 Deprecations
+ * Deprecate MatrixClient::resolveRoomAlias ([\#3316](https://github.com/matrix-org/matrix-js-sdk/pull/3316)).
+
+## ✨ Features
+ * add client method to remove pusher ([\#3324](https://github.com/matrix-org/matrix-js-sdk/pull/3324)). Contributed by @kerryarchibald.
+ * Implement MSC 3981 ([\#3248](https://github.com/matrix-org/matrix-js-sdk/pull/3248)). Fixes vector-im/element-web#25021. Contributed by @justjanne.
+ * Added `Room.getLastLiveEvent` and `Room.getLastThread`. Deprecated `Room.lastThread` in favour of `Room.getLastThread`. ([\#3321](https://github.com/matrix-org/matrix-js-sdk/pull/3321)).
+ * Element-R: wire up device lists ([\#3272](https://github.com/matrix-org/matrix-js-sdk/pull/3272)). Contributed by @florianduros.
+ * Node 20 support ([\#3302](https://github.com/matrix-org/matrix-js-sdk/pull/3302)).
+
+## 🐛 Bug Fixes
+ * Fix racing between one-time-keys processing and sync ([\#3327](https://github.com/matrix-org/matrix-js-sdk/pull/3327)). Fixes vector-im/element-web#25214. Contributed by @florianduros.
+ * Fix lack of media when a user reconnects ([\#3318](https://github.com/matrix-org/matrix-js-sdk/pull/3318)).
+ * Fix TimelineWindow getEvents exploding if no neigbouring timeline ([\#3285](https://github.com/matrix-org/matrix-js-sdk/pull/3285)). Fixes vector-im/element-web#25104.
+
 Changes in [25.0.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v25.0.0) (2023-04-25)
 ==================================================================================================
 

From 7792254c1209d1ff29874fee3c68da5d2749d08f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 2 May 2023 11:31:10 +0100
Subject: [PATCH 2/4] v25.1.0-rc.1

---
 package.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 9ad447372..ae1a55b3a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "matrix-js-sdk",
-    "version": "25.0.0",
+    "version": "25.1.0-rc.1",
     "description": "Matrix Client-Server SDK for Javascript",
     "engines": {
         "node": ">=16.0.0"
@@ -32,8 +32,8 @@
     "keywords": [
         "matrix-org"
     ],
-    "main": "./src/index.ts",
-    "browser": "./src/browser-index.ts",
+    "main": "./lib/index.js",
+    "browser": "./lib/browser-index.js",
     "matrix_src_main": "./src/index.ts",
     "matrix_src_browser": "./src/browser-index.ts",
     "matrix_lib_main": "./lib/index.js",
@@ -154,5 +154,6 @@
         "no-rust-crypto": {
             "src/rust-crypto/index.ts$": "./src/rust-crypto/browserify-index.ts"
         }
-    }
+    },
+    "typings": "./lib/index.d.ts"
 }

From b6aef6772ee9d31cb21e73cae3ebfc4464d71a56 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 9 May 2023 15:12:49 +0100
Subject: [PATCH 3/4] Prepare changelog for v25.1.0

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1330fcfca..c84bbdabc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
-Changes in [25.1.0-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v25.1.0-rc.1) (2023-05-02)
-============================================================================================================
+Changes in [25.1.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v25.1.0) (2023-05-09)
+==================================================================================================
 
 ## 🦖 Deprecations
  * Deprecate MatrixClient::resolveRoomAlias ([\#3316](https://github.com/matrix-org/matrix-js-sdk/pull/3316)).

From d4500da59a2ff66307b4ff1c8c7c3fc29e004f6d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 9 May 2023 15:12:52 +0100
Subject: [PATCH 4/4] v25.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae1a55b3a..af1c9c71e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "matrix-js-sdk",
-    "version": "25.1.0-rc.1",
+    "version": "25.1.0",
     "description": "Matrix Client-Server SDK for Javascript",
     "engines": {
         "node": ">=16.0.0"