@bitrix24/b24ui-nuxt 2.1.17 → 2.3.0

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.BeTQIwtu.mjs';
+import { g as getTemplates, d as defaultOptions, a as getDefaultConfig } from './shared/b24ui-nuxt.DEyBXBFe.mjs';
 import fs from 'node:fs';
 import path from 'node:path';
 import MagicString from 'magic-string';
@@ -63,6 +63,7 @@ function TemplatePlugin(options, appConfig) {
 
 function PluginsPlugin(options) {
   const plugins = globSync(["**/*", "!*.d.ts"], { cwd: join(runtimeDir, "plugins"), absolute: true });
+  plugins.unshift(resolvePathSync("../runtime/vue/plugins/router", { extensions: [".ts", ".mjs", ".js"], url: import.meta.url }));
   plugins.unshift(resolvePathSync("../runtime/vue/plugins/head", { extensions: [".ts", ".mjs", ".js"], url: import.meta.url }));
   if (options.colorMode) {
     plugins.push(resolvePathSync("../runtime/vue/plugins/color-mode", { extensions: [".ts", ".mjs", ".js"], url: import.meta.url }));
@@ -91,9 +92,10 @@ function PluginsPlugin(options) {
     load() {
       return `
         ${plugins.map((p) => `import ${genSafeVariableName(p)} from "${p}"`).join("\n")}
+
 export default {
-  install (app) {
-${plugins.map((p) => `    app.use(${genSafeVariableName(p)})`).join("\n")}
+  install (app, pluginOptions = {}) {
+${plugins.map((p) => `    app.use(${genSafeVariableName(p)}, pluginOptions)`).join("\n")}
   }
 }
         `;
@@ -144,69 +146,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 +250,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 +264,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.d.mts

@@ -1,6 +1,5 @@
-import * as vite from 'vite';
+import * as unplugin from 'unplugin';
 import { Bitrix24UIOptions } from './unplugin.mjs';
-import 'unplugin';
 import 'unplugin-auto-import/types';
 import 'unplugin-vue-components/types';
 import '#build/b24ui';
@@ -9,6 +8,6 @@ import '@nuxt/schema';
 import '../dist/runtime/types/index.js';
 import '../dist/runtime/types/tv.js';
 
-declare const _default: (options?: Bitrix24UIOptions | undefined) => vite.Plugin<any> | vite.Plugin<any>[];
+declare const _default: (options?: Bitrix24UIOptions | undefined) => unplugin.VitePlugin<any> | unplugin.VitePlugin<any>[];
 
 export { Bitrix24UIOptions, _default as default };

package/dist/vite.mjs

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

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "@bitrix24/b24ui-nuxt",
   "description": "Bitrix24 UI-Kit for developing web applications REST API for NUXT & VUE",
-  "version": "2.1.17",
+  "version": "2.3.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bitrix24/b24ui.git"
   },
   "homepage": "https://bitrix24.github.io/b24ui/",
   "type": "module",
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
   "license": "MIT",
   "exports": {
     ".": {
@@ -19,10 +22,6 @@
       "types": "./dist/unplugin.d.mts",
       "import": "./dist/unplugin.mjs"
     },
-    "./meta": {
-      "types": "./dist/meta.d.mts",
-      "import": "./dist/meta.mjs"
-    },
     "./vite": {
       "types": "./dist/vite.d.mts",
       "import": "./dist/vite.mjs"
@@ -108,32 +107,39 @@
     "vue-plugin.d.ts"
   ],
   "dependencies": {
+    "@floating-ui/dom": "^1.7.5",
     "@bitrix24/b24icons-nuxt": "^2.0.7",
-    "@internationalized/date": "^3.10.0",
+    "@bitrix24/b24icons-vue": "^2.0.7",
+    "@internationalized/date": "^3.11.0",
     "@internationalized/number": "^3.6.5",
-    "@nuxt/kit": "^4.2.2",
-    "@nuxt/schema": "^4.2.2",
-    "@standard-schema/spec": "^1.0.0",
+    "@nuxt/kit": "^4.3.0",
+    "@nuxt/schema": "^4.3.0",
+    "@standard-schema/spec": "^1.1.0",
     "@tailwindcss/postcss": "^4.1.18",
     "@tailwindcss/vite": "^4.1.18",
     "@tanstack/vue-table": "^8.21.3",
-    "@tanstack/vue-virtual": "^3.13.13",
-    "@tiptap/core": "3.13.0",
-    "@tiptap/extension-bubble-menu": "3.13.0",
-    "@tiptap/extension-drag-handle-vue-3": "3.13.0",
-    "@tiptap/extension-floating-menu": "3.13.0",
-    "@tiptap/extension-horizontal-rule": "3.13.0",
-    "@tiptap/extension-image": "3.13.0",
-    "@tiptap/extension-mention": "3.13.0",
-    "@tiptap/extension-placeholder": "3.13.0",
-    "@tiptap/markdown": "3.13.0",
-    "@tiptap/pm": "3.13.0",
-    "@tiptap/starter-kit": "3.13.0",
-    "@tiptap/suggestion": "3.13.0",
-    "@tiptap/vue-3": "3.13.0",
-    "@unhead/vue": "^2.0.19",
-    "@vueuse/core": "^14.1.0",
-    "@vueuse/integrations": "^14.1.0",
+    "@tanstack/vue-virtual": "^3.13.18",
+    "@tiptap/core": "^3.19.0",
+    "@tiptap/extension-bubble-menu": "^3.19.0",
+    "@tiptap/extension-code": "^3.19.0",
+    "@tiptap/extension-collaboration": "^3.19.0",
+    "@tiptap/extension-drag-handle": "^3.19.0",
+    "@tiptap/extension-drag-handle-vue-3": "^3.19.0",
+    "@tiptap/extension-floating-menu": "^3.19.0",
+    "@tiptap/extension-horizontal-rule": "^3.19.0",
+    "@tiptap/extension-image": "^3.19.0",
+    "@tiptap/extension-mention": "^3.19.0",
+    "@tiptap/extension-node-range": "^3.19.0",
+    "@tiptap/extension-placeholder": "^3.19.0",
+    "@tiptap/markdown": "^3.19.0",
+    "@tiptap/pm": "^3.19.0",
+    "@tiptap/starter-kit": "^3.19.0",
+    "@tiptap/suggestion": "^3.19.0",
+    "@tiptap/vue-3": "^3.19.0",
+    "@unhead/vue": "^2.1.4",
+    "@vueuse/core": "^14.2.0",
+    "@vueuse/integrations": "^14.2.0",
+    "@vueuse/shared": "^14.2.0",
     "canvas-confetti": "^1.9.3",
     "colortranslator": "^5.0.0",
     "consola": "^3.4.2",
@@ -150,46 +156,52 @@
     "knitwork": "^1.3.0",
     "magic-string": "^0.30.21",
     "mlly": "^1.8.0",
-    "motion-v": "^1.7.3",
+    "motion-v": "^1.10.2",
     "ohash": "^2.0.11",
     "pathe": "^2.0.3",
-    "reka-ui": "2.6.1",
+    "reka-ui": "2.8.0",
     "scule": "^1.3.0",
     "tailwind-merge": "^3.4.0",
     "tailwind-variants": "^3.2.2",
     "tailwindcss": "^4.1.18",
     "tinyglobby": "^0.2.15",
+    "ufo": "^1.6.3",
     "unplugin": "^2.3.11",
-    "unplugin-auto-import": "^20.3.0",
-    "unplugin-vue-components": "^30.0.0",
+    "unplugin-auto-import": "^21.0.0",
+    "unplugin-vue-components": "^31.0.0",
     "vaul-vue": "0.4.1",
-    "vue-component-type-helpers": "^3.1.5"
+    "vue-component-type-helpers": "^3.2.4"
   },
   "devDependencies": {
-    "@nuxt/eslint-config": "^1.12.1",
+    "@nuxt/eslint-config": "^1.14.0",
     "@nuxt/module-builder": "^1.0.2",
-    "@nuxt/test-utils": "^3.21.0",
+    "@nuxt/test-utils": "^3.23.0",
+    "@tanstack/table-core": "^8.21.3",
+    "@vitejs/plugin-vue": "^6.0.2",
+    "@vue/test-utils": "^2.4.6",
     "@types/canvas-confetti": "^1.9.0",
     "@types/node": "^24.7.0",
     "esno": "^4.8.0",
     "nuxt-component-meta": "^0.14.2",
     "sharp": "^0.34.3",
-    "@vue/test-utils": "^2.4.6",
-    "ai": "^5.0.113",
+    "ai": "^6.0.77",
     "embla-carousel": "^8.6.0",
-    "eslint": "^9.39.2",
-    "happy-dom": "^20.0.11",
-    "nuxt": "^4.2.2",
+    "eslint": "^10.0.0",
+    "happy-dom": "^20.5.3",
+    "nuxt": "^4.3.0",
+    "unbuild": "^3.6.1",
     "vitest": "^3.2.4",
     "vitest-axe": "^0.1.0",
     "vitest-environment-nuxt": "^1.0.1",
-    "vue-tsc": "^3.1.5"
+    "vue": "^3.5.25",
+    "vue-tsc": "^3.2.4"
   },
   "peerDependencies": {
     "@inertiajs/vue3": "^2.0.7",
-    "@nuxt/content": "^3.8.0",
+    "@nuxt/content": "^3.0.0",
     "joi": "^18.0.0",
     "superstruct": "^2.0.0",
+    "tailwindcss": "^4.0.0",
     "typescript": "^5.6.3",
     "valibot": "^1.0.0",
     "vue-router": "^4.5.0",
@@ -223,8 +235,9 @@
     }
   },
   "resolutions": {
-    "@nuxt/kit": "^4.2.2",
+    "@nuxt/kit": "^4.3.0",
     "@bitrix24/b24ui-nuxt": "workspace:*",
+    "nitropack": "^2.13.0",
     "typescript": "5.8.3",
     "unplugin": "^2.3.11",
     "c12": "^3.3.2"
@@ -247,7 +260,6 @@
     "ui-framework"
   ],
   "scripts": {
-    "dev:prepare-short": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxt prepare playgrounds/nuxt && nuxt prepare docs && pnpm dev:vue:build && nuxt prepare playgrounds/demo",
     "dev:generate": "nuxt generate playgrounds/nuxt",
     "dev:preview": "nuxt preview playgrounds/nuxt",
     "build": "nuxt-module-build build",
@@ -255,7 +267,7 @@
     "dev:build": "nuxt build playgrounds/nuxt",
     "dev:vue": "pnpm --filter ./playgrounds/vue dev -- --uiDev",
     "dev:vue:build": "pnpm --filter ./playgrounds/vue build",
-    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxt prepare playgrounds/nuxt && nuxt prepare docs && pnpm dev:vue:build && nuxt prepare playgrounds/demo && nuxt-component-meta playgrounds/nuxt --outputDir ../../src/.component-meta/",
+    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxt prepare playgrounds/nuxt && nuxt prepare docs && pnpm dev:vue:build && nuxt prepare playgrounds/demo",
     "demo:dev": "nuxt dev playgrounds/demo",
     "demo:generate": "nuxt generate playgrounds/demo",
     "demo:preview": "nuxt preview playgrounds/demo",