@yiiamee/multilinguist 1.4.2 → 1.5.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@yiiamee/multilinguist",
   "configKey": "multilinguist",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "compatibility": {
     "nuxt": "^3.0.0 || ^4.0.0"
   },
@@ -9,7 +9,8 @@
     "logging": true,
     "defaultLocale": "",
     "supportedLanguages": [],
-    "setBrowserLanguage": true
+    "setBrowserLanguage": true,
+    "localesPath": "./public/locales"
   },
   "builder": {
     "@nuxt/module-builder": "1.0.1",

package/dist/module.mjs

@@ -1,6 +1,6 @@
 import { defineNuxtModule, createResolver, addPlugin, addImportsDir } from '@nuxt/kit';
 import fs from 'fs';
-import path from 'path';
+import path, { resolve } from 'path';
 
 function flattenKeys(obj, prefix = "") {
   return Object.entries(obj).flatMap(([key, value]) => {
@@ -49,9 +49,9 @@ declare module 'vue' {
 }
 `;
 };
-function GenerateLocaleKeysPlugin(defaultLocaleFromConfig, localesPath, outPath, logging = true) {
+function GenerateLocaleKeysPlugin(defaultLocaleFromConfig, absoluteLocalesPath, outPath, logging = true) {
   async function generateTypes() {
-    const defaultLocalePath = path.join(localesPath, `${defaultLocaleFromConfig}.json`);
+    const defaultLocalePath = path.join(absoluteLocalesPath, `${defaultLocaleFromConfig}.json`);
     if (!fs.existsSync(defaultLocalePath)) {
       console?.error(`\u274C Default locale file not found: ${defaultLocalePath}`);
       return;
@@ -71,7 +71,7 @@ function GenerateLocaleKeysPlugin(defaultLocaleFromConfig, localesPath, outPath,
       await generateTypes();
     },
     async handleHotUpdate(ctx) {
-      if (ctx.file.endsWith(".json") && ctx.file.includes(localesPath)) {
+      if (ctx.file.endsWith(".json") && ctx.file.includes(absoluteLocalesPath)) {
         await generateTypes();
       }
     }
@@ -82,7 +82,7 @@ const module = defineNuxtModule({
   meta: {
     name: "@yiiamee/multilinguist",
     configKey: "multilinguist",
-    version: "1.4.2",
+    version: "1.5.1",
     compatibility: {
       nuxt: "^3.0.0 || ^4.0.0"
     },
@@ -90,25 +90,32 @@ const module = defineNuxtModule({
       logging: true,
       defaultLocale: "",
       supportedLanguages: [],
-      setBrowserLanguage: true
+      setBrowserLanguage: true,
+      localesPath: "./public/locales"
     }
   },
   setup(moduleOptions, nuxtApp) {
     const resolver = createResolver(import.meta.url);
+    const localesPath = moduleOptions.localesPath || "./public/locales";
+    const resolvedLocalesPath = resolve(nuxtApp.options.rootDir, localesPath);
     addPlugin(resolver.resolve("runtime/plugin"));
     addImportsDir(resolver.resolve("runtime/composables"));
     nuxtApp.options.runtimeConfig.public.multilinguist = {
       defaultLocale: moduleOptions.defaultLocale,
       supportedLanguages: moduleOptions.supportedLanguages,
       logging: typeof moduleOptions.logging === "boolean" ? moduleOptions.logging : true,
-      setBrowserLanguage: typeof moduleOptions.setBrowserLanguage === "boolean" ? moduleOptions.setBrowserLanguage : true
+      setBrowserLanguage: typeof moduleOptions.setBrowserLanguage === "boolean" ? moduleOptions.setBrowserLanguage : true,
+      localesPath
+    };
+    nuxtApp.options.runtimeConfig.multilinguist = {
+      resolvedLocalesPath
     };
     nuxtApp.hook("vite:extendConfig", (viteConfig) => {
       viteConfig.plugins = viteConfig.plugins || [];
       viteConfig.plugins.push(
         GenerateLocaleKeysPlugin(
           moduleOptions.defaultLocale,
-          `${nuxtApp.options.rootDir}/public/locales`,
+          resolvedLocalesPath,
           resolver.resolve("./runtime/types/generated-locales.d.ts"),
           moduleOptions.logging
         )
@@ -119,6 +126,17 @@ const module = defineNuxtModule({
         path: resolver.resolve("./runtime/types/generated-locales.d.ts")
       });
     });
+    if (!localesPath.includes("public")) {
+      nuxtApp.hook("nitro:config", async (nitroConfig) => {
+        nitroConfig.publicAssets = nitroConfig.publicAssets || [];
+        nitroConfig.publicAssets.push({
+          dir: resolvedLocalesPath,
+          maxAge: 60 * 60 * 24 * 7,
+          // 1 week
+          baseURL: `/${localesPath.replace(/^\.\//, "").replace(/^public\//, "")}`
+        });
+      });
+    }
   }
 });
 

package/dist/runtime/composables/useLocalization.js

@@ -1,21 +1,38 @@
 import useLocale from "../composables/useLocale.js";
-import { useCookie, useState } from "nuxt/app";
+import { useCookie, useState, useRuntimeConfig } from "nuxt/app";
 import { computed, watch } from "vue";
 export default function useLocalization(supportedLanguages, defaultLocale, setBrowserLanguage = true) {
   const { locale: userBrowserLocale } = useLocale(supportedLanguages, defaultLocale);
+  const config = useRuntimeConfig();
   const userSelectedLocale = useCookie("multilinguist-locale", {
     default: () => supportedLanguages.includes(userBrowserLocale.value) && setBrowserLanguage ? userBrowserLocale.value : defaultLocale
   });
-  const localeFiles = import.meta.glob("@/public/locales/*.json", { eager: true });
   const loadedLanguages = useState("loaded-languages", () => ({}));
   const loadLocaleMessages = async (locale2) => {
     if (!loadedLanguages.value[locale2]) {
-      const fileKey = `/public/locales/${locale2}.json`;
-      const messages = localeFiles[fileKey];
-      if (messages) {
-        loadedLanguages.value[locale2] = messages?.default;
-      } else {
-        throw new Error(`Locale file ${fileKey} not found`);
+      try {
+        const localesPath = config.public.multilinguist.localesPath || "./public/locales";
+        const normalizedPath = localesPath.startsWith("./") ? localesPath.slice(2) : localesPath.startsWith("/") ? localesPath.slice(1) : localesPath;
+        let messages;
+        if (import.meta.server) {
+          const { readFileSync, existsSync } = await import("fs");
+          const { join } = await import("path");
+          const resolvedPath = config.multilinguist?.resolvedLocalesPath;
+          const filePath = join(resolvedPath, `${locale2}.json`);
+          if (!existsSync(filePath)) {
+            throw new Error(`Locale file not found: ${filePath}`);
+          }
+          const fileContent = readFileSync(filePath, "utf-8");
+          messages = JSON.parse(fileContent);
+        } else {
+          const url = `/${normalizedPath}/${locale2}.json`;
+          const response = await $fetch(url);
+          messages = response;
+        }
+        loadedLanguages.value[locale2] = messages;
+      } catch (error) {
+        console.error(`Failed to load locale '${locale2}':`, error);
+        throw new Error(`Locale file for '${locale2}' not found at configured path`);
       }
     }
   };

package/dist/runtime/types/locale-imports.d.ts

@@ -0,0 +1,30 @@
+export declare const localeFiles: {
+    "/locales/en.json": {
+        default: {
+            "Hello, World": string;
+            "Switch Locale": string;
+            "Paste your variable here": string;
+            nested: {
+                "Nested key": string;
+                Language: string;
+                "nested second level": {
+                    "nested second level language": string;
+                };
+            };
+        };
+    };
+    "/locales/es.json": {
+        default: {
+            "Hello, World": string;
+            "Switch Locale": string;
+            "Paste your variable here": string;
+            nested: {
+                "Nested key": string;
+                Language: string;
+                "nested second level": {
+                    "nested second level language": string;
+                };
+            };
+        };
+    };
+};

package/dist/runtime/types/locale-imports.js

@@ -0,0 +1,6 @@
+import locale_0 from "../../../playground/locales/en.json";
+import locale_1 from "../../../playground/locales/es.json";
+export const localeFiles = {
+  "/locales/en.json": { default: locale_0 },
+  "/locales/es.json": { default: locale_1 }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yiiamee/multilinguist",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "description": "Nuxt Multilinguist module for localizations",
   "repository": "yiiameeMich/multilinguist",
   "license": "MIT",