merge: upstream

This commit is contained in:
Mar0xy 2023-10-31 19:33:24 +01:00
commit 4dd23a3793
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
217 changed files with 6773 additions and 2275 deletions

View file

@ -1,12 +1,12 @@
{
"name": "sharkey",
"version": "2023.10.3.beta1",
"version": "2023.11.0.beta2",
"codename": "shonk",
"repository": {
"type": "git",
"url": "https://github.com/transfem-org/sharkey.git"
},
"packageManager": "pnpm@8.9.2",
"packageManager": "pnpm@8.10.0",
"workspaces": [
"packages/frontend",
"packages/backend",
@ -22,6 +22,7 @@
"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
"init": "pnpm migrate",
"migrate": "cd packages/backend && pnpm migrate",
"revert": "cd packages/backend && pnpm revert",
"check:connect": "cd packages/backend && pnpm check:connect",
"migrateandstart": "pnpm migrate && pnpm start",
"watch": "pnpm dev",
@ -47,15 +48,15 @@
"cssnano": "6.0.1",
"js-yaml": "4.1.0",
"postcss": "8.4.31",
"terser": "5.21.0",
"terser": "5.22.0",
"typescript": "5.2.2"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "6.8.0",
"@typescript-eslint/parser": "6.8.0",
"@typescript-eslint/eslint-plugin": "6.9.0",
"@typescript-eslint/parser": "6.9.0",
"cross-env": "7.0.3",
"cypress": "13.3.1",
"eslint": "8.51.0",
"cypress": "13.3.3",
"eslint": "8.52.0",
"start-server-and-test": "2.0.1"
},
"optionalDependencies": {