nuxt-i18n-micro 1.39.0 → 1.41.0

package/dist/runtime/plugins/01.plugin.js

@@ -1,17 +1,21 @@
 import { useTranslationHelper, interpolate } from "nuxt-i18n-micro-core";
+import { isNoPrefixStrategy, withPrefixStrategy } from "../helpers.js";
 import { defineNuxtPlugin, useRuntimeConfig } from "#app";
 import { useRouter, useCookie, useState, navigateTo } from "#imports";
 import { plural } from "#build/i18n.plural.mjs";
 const i18nHelper = useTranslationHelper();
 const isDev = process.env.NODE_ENV !== "production";
-function getCurrentLocale(route, i18nConfig, hashLocale) {
+function getCurrentLocale(route, i18nConfig, hashLocale, noPrefixStrategy) {
   if (i18nConfig.hashMode && hashLocale) {
     return hashLocale;
   }
+  if (isNoPrefixStrategy(i18nConfig.strategy) && noPrefixStrategy) {
+    return noPrefixStrategy;
+  }
   return (route.params?.locale ?? i18nConfig.defaultLocale).toString();
 }
-function getCurrentName(route, i18nConfig, hashLocale) {
-  const currentLocaleCode = getCurrentLocale(route, i18nConfig, hashLocale);
+function getCurrentName(route, i18nConfig, hashLocale, noPrefixStrategy) {
+  const currentLocaleCode = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixStrategy);
   const checkLocale = i18nConfig.locales?.find((l) => l.code === currentLocaleCode);
   if (!checkLocale) {
     return null;
@@ -52,11 +56,14 @@ function switchLocaleRoute(fromLocale, toLocale, route, router, i18nConfig, i18n
     }
     return newRoute2;
   }
-  const newRouteName = toLocale !== i18nConfig.defaultLocale || i18nConfig.includeDefaultLocaleRoute ? `localized-${routeName}` : routeName;
+  let newRouteName = routeName;
   const newParams = { ...route.params, ...i18nRouteParams?.[toLocale] };
   delete newParams.locale;
-  if (toLocale !== i18nConfig.defaultLocale || i18nConfig.includeDefaultLocaleRoute) {
-    newParams.locale = toLocale;
+  if (!isNoPrefixStrategy(i18nConfig.strategy)) {
+    newRouteName = toLocale !== i18nConfig.defaultLocale || withPrefixStrategy(i18nConfig.strategy) ? `localized-${routeName}` : routeName;
+    if (toLocale !== i18nConfig.defaultLocale || withPrefixStrategy(i18nConfig.strategy)) {
+      newParams.locale = toLocale;
+    }
   }
   if (i18nConfig.hashMode) {
     const userLocaleCookie = useCookie("hash-locale");
@@ -77,6 +84,10 @@ function switchLocale(fromLocale, toLocale, route, router, i18nConfig, i18nRoute
     console.warn(`Locale ${toLocale} is not available`);
     return Promise.reject(`Locale ${toLocale} is not available`);
   }
+  if (isNoPrefixStrategy(i18nConfig.strategy)) {
+    const userLocaleCookie = useCookie("no-prefix-locale");
+    userLocaleCookie.value = toLocale;
+  }
   const switchedRoute = switchLocaleRoute(
     fromLocale,
     toLocale,
@@ -88,9 +99,12 @@ function switchLocale(fromLocale, toLocale, route, router, i18nConfig, i18nRoute
   if (typeof switchedRoute === "string" && switchedRoute.startsWith("http")) {
     return navigateTo(switchedRoute, { redirectCode: 200, external: true });
   }
+  if (isNoPrefixStrategy(i18nConfig.strategy)) {
+    return navigateTo(switchedRoute, { redirectCode: 200, external: true });
+  }
   return router.push(switchedRoute);
 }
-function getLocalizedRoute(to, router, route, i18nConfig, locale, hashLocale) {
+function getLocalizedRoute(to, router, route, i18nConfig, locale, hashLocale, noPrefixStrategy) {
   const resolveParams = (to2) => {
     const params = typeof to2 === "object" && "params" in to2 && typeof to2.params === "object" ? { ...to2.params } : {};
     if (typeof to2 === "string") {
@@ -101,7 +115,7 @@ function getLocalizedRoute(to, router, route, i18nConfig, locale, hashLocale) {
     }
     return params;
   };
-  if (i18nConfig.includeDefaultLocaleRoute) {
+  if (withPrefixStrategy(i18nConfig.strategy)) {
     const defaultLocale = i18nConfig.defaultLocale;
     let resolvedTo = to;
     if (typeof to === "string") {
@@ -124,13 +138,13 @@ function getLocalizedRoute(to, router, route, i18nConfig, locale, hashLocale) {
       });
     }
   }
-  const currentLocale = locale || getCurrentLocale(route, i18nConfig, hashLocale);
+  const currentLocale = locale || getCurrentLocale(route, i18nConfig, hashLocale, noPrefixStrategy);
   const selectRoute = router.resolve(to);
   const routeName = getRouteName(selectRoute, currentLocale).replace(new RegExp(`-${i18nConfig.defaultLocale}$`), "");
   if (!routeName || routeName === "") {
     const resolved = router.resolve(to);
     let url = resolved.path.replace(new RegExp(`^/${currentLocale}/`), "/");
-    if (currentLocale !== i18nConfig.defaultLocale || i18nConfig.includeDefaultLocaleRoute) {
+    if (currentLocale !== i18nConfig.defaultLocale || withPrefixStrategy(i18nConfig.strategy)) {
       url = "/" + currentLocale + url;
     }
     return router.resolve({
@@ -149,7 +163,7 @@ function getLocalizedRoute(to, router, route, i18nConfig, locale, hashLocale) {
       hash: selectRoute.hash
     });
   }
-  const newRouteName = currentLocale !== i18nConfig.defaultLocale || i18nConfig.includeDefaultLocaleRoute ? `localized-${routeName}` : routeName;
+  const newRouteName = currentLocale !== i18nConfig.defaultLocale || withPrefixStrategy(i18nConfig.strategy) ? `localized-${routeName}` : routeName;
   if (!router.hasRoute(newRouteName)) {
     const newParams2 = resolveParams(to);
     delete newParams2.locale;
@@ -165,7 +179,7 @@ function getLocalizedRoute(to, router, route, i18nConfig, locale, hashLocale) {
   }
   const newParams = resolveParams(to);
   delete newParams.locale;
-  if (currentLocale !== i18nConfig.defaultLocale || i18nConfig.includeDefaultLocaleRoute) {
+  if (currentLocale !== i18nConfig.defaultLocale || withPrefixStrategy(i18nConfig.strategy)) {
     newParams.locale = currentLocale;
   }
   return router.resolve({
@@ -189,6 +203,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   const i18nConfig = config.public.i18nConfig;
   const apiBaseUrl = i18nConfig.apiBaseUrl ?? "_locales";
   const runtimeConfig = useRuntimeConfig();
+  const noPrefixDefault = isNoPrefixStrategy(i18nConfig.strategy) ? useCookie("no-prefix-locale").value ?? i18nConfig.defaultLocale : null;
   const loadTranslationsIfNeeded = async (locale, routeName, path) => {
     try {
       if (!i18nHelper.hasPageTranslation(locale, routeName)) {
@@ -207,9 +222,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     } catch (_error) {
     }
   };
-  async function loadTranslationsForRoute(to) {
+  async function loadGlobalTranslations(to) {
     const hashLocale2 = i18nConfig.hashMode ? nuxtApp.runWithContext(() => (useCookie("hash-locale").value ?? i18nConfig.defaultLocale).toString()).toString() : null;
-    const locale = getCurrentLocale(to, i18nConfig, hashLocale2);
+    const locale = getCurrentLocale(to, i18nConfig, hashLocale2, noPrefixDefault);
     if (!i18nHelper.hasGeneralTranslation(locale)) {
       const data = await $fetch(`/${apiBaseUrl}/general/${locale}/data.json?v=${i18nConfig.dateBuild}`, {
         baseURL: runtimeConfig.app.baseURL
@@ -228,18 +243,18 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   const router = useRouter();
   router.beforeEach(async (to, from, next) => {
     if (to.path !== from.path) {
-      await loadTranslationsForRoute(to);
+      await loadGlobalTranslations(to);
     }
     if (next) {
       next();
     }
   });
-  await loadTranslationsForRoute(router.currentRoute.value);
+  await loadGlobalTranslations(router.currentRoute.value);
   const getTranslation = (key, params, defaultValue) => {
     if (!key) return "";
     const route = router.currentRoute.value;
     const hashLocale2 = i18nConfig.hashMode ? (useCookie("hash-locale").value ?? i18nConfig.defaultLocale).toString() : null;
-    const locale = getCurrentLocale(route, i18nConfig, hashLocale2);
+    const locale = getCurrentLocale(route, i18nConfig, hashLocale2, noPrefixDefault);
     const routeName = getRouteName(route, locale);
     let value = i18nHelper.getTranslation(locale, routeName, key);
     if (!value) {
@@ -261,12 +276,12 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   const provideData = {
     i18n: void 0,
     __micro: true,
-    getLocale: () => getCurrentLocale(router.currentRoute.value, i18nConfig, hashLocale),
-    getLocaleName: () => getCurrentName(router.currentRoute.value, i18nConfig, hashLocale),
+    getLocale: () => getCurrentLocale(router.currentRoute.value, i18nConfig, hashLocale, noPrefixDefault),
+    getLocaleName: () => getCurrentName(router.currentRoute.value, i18nConfig, hashLocale, noPrefixDefault),
     defaultLocale: () => i18nConfig.defaultLocale,
     getLocales: () => i18nConfig.locales || [],
     getRouteName: (route, locale) => {
-      const selectedLocale = locale ?? getCurrentLocale(router.currentRoute.value, i18nConfig, hashLocale);
+      const selectedLocale = locale ?? getCurrentLocale(router.currentRoute.value, i18nConfig, hashLocale, noPrefixDefault);
       const selectedRoute = route ?? router.currentRoute.value;
       return getRouteName(selectedRoute, selectedLocale);
     },
@@ -277,18 +292,18 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     },
     tc: (key, params, defaultValue) => {
       const route = router.currentRoute.value;
-      const currentLocale = getCurrentLocale(route, i18nConfig, hashLocale);
+      const currentLocale = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixDefault);
       const { count, ..._params } = typeof params === "number" ? { count: params } : params;
       return plural(key, Number.parseInt(count.toString()), _params, currentLocale, getTranslation) ?? defaultValue ?? key;
     },
     tn: (value, options) => {
       const route = router.currentRoute.value;
-      const locale = getCurrentLocale(route, i18nConfig, hashLocale);
+      const locale = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixDefault);
       return formatNumber(value, locale, options);
     },
     td: (value, options) => {
       const route = router.currentRoute.value;
-      const locale = getCurrentLocale(route, i18nConfig, hashLocale);
+      const locale = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixDefault);
       return formatDate(value, locale, options);
     },
     has: (key) => {
@@ -296,13 +311,13 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     },
     mergeTranslations: (newTranslations) => {
       const route = router.currentRoute.value;
-      const locale = getCurrentLocale(route, i18nConfig, hashLocale);
+      const locale = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixDefault);
       const routeName = getRouteName(route, locale);
       i18nHelper.mergeTranslation(locale, routeName, newTranslations);
     },
     switchLocaleRoute: (toLocale) => {
       const route = router.currentRoute.value;
-      const fromLocale = getCurrentLocale(route, i18nConfig, hashLocale);
+      const fromLocale = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixDefault);
       if (i18nConfig.hashMode) {
         hashLocale = toLocale;
       }
@@ -310,7 +325,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     },
     switchLocalePath: (toLocale) => {
       const route = router.currentRoute.value;
-      const fromLocale = getCurrentLocale(route, i18nConfig, hashLocale);
+      const fromLocale = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixDefault);
       if (i18nConfig.hashMode) {
         hashLocale = toLocale;
       }
@@ -325,7 +340,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     },
     switchLocale: (toLocale) => {
       const route = router.currentRoute.value;
-      const fromLocale = getCurrentLocale(route, i18nConfig, hashLocale);
+      const fromLocale = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixDefault);
       if (i18nConfig.hashMode) {
         hashLocale = toLocale;
       }
@@ -335,7 +350,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       if (typeof route === "string") {
         route = router.resolve(route);
       }
-      const fromLocale = getCurrentLocale(route, i18nConfig, hashLocale);
+      const fromLocale = getCurrentLocale(route, i18nConfig, hashLocale, noPrefixDefault);
       if (i18nConfig.hashMode) {
         hashLocale = toLocale ?? fromLocale;
       }

package/dist/runtime/plugins/03.define.js

@@ -1,3 +1,4 @@
+import { isPrefixStrategy } from "../helpers.js";
 import { defineNuxtPlugin, navigateTo, useNuxtApp, useRuntimeConfig } from "#app";
 import { useRoute, useRouter } from "#imports";
 export default defineNuxtPlugin(async (_nuxtApp) => {
@@ -35,12 +36,12 @@ export default defineNuxtPlugin(async (_nuxtApp) => {
     }
   };
   if (import.meta.server) {
-    if (i18nConfig.includeDefaultLocaleRoute) {
+    if (isPrefixStrategy(i18nConfig.strategy)) {
       await handleRedirect(route);
     }
   }
   router.beforeEach(async (to, from, next) => {
-    if (i18nConfig.includeDefaultLocaleRoute) {
+    if (isPrefixStrategy(i18nConfig.strategy)) {
       await handleRedirect(to);
     }
     if (next) {
@@ -61,7 +62,7 @@ export default defineNuxtPlugin(async (_nuxtApp) => {
         const resolvedRoute = router.resolve({ name: defaultRouteName });
         const newParams = { ...route.params };
         delete newParams.locale;
-        if (i18nConfig.includeDefaultLocaleRoute) {
+        if (isPrefixStrategy(i18nConfig.strategy)) {
           if (router.hasRoute(`localized-${defaultRouteName}-${currentLocale}`)) {
             defaultRouteName = `localized-${defaultRouteName}-${currentLocale}`;
           } else {

package/dist/runtime/plugins/04.auto-detect.js

@@ -1,3 +1,4 @@
+import { isPrefixStrategy, isNoPrefixStrategy } from "../helpers.js";
 import { defineNuxtPlugin, useCookie, useRequestHeaders, navigateTo } from "#app";
 import { useRoute, useRouter } from "#imports";
 const parseAcceptLanguage = (acceptLanguage) => acceptLanguage.split(",").map((entry) => entry.split(";")[0].trim());
@@ -16,13 +17,32 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   const router = useRouter();
   const route = useRoute();
   async function switchLocale(newLocale) {
+    if (isNoPrefixStrategy(i18nConfig.strategy)) {
+      if (newLocale !== defaultLocale) {
+        const newParams2 = { ...route.params };
+        delete newParams2.locale;
+        const resolvedRoute2 = router.resolve(router.currentRoute.value);
+        const routeName2 = resolvedRoute2.name.replace(`localized-`, "");
+        const newRoute2 = router.resolve({
+          name: routeName2,
+          params: newParams2
+        });
+        const userLocaleCookie2 = useCookie("no-prefix-locale");
+        userLocaleCookie2.value = newLocale;
+        await navigateTo(newRoute2, {
+          redirectCode: 302,
+          external: true
+        });
+      }
+      return;
+    }
     const currentPath = router.currentRoute;
     const resolvedRoute = router.resolve(currentPath.value);
     const routeName = resolvedRoute.name.replace(`localized-`, "");
-    const newRouteName = i18nConfig.includeDefaultLocaleRoute || newLocale !== defaultLocale ? `localized-${routeName}` : routeName;
+    const newRouteName = isPrefixStrategy(i18nConfig.strategy) || newLocale !== defaultLocale ? `localized-${routeName}` : routeName;
     const newParams = { ...route.params };
     delete newParams.locale;
-    if (i18nConfig.includeDefaultLocaleRoute || newLocale !== defaultLocale) {
+    if (isPrefixStrategy(i18nConfig.strategy) || newLocale !== defaultLocale) {
       newParams.locale = newLocale;
     }
     const newRoute = router.resolve({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-i18n-micro",
-  "version": "1.39.0",
+  "version": "1.41.0",
   "description": "Nuxt I18n Micro is a lightweight, high-performance internationalization module for Nuxt, designed to handle multi-language support with minimal overhead, fast build times, and efficient runtime performance.",
   "repository": "s00d/nuxt-i18n-micro",
   "license": "MIT",
@@ -40,8 +40,8 @@
     "internals.d.ts"
   ],
   "dependencies": {
-    "@nuxt/devtools-kit": "^1.6.1",
-    "@nuxt/kit": "^3.14.1592",
+    "@nuxt/devtools-kit": "^1.6.4",
+    "@nuxt/kit": "3.13.2",
     "chokidar": "^3.6.0",
     "sirv": "^2.0.4",
     "ufo": "^1.5.4",
@@ -50,27 +50,27 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@nuxt/devtools": "^1.6.1",
-    "@nuxt/devtools-ui-kit": "^1.6.1",
-    "@nuxt/eslint-config": "0.5.5",
+    "@nuxt/devtools": "^1.6.4",
+    "@nuxt/devtools-ui-kit": "^1.6.4",
+    "@nuxt/eslint-config": "0.7.3",
     "@nuxt/module-builder": "^0.8.4",
-    "@nuxt/schema": "^3.14.1592",
-    "@nuxt/test-utils": "^3.14.4",
-    "@playwright/test": "^1.49.0",
-    "@types/node": "^20.14.11",
+    "@nuxt/schema": "3.13.2",
+    "@nuxt/test-utils": "^3.15.1",
+    "@playwright/test": "^1.49.1",
+    "@types/node": "^20.17.10",
     "changelogen": "^0.5.7",
     "eslint": "^8.57.1",
-    "nuxt": "^3.14.1592",
+    "nuxt": "3.13.2",
     "typescript": "5.6.3",
     "vitepress": "^1.5.0",
-    "vitest": "^2.1.6",
+    "vitest": "^2.1.8",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
     "vue-tsc": "2.1.10"
   },
   "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "^4.9.6",
-    "@rollup/rollup-win32-x64-msvc": "^4.9.6"
+    "@rollup/rollup-linux-x64-gnu": "^4.28.1",
+    "@rollup/rollup-win32-x64-msvc": "^4.28.1"
   },
   "workspaces": [
     "client",