oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

refactor: init.ts周りのeslintエラーと型の修正 (#10157)

Browse source 
* refactor/miLocalStorageのメソッドに戻り値追加

* refactor/miLocalStorageのキーとしてdebugがconfig.tsに存在するので追加

* fix/JSON.parseにnullは入らないのでnullの時は分岐させてnullにする

* refactor/修正したファイルの型調整+記法の統一

* fix/型のためにlangがnullの時はhtmlの言語の設定をしない

* refactor/catchで何もしないと警告が出るので修正

* refactor/細かい点の修正

* refactor/変数の二重定義になっていた二重定義になっていたので修正

* refactor/importの整理(通常のimportは最初に処理されるので影響はない想定)

* fix/vueファイルに型を与えてインポート時の型エラーを防ぐ

* refactor/開発環境のみで利用するので,eslintの設定を変更する

* fix/vueの定義を最小限にする

* fallback language to 'en-US'

* remove accounts migration

* fix:vueの型定義ファイルを消す

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
This commit is contained in:
KokiSakano 2023-04-13 18:47:49 +09:00 • committed by GitHub
parent dffefdad95
commit 463446795d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

45
packages/frontend/src/init.ts
View file

@ -6,18 +6,6 @@ import 'vite/modulepreload-polyfill';
import '@/style.scss';
//#region account indexedDB migration
import { set } from '@/scripts/idb-proxy';
{
const accounts = miLocalStorage.getItem('accounts');
if (accounts) {
set('accounts', JSON.parse(accounts));
miLocalStorage.removeItem('accounts');
}
}
//#endregion
import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent } from 'vue';
import { compareVersions } from 'compare-versions';
import JSON5 from 'json5';
@ -42,11 +30,11 @@ import { reloadChannel } from '@/scripts/unison-reload';
import { reactionPicker } from '@/scripts/reaction-picker';
import { getUrlWithoutLoginId } from '@/scripts/login-id';
import { getAccountFromId } from '@/scripts/get-account-from-id';
import { deckStore } from './ui/deck/deck-store';
import { miLocalStorage } from './local-storage';
import { claimAchievement, claimedAchievements } from './scripts/achievements';
import { fetchCustomEmojis } from './custom-emojis';
import { mainRouter } from './router';
import { deckStore } from '@/ui/deck/deck-store';
import { miLocalStorage } from '@/local-storage';
import { claimAchievement, claimedAchievements } from '@/scripts/achievements';
import { fetchCustomEmojis } from '@/custom-emojis';
import { mainRouter } from '@/router';
console.info(`Misskey v${version}`);
@ -55,7 +43,9 @@ if (_DEV_) {
console.info(`vue ${vueVersion}`);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(window as any).$i = $i;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(window as any).$store = defaultStore;
window.addEventListener('error', event => {
@ -184,7 +174,7 @@ fetchInstanceMetaPromise.then(() => {
try {
await fetchCustomEmojis();
} catch (err) {}
} catch (err) { /* empty */ }
const app = createApp(
new URLSearchParams(window.location.search).has('zen') ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
@ -212,20 +202,20 @@ await deckStore.ready;
// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
const rootEl = (() => {
const rootEl = ((): HTMLElement => {
const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
const currentEl = document.getElementById(MISSKEY_MOUNT_DIV_ID);
const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID);
if (currentEl) {
if (currentRoot) {
console.warn('multiple import detected');
return currentEl;
return currentRoot;
}
const rootEl = document.createElement('div');
rootEl.id = MISSKEY_MOUNT_DIV_ID;
document.body.appendChild(rootEl);
return rootEl;
const root = document.createElement('div');
root.id = MISSKEY_MOUNT_DIV_ID;
document.body.appendChild(root);
return root;
})();
app.mount(rootEl);
@ -256,8 +246,7 @@ if (lastVersion !== version) {
popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {}, 'closed');
}
}
} catch (err) {
}
} catch (err) { /* empty */ }
}
await defaultStore.ready;