Merge remote-tracking branch 'misskey-dev/develop' into prismisskey

# Conflicts:
#	CHANGELOG.md
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/deck/tl-column.vue
#	pnpm-lock.yaml
This commit is contained in:
mattyatea 2023-09-29 23:08:01 +09:00
commit 7dbbfb657c
35 changed files with 1291 additions and 962 deletions

View file

@ -9,12 +9,12 @@
"lint": "pnpm typecheck && pnpm eslint"
},
"dependencies": {
"esbuild": "0.19.3",
"esbuild": "0.19.4",
"idb-keyval": "6.2.1",
"misskey-js": "workspace:*"
},
"devDependencies": {
"@typescript-eslint/parser": "6.7.2",
"@typescript-eslint/parser": "6.7.3",
"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
"eslint": "8.50.0",
"eslint-plugin-import": "2.28.1",