From 9e91f8537077ab59357bcfbc8d27981cf75d922b Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:08:40 +0900 Subject: refactor(frontend): use Symbol for vue provide/inject --- packages/frontend/src/components/MkPageWindow.vue | 3 ++- packages/frontend/src/components/global/RouterView.vue | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'packages/frontend/src/components') diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue index 5c0fa60847..67b3165ade 100644 --- a/packages/frontend/src/components/MkPageWindow.vue +++ b/packages/frontend/src/components/MkPageWindow.vue @@ -45,6 +45,7 @@ import { claimAchievement } from '@/utility/achievements.js'; import { useRouterFactory } from '@/router/supplier.js'; import { mainRouter } from '@/router/main.js'; import { analytics } from '@/analytics.js'; +import { DI } from '@/di.js'; const props = defineProps<{ initialPath: string; @@ -119,7 +120,7 @@ windowRouter.addListener('change', ctx => { windowRouter.init(); -provide('router', windowRouter); +provide(DI.router, windowRouter); provide('inAppSearchMarkerId', searchMarkerId); provideMetadataReceiver((metadataGetter) => { const info = metadataGetter(); diff --git a/packages/frontend/src/components/global/RouterView.vue b/packages/frontend/src/components/global/RouterView.vue index 2e963daa27..25a29a4ae7 100644 --- a/packages/frontend/src/components/global/RouterView.vue +++ b/packages/frontend/src/components/global/RouterView.vue @@ -24,20 +24,21 @@ import type { IRouter, Resolved, RouteDef } from '@/nirax.js'; import { prefer } from '@/preferences.js'; import { globalEvents } from '@/events.js'; import MkLoadingPage from '@/pages/_loading_.vue'; +import { DI } from '@/di.js'; const props = defineProps<{ router?: IRouter; nested?: boolean; }>(); -const router = props.router ?? inject('router'); +const router = props.router ?? inject(DI.router); if (router == null) { throw new Error('no router provided'); } -const currentDepth = inject('routerCurrentDepth', 0); -provide('routerCurrentDepth', currentDepth + 1); +const currentDepth = inject(DI.routerCurrentDepth, 0); +provide(DI.routerCurrentDepth, currentDepth + 1); function resolveNested(current: Resolved, d = 0): Resolved | null { if (!props.nested) return current; -- cgit v1.2.3-freya