From c812abe13967d58f41eac357c31585a596033e89 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <daisho7308+f@gmail.com>
Date: Sun, 26 Nov 2023 01:48:16 +0900
Subject: [PATCH] fix internal paths

---
 assets/js/misc/index.ts          |  5 +++++
 components/content/ProseA.vue    |  5 +++--
 components/g/NuxtLink.vue        |  4 ++--
 layouts/docs.vue                 | 15 +++++++++++++--
 nuxt.config.ts                   |  2 +-
 server/plugins/i18nRedirector.ts |  2 +-
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/assets/js/misc/index.ts b/assets/js/misc/index.ts
index 35a85fc8..d124b011 100644
--- a/assets/js/misc/index.ts
+++ b/assets/js/misc/index.ts
@@ -43,6 +43,11 @@ export function isLocalPath(link: string, base?: string): boolean {
     return (!url.host || rootDomain.host === url.host);
 }
 
+export function sanitizeInternalPath(path: string): string {
+    const runtimeConfig = useRuntimeConfig();
+    return path.replace(new RegExp(`^(\/(${runtimeConfig.public.locales.map((l) => l.code).join('|')})\/?){2,}(.*)$`, 'g'), '$1$2');
+}
+
 /**
  * ナビゲーションObjectを合致する条件まで深掘り
  * @param obj ナビゲーションObject
diff --git a/components/content/ProseA.vue b/components/content/ProseA.vue
index 6d137e55..5c3a3775 100644
--- a/components/content/ProseA.vue
+++ b/components/content/ProseA.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import ExtIco from 'bi/box-arrow-up-right.svg';
 import { $URL, isRelative, joinURL } from 'ufo';
+import { isLocalPath, sanitizeInternalPath } from '@/assets/js/misc';
 
 const runtimeConfig = useRuntimeConfig();
 const rootDomain = new $URL(runtimeConfig.public.baseUrl);
@@ -23,12 +24,12 @@ const realHref = ref(props.href);
 const realTarget = ref(props.target);
 
 const url = new $URL(realHref.value);
-if (url.host === '' || rootDomain.host === url.host) {
+if (isLocalPath(realHref.value)) {
     // 内部リンクの場合
     const route = resolve(realHref.value);
     if (route.name && !route.name.toString().includes('___')) {
         // 渡されたパスがローカライズされたルートではない場合はローカライズされたパスを返す
-        realHref.value = localePath(url.fullpath);
+        realHref.value = sanitizeInternalPath(localePath(url.fullpath));
     }
 
     // 相対パスの場合（trailing slashがあるので１つくり下げる）
diff --git a/components/g/NuxtLink.vue b/components/g/NuxtLink.vue
index 4a7daf81..7074adb1 100644
--- a/components/g/NuxtLink.vue
+++ b/components/g/NuxtLink.vue
@@ -9,7 +9,7 @@
 
 <script setup lang="ts">
 import { cleanDoubleSlashes, withTrailingSlash } from 'ufo';
-import { isLocalPath } from '@/assets/js/misc';
+import { isLocalPath, sanitizeInternalPath } from '@/assets/js/misc';
 import type { RouteLocationRaw } from '#vue-router';
 
 /**
@@ -29,7 +29,7 @@ const realHref = computed(() => {
     if (rhf && typeof rhf === 'string') {
 
         if (isLocalPath(rhf)) {
-            return withTrailingSlash(cleanDoubleSlashes(rhf), true);
+            return withTrailingSlash(cleanDoubleSlashes(sanitizeInternalPath(rhf)), true);
         }
 
         return rhf;
diff --git a/layouts/docs.vue b/layouts/docs.vue
index cee81107..f9ad69f7 100644
--- a/layouts/docs.vue
+++ b/layouts/docs.vue
@@ -8,8 +8,19 @@ useHead({
     },
 });
 
+const route = useRoute();
 const { locale } = useI18n();
-const { data: navigation } = await useAsyncData(`navigation_${locale.value}`, () => fetchContentNavigation(queryContent(`/${locale.value}/docs/`)));
+const navigation = ref();
+const asideNavKey = ref(0);
+const { data } = await useAsyncData(`navigation_${locale.value}`, () => fetchContentNavigation(queryContent(`/${locale.value}/docs/`)));
+navigation.value = data.value;
+
+watch(locale, async (to) => {
+    console.log('locale changed');
+    const { data } = await useAsyncData(`navigation_${to}`, () => fetchContentNavigation(queryContent(`/${to}/docs/`)));
+    navigation.value = data.value;
+    asideNavKey.value++;
+});
 </script>
 
 <template>
@@ -22,7 +33,7 @@ const { data: navigation } = await useAsyncData(`navigation_${locale.value}`, ()
                     :class="isAsideNavOpen ? 'translate-x-0' : '-translate-x-64'"
                 >
                     <div class="lg:sticky lg:top-16 h-[calc(100vh-7.25rem)] lg:h-[calc(100vh-4rem)] overflow-y-scroll border-r border-slate-200 dark:border-slate-700 py-6 pr-3">
-                        <DocsAsideNav :links="navigation ?? []" />
+                        <DocsAsideNav :links="navigation ?? []" :key="asideNavKey" />
                     </div>
                 </div>
                 <div class="relative">
diff --git a/nuxt.config.ts b/nuxt.config.ts
index b8dd18ad..18e97132 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -29,9 +29,9 @@ export const locales = localesConst as unknown as LocaleObject[];
 
 export default defineNuxtConfig({
 	runtimeConfig: {
-		locales,
 		public: {
 			baseUrl,
+			locales,
 		}
 	},
 	css: [
diff --git a/server/plugins/i18nRedirector.ts b/server/plugins/i18nRedirector.ts
index 03d9215c..71c6237f 100644
--- a/server/plugins/i18nRedirector.ts
+++ b/server/plugins/i18nRedirector.ts
@@ -14,7 +14,7 @@ export default defineNitroPlugin((nitroApp) => {
     }
 
     const runtimeConfig: MiHubRuntimeConfig = useRuntimeConfig();
-    if (!event.path.match(new RegExp(`^/(${runtimeConfig.locales.map((l) => l.code).join('|')})/`))) {
+    if (!event.path.match(new RegExp(`^/(${runtimeConfig.public.locales.map((l) => l.code).join('|')})/`))) {
       const links = runtimeConfig.locales.map((l) => {
         const url = withTrailingSlash(`/${l.code}${event.path.replace(/\.html$/g, '/')}`);
         return `<a href="${url}">${l.name}</a>`;