npm - nuxt-i18n-micro - Versions diffs - 2.2.0 → 2.4.0 - Mend

nuxt-i18n-micro 2.2.0 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/client/200.html +2 -2
package/dist/client/404.html +2 -2
package/dist/client/_nuxt/builds/latest.json +1 -1
package/dist/client/_nuxt/builds/meta/2d4fb144-8539-4f7d-a7d3-5dedb810c640.json +1 -0
package/dist/client/index.html +2 -2
package/dist/module.json +1 -1
package/dist/module.mjs +186 -32
package/dist/runtime/components/i18n-link.vue +2 -1
package/dist/runtime/components/i18n-t.vue +11 -11
package/dist/runtime/components/locale-redirect.vue +1 -1
package/dist/runtime/composables/useLocaleHead.js +13 -37
package/dist/runtime/plugins/01.plugin.js +5 -2
package/dist/runtime/plugins/02.meta.js +2 -1
package/dist/runtime/plugins/03.define.js +2 -1
package/dist/runtime/plugins/06.redirect.js +46 -10
package/package.json +4 -4
package/dist/client/_nuxt/builds/meta/761c8107-0390-4ed8-9b33-a10824c775b2.json +0 -1

package/dist/client/200.html CHANGED Viewed

@@ -8,5 +8,5 @@
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/CBxwnKtU.js">
 <link rel="prefetch" as="style" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/error-500.BqKd8Zt-.css">
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/BYEpoBUk.js">
-<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/XZXfxmri.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1762153620044,false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"761c8107-0390-4ed8-9b33-a10824c775b2",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/XZXfxmri.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1762341835524,false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"2d4fb144-8539-4f7d-a7d3-5dedb810c640",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

package/dist/client/404.html CHANGED Viewed

@@ -8,5 +8,5 @@
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/CBxwnKtU.js">
 <link rel="prefetch" as="style" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/error-500.BqKd8Zt-.css">
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/BYEpoBUk.js">
-<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/XZXfxmri.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1762153620044,false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"761c8107-0390-4ed8-9b33-a10824c775b2",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/XZXfxmri.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1762341835524,false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"2d4fb144-8539-4f7d-a7d3-5dedb810c640",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

package/dist/client/_nuxt/builds/latest.json CHANGED Viewed

	@@ -1 +1 @@
1	- {"id":"~~761c8107~~-~~0390~~-~~4ed8~~-~~9b33~~-~~a10824c775b2~~","timestamp":~~1762153612543~~}
1	+ {"id":"2d4fb144-8539-4f7d-a7d3-5dedb810c640","timestamp":1762341830059}

package/dist/client/_nuxt/builds/meta/2d4fb144-8539-4f7d-a7d3-5dedb810c640.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"id":"2d4fb144-8539-4f7d-a7d3-5dedb810c640","timestamp":1762341830059,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

package/dist/client/index.html CHANGED Viewed

@@ -8,5 +8,5 @@
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/CBxwnKtU.js">
 <link rel="prefetch" as="style" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/error-500.BqKd8Zt-.css">
 <link rel="prefetch" as="script" crossorigin href="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/BYEpoBUk.js">
-<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/XZXfxmri.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1762153620045,false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"761c8107-0390-4ed8-9b33-a10824c775b2",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<script type="module" src="/__NUXT_DEVTOOLS_I18N_BASE__/_nuxt/XZXfxmri.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1762341835524,false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__NUXT_DEVTOOLS_I18N_BASE__/",buildId:"2d4fb144-8539-4f7d-a7d3-5dedb810c640",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

package/dist/module.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-i18n-micro",
   "configKey": "i18n",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs CHANGED Viewed

@@ -194,11 +194,52 @@ function extractDefineI18nRouteData(content, _filePath) {
     if (!configObject) {
       return null;
     }
+    if (configObject.locales && typeof configObject.locales === "object" && !Array.isArray(configObject.locales)) {
+      const localesObj = configObject.locales;
+      const normalizedLocales = [];
+      const normalizedLocaleRoutes = {};
+      for (const [locale, value] of Object.entries(localesObj)) {
+        normalizedLocales.push(locale);
+        if (value && typeof value === "object" && "path" in value && typeof value.path === "string") {
+          normalizedLocaleRoutes[locale] = value.path;
+        }
+      }
+      return {
+        ...configObject,
+        locales: normalizedLocales,
+        localeRoutes: configObject.localeRoutes || Object.keys(normalizedLocaleRoutes).length > 0 ? { ...configObject.localeRoutes, ...normalizedLocaleRoutes } : void 0
+      };
+    }
+    if (Array.isArray(configObject.locales) && configObject.locales.length > 0 && typeof configObject.locales[0] === "object") {
+      const normalizedLocales = configObject.locales.map((item) => {
+        if (item && typeof item === "object" && "code" in item) {
+          return item.code;
+        }
+        return String(item);
+      });
+      return {
+        ...configObject,
+        locales: normalizedLocales
+      };
+    }
     return configObject;
   } catch {
     return null;
   }
 }
+function normalizeRouteKey(key) {
+  return key.split("/").map((segment) => {
+    if (segment.startsWith("[...") && segment.endsWith("]")) {
+      const paramName = segment.substring(4, segment.length - 1);
+      return `:${paramName}(.*)*`;
+    }
+    if (segment.startsWith("[") && segment.endsWith("]")) {
+      const paramName = segment.substring(1, segment.length - 1);
+      return `:${paramName}`;
+    }
+    return segment;
+  }).join("/");
+}
 const normalizePath = (routePath) => {
   if (!routePath) {
     return "";
@@ -249,7 +290,22 @@ class PageManager {
     this.noPrefixRedirect = noPrefixRedirect;
     this.excludePatterns = excludePatterns;
     this.activeLocaleCodes = this.computeActiveLocaleCodes();
-    this.globalLocaleRoutes = globalLocaleRoutes || {};
+    const normalizedGlobalRoutes = {};
+    for (const key in globalLocaleRoutes) {
+      const newKey = normalizeRouteKey(key);
+      const localePaths = globalLocaleRoutes[key];
+      if (typeof localePaths === "object") {
+        const normalizedLocalePaths = {};
+        for (const locale in localePaths) {
+          const customPath = localePaths[locale];
+          normalizedLocalePaths[locale] = normalizeRouteKey(customPath);
+        }
+        normalizedGlobalRoutes[newKey] = normalizedLocalePaths;
+      } else {
+        normalizedGlobalRoutes[newKey] = localePaths;
+      }
+    }
+    this.globalLocaleRoutes = normalizedGlobalRoutes;
     this.filesLocaleRoutes = filesLocaleRoutes || {};
     this.routeLocales = routeLocales || {};
   }
@@ -279,22 +335,84 @@ class PageManager {
   extendPages(pages, customRegex, isCloudflarePages) {
     this.localizedPaths = this.extractLocalizedPaths(pages);
     const additionalRoutes = [];
+    const originalPagePaths = /* @__PURE__ */ new Map();
     for (const page of [...pages]) {
+      if (isPageRedirectOnly(page)) {
+        continue;
+      }
       if (page.path && isInternalPath(page.path, this.excludePatterns)) {
         continue;
       }
-      if (!page.name && page.file?.endsWith(".vue")) {
-        console.warn(`[nuxt-i18n-next] Page name is missing for the file: ${page.file}`);
+      const originalPath = page.path ?? "";
+      originalPagePaths.set(page, originalPath);
+      const pageName = buildRouteNameFromRoute(page.name, page.path);
+      const normalizedOriginalPath = normalizeRouteKey(originalPath);
+      const customPaths = this.localizedPaths[originalPath] || this.localizedPaths[pageName];
+      const isLocalizationDisabled = this.globalLocaleRoutes[pageName] === false || this.globalLocaleRoutes[normalizedOriginalPath] === false;
+      if (isLocalizationDisabled) {
+        continue;
       }
-      const customRoute = this.globalLocaleRoutes[page.name ?? ""];
-      if (customRoute === false) {
+      const allowedLocales = this.getAllowedLocalesForPage(originalPath, pageName);
+      const originalChildren = cloneArray(page.children ?? []);
+      if (isNoPrefixStrategy(this.strategy)) {
+        if (customPaths) {
+          this.locales.forEach((locale) => {
+            const customPath = customPaths[locale.code];
+            if (customPath && allowedLocales.includes(locale.code)) {
+              const newRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPath, customRegex, false, locale.code, originalPath);
+              if (newRoute) {
+                additionalRoutes.push(newRoute);
+                if (this.noPrefixRedirect && locale.code === this.defaultLocale.code) {
+                  page.redirect = normalizePath(customPath);
+                }
+              }
+            }
+          });
+        }
+        this.handleAliasRoutes(page, additionalRoutes, customRegex, allowedLocales);
         continue;
       }
-      if (typeof customRoute === "object" && customRoute !== null) {
-        this.addCustomGlobalLocalizedRoutes(page, customRoute, additionalRoutes, customRegex);
-      } else {
-        this.localizePage(page, additionalRoutes, customRegex);
+      const defaultLocaleCode = this.defaultLocale.code;
+      if (allowedLocales.includes(defaultLocaleCode)) {
+        const customPath = customPaths?.[defaultLocaleCode];
+        if (isPrefixExceptDefaultStrategy(this.strategy)) {
+          if (customPath) {
+            page.path = normalizePath(customPath);
+          }
+          page.children = this.createLocalizedChildren(originalChildren, originalPath, [defaultLocaleCode], false, false, false, customPath ? { [defaultLocaleCode]: customPath } : {});
+        }
       }
+      const localesToGenerate = this.locales.filter((l) => {
+        if (!allowedLocales.includes(l.code)) return false;
+        if (isPrefixExceptDefaultStrategy(this.strategy) && l.code === defaultLocaleCode) return false;
+        return true;
+      });
+      if (localesToGenerate.length > 0) {
+        if (customPaths) {
+          localesToGenerate.forEach((locale) => {
+            if (customPaths[locale.code]) {
+              if (isPrefixAndDefaultStrategy(this.strategy) && locale.code === defaultLocaleCode) {
+                const nonPrefixedRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPaths[locale.code], customRegex, false, locale.code, originalPath);
+                if (nonPrefixedRoute) additionalRoutes.push(nonPrefixedRoute);
+                const prefixedRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPaths[locale.code], customRegex, true, locale.code, originalPath);
+                if (prefixedRoute) additionalRoutes.push(prefixedRoute);
+              } else {
+                const shouldAddPrefix = isPrefixAndDefaultStrategy(this.strategy) && locale.code === defaultLocaleCode;
+                const newRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPaths[locale.code], customRegex, shouldAddPrefix, locale.code, originalPath);
+                if (newRoute) additionalRoutes.push(newRoute);
+              }
+            } else {
+              const newRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, false, "", customRegex, false, locale.code, originalPath);
+              if (newRoute) additionalRoutes.push(newRoute);
+            }
+          });
+        } else {
+          const localeCodes = localesToGenerate.map((l) => l.code);
+          const newRoute = this.createLocalizedRoute(page, localeCodes, originalChildren, false, "", customRegex, false, true, originalPath);
+          if (newRoute) additionalRoutes.push(newRoute);
+        }
+      }
+      this.handleAliasRoutes(page, additionalRoutes, customRegex, allowedLocales);
     }
     if (isPrefixStrategy(this.strategy) && !isCloudflarePages) {
       for (let i = pages.length - 1; i >= 0; i--) {
@@ -316,7 +434,8 @@ class PageManager {
     pages.forEach((page) => {
       const pageName = buildRouteNameFromRoute(page.name, page.path);
       const normalizedFullPath = normalizePath(path.posix.join(parentPath, page.path));
-      const globalLocalePath = this.globalLocaleRoutes[normalizedFullPath] || this.globalLocaleRoutes[pageName];
+      const normalizedKey = normalizeRouteKey(normalizedFullPath);
+      const globalLocalePath = this.globalLocaleRoutes[normalizedKey] || this.globalLocaleRoutes[pageName];
       if (!globalLocalePath) {
         const filesLocalePath = this.filesLocaleRoutes[pageName];
         if (filesLocalePath && typeof filesLocalePath === "object") {
@@ -412,6 +531,9 @@ class PageManager {
     if (isNoPrefixStrategy(this.strategy)) {
       return;
     }
+    if (isPrefixAndDefaultStrategy(this.strategy)) {
+      return;
+    }
     const defaultLocalePath = this.localizedPaths[page.path]?.[this.defaultLocale.code];
     if (defaultLocalePath) {
       page.path = normalizePath(defaultLocalePath);
@@ -450,16 +572,22 @@ class PageManager {
       if (isDefaultLocale && isPrefixExceptDefaultStrategy(this.strategy)) {
         page.path = normalizePath(customPath);
         page.children = this.createLocalizedChildren(originalChildren, "", [locale.code], false, false, false, { [locale.code]: customPath });
+      } else if (isPrefixAndDefaultStrategy(this.strategy) && locale === this.defaultLocale) {
+        const nonPrefixedRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPath, customRegex, false, locale.code);
+        if (nonPrefixedRoute) {
+          additionalRoutes.push(nonPrefixedRoute);
+        }
+        const prefixedRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPath, customRegex, true, locale.code);
+        if (prefixedRoute) {
+          additionalRoutes.push(prefixedRoute);
+        }
       } else {
-        const newRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPath, customRegex, false, locale.code);
+        const shouldAddPrefix = !isDefaultLocale;
+        const newRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPath, customRegex, shouldAddPrefix, locale.code);
         if (newRoute) {
           additionalRoutes.push(newRoute);
         }
       }
-      if (isPrefixAndDefaultStrategy(this.strategy) && locale === this.defaultLocale) {
-        const newRoute = this.createLocalizedRoute(page, [locale.code], originalChildren, true, customPath, customRegex, true, locale.code);
-        if (newRoute) additionalRoutes.push(newRoute);
-      }
     });
   }
   createLocalizedChildren(routes, parentPath, localeCodes, modifyName = true, addLocalePrefix = false, parentLocale = false, localizedParentPaths = {}) {
@@ -564,16 +692,18 @@ class PageManager {
     }
     return baseName;
   }
-  createLocalizedRoute(page, localeCodes, originalChildren, isCustom, customPath = "", customRegex, force = false, parentLocale = false) {
+  createLocalizedRoute(page, localeCodes, originalChildren, isCustom, customPath = "", customRegex, force = false, parentLocale = false, originalPagePath) {
     const routePath = this.buildRoutePath(localeCodes, page.path, encodeURI(customPath), isCustom, customRegex, force);
-    if (!routePath || routePath == page.path) return null;
+    const isPrefixAndDefaultWithCustomPath = isPrefixAndDefaultStrategy(this.strategy) && isCustom && customPath;
+    if (!routePath || !isPrefixAndDefaultWithCustomPath && routePath === page.path) return null;
     if (localeCodes.length === 0) return null;
     const firstLocale = localeCodes[0];
     if (!firstLocale) return null;
-    const routeName = buildRouteName(buildRouteNameFromRoute(page.name ?? "", page.path ?? ""), firstLocale, isCustom);
+    const parentPathForChildren = originalPagePath ?? page.path ?? "";
+    const routeName = buildRouteName(buildRouteNameFromRoute(page.name ?? "", parentPathForChildren), firstLocale, isCustom);
     return {
       ...page,
-      children: this.createLocalizedChildren(originalChildren, page.path, localeCodes, true, false, parentLocale, { [firstLocale]: customPath }),
+      children: this.createLocalizedChildren(originalChildren, parentPathForChildren, localeCodes, true, false, parentLocale, { [firstLocale]: customPath }),
       path: routePath,
       name: routeName,
       alias: [],
@@ -598,7 +728,8 @@ class PageManager {
       return buildFullPathNoPrefix(isCustom ? customPath : originalPath);
     }
     if (isCustom) {
-      return force || isPrefixStrategy(this.strategy) || !localeCodes.includes(this.defaultLocale.code) ? buildFullPath(localeCodes, customPath, customRegex) : normalizePath(customPath);
+      const shouldAddPrefix = force || isPrefixStrategy(this.strategy) || isPrefixAndDefaultStrategy(this.strategy) && !localeCodes.includes(this.defaultLocale.code) || !localeCodes.includes(this.defaultLocale.code);
+      return shouldAddPrefix ? buildFullPath(localeCodes, customPath, customRegex) : normalizePath(customPath);
     }
     return buildFullPath(localeCodes, originalPath, customRegex);
   }
@@ -950,16 +1081,33 @@ ${accepts}
         localeManager.ensureTranslationFilesExist(pagesNames, options.translationDir, nuxt.options.rootDir);
       }
       pageManager.extendPages(pages, options.customRegexMatcher, isCloudflarePages);
-      if (isPrefixStrategy(options.strategy) && !isCloudflarePages) {
-        const fallbackRoute = {
-          path: "/:pathMatch(.*)*",
-          name: "custom-fallback-route",
-          file: resolver.resolve("./runtime/components/locale-redirect.vue"),
-          meta: {
-            globalLocaleRoutes: options.globalLocaleRoutes
+      if (!isCloudflarePages) {
+        const strategy = options.strategy;
+        if (isPrefixStrategy(strategy)) {
+          const rootPageIndex = pages.findIndex((page) => page.name === "index" && page.path === "/");
+          if (rootPageIndex > -1) {
+            pages.splice(rootPageIndex, 1);
           }
-        };
-        pages.push(fallbackRoute);
+          const fallbackRoute = {
+            path: "/:pathMatch(.*)*",
+            name: "custom-fallback-route",
+            file: resolver.resolve("./runtime/components/locale-redirect.vue")
+          };
+          pages.push(fallbackRoute);
+          logger.info("Strategy 'prefix': Added fallback route to redirect all non-prefixed paths.");
+        }
+        const needsFallback = isPrefixStrategy(options.strategy) || isPrefixExceptDefaultStrategy(options.strategy);
+        if (needsFallback) {
+          const fallbackRoute = {
+            path: "/:pathMatch(.*)*",
+            name: "custom-fallback-route",
+            file: resolver.resolve("./runtime/components/locale-redirect.vue"),
+            meta: {
+              globalLocaleRoutes: options.globalLocaleRoutes
+            }
+          };
+          pages.push(fallbackRoute);
+        }
       }
       if (!isNoPrefixStrategy(options.strategy)) {
         if (isCloudflarePages) {
@@ -996,7 +1144,9 @@ ${accepts}
               }
             }
             if (page.children && page.children.length) {
-              page.children.forEach((childPage) => processPageWithChildren(childPage, fullPath));
+              page.children.forEach((childPage) => {
+                processPageWithChildren(childPage, fullPath);
+              });
             }
           };
           pages.forEach((page) => {
@@ -1107,7 +1257,9 @@ ${accepts}
           routesToRemove.push(route);
         }
       });
-      routesToRemove.forEach((route) => routesSet.delete(route));
+      routesToRemove.forEach((route) => {
+        routesSet.delete(route);
+      });
       const additionalRoutes = /* @__PURE__ */ new Set();
       const routeRules = nuxt.options.routeRules || {};
       routesSet.forEach((route) => {
@@ -1134,7 +1286,9 @@ ${accepts}
           });
         }
       });
-      additionalRoutes.forEach((route) => routesSet.add(route));
+      additionalRoutes.forEach((route) => {
+        routesSet.add(route);
+      });
     });
     if (nuxt.options.dev) {
       setupDevToolsUI(options, resolver.resolve);

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

@@ -19,7 +19,8 @@
 </template>
 <script setup>
-import { useNuxtApp, computed, useRoute, useRouter } from "#imports";
+import { useNuxtApp, useRoute, useRouter } from "#imports";
+import { computed } from "vue";
 const { $localeRoute } = useNuxtApp();
 const props = defineProps({
   to: { type: [Object, String], required: true },

package/dist/runtime/components/i18n-t.vue CHANGED Viewed

@@ -1,5 +1,5 @@
 <script>
-import { h, defineComponent } from "vue";
+import { h as hyperscript, defineComponent } from "vue";
 import { useNuxtApp, useRoute } from "#imports";
 export default defineComponent({
   name: "I18nT",
@@ -53,18 +53,18 @@ export default defineComponent({
       const $t = $_t(route);
       if (props.number !== void 0) {
         const numberValue = Number(props.number);
-        return h(props.tag, { ...attrs, innerHTML: $t(props.keypath, { number: $tn(numberValue) }) });
+        return hyperscript(props.tag, { ...attrs, innerHTML: $t(props.keypath, { number: $tn(numberValue) }) });
       }
       if (props.date !== void 0) {
-        return h(props.tag, { ...attrs, innerHTML: $t(props.keypath, { date: $td(props.date) }) });
+        return hyperscript(props.tag, { ...attrs, innerHTML: $t(props.keypath, { date: $td(props.date) }) });
       }
       if (props.relativeDate !== void 0) {
-        return h(props.tag, { ...attrs, innerHTML: $t(props.keypath, { relativeDate: $tdr(props.relativeDate) }) });
+        return hyperscript(props.tag, { ...attrs, innerHTML: $t(props.keypath, { relativeDate: $tdr(props.relativeDate) }) });
       }
       if (props.plural !== void 0) {
         const count = Number.parseInt(props.plural.toString());
         if (props.customPluralRule) {
-          return h(props.tag, { ...attrs, innerHTML: props.customPluralRule(
+          return hyperscript(props.tag, { ...attrs, innerHTML: props.customPluralRule(
             props.keypath,
             count,
             props.params,
@@ -72,7 +72,7 @@ export default defineComponent({
             $t
           ) });
         } else {
-          return h(props.tag, { ...attrs, innerHTML: $tc(props.keypath, { count, ...props.params }) });
+          return hyperscript(props.tag, { ...attrs, innerHTML: $tc(props.keypath, { count, ...props.params }) });
         }
       }
       const translation = ($t(props.keypath, { ...props.params, ...options }) ?? "").toString();
@@ -80,10 +80,10 @@ export default defineComponent({
         return props.defaultValue ?? null;
       }
       if (props.html) {
-        return h(props.tag, { ...attrs, innerHTML: translation });
+        return hyperscript(props.tag, { ...attrs, innerHTML: translation });
       }
       if (slots.default) {
-        return h(
+        return hyperscript(
           props.tag,
           attrs,
           slots.default({ translation })
@@ -98,7 +98,7 @@ export default defineComponent({
           if (index > lastIndex) {
             children.push(translation.slice(lastIndex, index));
           }
-          children.push(h(slotFn));
+          children.push(hyperscript(slotFn));
           lastIndex = index + placeholder.length;
         }
       }
@@ -106,13 +106,13 @@ export default defineComponent({
         children.push(translation.slice(lastIndex));
       }
       if (slots.default) {
-        return h(
+        return hyperscript(
           props.tag,
           attrs,
           slots.default({ children })
         );
       }
-      return h(props.tag, attrs, children);
+      return hyperscript(props.tag, attrs, children);
     };
   }
 });

package/dist/runtime/components/locale-redirect.vue CHANGED Viewed

@@ -52,7 +52,7 @@ if (globalLocaleRoutes && globalLocaleRoutes[currentPageName]) {
 } else if (locales.includes(firstSegment) && globalLocaleRoutes && globalLocaleRoutes[currentLocalePageName]) {
   const localizedRoutes = globalLocaleRoutes[currentLocalePageName];
   if (localizedRoutes && localizedRoutes[firstSegment]) {
-    const localizedPath = `/${firstSegment}${localizedRoutes[firstSegment]}`;
+    const localizedPath = `/${firstSegment}/${localizedRoutes[firstSegment]}`;
     if (route.fullPath !== localizedPath) {
       handleRedirect(localizedPath);
     }

package/dist/runtime/composables/useLocaleHead.js CHANGED Viewed

@@ -1,7 +1,8 @@
 import { joinURL, parseURL, withQuery } from "ufo";
-import { isPrefixExceptDefaultStrategy, isNoPrefixStrategy } from "nuxt-i18n-micro-core";
-import { unref, useRoute, useRuntimeConfig, ref, useNuxtApp } from "#imports";
+import { isNoPrefixStrategy } from "nuxt-i18n-micro-core";
+import { useRoute, useRuntimeConfig, useNuxtApp } from "#imports";
 import { findAllowedLocalesForRoute } from "../utils/route-utils.js";
+import { ref, unref } from "vue";
 export const useLocaleHead = ({ addDirAttribute = true, identifierAttribute = "id", addSeoAttributes = true, baseUrl = "/" } = {}) => {
   const metaObject = ref({
     htmlAttrs: {},
@@ -20,8 +21,8 @@ export const useLocaleHead = ({ addDirAttribute = true, identifierAttribute = "i
     return withQuery(pathname, filtered);
   }
   function updateMeta() {
-    const { defaultLocale, strategy, canonicalQueryWhitelist, routeLocales, globalLocaleRoutes } = useRuntimeConfig().public.i18nConfig;
-    const { $getLocales, $getLocale, $getRouteName } = useNuxtApp();
+    const { strategy, canonicalQueryWhitelist, routeLocales } = useRuntimeConfig().public.i18nConfig;
+    const { $getLocales, $getLocale, $switchLocalePath } = useNuxtApp();
     if (!$getLocale || !$getLocales) return;
     const route = useRoute();
     const locale = unref($getLocale());
@@ -38,17 +39,6 @@ export const useLocaleHead = ({ addDirAttribute = true, identifierAttribute = "i
       fullPath = `/${fullPath}`;
     }
     const matchedLocale = locales.find((locale2) => fullPath.startsWith(`/${locale2.code}`));
-    const baseRouteName = $getRouteName ? unref($getRouteName(route, locale)) : routeName.replace(/^localized-/, "").replace(new RegExp(`-${locale}$`), "").replace(new RegExp(`-${defaultLocale}$`), "");
-    let normalizedPath = route.path;
-    if (matchedLocale && normalizedPath.startsWith(`/${matchedLocale.code}`)) {
-      normalizedPath = normalizedPath.slice(matchedLocale.code.length + 1);
-    }
-    if (!normalizedPath.startsWith("/")) {
-      normalizedPath = `/${normalizedPath}`;
-    }
-    if (normalizedPath !== "/" && normalizedPath.endsWith("/")) {
-      normalizedPath = normalizedPath.slice(0, -1);
-    }
     let localizedPath = fullPath;
     let ogUrl;
     let canonicalPath;
@@ -60,22 +50,6 @@ export const useLocaleHead = ({ addDirAttribute = true, identifierAttribute = "i
       canonicalPath = filterQuery(fullPath, canonicalQueryWhitelist ?? []);
       ogUrl = joinURL(unref(baseUrl), canonicalPath);
     }
-    let routeLocalizedPaths = globalLocaleRoutes?.[baseRouteName] || globalLocaleRoutes?.[normalizedPath] || null;
-    if (!routeLocalizedPaths && globalLocaleRoutes) {
-      for (const [, localizedPaths] of Object.entries(globalLocaleRoutes)) {
-        if (typeof localizedPaths === "object" && localizedPaths !== null) {
-          const normalizedCurrentPath = canonicalPath.replace(/^\/+/, "/");
-          const matchingLocale = Object.entries(localizedPaths).find(([_, localizedPathValue]) => {
-            const normalizedLocalizedPath = String(localizedPathValue).replace(/^\/+/, "/");
-            return normalizedCurrentPath === normalizedLocalizedPath || matchedLocale && normalizedCurrentPath === `/${matchedLocale.code}/${normalizedLocalizedPath}`;
-          });
-          if (matchingLocale) {
-            routeLocalizedPaths = localizedPaths;
-            break;
-          }
-        }
-      }
-    }
     metaObject.value = {
       htmlAttrs: {
         lang: currentIso,
@@ -107,14 +81,16 @@ export const useLocaleHead = ({ addDirAttribute = true, identifierAttribute = "i
       href: ogUrl
     };
     const alternateLinks = isNoPrefixStrategy(strategy) ? [] : alternateLocales.flatMap((loc) => {
-      let pathForLocale;
-      if (routeLocalizedPaths && routeLocalizedPaths[loc.code]) {
-        pathForLocale = routeLocalizedPaths[loc.code];
+      const switchedPath = $switchLocalePath(loc.code);
+      if (!switchedPath) {
+        return [];
+      }
+      let href;
+      if (switchedPath.startsWith("http://") || switchedPath.startsWith("https://")) {
+        href = switchedPath;
       } else {
-        pathForLocale = defaultLocale === loc.code && isPrefixExceptDefaultStrategy(strategy) ? canonicalPath : canonicalPath;
+        href = joinURL(unref(baseUrl), switchedPath.startsWith("/") ? switchedPath : `/${switchedPath}`);
       }
-      const localizedPath2 = defaultLocale === loc.code && isPrefixExceptDefaultStrategy(strategy) ? pathForLocale : joinURL(loc.code, pathForLocale);
-      const href = joinURL(unref(baseUrl), localizedPath2);
       const links = [{
         [identifierAttribute]: `i18n-alternate-${loc.code}`,
         rel: "alternate",

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

@@ -1,5 +1,6 @@
 import { useTranslationHelper, interpolate, isNoPrefixStrategy, RouteService, FormatService } from "nuxt-i18n-micro-core";
-import { useRouter, useCookie, unref, navigateTo, defineNuxtPlugin, useRuntimeConfig, createError } from "#imports";
+import { useRouter, useCookie, navigateTo, defineNuxtPlugin, useRuntimeConfig, createError } from "#imports";
+import { unref } from "vue";
 import { useState } from "#app";
 import { plural } from "#build/i18n.plural.mjs";
 const isDev = process.env.NODE_ENV !== "production";
@@ -46,7 +47,6 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   const enablePreviousPageFallback = i18nConfig.experimental?.i18nPreviousPageFallback ?? false;
   nuxtApp.hook("page:finish", () => {
     if (import.meta.client) {
-      i18nRouteParams.value = null;
       previousPageInfo.value = null;
     }
   });
@@ -83,6 +83,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     }
   }
   router.beforeEach(async (to, from, next) => {
+    if (to.name !== from.name) {
+      i18nRouteParams.value = {};
+    }
     if (to.path === from.path && !isNoPrefixStrategy(i18nConfig.strategy)) {
       if (next) next();
       return;

package/dist/runtime/plugins/02.meta.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { useLocaleHead } from "../composables/useLocaleHead.js";
-import { useRequestURL, useHead, defineNuxtPlugin, useRuntimeConfig, useRoute, watch } from "#imports";
+import { useRequestURL, useHead, defineNuxtPlugin, useRuntimeConfig, useRoute } from "#imports";
+import { watch } from "vue";
 import { isMetaDisabledForRoute } from "../utils/route-utils.js";
 const host = process.env.HOST ?? "localhost";
 const port = process.env.PORT ?? "host";

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

@@ -1,4 +1,5 @@
-import { defineNuxtPlugin, useNuxtApp, computed, watch, onUnmounted, unref } from "#imports";
+import { defineNuxtPlugin, useNuxtApp } from "#imports";
+import { watch, unref, computed, onUnmounted } from "vue";
 const normalizeLocales = (locales) => {
   if (Array.isArray(locales)) {
     return locales.reduce((acc, locale) => {

package/dist/runtime/plugins/06.redirect.js CHANGED Viewed

@@ -1,30 +1,64 @@
 import { isNoPrefixStrategy, isPrefixStrategy } from "nuxt-i18n-micro-core";
 import { defineNuxtPlugin, useRuntimeConfig, useRoute, useRouter, navigateTo, createError } from "#imports";
 import { findAllowedLocalesForRoute } from "../utils/route-utils.js";
+import { joinURL, withQuery } from "ufo";
+function resolvePathWithParams(path, params) {
+  let resolvedPath = path;
+  for (const key in params) {
+    const value = params[key];
+    if (value) {
+      const stringValue = String(value);
+      resolvedPath = resolvedPath.replace(`:${key}()`, stringValue).replace(`:${key}`, stringValue);
+    }
+  }
+  return resolvedPath;
+}
 export default defineNuxtPlugin(async (nuxtApp) => {
   const config = useRuntimeConfig();
   const i18nConfig = config.public.i18nConfig;
-  const { routeLocales } = useRuntimeConfig().public.i18nConfig;
+  const { routeLocales, globalLocaleRoutes } = useRuntimeConfig().public.i18nConfig;
   const route = useRoute();
   const router = useRouter();
+  const checkGlobalLocaleRoutes = (to) => {
+    if (!globalLocaleRoutes || typeof globalLocaleRoutes !== "object" || Object.keys(globalLocaleRoutes).length === 0) {
+      return false;
+    }
+    const locales = i18nConfig.locales?.map((l) => l.code) || [];
+    const defaultLocale = i18nConfig.defaultLocale || "en";
+    const pathSegments = to.path.split("/").filter(Boolean);
+    const firstSegment = pathSegments[0];
+    const pathWithoutLocale = locales.includes(firstSegment) ? "/" + pathSegments.slice(1).join("/") : to.path;
+    const routeName = (typeof to.name === "string" ? to.name : "").replace("localized-", "").replace(new RegExp(`-(${locales.join("|")})$`), "");
+    const routeRules = globalLocaleRoutes[pathWithoutLocale] || globalLocaleRoutes[routeName];
+    if (routeRules && typeof routeRules === "object") {
+      const localeToUse = locales.includes(firstSegment) ? firstSegment : defaultLocale;
+      const customPathSegment = routeRules[localeToUse];
+      if (customPathSegment) {
+        const resolvedCustomPath = resolvePathWithParams(customPathSegment, to.params);
+        const localizedPath = locales.includes(firstSegment) ? joinURL(`/${firstSegment}`, resolvedCustomPath) : resolvedCustomPath;
+        if (decodeURI(to.path) !== decodeURI(localizedPath)) {
+          const finalUrl = withQuery(localizedPath, to.query);
+          navigateTo(finalUrl, { redirectCode: 301, external: true });
+          return true;
+        }
+      } else if (locales.includes(firstSegment)) {
+        throw createError({ statusCode: 404, statusMessage: "Page Not Found" });
+      }
+    }
+    return false;
+  };
   const checkRouteLocales = (to) => {
     const allowedLocales = findAllowedLocalesForRoute(to, routeLocales);
-    if (!allowedLocales || allowedLocales.length === 0) {
-      return;
-    }
+    if (!allowedLocales || allowedLocales.length === 0) return;
     const pathSegments = to.path.split("/").filter(Boolean);
     const firstSegment = pathSegments[0];
     const allLocales = i18nConfig.locales?.map((l) => l.code) || [];
     if (firstSegment && allLocales.includes(firstSegment) && !allowedLocales.includes(firstSegment)) {
-      console.log("Locale not allowed, throwing 404");
-      throw createError({
-        statusCode: 404,
-        statusMessage: "Page Not Found"
-      });
+      throw createError({ statusCode: 404, statusMessage: "Page Not Found" });
     }
   };
   const handleRedirect = async (to) => {
-    const currentLocale = nuxtApp.$getLocale().toString();
+    const currentLocale = nuxtApp.$getLocale(to);
     const name = to.name?.toString();
     let defaultRouteName = name?.toString().replace("localized-", "").replace(new RegExp(`-${currentLocale}$`), "");
     if (!to.params.locale) {
@@ -45,12 +79,14 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     }
   };
   if (import.meta.server) {
+    if (checkGlobalLocaleRoutes(route)) return;
     checkRouteLocales(route);
     if (isPrefixStrategy(i18nConfig.strategy) || isNoPrefixStrategy(i18nConfig.strategy)) {
       await handleRedirect(route);
     }
   }
   router.beforeEach(async (to, from, next) => {
+    if (checkGlobalLocaleRoutes(to)) return;
     if (from.path !== to.path) {
       checkRouteLocales(to);
     }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-i18n-micro",
-  "version": "2.2.0",
+  "version": "2.4.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",
@@ -61,9 +61,9 @@
     "globby": "^14.1.0",
     "sirv": "^2.0.4",
     "ufo": "^1.5.4",
-    "nuxt-i18n-micro-core": "1.0.22",
+    "nuxt-i18n-micro-types": "1.0.12",
     "nuxt-i18n-micro-test-utils": "1.0.7",
-    "nuxt-i18n-micro-types": "1.0.12"
+    "nuxt-i18n-micro-core": "1.0.23"
   },
   "devDependencies": {
     "@nuxt/devtools": "^2.6.3",
@@ -100,7 +100,7 @@
     "dev:build": "nuxi build playground",
     "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
     "dev:generate": "nuxi generate playground",
-    "release": "pnpm run lint && pnpm run typecheck && pnpm run test:types && pnpm run test && pnpm run test:workspaces && pnpm run prepack && changelogen --release && pnpm publish -r && git push --follow-tags",
+    "release": "pnpm run lint && pnpm run typecheck && pnpm run test:types && pnpm run test && pnpm run test:vitest && pnpm run test:workspaces && pnpm run prepack && changelogen --release && pnpm publish -r && git push --follow-tags",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "test": "playwright test",

package/dist/client/_nuxt/builds/meta/761c8107-0390-4ed8-9b33-a10824c775b2.json DELETED Viewed

	@@ -1 +0,0 @@
1	- {"id":"761c8107-0390-4ed8-9b33-a10824c775b2","timestamp":1762153612543,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}