mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-04 14:19:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/develop' into feat/bundle-js

Browse source 
* origin/develop:
  Bump semver from 7.6.2 to 7.6.3 (#6517)
  Bump the dev-dependencies group across 1 directory with 7 updates (#6518)
  Bump the dev-dependencies group with 3 updates (#6513)
  Bump ueberdb2 from 4.2.82 to 4.2.84 (#6514)

# Conflicts:
#	pnpm-lock.yaml
#	src/package.json
#	ui/package.json
This commit is contained in:
SamTv12345 2024-07-18 08:48:49 +02:00
commit 03c2651c2f
6 changed files with 271 additions and 939 deletions
Download patch file Download diff file Expand all files Collapse all files

14
admin/package.json
View file

@ -18,23 +18,23 @@
"@radix-ui/react-toast": "^1.2.1",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.2.25",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@vitejs/plugin-react-swc": "^3.5.0",
"eslint": "^9.6.0",
"eslint": "^9.7.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.8",
"i18next": "^23.11.5",
"i18next": "^23.12.1",
"i18next-browser-languagedetector": "^8.0.0",
"lucide-react": "^0.408.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.52.1",
"react-i18next": "^14.1.0",
"react-router-dom": "^6.24.1",
"react-i18next": "^15.0.0",
"react-router-dom": "^6.25.0",
"socket.io-client": "^4.7.5",
"typescript": "^5.5.3",
"vite": "^5.3.3",
"vite": "^5.3.4",
"vite-plugin-static-copy": "^1.0.6",
"vite-plugin-svgr": "^4.2.0",
"zustand": "^4.5.4"

6
bin/package.json
View file

@ -10,12 +10,12 @@
"axios": "^1.7.2",
"ep_etherpad-lite": "workspace:../src",
"log4js": "^6.9.1",
"semver": "^7.6.2",
"semver": "^7.6.3",
"tsx": "^4.16.2",
"ueberdb2": "^4.2.82"
"ueberdb2": "^4.2.84"
},
"devDependencies": {
"@types/node": "^20.14.10",
"@types/node": "^20.14.11",
"@types/semver": "^7.5.8",
"typescript": "^5.5.3"
},

2
doc/package.json
View file

@ -1,6 +1,6 @@
{
"devDependencies": {
"vitepress": "^1.3.0"
"vitepress": "^1.3.1"
},
"scripts": {
"docs:dev": "vitepress dev",

1172
pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff

10
src/package.json
View file

@ -66,14 +66,14 @@
"rehype-minify-whitespace": "^6.0.0",
"resolve": "1.22.8",
"security": "1.0.0",
"semver": "^7.6.2",
"semver": "^7.6.3",
"socket.io": "^4.7.5",
"socket.io-client": "^4.7.5",
"superagent": "^9.0.2",
"threads": "^1.7.0",
"tinycon": "0.6.8",
"tsx": "4.16.2",
"ueberdb2": "^4.2.82",
"ueberdb2": "^4.2.84",
"underscore": "1.13.6",
"unorm": "1.6.0",
"wtfnode": "^0.9.3"
@ -83,7 +83,7 @@
"etherpad-lite": "node/server.ts"
},
"devDependencies": {
"@playwright/test": "^1.45.1",
"@playwright/test": "^1.45.2",
"@types/async": "^3.2.24",
"@types/express": "^4.17.21",
"@types/formidable": "^3.4.5",
@ -92,14 +92,14 @@
"@types/jsdom": "^21.1.7",
"@types/jsonwebtoken": "^9.0.6",
"@types/mocha": "^10.0.7",
"@types/node": "^20.14.10",
"@types/node": "^20.14.11",
"@types/oidc-provider": "^8.5.1",
"@types/semver": "^7.5.8",
"@types/sinon": "^17.0.3",
"@types/supertest": "^6.0.2",
"@types/underscore": "^1.11.15",
"chokidar": "^3.6.0",
"eslint": "^9.6.0",
"eslint": "^9.7.0",
"eslint-config-etherpad": "^4.0.4",
"etherpad-cli-client": "^3.0.2",
"mocha": "^10.6.0",

6
ui/package.json
View file

@ -12,10 +12,6 @@
"devDependencies": {
"ep_etherpad-lite": "workspace:../src",
"typescript": "^5.5.3",
"vite": "^5.3.3",
"vite-plugin-require": "^1.2.14"
},
"dependencies": {
"@originjs/vite-plugin-commonjs": "^1.0.3"
"vite": "^5.3.4"
}
}