@bitrix24/b24ui-nuxt 0.1.3 → 0.1.5

package/dist/unplugin.mjs

@@ -1,15 +1,15 @@
 import { fileURLToPath } from 'node:url';
 import { join, normalize } from 'pathe';
 import { createUnplugin } from 'unplugin';
-import AutoImport from 'unplugin-auto-import';
 import { defu } from 'defu';
 import tailwind from '@tailwindcss/vite';
-import { g as getTemplates, d as defaultOptions, a as getDefaultUiConfig } from './shared/b24ui-nuxt.ju-AYOH7.mjs';
+import { g as getTemplates, d as defaultOptions, a as getDefaultUiConfig } from './shared/b24ui-nuxt.CGBDJv97.mjs';
 import { globSync } from 'tinyglobby';
 import { genSafeVariableName } from 'knitwork';
 import MagicString from 'magic-string';
 import { resolvePathSync } from 'mlly';
 import AutoImportComponents from 'unplugin-vue-components';
+import AutoImport from 'unplugin-auto-import';
 import 'scule';
 import '@nuxt/kit';
 
@@ -90,7 +90,7 @@ function AppConfigPlugin(options, appConfig) {
   };
 }
 
-function ComponentImportPlugin(framework, options) {
+function ComponentImportPlugin(options, meta) {
   const components = globSync("**/*.vue", { cwd: join(runtimeDir, "components") });
   const componentNames = new Set(components.map((c) => `B24${c.replace(/\.vue$/, "")}`));
   const componentsContent = globSync("**/*.vue", { cwd: join(runtimeDir, "components/content") });
@@ -99,10 +99,26 @@ function ComponentImportPlugin(framework, options) {
   const componentProseNames = new Set(componentsProse.map((c) => `B24${c.replace(/\.vue$/, "")}`));
   const overrides = globSync("**/*.vue", { cwd: join(runtimeDir, "vue/components") });
   const overrideNames = new Set(overrides.map((c) => `B24${c.replace(/\.vue$/, "")}`));
+  const pluginOptions = defu(options.components, {
+    dts: options.dts ?? true,
+    exclude: [/[\\/]node_modules[\\/](?!\.pnpm|@nuxt\/ui)/, /[\\/]\.git[\\/]/, /[\\/]\.nuxt[\\/]/],
+    resolvers: [
+      (componentName) => {
+        if (overrideNames.has(componentName))
+          return { name: "default", from: join(runtimeDir, "vue/components", `${componentName.slice("B24".length)}.vue`) };
+        if (componentProseNames.has(componentName))
+          return { name: "default", from: join(runtimeDir, "components/prose", `${componentName.slice("B24".length)}.vue`) };
+        if (componentContentNames.has(componentName))
+          return { name: "default", from: join(runtimeDir, "components/content", `${componentName.slice("B24".length)}.vue`) };
+        if (componentNames.has(componentName))
+          return { name: "default", from: join(runtimeDir, "components", `${componentName.slice("B24".length)}.vue`) };
+      }
+    ]
+  });
   return [
     /**
      * This plugin aims to ensure we override certain components with Vue-compatible versions:
-     * <B24Icon> and <B24Link> currently.
+     * <B24Link> currently.
      */
     {
       name: "bitrix24:b24ui:components",
@@ -120,38 +136,7 @@ function ComponentImportPlugin(framework, options) {
         }
       }
     },
-    AutoImportComponents[framework]({
-      dts: options.dts ?? true,
-      exclude: [/[\\/]node_modules[\\/](?!\.pnpm|@bitrix24\/b24ui)/, /[\\/]\.git[\\/]/, /[\\/]\.nuxt[\\/]/],
-      resolvers: [
-        (componentName) => {
-          if (overrideNames.has(componentName)) {
-            return {
-              name: "default",
-              from: join(runtimeDir, "vue/components", `${componentName.slice("B24".length)}.vue`)
-            };
-          }
-          if (componentContentNames.has(componentName)) {
-            return {
-              name: "default",
-              from: join(runtimeDir, "components/content", `${componentName.slice("B24".length)}.vue`)
-            };
-          }
-          if (componentProseNames.has(componentName)) {
-            return {
-              name: "default",
-              from: join(runtimeDir, "components/prose", `${componentName.slice("B24".length)}.vue`)
-            };
-          }
-          if (componentNames.has(componentName)) {
-            return {
-              name: "default",
-              from: join(runtimeDir, "components", `${componentName.slice("B24".length)}.vue`)
-            };
-          }
-        }
-      ]
-    })
+    AutoImportComponents.raw(pluginOptions, meta)
   ];
 }
 const RELATIVE_IMPORT_RE = /^\.{1,2}\//;
@@ -184,19 +169,41 @@ function Bitrix24EnvironmentPlugin() {
   };
 }
 
+function AutoImportPlugin(options, meta) {
+  const pluginOptions = defu(options.autoImport, {
+    dts: options.dts ?? true,
+    dirs: [join(runtimeDir, "composables")]
+  });
+  return AutoImport.raw(pluginOptions, meta);
+}
+
 const runtimeDir = normalize(fileURLToPath(new URL("./runtime", import.meta.url)));
 const Bitrix24UIPlugin = createUnplugin((_options = {}, meta) => {
   const options = defu(_options, { fonts: false, devtools: { enabled: false } }, defaultOptions);
   const appConfig = defu({ b24ui: options.b24ui }, { b24ui: getDefaultUiConfig() });
   return [
     Bitrix24EnvironmentPlugin(),
-    ...ComponentImportPlugin(meta.framework, options),
-    AutoImport[meta.framework]({ dts: options.dts ?? true, dirs: [join(runtimeDir, "composables")] }),
+    ComponentImportPlugin(options, meta),
+    AutoImportPlugin(options, meta),
     tailwind(),
     PluginsPlugin(options),
     TemplatePlugin(options),
-    AppConfigPlugin(options, appConfig)
-  ];
+    AppConfigPlugin(options, appConfig),
+    {
+      name: "bitrix24:b24ui:plugins-duplication-detection",
+      vite: {
+        configResolved(config) {
+          const plugins = config.plugins || [];
+          if (plugins.filter((i) => i.name === "unplugin-auto-import").length > 1) {
+            throw new Error("[Bitrix24 UI] Multiple instances of `unplugin-auto-import` detected. Nuxt UI includes `unplugin-auto-import` already, and you can configure it using `autoImport` option in Bitrix24 UI module options.");
+          }
+          if (plugins.filter((i) => i.name === "unplugin-vue-components").length > 1) {
+            throw new Error("[Bitrix24 UI] Multiple instances of `unplugin-vue-components` detected. Nuxt UI includes `unplugin-vue-components` already, and you can configure it using `components` option in Bitrix24 UI module options.");
+          }
+        }
+      }
+    }
+  ].flat(1);
 });
 
 export { Bitrix24UIPlugin, runtimeDir };

package/dist/vite.cjs

@@ -4,10 +4,9 @@ const unplugin = require('./unplugin.cjs');
 require('node:url');
 require('pathe');
 require('unplugin');
-require('unplugin-auto-import');
 require('defu');
 require('@tailwindcss/vite');
-require('./shared/b24ui-nuxt.DKayP3fG.cjs');
+require('./shared/b24ui-nuxt.D8eTlsIC.cjs');
 require('scule');
 require('@nuxt/kit');
 require('tinyglobby');
@@ -15,6 +14,7 @@ require('knitwork');
 require('magic-string');
 require('mlly');
 require('unplugin-vue-components');
+require('unplugin-auto-import');
 
 const vite = unplugin.Bitrix24UIPlugin.vite;
 

package/dist/vite.d.cts

@@ -1,6 +1,8 @@
 import * as vite from 'vite';
 import { Bitrix24UIOptions } from './unplugin.cjs';
 import 'unplugin';
+import 'unplugin-auto-import/types';
+import 'unplugin-vue-components/types';
 import '#build/b24ui';
 import './module.cjs';
 import '@nuxt/schema';

package/dist/vite.d.mts

@@ -1,6 +1,8 @@
 import * as vite from 'vite';
 import { Bitrix24UIOptions } from './unplugin.mjs';
 import 'unplugin';
+import 'unplugin-auto-import/types';
+import 'unplugin-vue-components/types';
 import '#build/b24ui';
 import './module.mjs';
 import '@nuxt/schema';

package/dist/vite.d.ts

@@ -1,6 +1,8 @@
 import * as vite from 'vite';
 import { Bitrix24UIOptions } from './unplugin.js';
 import 'unplugin';
+import 'unplugin-auto-import/types';
+import 'unplugin-vue-components/types';
 import '#build/b24ui';
 import './module.js';
 import '@nuxt/schema';

package/dist/vite.mjs

@@ -2,10 +2,9 @@ import { Bitrix24UIPlugin } from './unplugin.mjs';
 import 'node:url';
 import 'pathe';
 import 'unplugin';
-import 'unplugin-auto-import';
 import 'defu';
 import '@tailwindcss/vite';
-import './shared/b24ui-nuxt.ju-AYOH7.mjs';
+import './shared/b24ui-nuxt.CGBDJv97.mjs';
 import 'scule';
 import '@nuxt/kit';
 import 'tinyglobby';
@@ -13,6 +12,7 @@ import 'knitwork';
 import 'magic-string';
 import 'mlly';
 import 'unplugin-vue-components';
+import 'unplugin-auto-import';
 
 const vite = Bitrix24UIPlugin.vite;
 

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": "0.1.3",
+  "version": "0.1.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bitrix24/b24ui.git"
@@ -62,11 +62,11 @@
     "@bitrix24/b24style": "^1.0.1",
     "@internationalized/date": "^3.7.0",
     "@internationalized/number": "^3.6.0",
-    "@nuxt/kit": "^3.15.3",
-    "@nuxt/schema": "^3.15.3",
+    "@nuxt/kit": "^3.15.4",
+    "@nuxt/schema": "^3.15.4",
     "@nuxtjs/color-mode": "^3.5.2",
-    "@tailwindcss/postcss": "^4.0.0",
-    "@tailwindcss/vite": "^4.0.0",
+    "@tailwindcss/postcss": "^4.0.1",
+    "@tailwindcss/vite": "^4.0.1",
     "@tanstack/vue-table": "^8.20.5",
     "@unhead/vue": "^1.11.18",
     "@vueuse/core": "^12.5.0",
@@ -87,10 +87,10 @@
     "mlly": "^1.7.4",
     "ohash": "^1.1.4",
     "pathe": "^2.0.2",
-    "reka-ui": "1.0.0-alpha.8",
+    "reka-ui": "1.0.0-alpha.9",
     "scule": "^1.3.0",
     "tailwind-variants": "^0.3.1",
-    "tailwindcss": "^4.0.0",
+    "tailwindcss": "^4.0.1",
     "tinyglobby": "^0.2.10",
     "unplugin": "^2.1.2",
     "unplugin-auto-import": "^19.0.0",
@@ -108,8 +108,7 @@
     "happy-dom": "15.7.4",
     "joi": "^17.13.3",
     "knitwork": "^1.2.0",
-    "npm-run-all": "^4.1.5",
-    "nuxt": "^3.15.3",
+    "nuxt": "^3.15.4",
     "nuxt-component-meta": "^0.10.0",
     "superstruct": "^2.0.2",
     "valibot": "^0.42.1",
@@ -136,19 +135,14 @@
     "vite": "^6.0.7"
   },
   "scripts": {
-    "dev:prepare": "npm-run-all -s prepare:*",
-    "prepare:build_stub": "nuxt-module-build build --stub",
-    "prepare:build_prepare": "nuxt-module-build prepare",
-    "prepare:playground": "nuxi prepare playground",
-    "prepare:playground-vue": "vite build playground-vue",
-    "prepare:playground_components-meta": "nuxt-component-meta playground --outputDir ../src/.component-meta/",
-    "build": "npm-run-all -s build:*",
-    "build:prepare": "pnpm dev:prepare",
-    "build:build": "nuxt-module-build build",
+    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground && vite build playground-vue && nuxt-component-meta playground --outputDir ../src/.component-meta/",
+    "dev:prepare_short": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground && vite build playground-vue",
+    "build": "nuxt-module-build build",
+    "build_short": "nuxt-module-build build",
     "dev": "set DEV=true && nuxi dev playground",
-    "dev:vue": "set DEV=true && vite playground-vue",
     "dev:build": "nuxi build playground",
     "dev:generate": "nuxt generate playground",
+    "dev:vue": "set DEV=true && vite playground-vue",
     "docs:full:dev": "pnpm build && vitepress dev docs",
     "docs:full:build": "pnpm build && vitepress build docs",
     "docs:dev": "vitepress dev docs",
@@ -157,10 +151,9 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "typecheck": "vue-tsc --noEmit && nuxi typecheck playground && cd playground-vue && vue-tsc --noEmit",
+    "typecheck-window": "vue-tsc --noEmit && nuxi typecheck playground && cd ../playground-vue && vue-tsc --noEmit",
     "test": "vitest",
-    "test:save": "vitest -u",
     "test:vue": "vitest -c vitest.vue.config.ts",
-    "test:vue:build": "vite build playground-vue",
-    "work:done": "pnpm lint && pnpm typecheck"
+    "test:vue:build": "vite build playground-vue"
   }
 }