From 5c5395dab672f06b68d530ac94eeda20e1f985fa Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <daisho7308+f@gmail.com>
Date: Fri, 22 Dec 2023 23:53:24 +0900
Subject: [PATCH] =?UTF-8?q?(fix)=20CDN=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7?=
 =?UTF-8?q?=E3=83=A5=E6=99=82=E3=81=AE=E6=84=8F=E5=9B=B3=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=83=AA=E3=83=80=E3=82=A4=E3=83=AC=E3=82=AF=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E8=BB=BD=E6=B8=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                            |  2 ++
 components/content/MkIndex.vue       |  2 +-
 components/content/ProseA.vue        |  2 +-
 components/g/Footer.vue              |  2 +-
 components/g/Nav.vue                 |  2 +-
 components/g/NuxtLink.vue            |  2 +-
 components/index/Donation.vue        |  2 +-
 components/index/GetStarted.vue      |  2 +-
 components/index/hero/Left.vue       |  2 +-
 components/tools/AsideNavSection.vue |  2 +-
 composables/useGLocalPath.ts         | 17 +++++++++++++++++
 error.vue                            |  2 +-
 layouts/tools.vue                    |  2 +-
 nuxt.config.ts                       |  3 ++-
 pages/about-us/index.vue             |  2 +-
 pages/blog/[slug].vue                |  2 +-
 pages/blog/index.vue                 |  2 +-
 pages/docs/index.vue                 |  2 +-
 pages/learn-more.vue                 |  2 +-
 pages/servers/index.vue              |  2 +-
 pages/test.vue                       |  2 +-
 pages/tools/index.vue                |  2 +-
 22 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 composables/useGLocalPath.ts

diff --git a/README.md b/README.md
index 274eb3f6..c68a38fa 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ Website for Misskey, built with [Nuxt](https://nuxt.com/).
 
 内部リンク・外部リンクに関する処理を強化した[`<GNuxtLink>`](./components/g/NuxtLink.vue)を使用していますので、**リンクを追加する際は`<NuxtLink>`ではなく`<GNuxtLink>`を使用してください。**
 
+また、Nuxtのルーティングストラテジに、ホスティング環境に適した設定を適用するため、動的リンクの作成に使用する`useLocalePath`をラップしたコンポーサブル関数`useGLocalePath`を使うようにしています。
+
 ### Misskey Webへのリンクについて
 
 GNuxtLinkおよび各種Docsで、アドレスに `x-mi-web://` から始め、続けてMisskeyの相対パスを入力すると、Misskey Webへのリンクに置き換えられます。
diff --git a/components/content/MkIndex.vue b/components/content/MkIndex.vue
index 77da4879..da3c3640 100644
--- a/components/content/MkIndex.vue
+++ b/components/content/MkIndex.vue
@@ -39,7 +39,7 @@ const realBasePath = computed<string>(() => {
     return route.path.replace(/^.*\/docs/, `/${locale.value}/docs`);
 });
 
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 
 const query = queryContent(realBasePath.value);
 </script>
diff --git a/components/content/ProseA.vue b/components/content/ProseA.vue
index 1dbf6827..65f9b187 100644
--- a/components/content/ProseA.vue
+++ b/components/content/ProseA.vue
@@ -7,7 +7,7 @@ import { isLocalPath, sanitizeInternalPath } from '@/assets/js/misc';
 const runtimeConfig = useRuntimeConfig();
 const rootDomain = new $URL(runtimeConfig.public.baseUrl);
 const { resolve } = useRouter();
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 
 const props = defineProps({
     href: {
diff --git a/components/g/Footer.vue b/components/g/Footer.vue
index 581e0a3a..925d8419 100644
--- a/components/g/Footer.vue
+++ b/components/g/Footer.vue
@@ -64,7 +64,7 @@
 import MiIcon from '@/assets/svg/misskey_mi_bi.svg';
 import ExtIco from 'bi/box-arrow-up-right.svg';
 
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 </script>
 
 <style scoped>
diff --git a/components/g/Nav.vue b/components/g/Nav.vue
index 2e8140eb..df6ac636 100644
--- a/components/g/Nav.vue
+++ b/components/g/Nav.vue
@@ -122,7 +122,7 @@ watch(() => route.path,(to) => {
 });
 
 const switchLocalePath = useSwitchLocalePath();
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const spLocaleOption = ref<string>(currentLocale.value);
 function changeLocale() {
     const path = switchLocalePath(spLocaleOption.value);
diff --git a/components/g/NuxtLink.vue b/components/g/NuxtLink.vue
index f618d4ed..460b4307 100644
--- a/components/g/NuxtLink.vue
+++ b/components/g/NuxtLink.vue
@@ -25,7 +25,7 @@ const rawProps = defineProps<{
     target?: unknown;
 }>();
 
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 
 const needsToOpenExternally = ref(false);
 const realHref = computed(() => {
diff --git a/components/index/Donation.vue b/components/index/Donation.vue
index 2802991d..9fa06726 100644
--- a/components/index/Donation.vue
+++ b/components/index/Donation.vue
@@ -8,5 +8,5 @@
     </div>
 </template>
 <script setup lang="ts">
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 </script>
diff --git a/components/index/GetStarted.vue b/components/index/GetStarted.vue
index bed6dc47..12d48e97 100644
--- a/components/index/GetStarted.vue
+++ b/components/index/GetStarted.vue
@@ -33,7 +33,7 @@
 <script setup lang="ts">
 import { vFadeIn } from 'assets/js/fadein';
 
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 </script>
 
 <style scoped>
diff --git a/components/index/hero/Left.vue b/components/index/hero/Left.vue
index 567f2d9a..6540bcb7 100644
--- a/components/index/hero/Left.vue
+++ b/components/index/hero/Left.vue
@@ -39,7 +39,7 @@ import { isLocalPath } from '~/assets/js/misc';
 
 const { notice } = useAppConfig();
 const { locale, fallbackLocale } = useI18n();
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const showTagline = ref(false);
 const colorMode = useColorMode();
 const mobileScreenShot = computed(() => (colorMode.preference === 'dark') ? '/img/hero/misskey-mobile-dark.png' : '/img/hero/misskey-mobile-light.png');
diff --git a/components/tools/AsideNavSection.vue b/components/tools/AsideNavSection.vue
index afb057ba..58d59715 100644
--- a/components/tools/AsideNavSection.vue
+++ b/components/tools/AsideNavSection.vue
@@ -15,7 +15,7 @@ const navData = props.d;
 const route = useRoute();
 const router = useRouter();
 const isShown = ref(false);
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 
 watch(() => route.path, () => {
     if (navData.items.some((e) => isSamePath(route.path, localePath(e.to)))) {
diff --git a/composables/useGLocalPath.ts b/composables/useGLocalPath.ts
new file mode 100644
index 00000000..c058258e
--- /dev/null
+++ b/composables/useGLocalPath.ts
@@ -0,0 +1,17 @@
+import {
+    getComposer,
+    useLocalePath as _useLocalePath,
+} from 'vue-i18n-routing';
+
+/** useLocalePathのラッパー関数。 */
+export function useGLocalePath(
+    options?: NonNullable<Parameters<typeof _useLocalePath>[0]>
+): ReturnType<typeof _useLocalePath> {
+    const { route, router, i18n, strategy } = options || {}
+    return _useLocalePath({
+        route: route || useRoute(),
+        router: router || useRouter(),
+        i18n: i18n || getComposer(useNuxtApp().$i18n),
+        strategy: strategy ?? 'prefix', // ←リンクではprefixつきにする
+    })
+}
\ No newline at end of file
diff --git a/error.vue b/error.vue
index 35f454be..a114946b 100644
--- a/error.vue
+++ b/error.vue
@@ -34,7 +34,7 @@ const colorMode = useColorMode();
 const runtimeConfig = useRuntimeConfig();
 
 const { locale, locales } = useI18n();
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const currentLocaleIso = computed(() => (locales.value as LocaleObject[]).find((e) => e?.code === locale.value)?.iso);
 
 const isNavOpen = ref<boolean>(false);
diff --git a/layouts/tools.vue b/layouts/tools.vue
index 6624df1d..c74066e2 100644
--- a/layouts/tools.vue
+++ b/layouts/tools.vue
@@ -14,7 +14,7 @@ function clickNav() {
 const isNavOpen = ref<boolean>(false);
 const isAsideNavOpen = ref<boolean>(false);
 
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 
 useHead({
     htmlAttrs: {
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 765e09bd..0badfc83 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -117,7 +117,8 @@ export default defineNuxtConfig({
 		langDir: 'locales_dist',
 		defaultLocale: 'ja',
 		// ▼ Defaultルートは、nitroプラグインでオーバーライドする
-		strategy: 'prefix',
+		// 　 リンクはuseGLocalePath（ラッパー）を使う
+		strategy: 'prefix_and_default',
 		trailingSlash: true,
 	},
 	colorMode: {
diff --git a/pages/about-us/index.vue b/pages/about-us/index.vue
index ad5d058e..bb2ae74b 100644
--- a/pages/about-us/index.vue
+++ b/pages/about-us/index.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script setup lang="ts">
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const { t } = useI18n();
 const route = useRoute();
 
diff --git a/pages/blog/[slug].vue b/pages/blog/[slug].vue
index 30df7241..56dde500 100644
--- a/pages/blog/[slug].vue
+++ b/pages/blog/[slug].vue
@@ -47,7 +47,7 @@ const route = useRoute();
 
 // ▼他言語からやってきたときに正しいパスに戻す▼
 const originalLocale = useState('miHub_blog_originalLocale', () => 'ja');
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const getRouteBaseName = useRouteBaseName();
 let isTransformed = false;
 
diff --git a/pages/blog/index.vue b/pages/blog/index.vue
index dd80c5b0..9fbc6d99 100644
--- a/pages/blog/index.vue
+++ b/pages/blog/index.vue
@@ -39,7 +39,7 @@ const localeState = useState('miHub_blog_originalLocale', () => locale.value);
 localeState.value = locale.value;
 
 const { data } = await useAsyncData('blog', () => queryContent('blog').only(['_path', 'navTitle', 'title', 'date']).sort({ date: -1 }).find());
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 
 route.meta.title = t('_blog.title');
 route.meta.description = t('_blog.description');
diff --git a/pages/docs/index.vue b/pages/docs/index.vue
index 6d9c5c30..34f3c8cc 100644
--- a/pages/docs/index.vue
+++ b/pages/docs/index.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script setup lang="ts">
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const { t, locale } = useI18n();
 const route = useRoute();
 
diff --git a/pages/learn-more.vue b/pages/learn-more.vue
index 591f4245..806b27d2 100644
--- a/pages/learn-more.vue
+++ b/pages/learn-more.vue
@@ -70,7 +70,7 @@
 
 <script setup lang="ts">
 const { t } = useI18n();
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const route = useRoute();
 
 route.meta.title = t('_other.title');
diff --git a/pages/servers/index.vue b/pages/servers/index.vue
index faac507f..5b368d4b 100644
--- a/pages/servers/index.vue
+++ b/pages/servers/index.vue
@@ -51,7 +51,7 @@ import type { InstancesStatsObj } from '@/types/instances-info';
 import ArrowRightIco from "bi/arrow-right.svg";
 
 const { t, locale } = useI18n();
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const route = useRoute();
 
 const instancesStats = ref<InstancesStatsObj>();
diff --git a/pages/test.vue b/pages/test.vue
index bab5ced2..2e6ed116 100644
--- a/pages/test.vue
+++ b/pages/test.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 </script>
 
 <style scoped>
diff --git a/pages/tools/index.vue b/pages/tools/index.vue
index 0211059e..f4dcc574 100644
--- a/pages/tools/index.vue
+++ b/pages/tools/index.vue
@@ -46,7 +46,7 @@ definePageMeta({
 });
 
 const { t } = useI18n();
-const localePath = useLocalePath();
+const localePath = useGLocalePath();
 const route = useRoute();
 
 route.meta.title = t('_tools.title');