merge: upstream

This commit is contained in:
Marie 2023-12-23 02:09:23 +01:00
commit 5db583a3eb
701 changed files with 50809 additions and 13660 deletions

View file

@ -1,12 +1,12 @@
{
"name": "sharkey",
"version": "2023.12.0.beta1",
"version": "2023.12.0.beta2",
"codename": "shonk",
"repository": {
"type": "git",
"url": "https://git.joinsharkey.org/Sharkey/Sharkey.git"
},
"packageManager": "pnpm@8.10.5",
"packageManager": "pnpm@8.12.1",
"workspaces": [
"packages/frontend",
"packages/backend",
@ -18,6 +18,7 @@
"build-assets": "node ./scripts/build-assets.mjs",
"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
"build-storybook": "pnpm --filter frontend build-storybook",
"build-misskey-js-with-types": "pnpm --filter backend build && pnpm --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build",
"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
"init": "pnpm migrate",
@ -26,7 +27,7 @@
"check:connect": "cd packages/backend && pnpm check:connect",
"migrateandstart": "pnpm migrate && pnpm start",
"watch": "pnpm dev",
"dev": "node ./scripts/dev.mjs",
"dev": "node scripts/dev.mjs",
"lint": "pnpm -r lint",
"cy:open": "pnpm cypress open --browser --e2e --config-file=cypress.config.ts",
"cy:run": "pnpm cypress run",
@ -45,18 +46,19 @@
},
"dependencies": {
"execa": "8.0.1",
"cssnano": "6.0.1",
"cssnano": "6.0.2",
"js-yaml": "4.1.0",
"postcss": "8.4.31",
"terser": "5.24.0",
"typescript": "5.2.2"
"postcss": "8.4.32",
"terser": "5.26.0",
"typescript": "5.3.3"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "6.11.0",
"@typescript-eslint/parser": "6.11.0",
"@typescript-eslint/eslint-plugin": "6.14.0",
"@typescript-eslint/parser": "6.14.0",
"cross-env": "7.0.3",
"cypress": "13.5.1",
"eslint": "8.53.0",
"start-server-and-test": "2.0.3"
"cypress": "13.6.1",
"eslint": "8.56.0",
"start-server-and-test": "2.0.3",
"ncp": "2.0.0"
}
}