@merkaly/nuxt 0.6.5 → 0.6.7

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.14.0"
   },
-  "version": "0.6.5",
+  "version": "0.6.7",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,11 +1,15 @@
 import { defineNuxtModule, useLogger, createResolver, addPlugin, addServerHandler, addRouteMiddleware, addImportsDir, addComponentsDir, addTypeTemplate, addTemplate } from '@nuxt/kit';
-import { defu } from 'defu';
-import { createJiti } from 'jiti';
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { resolve, dirname } from 'node:path';
+import { defu } from 'defu';
+import { createJiti } from 'jiti';
 import svgLoader from 'vite-svg-loader';
 import 'reflect-metadata';
 
+const MODULE_NAME = "@merkaly/nuxt";
+const MERKALY_ORG = "merkaly";
+const PLAUSIBLE_API_HOST = "https://analytics.merkaly.io";
+const FONT_AWESOME_KIT_URL = "https://kit.fontawesome.com/55a4b2f4e1.js";
 const defaultOptions = {
   api: {
     url: "/",
@@ -34,11 +38,48 @@ const defaultOptions = {
     token: ""
   }
 };
+function hasI18nConfig(options) {
+  return Boolean(
+    options.i18n?.defaultLocale && options.i18n.locales.length > 0
+  );
+}
 function hasPlausibleConfig(options) {
   return Boolean(options.plausible?.domain);
 }
+function hasSentryBuildConfig(options) {
+  return Boolean(options.sentry.project && options.sentry.token);
+}
+function resolveModuleOptions(nuxt) {
+  return defu(nuxt.options.merkaly || {}, defaultOptions);
+}
+function buildModuleDependencies(nuxt, options) {
+  const dependencies = {
+    "@bootstrap-vue-next/nuxt": {},
+    "@nuxt/eslint": {},
+    "@nuxt/fonts": {},
+    "@nuxt/image": {},
+    "@sentry/nuxt/module": {},
+    "@vueuse/nuxt": {},
+    "notivue/nuxt": {}
+  };
+  if (hasI18nConfig(options)) {
+    dependencies["@nuxtjs/i18n"] = {
+      overrides: configureI18n(nuxt, options)
+    };
+  }
+  if (hasPlausibleConfig(options)) {
+    dependencies["@nuxtjs/plausible"] = {};
+  }
+  const logger = useLogger(MODULE_NAME);
+  Object.keys(dependencies).forEach((dependency) => {
+    logger.info(`Loaded ${dependency} module`);
+  });
+  return dependencies;
+}
 function configureI18n(nuxt, options) {
-  if (!options.i18n?.defaultLocale || options.i18n.locales.length === 0) return {};
+  if (!hasI18nConfig(options)) {
+    return {};
+  }
   const writeTemplate = (filename, contents) => {
     const template = addTemplate({
       filename,
@@ -49,25 +90,28 @@ function configureI18n(nuxt, options) {
     writeFileSync(template.dst, contents);
     return template.dst;
   };
-  nuxt.options.alias["i18n"] = resolve(nuxt.options.buildDir, "i18n");
+  nuxt.options.alias.i18n = resolve(nuxt.options.buildDir, "i18n");
   const vueI18n = writeTemplate(
     "i18n/config.mjs",
     `export default defineI18nConfig(() => (${JSON.stringify({
       fallbackLocale: options.i18n.defaultLocale,
+      flatJson: true,
       legacy: false,
       locale: options.i18n.defaultLocale
     }, null, 2)}))
 `
   );
-  nuxt.hook("i18n:registerModule", (register) => register({
-    langDir: nuxt.options.rootDir,
-    locales: options.i18n.locales.map((locale) => ({
-      code: locale.code,
-      file: locale.file,
-      language: locale.language,
-      name: locale.name
-    }))
-  }));
+  nuxt.hook("i18n:registerModule", (register) => {
+    register({
+      langDir: nuxt.options.rootDir,
+      locales: options.i18n.locales.map((locale) => ({
+        code: locale.code,
+        file: locale.file,
+        language: locale.language,
+        name: locale.name
+      }))
+    });
+  });
   return {
     defaultLocale: options.i18n.defaultLocale,
     detectBrowserLanguage: { useCookie: true },
@@ -76,51 +120,47 @@ function configureI18n(nuxt, options) {
     vueI18n
   };
 }
-function buildModuleDependencies(nuxt, options) {
-  const dependencies = {
-    "@bootstrap-vue-next/nuxt": {},
-    "@nuxt/eslint": {},
-    "@nuxt/fonts": {},
-    "@nuxt/image": {},
-    "@nuxtjs/i18n": { overrides: configureI18n(nuxt, options) },
-    "@sentry/nuxt/module": {},
-    "@vueuse/nuxt": {},
-    "notivue/nuxt": {}
-  };
-  if (hasPlausibleConfig(options)) {
-    dependencies["@nuxtjs/plausible"] = {};
-  }
-  const logger = useLogger("@merkaly/nuxt");
-  Object.keys(dependencies).forEach((it) => logger.info(`Loaded ${it} module`));
-  return dependencies;
-}
 function configureRuntimeConfig(nuxt, options) {
+  nuxt.options.runtimeConfig.merkaly = defu({
+    sentry: {
+      token: options.sentry.token
+    }
+  }, nuxt.options.runtimeConfig.merkaly || {});
   nuxt.options.runtimeConfig.public.merkaly = defu(
-    options,
+    {
+      api: options.api,
+      auth0: options.auth0,
+      i18n: options.i18n,
+      plausible: options.plausible,
+      sentry: {
+        dsn: options.sentry.dsn,
+        project: options.sentry.project
+      }
+    },
     nuxt.options.runtimeConfig.public.merkaly || {}
   );
 }
 function configurePlausible(nuxt, options) {
-  nuxt.options.plausible = defu(
-    {
-      apiHost: "https://analytics.merkaly.io",
-      domain: options.plausible?.domain,
-      enableAutoOutboundTracking: true,
-      enableAutoPageviews: true,
-      enabled: process.env.NODE_ENV === "production" && hasPlausibleConfig(options),
-      ignoredHostnames: ["localhost", options.plausible?.localhost].filter(Boolean)
-    },
-    // @ts-expect-error plausible not defined
-    nuxt.options.plausible || {}
-  );
+  nuxt.options.plausible = defu({
+    apiHost: PLAUSIBLE_API_HOST,
+    domain: options.plausible?.domain,
+    enableAutoOutboundTracking: true,
+    enableAutoPageviews: true,
+    enabled: process.env.NODE_ENV === "production" && hasPlausibleConfig(options),
+    ignoredHostnames: ["localhost", options.plausible?.localhost].filter(Boolean)
+    // @ts-expect-error Plausible module options aren't typed in Nuxt options
+  }, nuxt.options.plausible || {});
 }
 function configureSentry(nuxt, options) {
   nuxt.options.sentry = defu({
     authToken: options.sentry.token,
-    org: "merkaly",
+    org: MERKALY_ORG,
     project: options.sentry.project
-  });
-  nuxt.options.sourcemap = { client: "hidden", server: true };
+  }, nuxt.options.sentry || {});
+  nuxt.options.sourcemap = {
+    client: "hidden",
+    server: true
+  };
 }
 function configureBootstrapVueNext(nuxt, components) {
   nuxt.options.bootstrapVueNext = defu(
@@ -128,7 +168,7 @@ function configureBootstrapVueNext(nuxt, components) {
     { plugin: { components } }
   );
 }
-function configureNotiVue(nuxt) {
+function configureNotivue(nuxt) {
   nuxt.options.css.push("notivue/notification.css");
   nuxt.options.css.push("notivue/animations.css");
   nuxt.options.css.push("notivue/notification-progress.css");
@@ -142,21 +182,30 @@ function configureNotiVue(nuxt) {
     position: "top-right"
   };
 }
-function configureAppHead(nuxt) {
-  nuxt.options.app?.head?.script?.push({
+function configureFontAwesome(nuxt) {
+  nuxt.options.app.head ||= {};
+  nuxt.options.app.head.script ||= [];
+  nuxt.options.app.head.script.push({
     crossorigin: "anonymous",
-    src: "https://kit.fontawesome.com/55a4b2f4e1.js"
+    src: FONT_AWESOME_KIT_URL
   });
 }
 function configureVite(nuxt) {
-  nuxt.options.vite = defu(
-    nuxt.options.vite || {},
-    {
-      plugins: [svgLoader()]
-    }
-  );
+  nuxt.options.vite = defu(nuxt.options.vite || {}, {
+    plugins: [svgLoader()]
+  });
 }
-function registerRuntimeFeatures(nuxt, options, resolver) {
+function configureNuxtOptions(nuxt, options) {
+  configureNotivue(nuxt);
+  configureRuntimeConfig(nuxt, options);
+  configurePlausible(nuxt, options);
+  if (hasSentryBuildConfig(options)) {
+    configureSentry(nuxt, options);
+  }
+  configureFontAwesome(nuxt);
+  configureVite(nuxt);
+}
+function registerRuntimeFeatures(options, resolver) {
   addPlugin({ src: resolver.resolve("./runtime/plugins/api.global") });
   addPlugin({ src: resolver.resolve("./runtime/plugins/auth0.client") });
   addPlugin({ src: resolver.resolve("./runtime/plugins/sentry.global") });
@@ -191,36 +240,33 @@ async function loadBootstrapConfig(nuxt) {
   const imported = await jiti.import(bootstrapConfigPath).catch(() => ({}));
   return imported.default || {};
 }
-const module = defineNuxtModule({
+async function configureExternalIntegrations(nuxt, logger) {
+  const bootstrapComponentsConfig = await loadBootstrapConfig(nuxt);
+  if (Object.keys(bootstrapComponentsConfig).length > 0) {
+    logger.success("Loading bootstrap.config.ts");
+  }
+  configureBootstrapVueNext(nuxt, bootstrapComponentsConfig);
+}
+const module$1 = defineNuxtModule({
   defaults: defaultOptions,
   meta: {
-    name: "@merkaly/nuxt",
+    name: MODULE_NAME,
     configKey: "merkaly",
-    compatibility: { nuxt: ">=3.14.0" }
+    compatibility: {
+      nuxt: ">=3.14.0"
+    }
   },
   moduleDependencies(nuxt) {
-    const options = defu(
-      nuxt.options.merkaly || {},
-      defaultOptions
-    );
+    const options = resolveModuleOptions(nuxt);
     return buildModuleDependencies(nuxt, options);
   },
   async setup(options, nuxt) {
-    const logger = useLogger("@merkaly/nuxt");
+    const logger = useLogger(MODULE_NAME);
     const resolver = createResolver(import.meta.url);
-    configureNotiVue(nuxt);
-    configureRuntimeConfig(nuxt, options);
-    configurePlausible(nuxt, options);
-    configureSentry(nuxt, options);
-    const bootstrapComponentsConfig = await loadBootstrapConfig(nuxt);
-    if (Object.keys(bootstrapComponentsConfig).length > 0) {
-      logger.success("Loading bootstrap.config.ts");
-    }
-    configureBootstrapVueNext(nuxt, bootstrapComponentsConfig);
-    configureAppHead(nuxt);
-    registerRuntimeFeatures(nuxt, options, resolver);
-    configureVite(nuxt);
+    configureNuxtOptions(nuxt, options);
+    await configureExternalIntegrations(nuxt, logger);
+    registerRuntimeFeatures(options, resolver);
   }
 });
 
-export { module as default };
+export { module$1 as default };

package/dist/runtime/adapters/create.auth.session.d.ts

@@ -5,5 +5,5 @@ interface AuthSessionData {
     role: string;
     userId: string;
 }
-export declare const createAuthSession: (args?: ((args: object) => import("#imports").AdapterArgs<AuthSessionData, Record<string, unknown>, object>) | undefined) => import("#imports").UseApiReturn<AuthSessionData, Record<string, unknown>, object>;
+export declare const createAuthSession: (args?: ((args: object) => import("../utils/withAdapter.js").AdapterArgs<AuthSessionData, Record<string, unknown>, object>) | undefined) => import("../composables/useApi.js").UseApiReturn<AuthSessionData, Record<string, unknown>, object>;
 export {};

package/dist/runtime/adapters/create.auth.session.js

@@ -1,14 +1,7 @@
-import { useAuth } from "#imports";
 import { withAdapter } from "../utils/withAdapter.js";
-export const createAuthSession = withAdapter(() => {
-  const { token } = useAuth();
-  return {
-    default: () => ({}),
-    global: true,
-    headers: {
-      authorization: token.value ? `Bearer ${token.value}` : ""
-    },
-    method: "POST",
-    uri: "/session"
-  };
-});
+export const createAuthSession = withAdapter(() => ({
+  default: () => ({}),
+  global: true,
+  method: "POST",
+  uri: "/session"
+}));

package/dist/runtime/composables/useAuth.d.ts

@@ -2,7 +2,6 @@ import type { User } from '@auth0/auth0-spa-js';
 export declare const useAuth: () => {
     isAuthenticated: import("vue").ComputedRef<boolean>;
     isLoading: import("vue").Ref<boolean, boolean>;
-    tenant: import("vue").ComputedRef<any>;
     token: import("vue").Ref<string | null, string | null>;
-    user: import("vue").Ref<User | null, User | null>;
+    user: import("vue").Ref<User | undefined, User | undefined>;
 };

package/dist/runtime/composables/useAuth.js

@@ -1,15 +1,13 @@
 import { computed } from "vue";
 import { useState } from "#imports";
 export const useAuth = () => {
-  const user = useState("auth:user", () => null);
+  const user = useState("auth:user", () => void 0);
   const token = useState("auth:token", () => null);
   const isLoading = useState("auth:loading", () => true);
-  const tenant = computed(() => user.value?.org_id);
   const isAuthenticated = computed(() => Boolean(user.value?.sub));
   return {
     isAuthenticated,
     isLoading,
-    tenant,
     token,
     user
   };

package/dist/runtime/composables/useTenant.d.ts

@@ -0,0 +1,5 @@
+export declare const useTenant: () => {
+    isReady: import("vue").ComputedRef<boolean>;
+    setTenant: (value: string) => string;
+    tenant: import("vue").Ref<string, string>;
+};

package/dist/runtime/composables/useTenant.js

@@ -0,0 +1,12 @@
+import { computed } from "vue";
+import { useState } from "#imports";
+export const useTenant = () => {
+  const tenant = useState("tenant:id", () => "");
+  const isReady = computed(() => Boolean(tenant.value));
+  const setTenant = (value) => tenant.value = value;
+  return {
+    isReady,
+    setTenant,
+    tenant
+  };
+};

package/dist/runtime/middleware/auth.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("#app").RouteMiddleware;
+declare const _default: import("nuxt/app").RouteMiddleware;
 export default _default;

package/dist/runtime/plugins/api.global.d.ts

@@ -46,5 +46,5 @@ export interface ParamsOptions {
 export type ApiOptions<TData = unknown, TMeta = Record<string, unknown>, TParams = object> = ParamsOptions & HooksOptions<TData, TMeta, TParams> & RefOptions & {
     params?: TParams;
 };
-declare const _default: import("#app").Plugin<Record<string, unknown>> & import("#app").ObjectPlugin<Record<string, unknown>>;
+declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/plugins/api.global.js

@@ -1,8 +1,12 @@
 import { defineNuxtPlugin } from "#app";
-import { useAuth } from "#imports";
+import { useAuth, useTenant } from "#imports";
 const GLOBAL_API_HEADER = "x-merkaly-global";
 export default defineNuxtPlugin(({ provide }) => provide("api", async (url, options = {}) => {
-  const { tenant, token } = useAuth();
+  const { token } = useAuth();
+  const { tenant } = useTenant();
+  if (!tenant.value && !options.global) {
+    throw new Error(`Missing tenant context for: ${url}`);
+  }
   await $fetch(url, {
     baseURL: "/api",
     body: options?.body,

package/dist/runtime/plugins/auth0.client.d.ts

@@ -1,6 +1,6 @@
-declare const _default: import("#app").Plugin<{
+declare const _default: import("nuxt/app").Plugin<{
     auth0: import("@auth0/auth0-spa-js").Auth0Client;
-}> & import("#app").ObjectPlugin<{
+}> & import("nuxt/app").ObjectPlugin<{
     auth0: import("@auth0/auth0-spa-js").Auth0Client;
 }>;
 export default _default;

package/dist/runtime/plugins/auth0.client.js

@@ -54,7 +54,10 @@ export default defineNuxtPlugin(async ({ callHook, hook }) => {
   };
   const isAuthCallback = window.location.pathname === callbackPath;
   if (!isAuthCallback) {
-    await Promise.allSettled([auth0.getUser(), auth0.getTokenSilently()]).then(() => hook("app:created", () => callHook("merkaly:auth", user.value))).catch(() => void 0);
+    await Promise.allSettled([auth0.getUser(), auth0.getTokenSilently()]).then(() => hook("app:created", async () => {
+      await callHook("merkaly:tenant", user.value);
+      await callHook("merkaly:auth", user.value);
+    })).catch(() => void 0);
   }
   isLoading.value = false;
   return { provide: { auth0 } };

package/dist/runtime/plugins/sentry.global.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("#app").Plugin<Record<string, unknown>> & import("#app").ObjectPlugin<Record<string, unknown>>;
+declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/plugins/sentry.global.js

@@ -1,11 +1,9 @@
 import { defineNuxtPlugin } from "#app";
 import { setUser } from "@sentry/nuxt";
 export default defineNuxtPlugin(async ({ hook }) => {
-  hook("merkaly:auth", (user) => {
-    return setUser(user ? {
-      id: user.sub,
-      email: user.email,
-      username: user.name
-    } : null);
-  });
+  hook("merkaly:auth", (user) => setUser(user ? {
+    id: user.sub,
+    email: user.email,
+    username: user.name
+  } : null));
 });

package/dist/runtime/types/nuxt.d.ts

@@ -1,21 +1,26 @@
+import type { HookResult } from '@nuxt/schema';
 import type { Auth0Client, User } from '@auth0/auth0-spa-js';
 import type { ApiOptions } from '../plugins/api.global';
 
 declare module '#app' {
   interface NuxtApp {
     $auth0: Auth0Client;
-    $api: (url: string, options?: ApiOptions) => Promise<void>;
+    $api: <T = unknown>(url: string, options?: ApiOptions) => Promise<T>;
     $gmap: never;
   }
 
   interface RuntimeNuxtHooks {
-    'merkaly:auth': (user: User | null) => void | Promise<void>;
+    'merkaly:auth': (user?: User) => HookResult;
+    'merkaly:tenant': (user?: User) => HookResult;
   }
 }
 
 declare module 'vue' {
   interface ComponentCustomProperties {
     $auth0: Auth0Client;
-    $api: (url: string, options?: ApiOptions) => Promise<void>;
+    $api: <T = unknown>(url: string, options?: ApiOptions) => Promise<T>;
+    $gmap: never;
   }
 }
+
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkaly/nuxt",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/merkaly-io/nuxt.git"
@@ -27,28 +27,18 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "nuxt-module-build build",
-    "build:stub": "nuxt-module-build build --stub",
-    "lint": "eslint .",
-    "prepack": "pnpm build",
-    "prepare": "nuxt-module-build prepare",
-    "test": "vitest run",
-    "test:types": "vue-tsc --noEmit",
-    "test:watch": "vitest watch"
-  },
   "dependencies": {
-    "@auth0/auth0-spa-js": "^2.20.0",
-    "@bootstrap-vue-next/nuxt": "^0.45.3",
-    "@nuxt/devtools": "^3.2.1",
+    "@auth0/auth0-spa-js": "^2.21.1",
+    "@bootstrap-vue-next/nuxt": "^0.45.5",
+    "@nuxt/devtools": "^3.2.4",
     "@nuxt/eslint": "1.15.1",
-    "@nuxt/eslint-config": "^1.15.1",
+    "@nuxt/eslint-config": "^1.15.2",
     "@nuxt/fonts": "0.14.0",
     "@nuxt/image": "^2.0.0",
-    "@nuxt/kit": "^4.4.2",
+    "@nuxt/kit": "^4.4.8",
     "@nuxtjs/i18n": "^10.4.0",
-    "@nuxtjs/plausible": "^3.0.1",
-    "@sentry/nuxt": "^10.54.0",
+    "@nuxtjs/plausible": "^3.0.2",
+    "@sentry/nuxt": "^10.57.0",
     "@types/node": "latest",
     "@types/vue-select": "^3.16.8",
     "@vueuse/components": "^14.3.0",
@@ -56,38 +46,45 @@
     "@vueuse/integrations": "^14.3.0",
     "@vueuse/nuxt": "^14.3.0",
     "bootstrap": "^5.3.8",
-    "bootstrap-vue-next": "^0.45.3",
-    "change-case": "^5",
+    "bootstrap-vue-next": "^0.45.5",
+    "change-case": "^5.4.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.15.1",
-    "eslint": "^9.39.1",
-    "filesize": "^11.0.2",
+    "eslint": "^9.39.4",
+    "filesize": "^11.0.17",
     "gsap": "^3.15.0",
     "notivue": "^2.4.5",
-    "nuxt": "^4.4.6",
+    "nuxt": "^4.4.8",
     "reflect-metadata": "^0.2.2",
     "sass": "^1.100.0",
     "typescript": "~5.9.3",
-    "v-money3": "^3.26.0",
-    "vite-svg-loader": "^5.1.0",
-    "vue": "^3.5.22",
-    "vue-router": "^5.0.0",
+    "v-money3": "^3.26.1",
+    "vite-svg-loader": "^5.1.1",
+    "vue": "^3.5.35",
+    "vue-router": "^5.1.0",
     "vue-select": "4.0.0-beta.6"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^1.0.2",
-    "@nuxt/schema": "^4.4.2",
-    "@nuxt/test-utils": "^4.0.0",
+    "@nuxt/schema": "^4.4.8",
+    "@nuxt/test-utils": "^4.0.3",
     "changelogen": "^0.6.2",
-    "eslint-plugin-storybook": "^10.1.11",
-    "vitest": "^4.1.0",
-    "vue-tsc": "^3.3.1"
+    "eslint-plugin-storybook": "^10.4.3",
+    "vitest": "^4.1.8",
+    "vue-tsc": "^3.3.4"
   },
   "optionalDependencies": {
-    "defu": "^6.1.5"
+    "defu": "^6.1.7"
   },
-  "packageManager": "pnpm@10.28.2",
   "engines": {
     "node": ">=24"
+  },
+  "scripts": {
+    "build": "nuxt-module-build build",
+    "build:stub": "nuxt-module-build build --stub",
+    "lint": "eslint .",
+    "test": "vitest run",
+    "test:types": "vue-tsc --noEmit",
+    "test:watch": "vitest watch"
   }
-}
+}