fix: cannot generate on differentDomains (#1559)

nuxt-modules · Oct 12, 2022 · c6ccdf4 · c6ccdf4
1 parent 1585fd4
commit c6ccdf4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
@@ -23,7 +23,7 @@ export default defineNuxtConfig({
         code: 'en',
         iso: 'en-US',
         file: 'en.json',
-        domain: 'localhost:3000',
+        domain: 'foo.localhost',
         name: 'English'
       },
       {
@@ -42,7 +42,7 @@ export default defineNuxtConfig({
       }
     ],
     // trailingSlash: true,
-    // debug: true,
+    debug: true,
     defaultLocale: 'en',
     // strategy: 'no_prefix',
     // strategy: 'prefix',
@@ -53,7 +53,7 @@ export default defineNuxtConfig({
         ja: '/about-ja'
       }
     },
-    // differentDomains: true,
+    differentDomains: true,
     detectBrowserLanguage: false,
     // detectBrowserLanguage: {
     //   // alwaysRedirect: true,

diff --git a/src/runtime/internal.ts b/src/runtime/internal.ts
@@ -345,11 +345,13 @@ export function getHost() {
 }
 
 export function getLocaleDomain(locales: LocaleObject[]): string {
-  const host = getHost() || ''
+  let host = getHost() || ''
   if (host) {
     const matchingLocale = locales.find(locale => locale.domain === host)
     if (matchingLocale) {
       return matchingLocale.code
+    } else {
+      host = ''
     }
   }
   return host

diff --git a/src/runtime/plugin.ts b/src/runtime/plugin.ts
@@ -33,7 +33,7 @@ import {
 } from '#build/i18n.internal.mjs'
 
 import type { Composer, I18nOptions, Locale } from '@intlify/vue-i18n-bridge'
-import type { LocaleObject, RouteLocationNormalized, ExtendProperyDescripters } from 'vue-i18n-routing'
+import type { LocaleObject, ExtendProperyDescripters } from 'vue-i18n-routing'
 import type { NuxtApp } from '#imports'
 
 type GetRouteBaseName = typeof getRouteBaseName

diff --git a/src/runtime/utils.ts b/src/runtime/utils.ts
@@ -310,7 +310,7 @@ export async function navigate<Context extends NuxtApp = NuxtApp>(
     if (process.client) {
       window.location.assign(redirectPath)
     } else if (process.server) {
-      // TODO:
+      __DEBUG__ && console.log('differentDomains servermode ', redirectPath)
     }
   }
 }
@@ -351,6 +351,7 @@ export function extendSwitchLocalePathIntercepter(
   return (path: string, locale: Locale): string => {
     if (differentDomains) {
       const domain = getDomainFromLocale(locale, normalizedLocales, nuxt)
+      __DEBUG__ && console.log('extendSwitchLocalePathIntercepter: domain -> ', domain, ' path -> ', path)
       if (domain) {
         return joinURL(domain, path)
       } else {