nuxt-i18n-micro 1.12.1 → 1.12.2

package/dist/client/_nuxt/{DxMn4SAe.js → IYJk2P0o.js}

@@ -1 +1 @@
-import{i as o,r as u,g as f,h as d,j as v,k as l,l as i,m as h,n as m}from"./D1fvHJQV.js";function U(t,a={}){const e=a.head||o();if(e)return e.ssr?e.push(t,a):p(e,t,a)}function p(t,a,e={}){const s=u(!1),n=u({});f(()=>{n.value=s.value?{}:d(a)});const r=t.push(n.value,e);return v(n,c=>{r.patch(c)}),m()&&(l(()=>{r.dispose()}),i(()=>{s.value=!0}),h(()=>{s.value=!1})),r}export{U as u};
+import{i as o,r as u,g as f,h as d,j as v,k as l,l as i,m as h,n as m}from"./DD0NUamG.js";function U(t,a={}){const e=a.head||o();if(e)return e.ssr?e.push(t,a):p(e,t,a)}function p(t,a,e={}){const s=u(!1),n=u({});f(()=>{n.value=s.value?{}:d(a)});const r=t.push(n.value,e);return v(n,c=>{r.patch(c)}),m()&&(l(()=>{r.dispose()}),i(()=>{s.value=!0}),h(()=>{s.value=!1})),r}export{U as u};

package/dist/client/_nuxt/{DzdJBprQ.js → RtVXrbos.js}

@@ -1 +1 @@
-import{u as o}from"./DxMn4SAe.js";import{_ as a,o as s,c as i,a as e,t as r,p as u,f as l}from"./D1fvHJQV.js";const c=t=>(u("data-v-b63e9691"),t=t(),l(),t),d={class:"font-sans antialiased bg-white dark:bg-black text-black dark:text-white grid min-h-screen place-content-center overflow-hidden"},p=c(()=>e("div",{class:"fixed -bottom-1/2 left-0 right-0 h-1/2 spotlight"},null,-1)),h={class:"max-w-520px text-center"},b=["textContent"],g=["textContent"],f={__name:"error-500",props:{appName:{type:String,default:"Nuxt"},version:{type:String,default:""},statusCode:{type:Number,default:500},statusMessage:{type:String,default:"Server error"},description:{type:String,default:"This page is temporarily unavailable."}},setup(t){const n=t;return o({title:`${n.statusCode} - ${n.statusMessage} | ${n.appName}`,script:[],style:[{children:'*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:var(--un-default-border-color, #e5e7eb)}:before,:after{--un-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}h1{font-size:inherit;font-weight:inherit}h1,p{margin:0}*,:before,:after{--un-rotate:0;--un-rotate-x:0;--un-rotate-y:0;--un-rotate-z:0;--un-scale-x:1;--un-scale-y:1;--un-scale-z:1;--un-skew-x:0;--un-skew-y:0;--un-translate-x:0;--un-translate-y:0;--un-translate-z:0;--un-pan-x: ;--un-pan-y: ;--un-pinch-zoom: ;--un-scroll-snap-strictness:proximity;--un-ordinal: ;--un-slashed-zero: ;--un-numeric-figure: ;--un-numeric-spacing: ;--un-numeric-fraction: ;--un-border-spacing-x:0;--un-border-spacing-y:0;--un-ring-offset-shadow:0 0 rgb(0 0 0 / 0);--un-ring-shadow:0 0 rgb(0 0 0 / 0);--un-shadow-inset: ;--un-shadow:0 0 rgb(0 0 0 / 0);--un-ring-inset: ;--un-ring-offset-width:0px;--un-ring-offset-color:#fff;--un-ring-width:0px;--un-ring-color:rgb(147 197 253 / .5);--un-blur: ;--un-brightness: ;--un-contrast: ;--un-drop-shadow: ;--un-grayscale: ;--un-hue-rotate: ;--un-invert: ;--un-saturate: ;--un-sepia: ;--un-backdrop-blur: ;--un-backdrop-brightness: ;--un-backdrop-contrast: ;--un-backdrop-grayscale: ;--un-backdrop-hue-rotate: ;--un-backdrop-invert: ;--un-backdrop-opacity: ;--un-backdrop-saturate: ;--un-backdrop-sepia: }'}]}),(m,x)=>(s(),i("div",d,[p,e("div",h,[e("h1",{class:"text-8xl sm:text-10xl font-medium mb-8",textContent:r(t.statusCode)},null,8,b),e("p",{class:"text-xl px-8 sm:px-0 sm:text-4xl font-light mb-16 leading-tight",textContent:r(t.description)},null,8,g)])]))}},w=a(f,[["__scopeId","data-v-b63e9691"]]);export{w as default};
+import{u as o}from"./IYJk2P0o.js";import{_ as a,o as s,c as i,a as e,t as r,p as u,f as l}from"./DD0NUamG.js";const c=t=>(u("data-v-b63e9691"),t=t(),l(),t),d={class:"font-sans antialiased bg-white dark:bg-black text-black dark:text-white grid min-h-screen place-content-center overflow-hidden"},p=c(()=>e("div",{class:"fixed -bottom-1/2 left-0 right-0 h-1/2 spotlight"},null,-1)),h={class:"max-w-520px text-center"},b=["textContent"],g=["textContent"],f={__name:"error-500",props:{appName:{type:String,default:"Nuxt"},version:{type:String,default:""},statusCode:{type:Number,default:500},statusMessage:{type:String,default:"Server error"},description:{type:String,default:"This page is temporarily unavailable."}},setup(t){const n=t;return o({title:`${n.statusCode} - ${n.statusMessage} | ${n.appName}`,script:[],style:[{children:'*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:var(--un-default-border-color, #e5e7eb)}:before,:after{--un-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}h1{font-size:inherit;font-weight:inherit}h1,p{margin:0}*,:before,:after{--un-rotate:0;--un-rotate-x:0;--un-rotate-y:0;--un-rotate-z:0;--un-scale-x:1;--un-scale-y:1;--un-scale-z:1;--un-skew-x:0;--un-skew-y:0;--un-translate-x:0;--un-translate-y:0;--un-translate-z:0;--un-pan-x: ;--un-pan-y: ;--un-pinch-zoom: ;--un-scroll-snap-strictness:proximity;--un-ordinal: ;--un-slashed-zero: ;--un-numeric-figure: ;--un-numeric-spacing: ;--un-numeric-fraction: ;--un-border-spacing-x:0;--un-border-spacing-y:0;--un-ring-offset-shadow:0 0 rgb(0 0 0 / 0);--un-ring-shadow:0 0 rgb(0 0 0 / 0);--un-shadow-inset: ;--un-shadow:0 0 rgb(0 0 0 / 0);--un-ring-inset: ;--un-ring-offset-width:0px;--un-ring-offset-color:#fff;--un-ring-width:0px;--un-ring-color:rgb(147 197 253 / .5);--un-blur: ;--un-brightness: ;--un-contrast: ;--un-drop-shadow: ;--un-grayscale: ;--un-hue-rotate: ;--un-invert: ;--un-saturate: ;--un-sepia: ;--un-backdrop-blur: ;--un-backdrop-brightness: ;--un-backdrop-contrast: ;--un-backdrop-grayscale: ;--un-backdrop-hue-rotate: ;--un-backdrop-invert: ;--un-backdrop-opacity: ;--un-backdrop-saturate: ;--un-backdrop-sepia: }'}]}),(m,x)=>(s(),i("div",d,[p,e("div",h,[e("h1",{class:"text-8xl sm:text-10xl font-medium mb-8",textContent:r(t.statusCode)},null,8,b),e("p",{class:"text-xl px-8 sm:px-0 sm:text-4xl font-light mb-16 leading-tight",textContent:r(t.description)},null,8,g)])]))}},w=a(f,[["__scopeId","data-v-b63e9691"]]);export{w as default};

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

@@ -1 +1 @@
-{"id":"1ab60d52-2c05-4618-8e25-19d2de5cb6af","timestamp":1725115421029}
+{"id":"ebef9bab-73b3-451c-9eee-7e9b779ac677","timestamp":1725188700332}

package/dist/client/_nuxt/builds/meta/ebef9bab-73b3-451c-9eee-7e9b779ac677.json

@@ -0,0 +1 @@
+{"id":"ebef9bab-73b3-451c-9eee-7e9b779ac677","timestamp":1725188700332,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

package/dist/client/index.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html><html  data-capo=""><head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="/__nuxt-i18n-micro/_nuxt/entry.DjxsrOxm.css">
-<link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/D1fvHJQV.js">
+<link rel="modulepreload" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DD0NUamG.js">
 <link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/B6E6ObS_.js">
 <link rel="prefetch" as="style" href="/__nuxt-i18n-micro/_nuxt/error-404.D-AvUzLt.css">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/BpNRGTHy.js">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DxMn4SAe.js">
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/BMM8J4-o.js">
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/IYJk2P0o.js">
 <link rel="prefetch" as="style" href="/__nuxt-i18n-micro/_nuxt/error-500.21ZDxC33.css">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/DzdJBprQ.js">
-<script type="module" src="/__nuxt-i18n-micro/_nuxt/D1fvHJQV.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__">[{"serverRendered":1},false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"1ab60d52-2c05-4618-8e25-19d2de5cb6af",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-i18n-micro/_nuxt/RtVXrbos.js">
+<script type="module" src="/__nuxt-i18n-micro/_nuxt/DD0NUamG.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__">[{"serverRendered":1},false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-i18n-micro",buildId:"ebef9bab-73b3-451c-9eee-7e9b779ac677",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-i18n-micro",
   "configKey": "i18n",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "builder": {
     "@nuxt/module-builder": "0.8.3",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -230,37 +230,28 @@ const module = defineNuxtModule({
       }
       const newRoutes = [];
       for (let i = 0; i < pages.length; i++) {
-        let localizeChildren = function(routes, parentPath = "") {
-          if (!parentPath.startsWith("/")) {
-            parentPath = "/" + parentPath;
-          }
-          return routes.map((route) => {
-            const fullPath = parentPath ? `${parentPath}/${route.path}` : route.path;
-            const customLocalePaths = customPaths[fullPath];
-            const localizedChildren = route.children ? localizeChildren(route.children, fullPath) : [];
-            const localizedRoutes = locales.map((locale) => {
-              let path2 = customLocalePaths && customLocalePaths[locale.code] ? `${customLocalePaths[locale.code]}` : `${fullPath}`;
+        let localizeChildren = function(routes, parentPath = "", currentLocales = [], modifyName = true, addLocalePrefix = false) {
+          return routes.flatMap((route) => {
+            const routePath = route.path.startsWith("/") ? route.path.slice(1) : route.path;
+            const customLocalePaths = customPaths[`${parentPath}/${routePath}`];
+            const localizedChildren = route.children ? localizeChildren(route.children, "", currentLocales, modifyName, false) : [];
+            return currentLocales.map((locale) => {
+              let path2 = customLocalePaths && customLocalePaths[locale] ? customLocalePaths[locale] : routePath;
               if (path2.startsWith("/")) {
                 path2 = path2.slice(1);
               }
+              const isDefault = locale === options.defaultLocale && !options.includeDefaultLocaleRoute;
+              const routeName = modifyName && !isDefault ? `localized-${route.name}-${locale}` : route.name;
+              const finalPath = addLocalePrefix && !isDefault ? `/:locale(${locale})/${path2}` : path2;
               return {
                 ...route,
-                name: `localized-${route.name}-${locale.code}`,
-                path: path2,
+                name: routeName,
+                path: finalPath,
                 children: localizedChildren
                 // Use localized children
               };
             });
-            if (customLocalePaths) {
-              return localizedRoutes;
-            }
-            return {
-              ...route,
-              name: `localized-${route.name}`,
-              children: localizedChildren
-              // Use localized children
-            };
-          }).flat();
+          });
         };
         const page = pages[i];
         if (page.redirect && !page.file) {
@@ -270,41 +261,59 @@ const module = defineNuxtModule({
         locales.forEach((locale) => {
           if (customPaths[page.path] && customPaths[page.path][locale.code]) {
             modLocaleRegex = modLocaleRegex.filter((locale2) => {
-              return !Object.values(customPaths).some((paths) => paths[locale2]);
+              return !customPaths[page.path][locale2];
             });
           }
         });
+        const children = [...page.children ?? []];
+        if (modLocaleRegex.length) {
+          const newRoute = {
+            file: page.file,
+            meta: { ...page.meta },
+            alias: page.alias,
+            redirect: page.redirect,
+            children: page.children ? localizeChildren(children, page.path, modLocaleRegex) : [],
+            mode: page.mode,
+            path: `/:locale(${modLocaleRegex.join("|")})${page.path}`,
+            name: `localized-${page.name}`
+          };
+          newRoutes.push(newRoute);
+        }
         if (customPaths[page.path]) {
           locales.forEach((locale) => {
             if (customPaths[page.path][locale.code]) {
-              const newRoute2 = {
-                file: page.file,
-                meta: { ...page.meta },
-                alias: page.alias,
-                redirect: page.redirect,
-                children: page.children,
-                mode: page.mode,
-                path: `/:locale(${locale.code})${customPaths[page.path][locale.code]}`,
-                name: `localized-${page.name}-${locale.code}`
-              };
-              newRoutes.push(newRoute2);
+              if (locale.code === options.defaultLocale && !options.includeDefaultLocaleRoute) {
+                if (page.children) {
+                  page.children = localizeChildren(children, `/${page.name}`, [locale.code], false, false);
+                }
+              } else {
+                const newRoute = {
+                  file: page.file,
+                  meta: { ...page.meta },
+                  alias: page.alias,
+                  redirect: page.redirect,
+                  children: page.children ? localizeChildren(children, page.path, [locale.code], true, false) : [],
+                  mode: page.mode,
+                  path: `/:locale(${locale.code})${customPaths[page.path][locale.code]}`,
+                  // Use custom path for the locale
+                  name: `localized-${page.name}-${locale.code}`
+                };
+                newRoutes.push(newRoute);
+              }
             }
           });
         }
-        if (!modLocaleRegex.length && !page.children?.length) {
-          continue;
+        if (!options.includeDefaultLocaleRoute) {
+          if (customPaths[page.path]) {
+            page.path = customPaths[page.path][options.defaultLocale] ?? page.path;
+          }
+          if (page.children?.length) {
+            page.children = [
+              ...children,
+              ...localizeChildren(children, `/${page.name}`, locales.filter((locale) => locale.code === options.defaultLocale).map((locale) => locale.code), false)
+            ];
+          }
         }
-        const newRoute = {
-          file: page.file,
-          meta: { ...page.meta },
-          alias: page.alias,
-          redirect: page.redirect,
-          children: page.children ? localizeChildren(page.children, page.name) : [],
-          mode: page.mode,
-          path: `/:locale(${modLocaleRegex.join("|")})${page.path}`,
-          name: `localized-${page.name}`
-        };
-        newRoutes.push(newRoute);
       }
       pages.push(...newRoutes);
       nuxt.options.generate.routes = Array.isArray(nuxt.options.generate.routes) ? nuxt.options.generate.routes : [];
@@ -368,25 +377,12 @@ const module = defineNuxtModule({
     }
   }
 });
-function cleanObjectString(objectString) {
-  let cleanedString = objectString.replace(/'/g, '"');
-  cleanedString = cleanedString.replace(/([{,]\s*)(\w+)(\s*:)/g, '$1"$2"$3');
-  cleanedString = cleanedString.replace(/,(\s*[}\]])/g, "$1");
-  cleanedString = cleanedString.replace(/,+/g, ",");
-  cleanedString = cleanedString.replace(/(\{|\[)\s*,/g, "$1");
-  cleanedString = cleanedString.replace(/,(\s*[}\]])/g, "$1");
-  cleanedString = cleanedString.trim();
-  if (!cleanedString.startsWith("{") || !cleanedString.endsWith("}")) {
-    throw new Error("Invalid object format after cleaning");
-  }
-  return cleanedString;
-}
 function extractDefineI18nRouteConfig(content, path2) {
-  const match = content.match(/\$defineI18nRoute\((\{[\s\S]*?\})\)/);
+  const match = content.match(/^[ \t]*\$defineI18nRoute\((\{[\s\S]*?\})\)/m);
   if (match && match[1]) {
     try {
-      const cleanedString = cleanObjectString(match[1]);
-      const configObject = JSON.parse(cleanedString);
+      const parsedObject = Function('"use strict";return (' + match[1] + ")")();
+      const configObject = parsedObject;
       if (validateDefineI18nRouteConfig(configObject)) {
         return configObject;
       } else {

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

@@ -8,13 +8,13 @@
 </template>
 
 <script lang="ts" setup>
+import type { RouteLocationRaw } from 'vue-router'
 import { useNuxtApp, computed, useRoute, useRouter } from '#imports'
-import type { NuxtLinkProps } from '#app/components/nuxt-link'
 
 const { $localeRoute } = useNuxtApp()
 
 interface Props {
-  to: NuxtLinkProps | string
+  to: RouteLocationRaw | string
   activeStyle?: Partial<CSSStyleDeclaration>
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-i18n-micro",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "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",

package/dist/client/_nuxt/builds/meta/1ab60d52-2c05-4618-8e25-19d2de5cb6af.json

@@ -1 +0,0 @@
-{"id":"1ab60d52-2c05-4618-8e25-19d2de5cb6af","timestamp":1725115421029,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}