Skip to content

Commit 0da15a4

Browse files
committed
Merge branch 'develop'
2 parents 0c68ddc + ff24e1e commit 0da15a4

34 files changed

+1829
-1332
lines changed

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# 2.2.7
2+
3+
4+
### Notable enhancements and fixes
5+
6+
- We migrated all important pages to React 19 and React Router v7
7+
8+
Besides that only dependency updates.
9+
10+
11+
-> Have a merry Christmas and a happy new year. 🎄 🎁
12+
13+
114
# 2.2.6
215

316
### Notable enhancements and fixes

admin/package.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "admin",
33
"private": true,
4-
"version": "2.2.6",
4+
"version": "2.2.7",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
@@ -11,32 +11,32 @@
1111
"preview": "vite preview"
1212
},
1313
"dependencies": {
14-
"@radix-ui/react-switch": "^1.1.1"
14+
"@radix-ui/react-switch": "^1.1.2"
1515
},
1616
"devDependencies": {
17-
"@radix-ui/react-dialog": "^1.1.2",
18-
"@radix-ui/react-toast": "^1.2.2",
19-
"@types/react": "^18.3.12",
20-
"@types/react-dom": "^18.3.1",
21-
"@typescript-eslint/eslint-plugin": "^8.11.0",
22-
"@typescript-eslint/parser": "^8.11.0",
23-
"@vitejs/plugin-react-swc": "^3.7.1",
24-
"eslint": "^9.13.0",
25-
"eslint-plugin-react-hooks": "^5.0.0",
26-
"eslint-plugin-react-refresh": "^0.4.13",
27-
"i18next": "^23.16.2",
28-
"i18next-browser-languagedetector": "^8.0.0",
29-
"lucide-react": "^0.453.0",
30-
"react": "^18.2.0",
31-
"react-dom": "^18.2.0",
32-
"react-hook-form": "^7.53.1",
33-
"react-i18next": "^15.1.0",
34-
"react-router-dom": "^6.27.0",
35-
"socket.io-client": "^4.8.0",
36-
"typescript": "^5.6.3",
37-
"vite": "^5.4.10",
38-
"vite-plugin-static-copy": "^2.0.0",
39-
"vite-plugin-svgr": "^4.2.0",
40-
"zustand": "^5.0.0"
17+
"@radix-ui/react-dialog": "^1.1.4",
18+
"@radix-ui/react-toast": "^1.2.4",
19+
"@types/react": "^19.0.2",
20+
"@types/react-dom": "^19.0.2",
21+
"@typescript-eslint/eslint-plugin": "^8.18.1",
22+
"@typescript-eslint/parser": "^8.18.1",
23+
"@vitejs/plugin-react-swc": "^3.7.2",
24+
"eslint": "^9.17.0",
25+
"eslint-plugin-react-hooks": "^5.1.0",
26+
"eslint-plugin-react-refresh": "^0.4.16",
27+
"i18next": "^24.2.0",
28+
"i18next-browser-languagedetector": "^8.0.2",
29+
"lucide-react": "^0.469.0",
30+
"react": "^19.0.0",
31+
"react-dom": "^19.0.0",
32+
"react-hook-form": "^7.54.1",
33+
"react-i18next": "^15.2.0",
34+
"react-router-dom": "^7.0.2",
35+
"socket.io-client": "^4.8.1",
36+
"typescript": "^5.7.2",
37+
"vite": "^6.0.5",
38+
"vite-plugin-static-copy": "^2.2.0",
39+
"vite-plugin-svgr": "^4.3.0",
40+
"zustand": "^5.0.2"
4141
}
4242
}

admin/src/components/IconButton.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {FC, ReactElement} from "react";
1+
import {FC, JSX, ReactElement} from "react";
22

33
export type IconButtonProps = {
44
icon: JSX.Element,

bin/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"name": "bin",
3-
"version": "2.2.6",
3+
"version": "2.2.7",
44
"description": "",
55
"main": "checkAllPads.js",
66
"directories": {
77
"doc": "doc"
88
},
99
"dependencies": {
10-
"axios": "^1.7.7",
10+
"axios": "^1.7.9",
1111
"ep_etherpad-lite": "workspace:../src",
1212
"log4js": "^6.9.1",
1313
"semver": "^7.6.3",
14-
"tsx": "^4.19.1",
14+
"tsx": "^4.19.2",
1515
"ueberdb2": "^5.0.6"
1616
},
1717
"devDependencies": {
18-
"@types/node": "^22.7.9",
18+
"@types/node": "^22.10.2",
1919
"@types/semver": "^7.5.8",
20-
"typescript": "^5.6.3"
20+
"typescript": "^5.7.2"
2121
},
2222
"scripts": {
2323
"makeDocs": "node --import tsx make_docs.ts",

doc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"vitepress": "^1.4.1"
3+
"vitepress": "^1.5.0"
44
},
55
"scripts": {
66
"docs:dev": "vitepress dev",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
"type": "git",
5151
"url": "https://github.com/ether/etherpad-lite.git"
5252
},
53-
"version": "2.2.6",
53+
"version": "2.2.7",
5454
"license": "Apache-2.0"
5555
}

0 commit comments

Comments
 (0)