natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#2668 の一部をRevert

This commit is contained in:
syuilo 2018-09-08 23:19:11 +09:00
parent 5d4e9aa949
commit 6a45bb21c3
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app/config.ts
View File

@ -5,7 +5,6 @@ declare const _COPYRIGHT_: string;
declare const _VERSION_: string; declare const _VERSION_: string;
declare const _CODENAME_: string; declare const _CODENAME_: string;
declare const _ENV_: string; declare const _ENV_: string;
declare const _NAME_: string;
const address = new URL(location.href); const address = new URL(location.href);
@ -21,4 +20,3 @@ export const copyright = _COPYRIGHT_;
export const version = _VERSION_; export const version = _VERSION_;
export const codename = _CODENAME_; export const codename = _CODENAME_;
export const env = _ENV_; export const env = _ENV_;
export const name = _NAME_;

4
src/client/app/mios.ts
View File

@ -3,7 +3,7 @@ import { EventEmitter } from 'eventemitter3';
import * as uuid from 'uuid'; import * as uuid from 'uuid';
import initStore from './store'; import initStore from './store';
import { apiUrl, version, lang, name } from './config'; import { apiUrl, version, lang } from './config';
import Progress from './common/scripts/loading'; import Progress from './common/scripts/loading';
import Connection from './common/scripts/streaming/stream'; import Connection from './common/scripts/streaming/stream';
import { HomeStreamManager } from './common/scripts/streaming/home'; import { HomeStreamManager } from './common/scripts/streaming/home';
@ -72,7 +72,7 @@ export default class MiOS extends EventEmitter {
}; };
public get instanceName() { public get instanceName() {
return this.meta ? this.meta.data.name : name; return this.meta ? this.meta.data.name : 'Misskey';
} }
private isMetaFetching = false; private isMetaFetching = false;

4
webpack.config.ts
View File

@ -22,7 +22,6 @@ const locales = require('./locales');
const meta = require('./package.json'); const meta = require('./package.json');
const version = `${meta.clientVersion}-${rndstr({ length: 8, chars: '0-9a-z' })}`; const version = `${meta.clientVersion}-${rndstr({ length: 8, chars: '0-9a-z' })}`;
const codename = meta.codename; const codename = meta.codename;
import config from './src/config';
declare var global: { declare var global: {
faReplacement: typeof faReplacement; faReplacement: typeof faReplacement;
@ -76,8 +75,7 @@ const consts = {
_CODENAME_: codename, _CODENAME_: codename,
_LANG_: '%lang%', _LANG_: '%lang%',
_LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]), _LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]),
_ENV_: process.env.NODE_ENV, _ENV_: process.env.NODE_ENV
_NAME_: config.name
}; };
const _consts: { [ key: string ]: any } = {}; const _consts: { [ key: string ]: any } = {};