diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index b795eca50f..38b16e1752 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -40,6 +40,7 @@ - Feat: 노트 작성 폼에 MFM 도움말을 볼 수 있는 버튼 추가 - Feat: 새 MFM 구문 추가 (페이드) - Feat: 햅틱 피드백 지원 +- Feat: 빌드 기반 Misskey 버전을 확인할 수 있음 - Enhance: 노트의 리액션을 삭제하지 않고도 리액션 버튼을 눌러 리액션을 변경할 수 있도록 (misskey-dev/misskey#11157) - Enhance: 이용 약관을 서버 메뉴에서 볼 수 있도록 - Enhance: 설정에서 변경 가능한 옵션은 다이얼로그에서 안내하도록 설명 추가 diff --git a/package.json b/package.json index 25c868b709..bcb3015022 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "cherrypick", "version": "2023.9.1-cp-4.3.0-rc.1", + "basedMisskeyVersion": "2023.9.1", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/frontend/.eslintrc.cjs b/packages/frontend/.eslintrc.cjs index 44d68763ec..6b297fbbf6 100644 --- a/packages/frontend/.eslintrc.cjs +++ b/packages/frontend/.eslintrc.cjs @@ -80,6 +80,7 @@ module.exports = { '_DEV_': false, '_LANGS_': false, '_VERSION_': false, + '_BASEDMISSKEYVERSION_': false, '_ENV_': false, '_PERF_PREFIX_': false, '_DATA_TRANSFER_DRIVE_FILE_': false, diff --git a/packages/frontend/@types/global.d.ts b/packages/frontend/@types/global.d.ts index 226c9f062b..7f72bcc935 100644 --- a/packages/frontend/@types/global.d.ts +++ b/packages/frontend/@types/global.d.ts @@ -7,6 +7,7 @@ type FIXME = any; declare const _LANGS_: string[][]; declare const _VERSION_: string; +declare const _BASEDMISSKEYVERSION_: string; declare const _ENV_: string; declare const _DEV_: boolean; declare const _PERF_PREFIX_: string; diff --git a/packages/frontend/src/config.ts b/packages/frontend/src/config.ts index 083d3f7274..3d95cdd9f2 100644 --- a/packages/frontend/src/config.ts +++ b/packages/frontend/src/config.ts @@ -18,6 +18,7 @@ export const langs = _LANGS_; const preParseLocale = miLocalStorage.getItem('locale'); export let locale = preParseLocale ? JSON.parse(preParseLocale) : null; export const version = _VERSION_; +export const basedMisskeyVersion = _BASEDMISSKEYVERSION_; export const instanceName = siteName === 'CherryPick' ? host : siteName; export const ui = miLocalStorage.getItem('ui'); export const debug = miLocalStorage.getItem('debug') === 'true'; diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index e498229911..079fae172c 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -14,6 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only