nuxt-i18n-micro 3.18.3 → 3.20.0

package/dist/runtime/components/i18n-link.vue

@@ -1,19 +1,9 @@
 <template>
-  <a
-    v-if="isExternalLink"
-    :href="externalHref"
-    :style="computedStyle"
-    target="_blank"
-    rel="noopener noreferrer"
-  >
+  <a v-if="isExternalLink" :href="externalHref" :style="computedStyle" target="_blank" rel="noopener noreferrer">
     <slot />
   </a>
 
-  <NuxtLink
-    v-else
-    :to="$localePath(to)"
-    :style="computedStyle"
-  >
+  <NuxtLink v-else :to="$localePath(to)" :style="computedStyle">
     <slot />
   </NuxtLink>
 </template>

package/dist/runtime/components/i18n-switcher.vue

@@ -2,11 +2,7 @@
   <div :style="[wrapperStyle, customWrapperStyle]">
     <slot name="before-button" />
 
-    <button
-      class="language-switcher"
-      :style="[buttonStyle, customButtonStyle]"
-      @click="toggleDropdown"
-    >
+    <button class="language-switcher" :style="[buttonStyle, customButtonStyle]" @click="toggleDropdown">
       <slot name="before-selected-locale" />
       {{ currentLocaleLabel }}
       <slot name="after-selected-locale" />
@@ -15,21 +11,11 @@
 
     <slot name="before-dropdown" />
 
-    <ul
-      v-show="dropdownOpen"
-      :style="[dropdownStyle, customDropdownStyle]"
-    >
+    <ul v-show="dropdownOpen" :style="[dropdownStyle, customDropdownStyle]">
       <slot name="before-dropdown-items" />
 
-      <li
-        v-for="locale in locales"
-        :key="locale.code"
-        :style="[itemStyle, customItemStyle]"
-      >
-        <slot
-          name="before-item"
-          :locale="locale"
-        />
+      <li v-for="locale in locales" :key="locale.code" :style="[itemStyle, customItemStyle]">
+        <slot name="before-item" :locale="locale" />
 
         <NuxtLink
           :class="`switcher-locale-${locale.code}`"
@@ -43,21 +29,12 @@
           :hreflang="locale.iso || locale.code"
           @click="switchLocale(locale.code)"
         >
-          <slot
-            name="before-link-content"
-            :locale="locale"
-          />
+          <slot name="before-link-content" :locale="locale" />
           {{ localeLabel(locale) }}
-          <slot
-            name="after-link-content"
-            :locale="locale"
-          />
+          <slot name="after-link-content" :locale="locale" />
         </NuxtLink>
 
-        <slot
-          name="after-item"
-          :locale="locale"
-        />
+        <slot name="after-item" :locale="locale" />
       </li>
 
       <slot name="after-dropdown-items" />

package/dist/runtime/composables/useI18n.js

@@ -1,4 +1,4 @@
-import { useNuxtApp } from "#imports";
+import { useNuxtApp } from "#app";
 export function useI18n() {
   const nuxtApp = useNuxtApp();
   const injections = {

package/dist/runtime/composables/useI18nLocale.js

@@ -1,9 +1,8 @@
-import { useNuxtApp, useState } from "#app";
+import { getEnabledLocaleCodes } from "@i18n-micro/utils/active-locales";
+import { getHashCookieName, getLocaleCookieName, getLocaleCookieOptions } from "@i18n-micro/utils/cookie";
+import { resolveI18nConfigWithRuntimeOverrides } from "@i18n-micro/utils/runtime-config";
+import { useCookie, useNuxtApp, useState } from "#app";
 import { getI18nConfig } from "#build/i18n.strategy.mjs";
-import { useCookie } from "#imports";
-import { getEnabledLocaleCodes } from "../utils/active-locales.js";
-import { getHashCookieName, getLocaleCookieName, getLocaleCookieOptions } from "../utils/cookie.js";
-import { resolveI18nConfigWithRuntimeOverrides } from "../utils/runtime-i18n-config.js";
 export function useI18nLocale() {
   const nuxtApp = useNuxtApp();
   const i18nConfig = resolveI18nConfigWithRuntimeOverrides(nuxtApp.$getI18nConfig?.() ?? getI18nConfig());
@@ -35,7 +34,7 @@ export function useI18nLocale() {
     return localeState.value ?? localeCookie.value ?? serverLocale ?? null;
   };
   const getEffectiveLocale = (route, getLocaleFromRoute) => {
-    if (i18nConfig.hashMode && localeState.value != null) return localeState.value;
+    if (i18nConfig.hashMode && localeState.value !== null && localeState.value !== void 0) return localeState.value;
     return getLocaleFromRoute(route);
   };
   const resolveInitialLocale = (options) => {

package/dist/runtime/composables/useLocaleHead.js

@@ -1,8 +1,8 @@
 import { isNoPrefixStrategy } from "@i18n-micro/core";
+import { findAllowedLocalesForRoute } from "@i18n-micro/utils/route";
 import { joinURL, parseURL, withQuery } from "ufo";
 import { ref, unref, watch } from "vue";
-import { useNuxtApp, useRoute } from "#imports";
-import { findAllowedLocalesForRoute } from "../utils/route-utils.js";
+import { useNuxtApp, useRoute } from "#app";
 export const useLocaleHead = ({
   addDirAttribute = true,
   identifierAttribute = "id",

package/dist/runtime/middleware/i18n-redirect.global.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Client-side locale redirect middleware.
+ * Replaces setTimeout-based afterEach redirects from the legacy redirect plugin.
+ */
+declare const _default: import("nuxt/app").RouteMiddleware;
+export default _default;

package/dist/runtime/middleware/i18n-redirect.global.js

@@ -0,0 +1,43 @@
+import { getEnabledLocaleCodes } from "@i18n-micro/utils/active-locales";
+import { defineNuxtRouteMiddleware, navigateTo, useNuxtApp } from "#imports";
+import { useI18nLocale } from "../composables/useI18nLocale.js";
+function redirectTo(path, to) {
+  return navigateTo({ path, query: to.query, hash: to.hash }, { replace: true, redirectCode: 302 });
+}
+export default defineNuxtRouteMiddleware((to, from) => {
+  if (import.meta.server) return;
+  const nuxtApp = useNuxtApp();
+  const getRuntimeConfig = nuxtApp.$getI18nConfig;
+  const i18nStrategy = nuxtApp.$i18nStrategy;
+  if (typeof getRuntimeConfig !== "function" || !i18nStrategy) return;
+  const i18nConfig = getRuntimeConfig();
+  if (i18nConfig.redirects === false) return;
+  if (to.path === from.path) return;
+  const validLocales = getEnabledLocaleCodes(i18nConfig.locales);
+  const defaultLocale = i18nConfig.defaultLocale || "en";
+  const autoDetectPath = i18nConfig.autoDetectPath || "/";
+  const { getPreferredLocale } = useI18nLocale();
+  const routeLocale = i18nStrategy.getCurrentLocale(to, getPreferredLocale());
+  let preferredLocale = routeLocale || getPreferredLocale() || defaultLocale;
+  const path = to.path || "/";
+  const pathSegments = path.replace(/^\//, "").split("/").filter(Boolean);
+  const firstSegment = pathSegments[0];
+  const hasLocalePrefix = Boolean(firstSegment && validLocales.includes(firstSegment));
+  if (autoDetectPath === "*" && !hasLocalePrefix) {
+    preferredLocale = defaultLocale;
+  }
+  if (autoDetectPath === "*" && hasLocalePrefix && firstSegment !== preferredLocale) {
+    const rest = pathSegments.slice(1).join("/");
+    let targetPath;
+    if (preferredLocale === defaultLocale && i18nConfig.strategy === "prefix_except_default") {
+      targetPath = rest ? `/${rest}` : "/";
+    } else {
+      targetPath = rest ? `/${preferredLocale}/${rest}` : `/${preferredLocale}`;
+    }
+    return redirectTo(targetPath, to);
+  }
+  const redirectPath = i18nStrategy.getClientRedirect(path, preferredLocale);
+  if (redirectPath) {
+    return redirectTo(redirectPath, to);
+  }
+});

package/dist/runtime/plugins/01.plugin.d.ts

@@ -3,32 +3,32 @@ import type { CleanTranslation, I18nRouteParams, Locale, MissingHandler, ModuleO
 import type { RouteLocationNamedRaw, RouteLocationNormalizedLoaded, RouteLocationRaw, RouteLocationResolved, RouteLocationResolvedGeneric } from 'vue-router';
 declare const _default: import("nuxt/app").Plugin<{
     getI18nConfig: () => ModuleOptionsExtend;
-    i18n: undefined;
-    __micro: boolean;
     helper: {
         mergeTranslation(locale: string, routeName: string, newTranslations: Translations, _force?: boolean): Promise<void>;
     };
-    i18nStrategy: import("~/packages/path-strategy/dist/prefix-except-default-strategy.mjs").PrefixExceptDefaultPathStrategy;
+    i18n: unknown;
+    __micro: boolean;
+    i18nStrategy: PathStrategy;
     getLocale: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric) => string;
-    getLocaleName: () => any;
+    getLocaleName: () => string | null;
     defaultLocale: () => string | undefined;
     getLocales: () => Locale[];
-    getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, locale?: string) => any;
-    t: (key: string, params?: Params, defaultValue?: string | null, route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric) => CleanTranslation;
+    getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, locale?: string) => string;
+    t: (key: import("@i18n-micro/types").TranslationKey, params?: Params, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
     ts: (key: string, params?: Params, defaultValue?: string, route?: RouteLocationNormalizedLoaded) => string;
     _t: (route: RouteLocationNormalizedLoaded) => (key: string, params?: Params, defaultValue?: string | null) => CleanTranslation;
     _ts: (route: RouteLocationNormalizedLoaded) => (key: string, params?: Params, defaultValue?: string) => string;
-    tc: (key: string, params: number | Params, defaultValue?: string) => string;
+    tc: (key: import("@i18n-micro/types").TranslationKey, count: number | Params, defaultValue?: string) => string;
     tn: (value: number, options?: Intl.NumberFormatOptions) => string;
     td: (value: Date | number | string, options?: Intl.DateTimeFormatOptions) => string;
     tdr: (value: Date | number | string, options?: Intl.RelativeTimeFormatOptions) => string;
-    has: (key: string) => boolean;
+    has: (key: import("@i18n-micro/types").TranslationKey, routeContext?: unknown) => boolean;
     mergeTranslations: (newTranslations: Translations) => void;
     switchLocaleRoute: (toLocale: string) => RouteLocationRaw;
     clearCache: () => void;
     switchLocalePath: (toLocale: string) => string;
-    switchLocale: (toLocale: string) => Promise<string | false | void | import("vue-router").RouteLocationAsRelativeGeneric | import("vue-router").RouteLocationAsPathGeneric | import("vue-router").NavigationFailure>;
-    switchRoute: (route: RouteLocationNamedRaw | RouteLocationResolvedGeneric | string, toLocale?: string) => string | false | void | import("vue-router").RouteLocationAsRelativeGeneric | import("vue-router").RouteLocationAsPathGeneric | Promise<false | void | import("vue-router").NavigationFailure>;
+    switchLocale: (toLocale: string) => Promise<unknown>;
+    switchRoute: (route: RouteLocationNamedRaw | RouteLocationResolvedGeneric | string, toLocale?: string) => unknown;
     localeRoute(to: RouteLocationNamedRaw | RouteLocationResolvedGeneric | string, locale?: string): RouteLocationResolved;
     localePath(to: RouteLocationNamedRaw | RouteLocationResolvedGeneric | string, locale?: string): string;
     setI18nRouteParams: (value: I18nRouteParams) => I18nRouteParams;
@@ -36,32 +36,32 @@ declare const _default: import("nuxt/app").Plugin<{
     setMissingHandler: (handler: MissingHandler | null) => void;
 }> & import("nuxt/app").ObjectPlugin<{
     getI18nConfig: () => ModuleOptionsExtend;
-    i18n: undefined;
-    __micro: boolean;
     helper: {
         mergeTranslation(locale: string, routeName: string, newTranslations: Translations, _force?: boolean): Promise<void>;
     };
-    i18nStrategy: import("~/packages/path-strategy/dist/prefix-except-default-strategy.mjs").PrefixExceptDefaultPathStrategy;
+    i18n: unknown;
+    __micro: boolean;
+    i18nStrategy: PathStrategy;
     getLocale: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric) => string;
-    getLocaleName: () => any;
+    getLocaleName: () => string | null;
     defaultLocale: () => string | undefined;
     getLocales: () => Locale[];
-    getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, locale?: string) => any;
-    t: (key: string, params?: Params, defaultValue?: string | null, route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric) => CleanTranslation;
+    getRouteName: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric, locale?: string) => string;
+    t: (key: import("@i18n-micro/types").TranslationKey, params?: Params, defaultValue?: string | null, routeContext?: unknown) => CleanTranslation;
     ts: (key: string, params?: Params, defaultValue?: string, route?: RouteLocationNormalizedLoaded) => string;
     _t: (route: RouteLocationNormalizedLoaded) => (key: string, params?: Params, defaultValue?: string | null) => CleanTranslation;
     _ts: (route: RouteLocationNormalizedLoaded) => (key: string, params?: Params, defaultValue?: string) => string;
-    tc: (key: string, params: number | Params, defaultValue?: string) => string;
+    tc: (key: import("@i18n-micro/types").TranslationKey, count: number | Params, defaultValue?: string) => string;
     tn: (value: number, options?: Intl.NumberFormatOptions) => string;
     td: (value: Date | number | string, options?: Intl.DateTimeFormatOptions) => string;
     tdr: (value: Date | number | string, options?: Intl.RelativeTimeFormatOptions) => string;
-    has: (key: string) => boolean;
+    has: (key: import("@i18n-micro/types").TranslationKey, routeContext?: unknown) => boolean;
     mergeTranslations: (newTranslations: Translations) => void;
     switchLocaleRoute: (toLocale: string) => RouteLocationRaw;
     clearCache: () => void;
     switchLocalePath: (toLocale: string) => string;
-    switchLocale: (toLocale: string) => Promise<string | false | void | import("vue-router").RouteLocationAsRelativeGeneric | import("vue-router").RouteLocationAsPathGeneric | import("vue-router").NavigationFailure>;
-    switchRoute: (route: RouteLocationNamedRaw | RouteLocationResolvedGeneric | string, toLocale?: string) => string | false | void | import("vue-router").RouteLocationAsRelativeGeneric | import("vue-router").RouteLocationAsPathGeneric | Promise<false | void | import("vue-router").NavigationFailure>;
+    switchLocale: (toLocale: string) => Promise<unknown>;
+    switchRoute: (route: RouteLocationNamedRaw | RouteLocationResolvedGeneric | string, toLocale?: string) => unknown;
     localeRoute(to: RouteLocationNamedRaw | RouteLocationResolvedGeneric | string, locale?: string): RouteLocationResolved;
     localePath(to: RouteLocationNamedRaw | RouteLocationResolvedGeneric | string, locale?: string): string;
     setI18nRouteParams: (value: I18nRouteParams) => I18nRouteParams;
@@ -74,8 +74,8 @@ export interface PluginsInjections {
     $getI18nConfig: () => ModuleOptionsExtend;
     $getLocale: (route?: RouteLocationNormalizedLoaded | RouteLocationResolvedGeneric) => string;
     $getLocaleName: () => string | null;
-    $getLocales: () => Locale[];
     $defaultLocale: () => string | undefined;
+    $getLocales: () => Locale[];
     $getRouteName: (route?: RouteLocationNamedRaw | RouteLocationResolvedGeneric, locale?: string) => string;
     $t: (key: string, params?: Params, defaultValue?: string | null) => CleanTranslation;
     $_t: (route: RouteLocationNormalizedLoaded) => (key: string, params?: Params, defaultValue?: string | null) => CleanTranslation;