Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/notes/local-timeline.ts
#	packages/backend/src/server/api/endpoints/notes/timeline.ts
#	pnpm-lock.yaml
This commit is contained in:
mattyatea 2023-10-09 21:24:33 +09:00
commit cbd9a16047
21 changed files with 519 additions and 589 deletions
Download patch file Download diff file Expand all files Collapse all files

14
packages/frontend/package.json
View file

@ -39,7 +39,7 @@
"chartjs-chart-matrix": "2.0.1",
"chartjs-plugin-gradient": "0.6.1",
"chartjs-plugin-zoom": "2.0.1",
"chromatic": "7.2.2",
"chromatic": "7.2.3",
"compare-versions": "6.1.0",
"cropperjs": "2.0.0-beta.4",
"date-fns": "2.30.0",
@ -58,7 +58,7 @@
"prismjs": "1.29.0",
"punycode": "2.3.0",
"querystring": "0.2.1",
"rollup": "4.0.0",
"rollup": "4.0.2",
"sanitize-html": "2.11.0",
"sass": "1.69.0",
"strict-event-emitter-types": "2.0.0",
@ -103,12 +103,12 @@
"@types/estree": "1.0.2",
"@types/matter-js": "0.19.1",
"@types/micromatch": "4.0.3",
"@types/node": "20.8.2",
"@types/node": "20.8.3",
"@types/punycode": "2.1.0",
"@types/sanitize-html": "2.9.1",
"@types/throttle-debounce": "5.0.0",
"@types/tinycolor2": "1.4.4",
"@types/uuid": "9.0.4",
"@types/uuid": "9.0.5",
"@types/websocket": "1.0.7",
"@types/ws": "8.5.6",
"@typescript-eslint/eslint-plugin": "6.7.4",
@ -118,7 +118,7 @@
"acorn": "8.10.0",
"cross-env": "7.0.3",
"cypress": "13.3.0",
"eslint": "8.50.0",
"eslint": "8.51.0",
"eslint-plugin-import": "2.28.1",
"eslint-plugin-vue": "9.17.0",
"fast-glob": "3.3.1",
@ -137,7 +137,7 @@
"vite-plugin-turbosnap": "1.0.3",
"vitest": "0.34.6",
"vitest-fetch-mock": "0.2.2",
"vue-eslint-parser": "9.3.1",
"vue-tsc": "1.8.15"
"vue-eslint-parser": "9.3.2",
"vue-tsc": "1.8.18"
}
}