Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
SamTV12345 committed Dec 22, 2024
2 parents 0c68ddc + ff24e1e commit 0da15a4
Show file tree
Hide file tree
Showing 34 changed files with 1,829 additions and 1,332 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# 2.2.7


### Notable enhancements and fixes

- We migrated all important pages to React 19 and React Router v7

Besides that only dependency updates.


-> Have a merry Christmas and a happy new year. 🎄 🎁


# 2.2.6

### Notable enhancements and fixes
Expand Down
52 changes: 26 additions & 26 deletions admin/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "admin",
"private": true,
"version": "2.2.6",
"version": "2.2.7",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -11,32 +11,32 @@
"preview": "vite preview"
},
"dependencies": {
"@radix-ui/react-switch": "^1.1.1"
"@radix-ui/react-switch": "^1.1.2"
},
"devDependencies": {
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-toast": "^1.2.2",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.11.0",
"@vitejs/plugin-react-swc": "^3.7.1",
"eslint": "^9.13.0",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.13",
"i18next": "^23.16.2",
"i18next-browser-languagedetector": "^8.0.0",
"lucide-react": "^0.453.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.53.1",
"react-i18next": "^15.1.0",
"react-router-dom": "^6.27.0",
"socket.io-client": "^4.8.0",
"typescript": "^5.6.3",
"vite": "^5.4.10",
"vite-plugin-static-copy": "^2.0.0",
"vite-plugin-svgr": "^4.2.0",
"zustand": "^5.0.0"
"@radix-ui/react-dialog": "^1.1.4",
"@radix-ui/react-toast": "^1.2.4",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"@vitejs/plugin-react-swc": "^3.7.2",
"eslint": "^9.17.0",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-refresh": "^0.4.16",
"i18next": "^24.2.0",
"i18next-browser-languagedetector": "^8.0.2",
"lucide-react": "^0.469.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-hook-form": "^7.54.1",
"react-i18next": "^15.2.0",
"react-router-dom": "^7.0.2",
"socket.io-client": "^4.8.1",
"typescript": "^5.7.2",
"vite": "^6.0.5",
"vite-plugin-static-copy": "^2.2.0",
"vite-plugin-svgr": "^4.3.0",
"zustand": "^5.0.2"
}
}
2 changes: 1 addition & 1 deletion admin/src/components/IconButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {FC, ReactElement} from "react";
import {FC, JSX, ReactElement} from "react";

export type IconButtonProps = {
icon: JSX.Element,
Expand Down
10 changes: 5 additions & 5 deletions bin/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "bin",
"version": "2.2.6",
"version": "2.2.7",
"description": "",
"main": "checkAllPads.js",
"directories": {
"doc": "doc"
},
"dependencies": {
"axios": "^1.7.7",
"axios": "^1.7.9",
"ep_etherpad-lite": "workspace:../src",
"log4js": "^6.9.1",
"semver": "^7.6.3",
"tsx": "^4.19.1",
"tsx": "^4.19.2",
"ueberdb2": "^5.0.6"
},
"devDependencies": {
"@types/node": "^22.7.9",
"@types/node": "^22.10.2",
"@types/semver": "^7.5.8",
"typescript": "^5.6.3"
"typescript": "^5.7.2"
},
"scripts": {
"makeDocs": "node --import tsx make_docs.ts",
Expand Down
2 changes: 1 addition & 1 deletion doc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"vitepress": "^1.4.1"
"vitepress": "^1.5.0"
},
"scripts": {
"docs:dev": "vitepress dev",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
"type": "git",
"url": "https://github.com/ether/etherpad-lite.git"
},
"version": "2.2.6",
"version": "2.2.7",
"license": "Apache-2.0"
}
Loading

0 comments on commit 0da15a4

Please sign in to comment.