From 6a45bb21c384e722b0c67b0c65608cc62ae62b6a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 8 Sep 2018 23:19:11 +0900 Subject: [PATCH] =?UTF-8?q?#2668=20=E3=81=AE=E4=B8=80=E9=83=A8=E3=82=92Rev?= =?UTF-8?q?ert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/config.ts | 2 -- src/client/app/mios.ts | 4 ++-- webpack.config.ts | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/client/app/config.ts b/src/client/app/config.ts index 2e464c50f3..a326c521db 100644 --- a/src/client/app/config.ts +++ b/src/client/app/config.ts @@ -5,7 +5,6 @@ declare const _COPYRIGHT_: string; declare const _VERSION_: string; declare const _CODENAME_: string; declare const _ENV_: string; -declare const _NAME_: string; const address = new URL(location.href); @@ -21,4 +20,3 @@ export const copyright = _COPYRIGHT_; export const version = _VERSION_; export const codename = _CODENAME_; export const env = _ENV_; -export const name = _NAME_; diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts index d9d4ee9a07..0f72cd2f34 100644 --- a/src/client/app/mios.ts +++ b/src/client/app/mios.ts @@ -3,7 +3,7 @@ import { EventEmitter } from 'eventemitter3'; import * as uuid from 'uuid'; import initStore from './store'; -import { apiUrl, version, lang, name } from './config'; +import { apiUrl, version, lang } from './config'; import Progress from './common/scripts/loading'; import Connection from './common/scripts/streaming/stream'; import { HomeStreamManager } from './common/scripts/streaming/home'; @@ -72,7 +72,7 @@ export default class MiOS extends EventEmitter { }; public get instanceName() { - return this.meta ? this.meta.data.name : name; + return this.meta ? this.meta.data.name : 'Misskey'; } private isMetaFetching = false; diff --git a/webpack.config.ts b/webpack.config.ts index bc1c0ddbcf..a50d6c40cc 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -22,7 +22,6 @@ const locales = require('./locales'); const meta = require('./package.json'); const version = `${meta.clientVersion}-${rndstr({ length: 8, chars: '0-9a-z' })}`; const codename = meta.codename; -import config from './src/config'; declare var global: { faReplacement: typeof faReplacement; @@ -76,8 +75,7 @@ const consts = { _CODENAME_: codename, _LANG_: '%lang%', _LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]), - _ENV_: process.env.NODE_ENV, - _NAME_: config.name + _ENV_: process.env.NODE_ENV }; const _consts: { [ key: string ]: any } = {};