refactor: simplify extendSwitchLocalePathIntercepter (#3128)

nuxt-modules · Sep 24, 2024 · 5caa83b · 5caa83b
1 parent d067336
commit 5caa83b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/src/runtime/routing/compatibles/routing.ts b/src/runtime/routing/compatibles/routing.ts
@@ -9,7 +9,7 @@ import { resolve, routeToObject } from './utils'
 import { getLocaleRouteName, getRouteName } from '../utils'
 import { extendPrefixable, extendSwitchLocalePathIntercepter, type CommonComposableOptions } from '../../utils'
 
-import type { Strategies, PrefixableOptions, SwitchLocalePathIntercepter } from '../../shared-types'
+import type { Strategies, PrefixableOptions } from '../../shared-types'
 import type { Locale } from 'vue-i18n'
 import type {
   RouteLocation,
@@ -209,8 +209,6 @@ export function resolveRoute(common: CommonComposableOptions, route: RouteLocati
   }
 }
 
-export const DefaultSwitchLocalePathIntercepter: SwitchLocalePathIntercepter = (path: string) => path
-
 function getLocalizableMetaFromDynamicParams(
   common: CommonComposableOptions,
   route: RouteLocationNormalizedLoaded

diff --git a/src/runtime/utils.ts b/src/runtime/utils.ts
@@ -20,8 +20,7 @@ import {
   localeRoute,
   getRouteBaseName,
   switchLocalePath,
-  DefaultPrefixable,
-  DefaultSwitchLocalePathIntercepter
+  DefaultPrefixable
 } from './routing/compatibles/routing'
 import {
   getI18nProperty,
@@ -400,18 +399,15 @@ export function extendPrefixable(runtimeConfig = useRuntimeConfig()) {
 // override switch locale path intercepter, support domain
 export function extendSwitchLocalePathIntercepter(runtimeConfig = useRuntimeConfig()): SwitchLocalePathIntercepter {
   const logger = /*#__PURE__*/ createLogger('extendSwitchLocalePathIntercepter')
+
   return (path: string, locale: Locale): string => {
-    if (runtimeConfig.public.i18n.differentDomains) {
-      const domain = getDomainFromLocale(locale)
-      __DEBUG__ && logger.log({ domain, path })
-      if (domain) {
-        return joinURL(domain, path)
-      } else {
-        return path
-      }
-    } else {
-      return DefaultSwitchLocalePathIntercepter(path, locale)
+    if (!runtimeConfig.public.i18n.differentDomains) {
+      return path
     }
+
+    const domain = getDomainFromLocale(locale)
+    __DEBUG__ && logger.log({ domain, path })
+    return (domain && joinURL(domain, path)) || path
   }
 }