feat: ビルドベースのMisskeyバージョンを確認できる

kokonect-link · Sep 27, 2023 · f13b479 · f13b479
1 parent 7749bbc
commit f13b479
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,6 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
 						<div class="cherrypick">CherryPick</div>
 						<div class="version" @click="whatIsNewCherryPick">v{{ version }}</div>
+						<div class="version" style="font-size: 11px;" @click="whatIsNewMisskey">v{{ basedMisskeyVersion }} (Based on Misskey)</div>
 						<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }">
 							<MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :noStyle="true"/>
 							<MkEmoji v-else class="emoji" :emoji="emoji.emoji" :normal="true" :noStyle="true"/>
@@ -202,7 +203,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { nextTick, onBeforeUnmount, onMounted } from 'vue';
-import { version } from '@/config.js';
+import { version, basedMisskeyVersion } from '@/config.js';
 import FormLink from '@/components/form/link.vue';
 import FormSection from '@/components/form/section.vue';
 import MkButton from '@/components/MkButton.vue';
@@ -400,6 +401,10 @@ const whatIsNewCherryPick = () => {
 	window.open(`https://github.com/kokonect-link/cherrypick/blob/develop/CHANGELOG_CHERRYPICK.md#${version.replace(/\./g, '')}`, '_blank');
 };
 
+const whatIsNewMisskey = () => {
+	window.open(`https://github.com/kokonect-link/cherrypick/blob/develop/CHANGELOG.md#${basedMisskeyVersion.replace(/\./g, '')}`, '_blank');
+};
+
 function iconLoaded() {
 	const emojis = defaultStore.state.reactions;
 	const containerWidth = containerEl.offsetWidth;

diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
@@ -94,6 +94,7 @@ export function getConfig(): UserConfig {
 
 		define: {
 			_VERSION_: JSON.stringify(meta.version),
+			_BASEDMISSKEYVERSION_: JSON.stringify(meta.basedMisskeyVersion),
 			_LANGS_: JSON.stringify(Object.entries(locales).map(([k, v]) => [k, v._lang_])),
 			_ENV_: JSON.stringify(process.env.NODE_ENV),
 			_DEV_: process.env.NODE_ENV !== 'production',

diff --git a/packages/sw/.eslintrc.cjs b/packages/sw/.eslintrc.cjs
@@ -14,6 +14,7 @@ module.exports = {
 		_DEV_: false,
 		_LANGS_: false,
 		_VERSION_: false,
+		_BASEDMISSKEYVERSION_: false,
 		_ENV_: false,
 		_PERF_PREFIX_: false,
 	},

diff --git a/packages/sw/build.js b/packages/sw/build.js
@@ -25,6 +25,7 @@ const buildOptions = {
 		_LANGS_: JSON.stringify(Object.entries(locales).map(([k, v]) => [k, v._lang_])),
 		_PERF_PREFIX_: JSON.stringify('CherryPick:'),
 		_VERSION_: JSON.stringify(meta.version),
+		_BASEDMISSKEYVERSION_: JSON.stringify(meta.basedMisskeyVersion),
 	},
 	entryPoints: [`${__dirname}/src/sw.ts`],
 	format: 'esm',

diff --git a/packages/sw/src/@types/global.d.ts b/packages/sw/src/@types/global.d.ts
@@ -8,6 +8,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;