Merge remote-tracking branch 'upstream/develop' into enhance-locale-b…

…uild

CHANGELOG.md

@@ -30,6 +30,7 @@
 - Fix: コードエディタが正しく表示されない問題を修正
 - Fix: プロフィールの「ファイル」にセンシティブな画像がある際のデザインを修正
 - Fix: 一度に大量の通知が入った際に通知音が音割れする問題を修正
+- Fix: 通知のグルーピング設定を変更してもリロードされるまで表示が変わらない問題を修正 #12470
 
 ### Server
 - Enhance: MFM `$[ruby ]` が他ソフトウェアと連合されるように
@@ -42,6 +43,9 @@
 
 ## 2023.11.1
 
+### Note
+- 悪意のある第三者がリモートユーザーになりすました任意のアクティビティを受け取れてしまう問題を修正しました。詳しくは[GitHub security advisory](https://github.com/misskey-dev/misskey/security/advisories/GHSA-3f39-6537-3cgc)をご覧ください。
+
 ### General
 - Feat: 管理者がコントロールパネルからメールアドレスの照会を行えるようになりました
 - Enhance: ローカリゼーションの更新

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2023.11.1",
+	"version": "2023.12.0-beta.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
@@ -52,11 +52,11 @@
 		"typescript": "5.3.2"
 	},
 	"devDependencies": {
-		"@typescript-eslint/eslint-plugin": "6.11.0",
-		"@typescript-eslint/parser": "6.11.0",
+		"@typescript-eslint/eslint-plugin": "6.12.0",
+		"@typescript-eslint/parser": "6.12.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.5.1",
-		"eslint": "8.53.0",
+		"cypress": "13.6.0",
+		"eslint": "8.54.0",
 		"start-server-and-test": "2.0.3"
 	},
 	"optionalDependencies": {

packages/backend/package.json

@@ -60,9 +60,9 @@
 	"dependencies": {
 		"@aws-sdk/client-s3": "3.412.0",
 		"@aws-sdk/lib-storage": "3.412.0",
-		"@bull-board/api": "5.9.1",
-		"@bull-board/fastify": "5.9.1",
-		"@bull-board/ui": "5.9.1",
+		"@bull-board/api": "5.9.2",
+		"@bull-board/fastify": "5.9.2",
+		"@bull-board/ui": "5.9.2",
 		"@discordapp/twemoji": "14.1.2",
 		"@fastify/accepts": "4.2.0",
 		"@fastify/cookie": "9.2.0",
@@ -72,23 +72,23 @@
 		"@fastify/multipart": "8.0.0",
 		"@fastify/static": "6.12.0",
 		"@fastify/view": "8.2.0",
-		"@nestjs/common": "10.2.8",
-		"@nestjs/core": "10.2.8",
-		"@nestjs/testing": "10.2.8",
+		"@nestjs/common": "10.2.10",
+		"@nestjs/core": "10.2.10",
+		"@nestjs/testing": "10.2.10",
 		"@peertube/http-signature": "1.7.0",
 		"@simplewebauthn/server": "8.3.5",
 		"@sinonjs/fake-timers": "11.2.2",
-		"@smithy/node-http-handler": "2.1.5",
+		"@smithy/node-http-handler": "2.1.10",
 		"@swc/cli": "0.1.63",
-		"@swc/core": "1.3.96",
+		"@swc/core": "1.3.99",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "6.0.1",
 		"async-mutex": "0.4.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "4.13.3",
+		"bullmq": "4.14.2",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.1",
 		"chalk": "5.3.0",
@@ -114,11 +114,11 @@
 		"ipaddr.js": "2.1.0",
 		"is-svg": "5.0.0",
 		"js-yaml": "4.1.0",
-		"jsdom": "22.1.0",
+		"jsdom": "23.0.0",
 		"json5": "2.2.3",
 		"jsonld": "8.3.1",
-		"jsrsasign": "10.8.6",
-		"meilisearch": "0.35.0",
+		"jsrsasign": "10.9.0",
+		"meilisearch": "0.36.0",
 		"mfm-js": "0.23.3",
 		"microformats-parser": "1.5.2",
 		"mime-types": "2.1.35",
@@ -145,7 +145,7 @@
 		"qrcode": "1.5.3",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.20.8",
+		"re2": "1.20.9",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
@@ -159,7 +159,7 @@
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "github:misskey-dev/summaly",
-		"systeminformation": "5.21.17",
+		"systeminformation": "5.21.18",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.8",
@@ -178,49 +178,49 @@
 		"@simplewebauthn/typescript-types": "8.3.4",
 		"@swc/jest": "0.2.29",
 		"@types/accepts": "1.3.7",
-		"@types/archiver": "6.0.1",
+		"@types/archiver": "6.0.2",
 		"@types/bcryptjs": "2.4.6",
 		"@types/body-parser": "1.19.5",
 		"@types/cbor": "6.0.0",
 		"@types/color-convert": "2.0.3",
 		"@types/content-disposition": "0.5.8",
 		"@types/fluent-ffmpeg": "2.1.24",
 		"@types/http-link-header": "1.0.5",
-		"@types/jest": "29.5.8",
+		"@types/jest": "29.5.10",
 		"@types/js-yaml": "4.0.9",
-		"@types/jsdom": "21.1.5",
-		"@types/jsonld": "1.5.12",
+		"@types/jsdom": "21.1.6",
+		"@types/jsonld": "1.5.13",
 		"@types/jsrsasign": "10.5.12",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "20.9.1",
+		"@types/node": "20.10.0",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.14",
 		"@types/oauth": "0.9.4",
 		"@types/oauth2orize": "1.11.3",
 		"@types/oauth2orize-pkce": "0.1.2",
 		"@types/pg": "8.10.9",
-		"@types/pug": "2.0.9",
-		"@types/punycode": "2.1.2",
+		"@types/pug": "2.0.10",
+		"@types/punycode": "2.1.3",
 		"@types/qrcode": "1.5.5",
 		"@types/random-seed": "0.3.5",
 		"@types/ratelimiter": "3.4.6",
 		"@types/rename": "1.0.7",
-		"@types/sanitize-html": "2.9.4",
-		"@types/semver": "7.5.5",
+		"@types/sanitize-html": "2.9.5",
+		"@types/semver": "7.5.6",
 		"@types/sharp": "0.32.0",
 		"@types/simple-oauth2": "5.0.7",
 		"@types/sinonjs__fake-timers": "8.1.5",
 		"@types/tinycolor2": "1.4.6",
 		"@types/tmp": "0.2.6",
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.3",
-		"@types/ws": "8.5.9",
-		"@typescript-eslint/eslint-plugin": "6.11.0",
-		"@typescript-eslint/parser": "6.11.0",
+		"@types/ws": "8.5.10",
+		"@typescript-eslint/eslint-plugin": "6.12.0",
+		"@typescript-eslint/parser": "6.12.0",
 		"aws-sdk-client-mock": "3.0.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.53.0",
+		"eslint": "8.54.0",
 		"eslint-plugin-import": "2.29.0",
 		"execa": "8.0.1",
 		"jest": "29.7.0",

packages/frontend/package.json

@@ -18,15 +18,15 @@
 	"dependencies": {
 		"@discordapp/twemoji": "14.1.2",
 		"@github/webauthn-json": "2.1.1",
-		"@rollup/plugin-alias": "5.0.1",
+		"@rollup/plugin-alias": "5.1.0",
 		"@rollup/plugin-json": "6.0.1",
 		"@rollup/plugin-replace": "5.0.5",
 		"@rollup/pluginutils": "5.0.5",
 		"@syuilo/aiscript": "0.16.0",
 		"@tabler/icons-webfont": "2.37.0",
 		"@vitejs/plugin-vue": "4.5.0",
 		"@vue-macros/reactivity-transform": "0.4.0",
-		"@vue/compiler-sfc": "3.3.8",
+		"@vue/compiler-sfc": "3.3.9",
 		"astring": "1.8.6",
 		"autosize": "6.0.1",
 		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.6",
@@ -39,7 +39,7 @@
 		"chartjs-chart-matrix": "2.0.1",
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.0.1",
-		"chromatic": "9.0.0",
+		"chromatic": "9.1.0",
 		"compare-versions": "6.1.0",
 		"cropperjs": "2.0.0-beta.4",
 		"date-fns": "2.30.0",
@@ -57,7 +57,7 @@
 		"photoswipe": "5.4.2",
 		"punycode": "2.3.1",
 		"querystring": "0.2.1",
-		"rollup": "4.4.1",
+		"rollup": "4.6.0",
 		"sanitize-html": "2.11.0",
 		"shiki": "^0.14.5",
 		"sass": "1.69.5",
@@ -73,8 +73,8 @@
 		"uuid": "9.0.1",
 		"v-code-diff": "1.7.2",
 		"vanilla-tilt": "1.8.1",
-		"vite": "4.5.0",
-		"vue": "3.3.8",
+		"vite": "5.0.2",
+		"vue": "3.3.9",
 		"vuedraggable": "next"
 	},
 	"devDependencies": {
@@ -96,27 +96,27 @@
 		"@storybook/types": "7.5.3",
 		"@storybook/vue3": "7.5.3",
 		"@storybook/vue3-vite": "7.5.3",
-		"@testing-library/vue": "8.0.0",
+		"@testing-library/vue": "8.0.1",
 		"@types/escape-regexp": "0.0.3",
 		"@types/estree": "1.0.5",
-		"@types/matter-js": "0.19.4",
-		"@types/micromatch": "4.0.5",
-		"@types/node": "20.9.1",
-		"@types/punycode": "2.1.2",
-		"@types/sanitize-html": "2.9.4",
+		"@types/matter-js": "0.19.5",
+		"@types/micromatch": "4.0.6",
+		"@types/node": "20.10.0",
+		"@types/punycode": "2.1.3",
+		"@types/sanitize-html": "2.9.5",
 		"@types/throttle-debounce": "5.0.2",
 		"@types/tinycolor2": "1.4.6",
 		"@types/uuid": "9.0.7",
-		"@types/websocket": "1.0.9",
-		"@types/ws": "8.5.9",
-		"@typescript-eslint/eslint-plugin": "6.11.0",
-		"@typescript-eslint/parser": "6.11.0",
+		"@types/websocket": "1.0.10",
+		"@types/ws": "8.5.10",
+		"@typescript-eslint/eslint-plugin": "6.12.0",
+		"@typescript-eslint/parser": "6.12.0",
 		"@vitest/coverage-v8": "0.34.6",
-		"@vue/runtime-core": "3.3.8",
+		"@vue/runtime-core": "3.3.9",
 		"acorn": "8.11.2",
 		"cross-env": "7.0.3",
-		"cypress": "13.5.1",
-		"eslint": "8.53.0",
+		"cypress": "13.6.0",
+		"eslint": "8.54.0",
 		"eslint-plugin-import": "2.29.0",
 		"eslint-plugin-vue": "9.18.1",
 		"fast-glob": "3.3.2",

packages/frontend/src/components/MkNotifications.vue

@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated } from 'vue';
+import { onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated, watch } from 'vue';
 import MkPagination, { Paging } from '@/components/MkPagination.vue';
 import XNotification from '@/components/MkNotification.vue';
 import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
@@ -43,7 +43,7 @@ const props = defineProps<{
 
 const pagingComponent = shallowRef<InstanceType<typeof MkPagination>>();
 
-const pagination: Paging = defaultStore.state.useGroupedNotifications ? {
+let pagination = $computed(() => defaultStore.reactiveState.useGroupedNotifications.value ? {
 	endpoint: 'i/notifications-grouped' as const,
 	limit: 20,
 	params: computed(() => ({
@@ -55,7 +55,7 @@ const pagination: Paging = defaultStore.state.useGroupedNotifications ? {
 	params: computed(() => ({
 		excludeTypes: props.excludeTypes ?? undefined,
 	})),
-};
+});
 
 function onNotification(notification) {
 	const isMuted = props.excludeTypes ? props.excludeTypes.includes(notification.type) : false;

packages/frontend/src/components/MkPagination.vue

@@ -186,7 +186,7 @@ watch([$$(backed), $$(contentEl)], () => {
 });
 
 // パラメータに何らかの変更があった際、再読込したい（チャンネル等のIDが変わったなど）
-watch(() => props.pagination.params, init, { deep: true });
+watch(() => [props.pagination.endpoint, props.pagination.params], init, { deep: true });
 
 watch(queue, (a, b) => {
 	if (a.size === 0 && b.size === 0) return;

packages/misskey-js/package.json

@@ -22,11 +22,11 @@
 	"devDependencies": {
 		"@microsoft/api-extractor": "7.38.3",
 		"@swc/jest": "0.2.29",
-		"@types/jest": "29.5.8",
-		"@types/node": "20.9.1",
-		"@typescript-eslint/eslint-plugin": "6.11.0",
-		"@typescript-eslint/parser": "6.11.0",
-		"eslint": "8.53.0",
+		"@types/jest": "29.5.10",
+		"@types/node": "20.10.0",
+		"@typescript-eslint/eslint-plugin": "6.12.0",
+		"@typescript-eslint/parser": "6.12.0",
+		"eslint": "8.54.0",
 		"jest": "29.7.0",
 		"jest-fetch-mock": "3.0.3",
 		"jest-websocket-mock": "2.5.0",
@@ -39,7 +39,7 @@
 	],
 	"dependencies": {
 		"@swc/cli": "0.1.63",
-		"@swc/core": "1.3.96",
+		"@swc/core": "1.3.99",
 		"eventemitter3": "5.0.1",
 		"reconnecting-websocket": "4.4.0"
 	}

packages/sw/package.json

@@ -9,14 +9,14 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
-		"esbuild": "0.19.5",
+		"esbuild": "0.19.8",
 		"idb-keyval": "6.2.1",
 		"misskey-js": "workspace:*"
 	},
 	"devDependencies": {
-		"@typescript-eslint/parser": "6.11.0",
+		"@typescript-eslint/parser": "6.12.0",
 		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
-		"eslint": "8.53.0",
+		"eslint": "8.54.0",
 		"eslint-plugin-import": "2.29.0",
 		"typescript": "5.3.2"
 	},