@inzombieland/nuxt-common 1.16.8 → 1.16.10

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.8",
+  "version": "1.16.10",
   "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.8";
+const version = "1.16.10";
 
 const module = defineNuxtModule({
   meta: {

package/dist/runtime/SidebarProvider.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useSwipe, type UseSwipeDirection } from "@vueuse/core"
 import { onMounted, ref, watch } from "vue"
-import { useNuxtApp } from "#imports"
+import { useDevice } from "./composables/use-device"
 import { useToggleSidebar } from "./composables/use-toggle-sidebar"
 
 const sidebarRef = ref<HTMLElement | null>(null)
@@ -10,7 +10,7 @@ const sidebarBackdropRef = ref<HTMLElement | null>(null)
 
 const sidebar = ref("hidden")
 const toggleSidebar = useToggleSidebar()
-const { $device } = useNuxtApp()
+const $device = useDevice()
 const sidebarClass = ref({
 	sidebar: true,
 	"sidebar-open": sidebar.value === "open",

package/dist/runtime/api/index.d.ts

@@ -10,7 +10,7 @@ export declare const config: {
     isDesktopApp: any;
     appName: any;
     getHostname: () => string;
-    getDevice: () => Promise<any>;
+    getDevice: () => Promise<string>;
     useRequestHeaders: (include?: string[]) => {
         baseURL: string;
         headers: {

package/dist/runtime/api/index.mjs

@@ -1,4 +1,5 @@
-import { useNuxtApp, useRequestHeaders, useRequestURL } from "#imports";
+import { useRequestHeaders, useRequestURL } from "#imports";
+import { useDevice } from "../composables/use-device.mjs";
 import { initApiFetch } from "../packages/api/index.mjs";
 export { getVisitor, getVisitorId, useUser } from "../packages/api/index.mjs";
 export const config = {
@@ -11,8 +12,8 @@ export const config = {
   appName: import.meta.env.VITE_APP_NAME,
   getHostname: () => useRequestURL().hostname,
   getDevice: async () => {
-    const { $device } = useNuxtApp();
-    return await $device.getInfo();
+    const device = useDevice();
+    return await device.getInfo();
   },
   useRequestHeaders: (include = []) => {
     return {

package/dist/runtime/composables/use-device.d.ts

@@ -0,0 +1,3 @@
+export declare const useDevice: () => import("src/runtime/packages/api/helpers").Device & {
+    getInfo: () => Promise<string> | string;
+};

package/dist/runtime/composables/use-device.mjs

@@ -0,0 +1,5 @@
+import { useNuxtApp } from "#imports";
+export const useDevice = () => {
+  const { $device } = useNuxtApp();
+  return $device;
+};

package/dist/runtime/packages/api/helpers/device-helper.d.ts

@@ -0,0 +1,43 @@
+export interface Device {
+    mobile: () => boolean;
+    tablet: () => boolean;
+    desktop: () => boolean;
+    ios: () => boolean;
+    macos: () => boolean;
+    ipad: () => boolean;
+    iphone: () => boolean;
+    ipod: () => boolean;
+    android: () => boolean;
+    androidPhone: () => boolean;
+    androidTablet: () => boolean;
+    blackberry: () => boolean;
+    blackberryPhone: () => boolean;
+    blackberryTablet: () => boolean;
+    windows: () => boolean;
+    windowsPhone: () => boolean;
+    windowsTablet: () => boolean;
+    fxos: () => boolean;
+    fxosPhone: () => boolean;
+    fxosTablet: () => boolean;
+    meego: () => boolean;
+    television: () => boolean;
+    isMobileApp: boolean;
+    mobileApp: () => boolean;
+    iosMobileApp: () => boolean;
+    androidMobileApp: () => boolean;
+    tabletApp: () => boolean;
+    iosTabletApp: () => boolean;
+    androidTabletApp: () => boolean;
+    landscape: () => boolean;
+    portrait: () => boolean;
+    onChangeOrientation: (cb: (newOrientation: DeviceOrientation) => void) => void;
+    noConflict: (currentDevice: Device) => void;
+    type: DeviceType;
+    orientation: DeviceOrientation;
+    os: DeviceOs;
+    osName: () => string;
+}
+export type DeviceType = "mobile" | "tablet" | "desktop" | "unknown";
+export type DeviceOrientation = "landscape" | "portrait" | "unknown";
+export type DeviceOs = "ios" | "macos" | "iphone" | "ipad" | "ipod" | "android" | "blackberry" | "windows" | "fxos" | "meego" | "television" | "unknown";
+export declare const deviceHelper: () => Device;

package/dist/runtime/packages/api/helpers/device-helper.mjs

@@ -0,0 +1,15 @@
+import { device as currentDevice } from "./current-device.mjs";
+export const deviceHelper = () => {
+  const device = currentDevice;
+  const isMobileApp = import.meta.env.VITE_IS_MOBILE_APP === "true" || import.meta.env.VITE_IS_MOBILE_APP === true;
+  return {
+    ...device,
+    isMobileApp,
+    mobileApp: () => isMobileApp && device.mobile(),
+    iosMobileApp: () => isMobileApp && device.mobile() && device.ios(),
+    androidMobileApp: () => isMobileApp && device.androidPhone(),
+    tabletApp: () => isMobileApp && device.tablet(),
+    iosTabletApp: () => isMobileApp && device.tablet() && device.ios(),
+    androidTabletApp: () => isMobileApp && device.androidTablet()
+  };
+};

package/dist/runtime/packages/api/helpers/index.d.ts

@@ -1,4 +1,4 @@
 export { apiHelper } from "./api-helper";
 export { dateHelper } from "./date-helper";
-export { device } from "./current-device";
+export { deviceHelper, type Device } from "./device-helper";
 export declare function once<T extends (...args: any[]) => any>(fn: T): T;

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

@@ -1,6 +1,6 @@
 export { apiHelper } from "./api-helper.mjs";
 export { dateHelper } from "./date-helper.mjs";
-export { device } from "./current-device.mjs";
+export { deviceHelper } from "./device-helper.mjs";
 export function once(fn) {
   let executed = false;
   let result;

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

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/api",
-  "version": "1.16.8",
+  "version": "1.16.10",
   "type": "module",
   "license": "ISC",
   "main": "./index.mjs",

package/dist/runtime/packages/api/types.d.ts

@@ -33,7 +33,7 @@ export type FetchConfig = {
     isDesktopApp: boolean;
     appName: string;
     getHostname: () => string;
-    getDevice: () => Promise<string>;
+    getDevice: () => Promise<string> | string;
     useRequestHeaders?: (include: string[]) => {};
 };
 export type ActiveSession = {

package/dist/runtime/plugins/device.d.ts

@@ -1,52 +1,6 @@
-export interface Device {
-    mobile: () => boolean;
-    tablet: () => boolean;
-    desktop: () => boolean;
-    ios: () => boolean;
-    macos: () => boolean;
-    ipad: () => boolean;
-    iphone: () => boolean;
-    ipod: () => boolean;
-    android: () => boolean;
-    androidPhone: () => boolean;
-    androidTablet: () => boolean;
-    blackberry: () => boolean;
-    blackberryPhone: () => boolean;
-    blackberryTablet: () => boolean;
-    windows: () => boolean;
-    windowsPhone: () => boolean;
-    windowsTablet: () => boolean;
-    fxos: () => boolean;
-    fxosPhone: () => boolean;
-    fxosTablet: () => boolean;
-    meego: () => boolean;
-    television: () => boolean;
-    mobileApp: () => boolean;
-    iosMobileApp: () => boolean;
-    androidMobileApp: () => boolean;
-    tabletApp: () => boolean;
-    iosTabletApp: () => boolean;
-    androidTabletApp: () => boolean;
-    landscape: () => boolean;
-    portrait: () => boolean;
-    onChangeOrientation: (cb: (newOrientation: DeviceOrientation) => void) => void;
-    noConflict: (currentDevice: Device) => void;
-    type: DeviceType;
-    orientation: DeviceOrientation;
-    os: DeviceOs;
-    osName: () => string;
-}
-export type DeviceType = "mobile" | "tablet" | "desktop" | "unknown";
-export type DeviceOrientation = "landscape" | "portrait" | "unknown";
-export type DeviceOs = "ios" | "macos" | "iphone" | "ipad" | "ipod" | "android" | "blackberry" | "windows" | "fxos" | "meego" | "television" | "unknown";
+import { deviceHelper } from "../packages/api/helpers";
 declare const _default: import("#app").Plugin<{
     device: {
-        mobileApp: () => boolean;
-        iosMobileApp: () => boolean;
-        androidMobileApp: () => boolean;
-        tabletApp: () => boolean;
-        iosTabletApp: () => boolean;
-        androidTabletApp: () => boolean;
         getInfo: () => Promise<string>;
         mobile: () => boolean;
         tablet: () => boolean;
@@ -70,23 +24,24 @@ declare const _default: import("#app").Plugin<{
         fxosTablet: () => boolean;
         meego: () => boolean;
         television: () => boolean;
-        landscape: () => boolean;
-        portrait: () => boolean;
-        onChangeOrientation: (cb: (newOrientation: DeviceOrientation) => void) => void;
-        noConflict: (currentDevice: Device) => void;
-        type: DeviceType;
-        orientation: DeviceOrientation;
-        os: DeviceOs;
-        osName: () => string;
-    };
-}> & import("#app").ObjectPlugin<{
-    device: {
+        isMobileApp: boolean;
         mobileApp: () => boolean;
         iosMobileApp: () => boolean;
         androidMobileApp: () => boolean;
         tabletApp: () => boolean;
         iosTabletApp: () => boolean;
         androidTabletApp: () => boolean;
+        landscape: () => boolean;
+        portrait: () => boolean;
+        onChangeOrientation: (cb: (newOrientation: import("src/runtime/packages/api/helpers/device-helper").DeviceOrientation) => void) => void;
+        noConflict: (currentDevice: import("src/runtime/packages/api/helpers/device-helper").Device) => void;
+        type: import("src/runtime/packages/api/helpers/device-helper").DeviceType;
+        orientation: import("src/runtime/packages/api/helpers/device-helper").DeviceOrientation;
+        os: import("src/runtime/packages/api/helpers/device-helper").DeviceOs;
+        osName: () => string;
+    };
+}> & import("#app").ObjectPlugin<{
+    device: {
         getInfo: () => Promise<string>;
         mobile: () => boolean;
         tablet: () => boolean;
@@ -110,22 +65,31 @@ declare const _default: import("#app").Plugin<{
         fxosTablet: () => boolean;
         meego: () => boolean;
         television: () => boolean;
+        isMobileApp: boolean;
+        mobileApp: () => boolean;
+        iosMobileApp: () => boolean;
+        androidMobileApp: () => boolean;
+        tabletApp: () => boolean;
+        iosTabletApp: () => boolean;
+        androidTabletApp: () => boolean;
         landscape: () => boolean;
         portrait: () => boolean;
-        onChangeOrientation: (cb: (newOrientation: DeviceOrientation) => void) => void;
-        noConflict: (currentDevice: Device) => void;
-        type: DeviceType;
-        orientation: DeviceOrientation;
-        os: DeviceOs;
+        onChangeOrientation: (cb: (newOrientation: import("src/runtime/packages/api/helpers/device-helper").DeviceOrientation) => void) => void;
+        noConflict: (currentDevice: import("src/runtime/packages/api/helpers/device-helper").Device) => void;
+        type: import("src/runtime/packages/api/helpers/device-helper").DeviceType;
+        orientation: import("src/runtime/packages/api/helpers/device-helper").DeviceOrientation;
+        os: import("src/runtime/packages/api/helpers/device-helper").DeviceOs;
         osName: () => string;
     };
 }>;
 export default _default;
 declare module "#app" {
     interface NuxtApp {
-        $device: Device;
+        $device: ReturnType<typeof deviceHelper> & {
+            getInfo: () => Promise<string> | string;
+        };
         $mobileApp: {
-            getInfo: () => Promise<{
+            getInfo?: () => Promise<{
                 name: string;
             }>;
             changeTheme: ({ theme }: {

package/dist/runtime/plugins/device.mjs

@@ -1,23 +1,15 @@
 import { defineNuxtPlugin } from "#app";
-import { useNuxtApp, useRuntimeConfig } from "#imports";
-import { device as currentDevice } from "../packages/api/helpers/index.mjs";
+import { useNuxtApp } from "#imports";
+import { deviceHelper } from "../packages/api/helpers/index.mjs";
 export default defineNuxtPlugin(() => {
-  const device = currentDevice;
-  const runtimeConfig = useRuntimeConfig();
-  const isMobileApp = Boolean(runtimeConfig.public.isMobileApp);
+  const device = deviceHelper();
   return {
     provide: {
       device: {
         ...device,
-        mobileApp: () => isMobileApp && device.mobile(),
-        iosMobileApp: () => isMobileApp && device.mobile() && device.ios(),
-        androidMobileApp: () => isMobileApp && device.androidPhone(),
-        tabletApp: () => isMobileApp && device.tablet(),
-        iosTabletApp: () => isMobileApp && device.tablet() && device.ios(),
-        androidTabletApp: () => isMobileApp && device.androidTablet(),
         getInfo: async () => {
           const { $mobileApp } = useNuxtApp();
-          if (isMobileApp && $mobileApp && typeof $mobileApp.getInfo === "function") {
+          if (device.isMobileApp && $mobileApp && typeof $mobileApp.getInfo === "function") {
             const device2 = await $mobileApp.getInfo();
             return device2.name;
           }

package/package.json

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