@bitrix24/b24ui-nuxt 2.1.16 → 2.2.1

package/dist/unplugin.mjs

@@ -3,7 +3,7 @@ import { join, normalize } from 'pathe';
 import { createUnplugin } from 'unplugin';
 import { defu } from 'defu';
 import tailwind from '@tailwindcss/vite';
-import { g as getTemplates, d as defaultOptions, a as getDefaultConfig } from './shared/b24ui-nuxt.DdKajqQs.mjs';
+import { g as getTemplates, d as defaultOptions, a as getDefaultConfig } from './shared/b24ui-nuxt.C-CS9MBp.mjs';
 import fs from 'node:fs';
 import path from 'node:path';
 import MagicString from 'magic-string';
@@ -144,69 +144,90 @@ function AppConfigPlugin(_options, appConfig) {
   };
 }
 
-function ComponentImportPlugin(options, meta) {
-  const components = globSync("**/*.vue", {
-    cwd: join(runtimeDir, "components"),
-    ignore: [
-      !options.colorMode && "color-mode/**/*.vue",
-      "content/*.vue",
-      "prose/**/*.vue"
-    ].filter(Boolean)
-  });
-  const componentNames = new Set(components.map((c) => `B24${c.split("/").pop()?.replace(/\.vue$/, "")}`));
-  const componentPaths = new Map(components.map((c) => {
-    const name = c.replace(/\.vue$/, "");
-    const componentName = `B24${name.split("/").pop()}`;
-    return [componentName, c];
-  }));
-  const componentsProse = globSync("**/*.vue", {
-    cwd: join(runtimeDir, "components/prose")
-  });
-  const componentProseNames = new Set(componentsProse.map((c) => `Prose${c.replace(/\.vue$/, "")}`));
-  const componentProsePaths = new Map(componentsProse.map((c) => {
-    const name = c.replace(/\.vue$/, "");
-    const componentName = `Prose${name.split("/").pop()}`;
-    return [componentName, c];
-  }));
-  const overrides = globSync("**/*.vue", {
-    cwd: join(runtimeDir, "vue/components"),
-    ignore: [
-      !options.colorMode && "color-mode/**/*.vue"
-    ].filter(Boolean)
-  });
-  const overrideNames = new Set(overrides.map((c) => `B24${c.split("/").pop()?.replace(/\.vue$/, "")}`));
-  const overridePaths = new Map(overrides.map((c) => {
-    const name = c.replace(/\.vue$/, "");
-    const componentName = `B24${name.split("/").pop()}`;
+function resolveRouterMode(options) {
+  if (options.router === false) {
+    return "none";
+  }
+  if (options.router === "inertia") {
+    return "inertia";
+  }
+  if (options.router === void 0 && options.inertia === true) {
+    return "inertia";
+  }
+  return "vue-router";
+}
+
+function createComponentSource(cwd, prefix, ignore = []) {
+  const files = globSync("**/*.vue", { cwd, ignore: ignore.filter(Boolean) });
+  const names = new Set(files.map((c) => `${prefix}${c.split("/").pop()?.replace(/\.vue$/, "")}`));
+  const paths = new Map(files.map((c) => {
+    const componentName = `${prefix}${c.split("/").pop()?.replace(/\.vue$/, "")}`;
     return [componentName, c];
   }));
-  const inertiaOverrides = globSync("**/*.vue", {
-    cwd: join(runtimeDir, "inertia/components")
-  });
-  const inertiaOverrideNames = new Set(inertiaOverrides.map((c) => `B24${c.replace(/\.vue$/, "")}`));
+  return {
+    has: (name) => names.has(name),
+    resolve: (componentName) => {
+      const relativePath = paths.get(componentName);
+      if (!relativePath) return;
+      return { name: "default", from: join(cwd, relativePath) };
+    },
+    resolveFile: (filename) => {
+      const componentName = `${prefix}${filename}`;
+      const relativePath = paths.get(componentName);
+      if (!relativePath) return;
+      return join(cwd, relativePath);
+    }
+  };
+}
+function ComponentImportPlugin(options, meta) {
+  const colorModeIgnore = !options.colorMode ? ["color-mode/**/*.vue"] : [];
+  const routerMode = resolveRouterMode(options);
+  const routerOverrides = {
+    "vue-router": createComponentSource(join(runtimeDir, "vue/overrides/vue-router"), "B24"),
+    "inertia": createComponentSource(join(runtimeDir, "vue/overrides/inertia"), "B24"),
+    "none": createComponentSource(join(runtimeDir, "vue/overrides/none"), "B24")
+  };
+  const unpluginComponents = createComponentSource(
+    join(runtimeDir, "vue/components"),
+    "B24",
+    colorModeIgnore
+  );
+  const defaultComponents = createComponentSource(
+    join(runtimeDir, "components"),
+    "B24",
+    [...colorModeIgnore, "content/*.vue", "prose/**/*.vue"]
+  );
+  const defaultProseComponents = createComponentSource(
+    join(runtimeDir, "components/prose"),
+    "Prose",
+    []
+  );
+  const sources = [
+    routerOverrides[routerMode],
+    unpluginComponents,
+    defaultComponents,
+    defaultProseComponents
+  ].filter((s) => !!s);
+  const packagesToScan = [
+    "@bitrix24/b24ui-nuxt",
+    "@compodium/examples",
+    ...Array.isArray(options.scanPackages) ? options.scanPackages : []
+  ];
+  const escapeRegex = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const packagesRegex = packagesToScan.map(escapeRegex).join("|");
+  const excludeRegex = new RegExp(`[\\\\/]node_modules[\\\\/](?!\\.pnpm|${packagesRegex})`);
   const pluginOptions = defu(options.components, {
     dts: options.dts ?? true,
     exclude: [
-      /[\\/]node_modules[\\/](?!\.pnpm|@bitrix24\/b24ui-nuxt|@compodium\/examples)/,
+      excludeRegex,
       /[\\/]\.git[\\/]/,
       /[\\/]\.nuxt[\\/]/
     ],
     resolvers: [
       (componentName) => {
-        if (options.inertia && inertiaOverrideNames.has(componentName)) {
-          return { name: "default", from: join(runtimeDir, "inertia/components", `${componentName.slice("B24".length)}.vue`) };
-        }
-        if (overrideNames.has(componentName)) {
-          const relativePath = overridePaths.get(componentName);
-          return { name: "default", from: join(runtimeDir, "vue/components", relativePath) };
-        }
-        if (componentNames.has(componentName)) {
-          const relativePath = componentPaths.get(componentName);
-          return { name: "default", from: join(runtimeDir, "components", relativePath) };
-        }
-        if (componentProseNames.has(componentName)) {
-          const relativePath = componentProsePaths.get(componentName);
-          return { name: "default", from: join(runtimeDir, "components/prose", relativePath) };
+        for (const source of sources) {
+          const resolved = source.resolve(componentName);
+          if (resolved) return resolved;
         }
       }
     ]
@@ -227,12 +248,11 @@ function ComponentImportPlugin(options, meta) {
           return;
         }
         const filename = id.match(/([^/]+)\.vue$/)?.[1];
-        if (filename && options.inertia && inertiaOverrideNames.has(`B24${filename}`)) {
-          return join(runtimeDir, "inertia/components", `${filename}.vue`);
-        }
-        if (filename && overrideNames.has(`B24${filename}`)) {
-          const relativePath = overridePaths.get(`B24${filename}`);
-          return join(runtimeDir, "vue/components", relativePath);
+        if (filename) {
+          for (const source of sources) {
+            const resolved = source.resolveFile(filename);
+            if (resolved) return resolved;
+          }
         }
       }
     },
@@ -242,7 +262,9 @@ function ComponentImportPlugin(options, meta) {
 const RELATIVE_IMPORT_RE = /^\.{1,2}\//;
 
 function Bitrix24EnvironmentPlugin(options) {
-  const stubPath = resolvePathSync(options.inertia ? "../runtime/inertia/stubs" : "../runtime/vue/stubs", { extensions: [".ts", ".mjs", ".js"], url: import.meta.url });
+  const routerMode = resolveRouterMode(options);
+  const stubsPath = `../runtime/vue/stubs/${routerMode}`;
+  const stubPath = resolvePathSync(stubsPath, { extensions: [".ts", ".mjs", ".js"], url: import.meta.url });
   return {
     name: "bitrix24:b24ui",
     enforce: "pre",

package/dist/vite.mjs

@@ -4,7 +4,7 @@ import 'pathe';
 import 'unplugin';
 import 'defu';
 import '@tailwindcss/vite';
-import './shared/b24ui-nuxt.DdKajqQs.mjs';
+import './shared/b24ui-nuxt.C-CS9MBp.mjs';
 import 'scule';
 import 'knitwork';
 import '@nuxt/kit';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bitrix24/b24ui-nuxt",
   "description": "Bitrix24 UI-Kit for developing web applications REST API for NUXT & VUE",
-  "version": "2.1.16",
+  "version": "2.2.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bitrix24/b24ui.git"
@@ -109,11 +109,11 @@
   ],
   "dependencies": {
     "@bitrix24/b24icons-nuxt": "^2.0.7",
-    "@internationalized/date": "^3.10.0",
+    "@internationalized/date": "^3.10.1",
     "@internationalized/number": "^3.6.5",
     "@nuxt/kit": "^4.2.2",
     "@nuxt/schema": "^4.2.2",
-    "@standard-schema/spec": "^1.0.0",
+    "@standard-schema/spec": "^1.1.0",
     "@tailwindcss/postcss": "^4.1.18",
     "@tailwindcss/vite": "^4.1.18",
     "@tanstack/vue-table": "^8.21.3",
@@ -175,7 +175,7 @@
     "nuxt-component-meta": "^0.14.2",
     "sharp": "^0.34.3",
     "@vue/test-utils": "^2.4.6",
-    "ai": "^5.0.113",
+    "ai": "^5.0.114",
     "embla-carousel": "^8.6.0",
     "eslint": "^9.39.2",
     "happy-dom": "^20.0.11",

package/dist/runtime/inertia/stubs.d.ts

@@ -1,46 +0,0 @@
-import type { Ref } from 'vue';
-import type { NuxtApp } from '#app';
-export { useHead } from '@unhead/vue';
-export { useAppConfig } from '../vue/composables/useAppConfig';
-export { defineShortcuts } from '../composables/defineShortcuts';
-export { defineLocale } from '../composables/defineLocale';
-export { useLocale } from '../composables/useLocale';
-export { useConfetti } from '../composables/useConfetti';
-export { useOverlay } from '../composables/useOverlay';
-export declare const useRoute: () => {
-    fullPath: string;
-};
-export declare const useRouter: () => void;
-export declare const clearError: () => void;
-export declare const useColorMode: () => {
-    forced: boolean;
-    preference?: undefined;
-    readonly value?: undefined;
-} | {
-    preference: import("@vueuse/core").BasicColorMode | "system";
-    readonly value: import("@vueuse/core").BasicColorMode;
-    forced: boolean;
-};
-export declare const useCookie: <T = string>(_name: string, _options?: Record<string, any>) => {
-    value: T;
-    get: () => T;
-    set: () => void;
-    update: () => void;
-    refresh: () => Promise<Awaited<T>>;
-    remove: () => void;
-};
-export declare const useState: <T>(key: string, init: () => T) => Ref<T>;
-export declare function useNuxtApp(): {
-    isHydrating: boolean;
-    payload: {
-        serverRendered: boolean;
-    };
-    hooks: import("hookable").Hookable<Record<string, any>, string>;
-    hook: <NameT extends string>(name: NameT, function_: any, options?: {
-        allowDeprecated?: boolean;
-    }) => () => void;
-};
-export declare function useRuntimeHook(name: string, fn: (...args: any[]) => void): void;
-export declare function defineNuxtPlugin(plugin: (nuxtApp: NuxtApp) => void): {
-    install(app: import("vue").App<any>): void;
-};

package/dist/runtime/inertia/stubs.js

@@ -1,93 +0,0 @@
-import { ref, onScopeDispose } from "vue";
-import { createHooks } from "hookable";
-import { usePage } from "@inertiajs/vue3";
-import { useColorMode as useColorModeVueUse } from "@vueuse/core";
-import appConfig from "#build/app.config";
-export { useHead } from "@unhead/vue";
-export { useAppConfig } from "../vue/composables/useAppConfig.js";
-export { defineShortcuts } from "../composables/defineShortcuts.js";
-export { defineLocale } from "../composables/defineLocale.js";
-export { useLocale } from "../composables/useLocale.js";
-export { useConfetti } from "../composables/useConfetti.js";
-export { useOverlay } from "../composables/useOverlay.js";
-export const useRoute = () => {
-  const page = usePage();
-  return {
-    fullPath: page.url
-  };
-};
-export const useRouter = () => {
-};
-export const clearError = () => {
-};
-export const useColorMode = () => {
-  if (!appConfig.colorMode) {
-    return {
-      forced: true
-    };
-  }
-  const { store, system } = useColorModeVueUse({
-    attribute: "class",
-    modes: {
-      auto: "auto",
-      light: appConfig?.colorModeTypeLight || "light",
-      dark: "dark"
-    }
-  });
-  return {
-    get preference() {
-      return store.value === "auto" ? "system" : store.value;
-    },
-    set preference(value) {
-      store.value = value === "system" ? "auto" : value;
-    },
-    get value() {
-      return store.value === "auto" ? system.value : store.value;
-    },
-    forced: false
-  };
-};
-export const useCookie = (_name, _options = {}) => {
-  const value = ref(_options?.default?.() ?? null);
-  return {
-    value: value.value,
-    get: () => value.value,
-    set: () => {
-    },
-    update: () => {
-    },
-    refresh: () => Promise.resolve(value.value),
-    remove: () => {
-    }
-  };
-};
-const state = {};
-export const useState = (key, init) => {
-  if (state[key]) {
-    return state[key];
-  }
-  const value = ref(init());
-  state[key] = value;
-  return value;
-};
-const hooks = createHooks();
-export function useNuxtApp() {
-  return {
-    isHydrating: true,
-    payload: { serverRendered: typeof window === "undefined" },
-    hooks,
-    hook: hooks.hook
-  };
-}
-export function useRuntimeHook(name, fn) {
-  const nuxtApp = useNuxtApp();
-  const unregister = nuxtApp.hook(name, fn);
-  onScopeDispose(unregister);
-}
-export function defineNuxtPlugin(plugin) {
-  return {
-    install(app) {
-      app.runWithContext(() => plugin({ vueApp: app }));
-    }
-  };
-}