diff options
| author | おさむのひと <46447427+samunohito@users.noreply.github.com> | 2024-01-08 14:44:43 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-08 14:44:43 +0900 |
| commit | 04f9147db6c0b3aff3347a62659f3dfb21fc3f94 (patch) | |
| tree | b489a71c7379890f6ff579be9e52b8b61f87d50d /packages/frontend/src/scripts | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-04f9147db6c0b3aff3347a62659f3dfb21fc3f94.tar.gz sharkey-04f9147db6c0b3aff3347a62659f3dfb21fc3f94.tar.bz2 sharkey-04f9147db6c0b3aff3347a62659f3dfb21fc3f94.zip | |
refactor(frontend): router.ts解きほぐし (#12907)
* refactor(frontend): router.ts解きほぐし
* add debug hmr option
* fix comment
* fix not working
* add comment
* fix name
* Update definition.ts
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/frontend/src/scripts')
| -rw-r--r-- | packages/frontend/src/scripts/get-user-menu.ts | 6 | ||||
| -rw-r--r-- | packages/frontend/src/scripts/lookup.ts | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts index 2735253b36..d9a52c3741 100644 --- a/packages/frontend/src/scripts/get-user-menu.ts +++ b/packages/frontend/src/scripts/get-user-menu.ts @@ -13,11 +13,11 @@ import * as os from '@/os.js'; import { misskeyApi } from '@/scripts/misskey-api.js'; import { defaultStore, userActions } from '@/store.js'; import { $i, iAmModerator } from '@/account.js'; -import { mainRouter } from '@/router.js'; -import { Router } from '@/nirax.js'; +import { IRouter } from '@/nirax.js'; import { antennasCache, rolesCache, userListsCache } from '@/cache.js'; +import { mainRouter } from '@/global/router/main.js'; -export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router = mainRouter) { +export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter = mainRouter) { const meId = $i ? $i.id : null; const cleanups = [] as (() => void)[]; diff --git a/packages/frontend/src/scripts/lookup.ts b/packages/frontend/src/scripts/lookup.ts index ff438af24f..ddcfd8852e 100644 --- a/packages/frontend/src/scripts/lookup.ts +++ b/packages/frontend/src/scripts/lookup.ts @@ -6,8 +6,8 @@ import * as os from '@/os.js'; import { misskeyApi } from '@/scripts/misskey-api.js'; import { i18n } from '@/i18n.js'; -import { mainRouter } from '@/router.js'; import { Router } from '@/nirax.js'; +import { mainRouter } from '@/global/router/main.js'; export async function lookup(router?: Router) { const _router = router ?? mainRouter; |