@inzombieland/nuxt-common 1.16.21 → 1.16.24

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.21",
+  "version": "1.16.24",
   "configKey": "nuxt-common",
   "builder": {
     "@nuxt/module-builder": "0.6.0",

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url';
 import { defineNuxtModule, createResolver, addServerHandler, addImportsDir, addPlugin, addComponent } from '@nuxt/kit';
 
 const name = "@inzombieland/nuxt-common";
-const version = "1.16.21";
+const version = "1.16.24";
 
 const module = defineNuxtModule({
   meta: {

package/dist/runtime/AppProvider.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { StyleProvider, Themes } from "@varlet/ui"
 import { useLocalStorage } from "@vueuse/core"
-import { useI18n, useLocalePath } from "#i18n"
+import { useLocalePath } from "#i18n"
 import { useNuxtApp } from "#imports"
 import { onMounted, ref, watch } from "vue"
 import { useRouter } from "vue-router"
@@ -15,15 +15,12 @@ import "@vant/touch-emulator"
 
 const theme = ref("")
 const appPreferencesTheme = useLocalStorage("app-preferences-theme", JSON.stringify({ value: "" }))
-const locale = useLocalStorage("locale", "en")
 const user = useUser()
 const activeSessions = useActiveSessions()
 const { fetchActiveSessions, logout } = useUserActions()
 const localePath = useLocalePath()
 const router = useRouter()
 const appLoading = ref(Boolean(user.value))
-// @ts-ignore
-const { setLocale } = useI18n()
 const { $mobileApp } = useNuxtApp()
 
 useSubscribe("WS.SessionsUpdated", async (session: { status?: string; visitorId?: string; sessionId?: string }) => {
@@ -52,10 +49,12 @@ onMounted(() => {
 		appPreferencesTheme,
 		newThemeValue => {
 			try {
-				const { value } = JSON.parse(newThemeValue)
-				theme.value = value
+				if (newThemeValue) {
+					const { value } = JSON.parse(newThemeValue)
+					theme.value = value
+				}
 			} catch (error) {
-				console.error(`Error parsing theme storage object:`, error)
+				console.error(`Error parsing app preferences theme:`, error)
 			}
 
 			if (!theme.value) {
@@ -80,14 +79,6 @@ onMounted(() => {
 		{ immediate: true }
 	)
 
-	watch(
-		locale,
-		locale => {
-			setLocale(locale as "en" | "ru")
-		},
-		{ immediate: true }
-	)
-
 	appLoading.value = false
 })
 

package/dist/runtime/api/user-actions.mjs

@@ -134,8 +134,8 @@ export const changeLocale = async (body) => {
   if (typeof window !== "undefined") {
     const localeCookie = useCookie("locale", { maxAge: 60 * 60 * 24 * 365 });
     localeCookie.value = body.locale;
-    const locale = useLocalStorage("locale", "en");
-    locale.value = body.locale;
+    const locale = useLocalStorage("app-preferences-locale", JSON.stringify({ value: "" }));
+    locale.value = JSON.stringify({ value: body.locale });
   }
 };
 export const changeAvatar = async (body) => {

package/dist/runtime/packages/api/index.mjs

@@ -1,15 +1,11 @@
-import { Locale as VarletLocale } from "@varlet/ui";
 import { useLocalStorage } from "@vueuse/core";
-import { setNotifyDefaultOptions, Locale as VantLocale } from "vant";
-import enUS from "vant/es/locale/lang/en-US";
-import ruRU from "vant/es/locale/lang/ru-RU";
-import { watch } from "vue";
 import { createApiFetch } from "./api-client.mjs";
 import bus from "./bus.mjs";
 import { newCometClient } from "./comet-client.mjs";
 import { useApiActions } from "./composables/use-api-actions.mjs";
 import { createApiGetUser } from "./get-user.mjs";
 import { createApiGetVisitorIdentifier } from "./get-visitor.mjs";
+import { createInitApplication } from "./init-application.mjs";
 import { createApiRefreshToken } from "./refresh-token.mjs";
 import { createApiUserActions } from "./user-actions.mjs";
 export { useUser } from "./composables/use-user.mjs";
@@ -20,8 +16,8 @@ export function initApiFetch($fetch, config) {
   const fetch = createApiFetch($fetch, config);
   const getUser = createApiGetUser(fetch, config);
   const getVisitorIdentifier = createApiGetVisitorIdentifier(config);
+  const initApplication = createInitApplication();
   const refreshToken = createApiRefreshToken(fetch, config);
-  const useApiFetch = () => fetch;
   const userActions = createApiUserActions(fetch, config, getUser);
   apiActions.value = {
     initialized: true,
@@ -30,8 +26,6 @@ export function initApiFetch($fetch, config) {
   };
   if (typeof window !== "undefined") {
     const loggedIn = useLocalStorage("lin", "no");
-    const theme = useLocalStorage("app-preferences-theme", JSON.stringify({ value: "" }));
-    const locale = useLocalStorage("locale", "en");
     const cometServerURL = config.cometServerURL;
     let cometClient;
     bus.subscribe("user:onUpdated", (user) => {
@@ -46,35 +40,12 @@ export function initApiFetch($fetch, config) {
         cometClient.isStarted = false;
       }
       loggedIn.value = user ? "yes" : "no";
-      try {
-        const { value } = JSON.parse(theme.value);
-        if (user && user.theme !== value) {
-          theme.value = JSON.stringify({ value: user.theme });
-        }
-      } catch (error) {
-        console.error(`Error parsing theme storage object:`, error);
-      }
-      if (user && user.locale !== locale.value) {
-        locale.value = user.locale;
-      }
     });
-    watch(
-      locale,
-      (locale2) => {
-        if (locale2 === "ru") {
-          VantLocale.use(locale2, ruRU);
-          VarletLocale.add("en-US", VarletLocale.enUS);
-        } else {
-          VantLocale.use(locale2, enUS);
-          VarletLocale.add("en-US", VarletLocale.enUS);
-        }
-      },
-      { immediate: true }
-    );
-    setNotifyDefaultOptions({ position: "bottom" });
     bus.subscribe("app:beforeMount", () => {
       getVisitorIdentifier();
+      initApplication();
     });
   }
+  const useApiFetch = () => fetch;
   return { fetch, getUser, useApiFetch, userActions };
 }

package/dist/runtime/packages/api/init-application.d.ts

@@ -0,0 +1 @@
+export declare const createInitApplication: () => () => void;

package/dist/runtime/packages/api/init-application.mjs

@@ -0,0 +1,63 @@
+import { Locale as VarletLocale } from "@varlet/ui";
+import { useLocalStorage } from "@vueuse/core";
+import { setNotifyDefaultOptions, Locale as VantLocale } from "vant";
+import enUS from "vant/es/locale/lang/en-US";
+import ruRU from "vant/es/locale/lang/ru-RU";
+import { watch } from "vue";
+import { useI18n } from "vue-i18n";
+import { useUser } from "./composables/use-user.mjs";
+import { once } from "./helpers/index.mjs";
+function initApplication() {
+  const user = useUser();
+  const theme = useLocalStorage("app-preferences-theme", JSON.stringify({ value: "" }));
+  const locale = useLocalStorage("app-preferences-locale", JSON.stringify({ value: "en" }));
+  const i18n = useI18n();
+  watch(
+    user,
+    (user2) => {
+      try {
+        const { value } = JSON.parse(theme.value);
+        if (user2 && user2.theme !== value) {
+          theme.value = JSON.stringify({ value: user2.theme });
+        }
+      } catch (error) {
+        console.error(`Error parsing app preferences theme:`, error);
+      }
+      try {
+        const { value } = JSON.parse(locale.value);
+        if (user2 && user2.locale !== value) {
+          locale.value = JSON.stringify({ value: user2.locale });
+        }
+      } catch (error) {
+        console.error(`Error parsing app preferences locale:`, error);
+      }
+    },
+    { immediate: true }
+  );
+  watch(
+    locale,
+    (locale2) => {
+      try {
+        const { value } = JSON.parse(locale2);
+        if ("setLocale" in i18n && typeof i18n.setLocale === "function") {
+          i18n.setLocale(value);
+        }
+        if (value === "en") {
+          VantLocale.use(locale2, enUS);
+          VarletLocale.add("en-US", VarletLocale.enUS);
+        }
+        if (value === "ru") {
+          VantLocale.use(locale2, ruRU);
+          VarletLocale.add("en-US", VarletLocale.enUS);
+        }
+      } catch (error) {
+        console.error(`Error parsing app preferences locale:`, error);
+      }
+    },
+    { immediate: true }
+  );
+  setNotifyDefaultOptions({ position: "bottom" });
+}
+export const createInitApplication = once(() => {
+  return () => initApplication();
+});

package/dist/runtime/packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/api",
-  "version": "1.16.21",
+  "version": "1.16.24",
   "type": "module",
   "license": "ISC",
   "main": "./index.mjs",
@@ -17,7 +17,6 @@
     "ofetch": "^1.4.1",
     "rxjs": "^7.8.2",
     "vant": "^4.9.19",
-    "vue": "^3.5.13",
     "zod": "^3.24.2"
   }
 }

package/dist/runtime/plugin.mjs

@@ -1,10 +1,8 @@
-import { useLocalStorage } from "@vueuse/core";
 import { addRouteMiddleware, defineNuxtPlugin } from "#app";
 import { useRequestHeaders, useRuntimeConfig, useState } from "#imports";
 import { fetch, getUser } from "./api/index.mjs";
 import { authMiddleware, guestMiddleware, localeMiddleware } from "./middleware/index.mjs";
 import { flush, setToken, setUser } from "./packages/api/api-client.mjs";
-import bus from "./packages/api/bus.mjs";
 const useAuth = () => {
   return useState("auth", () => null);
 };
@@ -28,10 +26,6 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   }
   nuxtApp.hook("app:beforeMount", () => {
     auth.value = null;
-    bus.subscribe("user:onUpdated", (value) => {
-      const loggedIn = useLocalStorage("lin", "no");
-      loggedIn.value = value ? "yes" : "no";
-    });
   });
   addRouteMiddleware("auth", authMiddleware, { global: false });
   addRouteMiddleware("guest", guestMiddleware, { global: false });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.21",
+  "version": "1.16.24",
   "license": "ISC",
   "type": "module",
   "exports": {