diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2025-12-16 11:42:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-16 11:42:06 +0900 |
| commit | 0d52145b2bc9ba9dd0f138673d0fc12ea5d9c3ec (patch) | |
| tree | 758c520166bfa855e4b07eabe48e53a660391939 /packages/frontend | |
| parent | fix(gh): `thollander/actions-comment-pull-request@v3` の breaking change 対... (diff) | |
| download | misskey-0d52145b2bc9ba9dd0f138673d0fc12ea5d9c3ec.tar.gz misskey-0d52145b2bc9ba9dd0f138673d0fc12ea5d9c3ec.tar.bz2 misskey-0d52145b2bc9ba9dd0f138673d0fc12ea5d9c3ec.zip | |
deps: update deps [ci skip] (#16997)
* update deps
* update chokidar to v5
* fix type error
* rollback serviceworker types to r74
* fix [ci skip]
Diffstat (limited to 'packages/frontend')
| -rw-r--r-- | packages/frontend/package.json | 58 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkImgPreviewDialog.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/global/MkAvatar.vue | 19 |
3 files changed, 43 insertions, 36 deletions
diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 68dc5bd656..361ab2f923 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -19,18 +19,18 @@ "@analytics/google-analytics": "1.1.0", "@discordapp/twemoji": "16.0.1", "@github/webauthn-json": "2.1.1", - "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", + "@mcaptcha/vanilla-glue": "0.1.0-rc2", "i18n": "workspace:*", "@misskey-dev/browser-image-resizer": "2024.1.0", "@rollup/plugin-json": "6.1.0", "@rollup/plugin-replace": "6.0.3", "@rollup/pluginutils": "5.3.0", - "@sentry/vue": "10.27.0", + "@sentry/vue": "10.29.0", "@syuilo/aiscript": "1.2.0", "@syuilo/aiscript-0-19-0": "npm:@syuilo/aiscript@^0.19.0", "@twemoji/parser": "16.0.0", "@vitejs/plugin-vue": "6.0.2", - "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.15", + "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.16", "analytics": "0.8.19", "broadcast-channel": "7.2.0", "buraha": "0.0.1", @@ -45,8 +45,8 @@ "cropperjs": "2.1.0", "date-fns": "4.1.0", "eventemitter3": "5.0.1", - "execa": "9.6.0", - "exifreader": "4.32.0", + "execa": "9.6.1", + "exifreader": "4.33.1", "frontend-shared": "workspace:*", "icons-subsetter": "workspace:*", "idb-keyval": "6.2.2", @@ -55,7 +55,7 @@ "is-file-animated": "1.0.2", "json5": "2.2.3", "matter-js": "0.20.0", - "mediabunny": "1.25.3", + "mediabunny": "1.25.7", "mfm-js": "0.25.0", "misskey-bubble-game": "workspace:*", "misskey-js": "workspace:*", @@ -66,14 +66,14 @@ "qr-scanner": "1.4.2", "rollup": "4.53.3", "sanitize-html": "2.17.0", - "sass": "1.94.2", - "shiki": "3.17.0", + "sass": "1.95.0", + "shiki": "3.19.0", "textarea-caret": "3.1.0", "three": "0.181.2", "throttle-debounce": "5.0.2", "tinycolor2": "1.6.0", "v-code-diff": "1.13.1", - "vite": "7.2.4", + "vite": "7.2.7", "vue": "3.5.25", "vuedraggable": "next", "wanakana": "5.3.1" @@ -82,7 +82,7 @@ "@misskey-dev/summaly": "5.2.5", "@storybook/addon-essentials": "8.6.14", "@storybook/addon-interactions": "8.6.14", - "@storybook/addon-links": "10.1.0", + "@storybook/addon-links": "10.1.4", "@storybook/addon-mdx-gfm": "8.6.14", "@storybook/addon-storysource": "8.6.14", "@storybook/blocks": "8.6.14", @@ -90,33 +90,33 @@ "@storybook/core-events": "8.6.14", "@storybook/manager-api": "8.6.14", "@storybook/preview-api": "8.6.14", - "@storybook/react": "10.1.0", - "@storybook/react-vite": "10.1.0", + "@storybook/react": "10.1.4", + "@storybook/react-vite": "10.1.4", "@storybook/test": "8.6.14", "@storybook/theming": "8.6.14", "@storybook/types": "8.6.14", - "@storybook/vue3": "10.1.0", - "@storybook/vue3-vite": "10.1.0", + "@storybook/vue3": "10.1.4", + "@storybook/vue3-vite": "10.1.4", "@tabler/icons-webfont": "3.35.0", "@testing-library/vue": "8.1.0", "@types/canvas-confetti": "1.9.0", "@types/estree": "1.0.8", "@types/matter-js": "0.20.2", "@types/micromatch": "4.0.10", - "@types/node": "24.10.1", + "@types/node": "24.10.2", "@types/punycode.js": "npm:@types/punycode@2.1.4", "@types/sanitize-html": "2.16.0", "@types/seedrandom": "3.0.8", "@types/throttle-debounce": "5.0.2", "@types/tinycolor2": "1.4.6", - "@typescript-eslint/eslint-plugin": "8.48.0", - "@typescript-eslint/parser": "8.48.0", - "@vitest/coverage-v8": "4.0.14", + "@typescript-eslint/eslint-plugin": "8.49.0", + "@typescript-eslint/parser": "8.49.0", + "@vitest/coverage-v8": "4.0.15", "@vue/compiler-core": "3.5.25", "acorn": "8.15.0", "astring": "1.9.0", "cross-env": "10.1.0", - "cypress": "15.7.0", + "cypress": "15.7.1", "eslint-plugin-import": "2.32.0", "eslint-plugin-vue": "10.6.2", "estree-walker": "3.0.3", @@ -125,24 +125,24 @@ "magic-string": "0.30.21", "micromatch": "4.0.8", "minimatch": "10.1.1", - "msw": "2.12.3", + "msw": "2.12.4", "msw-storybook-addon": "2.0.6", "nodemon": "3.1.11", - "prettier": "3.7.1", - "react": "19.2.0", - "react-dom": "19.2.0", + "prettier": "3.7.4", + "react": "19.2.1", + "react-dom": "19.2.1", "seedrandom": "3.0.5", "start-server-and-test": "2.1.3", - "storybook": "10.1.0", + "storybook": "10.1.4", "storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme", - "tsx": "4.20.6", + "tsx": "4.21.0", "typescript": "5.9.3", - "vite-plugin-glsl": "1.5.4", + "vite-plugin-glsl": "1.5.5", "vite-plugin-turbosnap": "1.0.3", - "vitest": "4.0.14", + "vitest": "4.0.15", "vitest-fetch-mock": "0.4.5", - "vue-component-type-helpers": "3.1.5", + "vue-component-type-helpers": "3.1.7", "vue-eslint-parser": "10.2.0", - "vue-tsc": "3.1.5" + "vue-tsc": "3.1.8" } } diff --git a/packages/frontend/src/components/MkImgPreviewDialog.vue b/packages/frontend/src/components/MkImgPreviewDialog.vue index 3e6e4e0ec9..e17a1651cf 100644 --- a/packages/frontend/src/components/MkImgPreviewDialog.vue +++ b/packages/frontend/src/components/MkImgPreviewDialog.vue @@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only </MkModalWindow> </template> <script lang="ts" setup> -import { defineProps, ref } from 'vue'; +import { ref } from 'vue'; import MkModalWindow from './MkModalWindow.vue'; import type * as Misskey from 'misskey-js'; diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue index c2548cc7be..e7208ed574 100644 --- a/packages/frontend/src/components/global/MkAvatar.vue +++ b/packages/frontend/src/components/global/MkAvatar.vue @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template v-if="showDecoration"> <img v-for="decoration in decorations ?? user.avatarDecorations" - :class="[$style.decoration, { [$style.decorationBlink]: decoration.blink }]" + :class="[$style.decoration, { [$style.decorationBlink]: getDecorationIsBrink(decoration) }]" :src="getDecorationUrl(decoration)" :style="{ rotate: getDecorationAngle(decoration), @@ -56,13 +56,16 @@ import { prefer } from '@/preferences.js'; const animation = ref(prefer.s.animation); const squareAvatars = ref(prefer.s.squareAvatars); +type Decoration = Misskey.entities.UserDetailed['avatarDecorations'][number]; +type DecorationEditorDecoration = Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'> & { blink?: boolean; }; + const props = withDefaults(defineProps<{ user: Misskey.entities.User; target?: string | null; link?: boolean; preview?: boolean; indicator?: boolean; - decorations?: (Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'> & { blink?: boolean; })[]; + decorations?: DecorationEditorDecoration[]; forceShowDecoration?: boolean; }>(), { target: null, @@ -93,27 +96,31 @@ function onClick(ev: MouseEvent): void { emit('click', ev); } -function getDecorationUrl(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) { +function getDecorationUrl(decoration: Decoration | DecorationEditorDecoration) { if (prefer.s.disableShowingAnimatedImages || prefer.s.dataSaver.avatar) return getStaticImageUrl(decoration.url); return decoration.url; } -function getDecorationAngle(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) { +function getDecorationAngle(decoration: Decoration | DecorationEditorDecoration) { const angle = decoration.angle ?? 0; return angle === 0 ? undefined : `${angle * 360}deg`; } -function getDecorationScale(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) { +function getDecorationScale(decoration: Decoration | DecorationEditorDecoration) { const scaleX = decoration.flipH ? -1 : 1; return scaleX === 1 ? undefined : `${scaleX} 1`; } -function getDecorationOffset(decoration: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>) { +function getDecorationOffset(decoration: Decoration | DecorationEditorDecoration) { const offsetX = decoration.offsetX ?? 0; const offsetY = decoration.offsetY ?? 0; return offsetX === 0 && offsetY === 0 ? undefined : `${offsetX * 100}% ${offsetY * 100}%`; } +function getDecorationIsBrink(decoration: Decoration | DecorationEditorDecoration) { + return 'blink' in decoration && decoration.blink === true; +} + const color = ref<string | undefined>(); watch(() => props.user.avatarBlurhash, () => { |