diff --git a/package.json b/package.json
index e09796039..274962c36 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,6 @@
"@types/redis": "2.8.5",
"@types/request": "2.47.0",
"@types/rimraf": "2.0.2",
- "@types/riot": "3.6.1",
"@types/seedrandom": "2.4.27",
"@types/serve-favicon": "2.2.30",
"@types/speakeasy": "2.0.2",
@@ -148,8 +147,6 @@
"redis": "2.8.0",
"request": "2.83.0",
"rimraf": "2.6.2",
- "riot": "3.8.1",
- "riot-tag-loader": "2.0.2",
"rndstr": "1.0.0",
"s-age": "1.1.2",
"seedrandom": "2.4.3",
diff --git a/src/web/app/app.vue b/src/web/app/app.vue
index 321e00393..7a46e7dea 100644
--- a/src/web/app/app.vue
+++ b/src/web/app/app.vue
@@ -1,3 +1,3 @@
-
+
diff --git a/src/web/app/auth/script.ts b/src/web/app/auth/script.ts
deleted file mode 100644
index dd598d1ed..000000000
--- a/src/web/app/auth/script.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Authorize Form
- */
-
-// Style
-import './style.styl';
-
-import * as riot from 'riot';
-require('./tags');
-import init from '../init';
-
-document.title = 'Misskey | アプリの連携';
-
-/**
- * init
- */
-init(() => {
- mount(document.createElement('mk-index'));
-});
-
-function mount(content) {
- riot.mount(document.getElementById('app').appendChild(content));
-}
diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index e20f4bfe4..6c95e5b9b 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -1,5 +1,7 @@
import Vue from 'vue';
import { EventEmitter } from 'eventemitter3';
+
+import { apiUrl, swPublickey, version, lang } from '../config';
import api from './scripts/api';
import signout from './scripts/signout';
import Progress from './scripts/loading';
@@ -11,13 +13,6 @@ import MessagingIndexStreamManager from './scripts/streaming/messaging-index-str
import Err from '../common/views/components/connect-failed.vue';
-//#region environment variables
-declare const _VERSION_: string;
-declare const _LANG_: string;
-declare const _API_URL_: string;
-declare const _SW_PUBLICKEY_: string;
-//#endregion
-
export type API = {
chooseDriveFile: (opts: {
title?: string;
@@ -204,7 +199,7 @@ export default class MiOS extends EventEmitter {
}
// Fetch user
- fetch(`${_API_URL_}/i`, {
+ fetch(`${apiUrl}/i`, {
method: 'POST',
body: JSON.stringify({
i: token
@@ -311,7 +306,7 @@ export default class MiOS extends EventEmitter {
// A public key your push server will use to send
// messages to client apps via a push server.
- applicationServerKey: urlBase64ToUint8Array(_SW_PUBLICKEY_)
+ applicationServerKey: urlBase64ToUint8Array(swPublickey)
};
// Subscribe push notification
@@ -348,7 +343,7 @@ export default class MiOS extends EventEmitter {
});
// The path of service worker script
- const sw = `/sw.${_VERSION_}.${_LANG_}.js`;
+ const sw = `/sw.${version}.${lang}.js`;
// Register service worker
navigator.serviceWorker.register(sw).then(registration => {
diff --git a/src/web/app/common/views/components/index.ts b/src/web/app/common/views/components/index.ts
index 5460d7577..ab0f1767d 100644
--- a/src/web/app/common/views/components/index.ts
+++ b/src/web/app/common/views/components/index.ts
@@ -21,20 +21,6 @@ import urlPreview from './url-preview.vue';
import twitterSetting from './twitter-setting.vue';
import fileTypeIcon from './file-type-icon.vue';
-//#region widgets
-import wAccessLog from './widgets/access-log.vue';
-import wVersion from './widgets/version.vue';
-import wRss from './widgets/rss.vue';
-import wServer from './widgets/server.vue';
-import wBroadcast from './widgets/broadcast.vue';
-import wCalendar from './widgets/calendar.vue';
-import wPhotoStream from './widgets/photo-stream.vue';
-import wSlideshow from './widgets/slideshow.vue';
-import wTips from './widgets/tips.vue';
-import wDonation from './widgets/donation.vue';
-import wNav from './widgets/nav.vue';
-//#endregion
-
Vue.component('mk-signin', signin);
Vue.component('mk-signup', signup);
Vue.component('mk-forkit', forkit);
@@ -55,17 +41,3 @@ Vue.component('mk-messaging-room', messagingRoom);
Vue.component('mk-url-preview', urlPreview);
Vue.component('mk-twitter-setting', twitterSetting);
Vue.component('mk-file-type-icon', fileTypeIcon);
-
-//#region widgets
-Vue.component('mkw-nav', wNav);
-Vue.component('mkw-calendar', wCalendar);
-Vue.component('mkw-photo-stream', wPhotoStream);
-Vue.component('mkw-slideshow', wSlideshow);
-Vue.component('mkw-tips', wTips);
-Vue.component('mkw-donation', wDonation);
-Vue.component('mkw-broadcast', wBroadcast);
-Vue.component('mkw-server', wServer);
-Vue.component('mkw-rss', wRss);
-Vue.component('mkw-version', wVersion);
-Vue.component('mkw-access-log', wAccessLog);
-//#endregion
diff --git a/src/web/app/common/views/components/widgets/access-log.vue b/src/web/app/common/views/widgets/access-log.vue
similarity index 97%
rename from src/web/app/common/views/components/widgets/access-log.vue
rename to src/web/app/common/views/widgets/access-log.vue
index c810c2d15..f7bb17d83 100644
--- a/src/web/app/common/views/components/widgets/access-log.vue
+++ b/src/web/app/common/views/widgets/access-log.vue
@@ -15,7 +15,7 @@