From efd0368e568b39ca31d75bc3962e2627681bff13 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 18 Feb 2019 04:52:40 +0900
Subject: [PATCH] Resolve #4305

---
 package.json                                         | 1 -
 src/client/app/boot.js                               | 4 ++--
 src/client/app/common/scripts/check-for-update.ts    | 4 ++--
 src/client/app/common/views/widgets/version.vue      | 2 +-
 src/client/app/config.ts                             | 2 --
 src/client/app/desktop/views/components/settings.vue | 2 +-
 src/client/app/init.ts                               | 2 +-
 src/client/app/mios.ts                               | 2 +-
 src/client/app/mobile/views/pages/settings.vue       | 2 +-
 src/server/api/endpoints/meta.ts                     | 3 ---
 webpack.config.ts                                    | 3 +--
 11 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 6514cc6057..d876274c73 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
 	"version": "10.87.1",
-	"clientVersion": "2.0.14358",
 	"codename": "nighthike",
 	"repository": {
 		"type": "git",
diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 28ba1be099..f93cb407e8 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -138,8 +138,8 @@
 		const meta = await res.json();
 
 		// Compare versions
-		if (meta.clientVersion != ver) {
-			localStorage.setItem('v', meta.clientVersion);
+		if (meta.version != ver) {
+			localStorage.setItem('v', meta.version);
 
 			alert(
 				'Misskeyの新しいバージョンがあります。ページを再度読み込みします。' +
diff --git a/src/client/app/common/scripts/check-for-update.ts b/src/client/app/common/scripts/check-for-update.ts
index 20da83a0c2..d487915766 100644
--- a/src/client/app/common/scripts/check-for-update.ts
+++ b/src/client/app/common/scripts/check-for-update.ts
@@ -1,8 +1,8 @@
-import { clientVersion as current } from '../../config';
+import { version as current } from '../../config';
 
 export default async function($root: any, force = false, silent = false) {
 	const meta = await $root.getMeta(force);
-	const newer = meta.clientVersion;
+	const newer = meta.version;
 
 	if (newer != current) {
 		localStorage.setItem('should-refresh', 'true');
diff --git a/src/client/app/common/views/widgets/version.vue b/src/client/app/common/views/widgets/version.vue
index 470eb1a84e..e8f6c08f34 100644
--- a/src/client/app/common/views/widgets/version.vue
+++ b/src/client/app/common/views/widgets/version.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { clientVersion as version, codename } from '../../../config';
+import { version, codename } from '../../../config';
 import define from '../../../common/define-widget';
 export default define({
 	name: 'version'
diff --git a/src/client/app/config.ts b/src/client/app/config.ts
index 6813c01273..55c0c6b3a5 100644
--- a/src/client/app/config.ts
+++ b/src/client/app/config.ts
@@ -1,7 +1,6 @@
 declare const _LANGS_: string[];
 declare const _COPYRIGHT_: string;
 declare const _VERSION_: string;
-declare const _CLIENT_VERSION_: string;
 declare const _CODENAME_: string;
 declare const _ENV_: string;
 
@@ -17,6 +16,5 @@ export const langs = _LANGS_;
 export const locale = JSON.parse(localStorage.getItem('locale'));
 export const copyright = _COPYRIGHT_;
 export const version = _VERSION_;
-export const clientVersion = _CLIENT_VERSION_;
 export const codename = _CODENAME_;
 export const env = _ENV_;
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index e4e7830a16..25e254f228 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -275,7 +275,7 @@ import XApiSettings from '../../../common/views/components/api-settings.vue';
 import XLanguageSettings from '../../../common/views/components/language-settings.vue';
 import XNotificationSettings from '../../../common/views/components/notification-settings.vue';
 
-import { url, clientVersion as version } from '../../../config';
+import { url, version } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
 
 export default Vue.extend({
diff --git a/src/client/app/init.ts b/src/client/app/init.ts
index 22285aa992..83ec30952b 100644
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@@ -15,7 +15,7 @@ import VueSize from './common/size';
 import App from './app.vue';
 import checkForUpdate from './common/scripts/check-for-update';
 import MiOS from './mios';
-import { clientVersion as version, codename, lang, locale } from './config';
+import { version, codename, lang, locale } from './config';
 import { builtinThemes, lightTheme, applyTheme } from './theme';
 import Dialog from './common/views/components/dialog.vue';
 
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index 83f62a502a..4d6f8a8246 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -4,7 +4,7 @@ import { EventEmitter } from 'eventemitter3';
 import * as uuid from 'uuid';
 
 import initStore from './store';
-import { apiUrl, clientVersion as version } from './config';
+import { apiUrl, version } from './config';
 import Progress from './common/scripts/loading';
 
 import Err from './common/views/components/connect-failed.vue';
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index e8b51d1271..f26b9af6f4 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -152,7 +152,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { apiUrl, clientVersion as version, codename } from '../../../config';
+import { apiUrl, version, codename } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
 import XTheme from '../../../common/views/components/theme.vue';
 import XDriveSettings from '../../../common/views/components/drive-settings.vue';
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index ebbaabc24e..b9f458e9a6 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -6,8 +6,6 @@ import define from '../define';
 import fetchMeta from '../../../misc/fetch-meta';
 import * as pkg from '../../../../package.json';
 
-import * as client from '../../../../built/client/meta.json';
-
 export const meta = {
 	stability: 'stable',
 
@@ -39,7 +37,6 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		maintainer: instance.maintainer,
 
 		version: pkg.version,
-		clientVersion: client.version,
 
 		name: instance.name,
 		uri: config.url,
diff --git a/webpack.config.ts b/webpack.config.ts
index 3c7a112a80..07a54ec831 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -18,7 +18,7 @@ const constants = require('./src/const.json');
 
 const locales = require('./locales');
 const meta = require('./package.json');
-const version = isProduction ? meta.clientVersion : meta.clientVersion + '-' + rndstr({ length: 8, chars: '0-9a-z' });
+const version = isProduction ? meta.version : meta.version + '-' + rndstr({ length: 8, chars: '0-9a-z' });
 const codename = meta.codename;
 
 const postcss = {
@@ -116,7 +116,6 @@ module.exports = {
 		new webpack.DefinePlugin({
 			_COPYRIGHT_: JSON.stringify(constants.copyright),
 			_VERSION_: JSON.stringify(meta.version),
-			_CLIENT_VERSION_: JSON.stringify(version),
 			_CODENAME_: JSON.stringify(codename),
 			_LANGS_: JSON.stringify(Object.keys(locales).map(l => [l, locales[l].meta.lang])),
 			_ENV_: JSON.stringify(process.env.NODE_ENV)