@nuxt/ui 3.0.0-alpha.9 → 3.0.0-beta.2

package/dist/unplugin.cjs

@@ -3,26 +3,27 @@
 const node_url = require('node:url');
 const pathe = require('pathe');
 const unplugin = require('unplugin');
-const AutoImport = require('unplugin-auto-import');
 const defu = require('defu');
 const tailwind = require('@tailwindcss/vite');
-const templates = require('./shared/ui.BPnAe4QS.cjs');
+const templates = require('./shared/ui.DfK2RX6G.cjs');
 const tinyglobby = require('tinyglobby');
 const knitwork = require('knitwork');
 const MagicString = require('magic-string');
 const mlly = require('mlly');
 const AutoImportComponents = require('unplugin-vue-components');
+const AutoImport = require('unplugin-auto-import');
 require('../dist/runtime/utils/index.js');
 require('scule');
 require('@nuxt/kit');
+require('tailwindcss/colors');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const AutoImport__default = /*#__PURE__*/_interopDefaultCompat(AutoImport);
 const tailwind__default = /*#__PURE__*/_interopDefaultCompat(tailwind);
 const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 const AutoImportComponents__default = /*#__PURE__*/_interopDefaultCompat(AutoImportComponents);
+const AutoImport__default = /*#__PURE__*/_interopDefaultCompat(AutoImport);
 
 function TemplatePlugin(options, appConfig) {
   const templates$1 = templates.getTemplates(options, appConfig.ui);
@@ -45,9 +46,9 @@ function TemplatePlugin(options, appConfig) {
 
 function PluginsPlugin(options) {
   const plugins = tinyglobby.globSync(["**/*", "!*.d.ts"], { cwd: pathe.join(runtimeDir, "plugins"), absolute: true });
-  plugins.unshift(mlly.resolvePathSync(pathe.join(runtimeDir, "vue/plugins/head"), { extensions: [".ts", ".mjs", ".js"] }));
+  plugins.unshift(mlly.resolvePathSync("../runtime/vue/plugins/head", { extensions: [".ts", ".mjs", ".js"], url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('unplugin.cjs', document.baseURI).href)) }));
   if (options.colorMode) {
-    plugins.push(mlly.resolvePathSync(pathe.join(runtimeDir, "vue/plugins/color-mode"), { extensions: [".ts", ".mjs", ".js"] }));
+    plugins.push(mlly.resolvePathSync("../runtime/vue/plugins/color-mode", { extensions: [".ts", ".mjs", ".js"], url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('unplugin.cjs', document.baseURI).href)) }));
   }
   return {
     name: "nuxt:ui:plugins",
@@ -79,6 +80,18 @@ ${plugins.map((p) => `    app.use(${knitwork.genSafeVariableName(p)})`).join("\n
   }
 }
         `;
+    },
+    // Argument Vite specific configuration
+    vite: {
+      config() {
+        return {
+          // Opt-out Nuxt UI from Vite's pre-bundling,
+          // as we need Vite's pipeline to resolve imports like `#imports`
+          optimizeDeps: {
+            exclude: ["@nuxt/ui"]
+          }
+        };
+      }
     }
   };
 }
@@ -101,11 +114,23 @@ function AppConfigPlugin(options, appConfig) {
   };
 }
 
-function ComponentImportPlugin(framework, options) {
+function ComponentImportPlugin(options, meta) {
   const components = tinyglobby.globSync("**/*.vue", { cwd: pathe.join(runtimeDir, "components") });
   const componentNames = new Set(components.map((c) => `${options.prefix}${c.replace(/\.vue$/, "")}`));
   const overrides = tinyglobby.globSync("**/*.vue", { cwd: pathe.join(runtimeDir, "vue/components") });
   const overrideNames = new Set(overrides.map((c) => `${options.prefix}${c.replace(/\.vue$/, "")}`));
+  const pluginOptions = defu.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: pathe.join(runtimeDir, "vue/components", `${componentName.slice(options.prefix.length)}.vue`) };
+        if (componentNames.has(componentName))
+          return { name: "default", from: pathe.join(runtimeDir, "components", `${componentName.slice(options.prefix.length)}.vue`) };
+      }
+    ]
+  });
   return [
     /**
      * This plugin aims to ensure we override certain components with Vue-compatible versions:
@@ -127,24 +152,13 @@ function ComponentImportPlugin(framework, options) {
         }
       }
     },
-    AutoImportComponents__default[framework]({
-      dts: options.dts ?? true,
-      exclude: [/[\\/]node_modules[\\/](?!\.pnpm|@nuxt\/ui)/, /[\\/]\.git[\\/]/, /[\\/]\.nuxt[\\/]/],
-      resolvers: [
-        (componentName) => {
-          if (overrideNames.has(componentName))
-            return { name: "default", from: pathe.join(runtimeDir, "vue/components", `${componentName.slice(options.prefix.length)}.vue`) };
-          if (componentNames.has(componentName))
-            return { name: "default", from: pathe.join(runtimeDir, "components", `${componentName.slice(options.prefix.length)}.vue`) };
-        }
-      ]
-    })
+    AutoImportComponents__default.raw(pluginOptions, meta)
   ];
 }
 const RELATIVE_IMPORT_RE = /^\.{1,2}\//;
 
 function NuxtEnvironmentPlugin() {
-  const stubPath = mlly.resolvePathSync(pathe.join(runtimeDir, "vue/stubs"), { extensions: [".ts", ".mjs", ".js"] });
+  const stubPath = mlly.resolvePathSync("../runtime/vue/stubs", { extensions: [".ts", ".mjs", ".js"], url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('unplugin.cjs', document.baseURI).href)) });
   return {
     name: "nuxt:ui",
     enforce: "pre",
@@ -171,21 +185,43 @@ function NuxtEnvironmentPlugin() {
   };
 }
 
-const runtimeDir = node_url.fileURLToPath(new URL("./runtime", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('unplugin.cjs', document.baseURI).href))));
+function AutoImportPlugin(options, meta) {
+  const pluginOptions = defu.defu(options.autoImport, {
+    dts: options.dts ?? true,
+    dirs: [pathe.join(runtimeDir, "composables"), pathe.join(runtimeDir, "vue/composables")]
+  });
+  return AutoImport__default.raw(pluginOptions, meta);
+}
+
+const runtimeDir = pathe.normalize(node_url.fileURLToPath(new URL("./runtime", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('unplugin.cjs', document.baseURI).href)))));
 const NuxtUIPlugin = unplugin.createUnplugin((_options = {}, meta) => {
-  const options = defu.defu(_options, { fonts: false, devtools: { enabled: false } }, templates.defaultOptions);
+  const options = defu.defu(_options, { fonts: false }, templates.defaultOptions);
   options.theme = options.theme || {};
   options.theme.colors = templates.resolveColors(options.theme.colors);
-  const appConfig = defu.defu({ ui: options.ui }, { ui: templates.getDefaultUiConfig(options.theme.colors) });
+  const appConfig = defu.defu({ ui: options.ui, colorMode: options.colorMode }, { ui: templates.getDefaultUiConfig(options.theme.colors) });
   return [
     NuxtEnvironmentPlugin(),
-    ...ComponentImportPlugin(meta.framework, options),
-    AutoImport__default[meta.framework]({ dts: options.dts ?? true, dirs: [pathe.join(runtimeDir, "composables")] }),
+    ComponentImportPlugin(options, meta),
+    AutoImportPlugin(options, meta),
     tailwind__default(),
     PluginsPlugin(options),
     TemplatePlugin(options, appConfig),
-    AppConfigPlugin(options, appConfig)
-  ];
+    AppConfigPlugin(options, appConfig),
+    {
+      name: "nuxt:ui:plugins-duplication-detection",
+      vite: {
+        configResolved(config) {
+          const plugins = config.plugins || [];
+          if (plugins.filter((i) => i.name === "unplugin-auto-import").length > 1) {
+            throw new Error("[Nuxt UI] Multiple instances of `unplugin-auto-import` detected. Nuxt UI includes `unplugin-auto-import` already, and you can configure it using `autoImport` option in Nuxt UI module options.");
+          }
+          if (plugins.filter((i) => i.name === "unplugin-vue-components").length > 1) {
+            throw new Error("[Nuxt UI] Multiple instances of `unplugin-vue-components` detected. Nuxt UI includes `unplugin-vue-components` already, and you can configure it using `components` option in Nuxt UI module options.");
+          }
+        }
+      }
+    }
+  ].flat(1);
 });
 
 exports.NuxtUIPlugin = NuxtUIPlugin;

package/dist/unplugin.d.cts

@@ -1,4 +1,6 @@
 import * as unplugin from 'unplugin';
+import { Options } from 'unplugin-auto-import/types';
+import { Options as Options$1 } from 'unplugin-vue-components/types';
 import colors from 'tailwindcss/colors';
 import * as ui from '#build/ui';
 import { ModuleOptions } from './module.cjs';
@@ -15,14 +17,16 @@ declare const _default: {
     chevronDown: string;
     chevronLeft: string;
     chevronRight: string;
+    chevronUp: string;
     close: string;
     ellipsis: string;
     external: string;
+    folder: string;
+    folderOpen: string;
     loading: string;
     minus: string;
     plus: string;
     search: string;
-    chevronUp: string;
 };
 
 type NeutralColor = 'slate' | 'gray' | 'zinc' | 'neutral' | 'stone';
@@ -42,6 +46,14 @@ interface NuxtUIOptions extends Omit<ModuleOptions, 'fonts' | 'colorMode'> {
      * @defaultValue `true`
      */
     colorMode?: boolean;
+    /**
+     * Override options for `unplugin-auto-import`
+     */
+    autoImport?: Partial<Options>;
+    /**
+     * Override options for `unplugin-vue-components`
+     */
+    components?: Partial<Options$1>;
 }
 declare const runtimeDir: string;
 declare const NuxtUIPlugin: unplugin.UnpluginInstance<NuxtUIOptions | undefined, boolean>;

package/dist/unplugin.d.mts

@@ -1,4 +1,6 @@
 import * as unplugin from 'unplugin';
+import { Options } from 'unplugin-auto-import/types';
+import { Options as Options$1 } from 'unplugin-vue-components/types';
 import colors from 'tailwindcss/colors';
 import * as ui from '#build/ui';
 import { ModuleOptions } from './module.mjs';
@@ -15,14 +17,16 @@ declare const _default: {
     chevronDown: string;
     chevronLeft: string;
     chevronRight: string;
+    chevronUp: string;
     close: string;
     ellipsis: string;
     external: string;
+    folder: string;
+    folderOpen: string;
     loading: string;
     minus: string;
     plus: string;
     search: string;
-    chevronUp: string;
 };
 
 type NeutralColor = 'slate' | 'gray' | 'zinc' | 'neutral' | 'stone';
@@ -42,6 +46,14 @@ interface NuxtUIOptions extends Omit<ModuleOptions, 'fonts' | 'colorMode'> {
      * @defaultValue `true`
      */
     colorMode?: boolean;
+    /**
+     * Override options for `unplugin-auto-import`
+     */
+    autoImport?: Partial<Options>;
+    /**
+     * Override options for `unplugin-vue-components`
+     */
+    components?: Partial<Options$1>;
 }
 declare const runtimeDir: string;
 declare const NuxtUIPlugin: unplugin.UnpluginInstance<NuxtUIOptions | undefined, boolean>;

package/dist/unplugin.d.ts

@@ -1,4 +1,6 @@
 import * as unplugin from 'unplugin';
+import { Options } from 'unplugin-auto-import/types';
+import { Options as Options$1 } from 'unplugin-vue-components/types';
 import colors from 'tailwindcss/colors';
 import * as ui from '#build/ui';
 import { ModuleOptions } from './module.js';
@@ -15,14 +17,16 @@ declare const _default: {
     chevronDown: string;
     chevronLeft: string;
     chevronRight: string;
+    chevronUp: string;
     close: string;
     ellipsis: string;
     external: string;
+    folder: string;
+    folderOpen: string;
     loading: string;
     minus: string;
     plus: string;
     search: string;
-    chevronUp: string;
 };
 
 type NeutralColor = 'slate' | 'gray' | 'zinc' | 'neutral' | 'stone';
@@ -42,6 +46,14 @@ interface NuxtUIOptions extends Omit<ModuleOptions, 'fonts' | 'colorMode'> {
      * @defaultValue `true`
      */
     colorMode?: boolean;
+    /**
+     * Override options for `unplugin-auto-import`
+     */
+    autoImport?: Partial<Options>;
+    /**
+     * Override options for `unplugin-vue-components`
+     */
+    components?: Partial<Options$1>;
 }
 declare const runtimeDir: string;
 declare const NuxtUIPlugin: unplugin.UnpluginInstance<NuxtUIOptions | undefined, boolean>;

package/dist/unplugin.mjs

@@ -1,18 +1,19 @@
 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, r as resolveColors, a as getDefaultUiConfig } from './shared/ui.d52SSCwA.mjs';
+import { g as getTemplates, d as defaultOptions, r as resolveColors, a as getDefaultUiConfig } from './shared/ui.DSPu6Y8j.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 '../dist/runtime/utils/index.js';
 import 'scule';
 import '@nuxt/kit';
+import 'tailwindcss/colors';
 
 function TemplatePlugin(options, appConfig) {
   const templates = getTemplates(options, appConfig.ui);
@@ -35,9 +36,9 @@ function TemplatePlugin(options, appConfig) {
 
 function PluginsPlugin(options) {
   const plugins = globSync(["**/*", "!*.d.ts"], { cwd: join(runtimeDir, "plugins"), absolute: true });
-  plugins.unshift(resolvePathSync(join(runtimeDir, "vue/plugins/head"), { extensions: [".ts", ".mjs", ".js"] }));
+  plugins.unshift(resolvePathSync("../runtime/vue/plugins/head", { extensions: [".ts", ".mjs", ".js"], url: import.meta.url }));
   if (options.colorMode) {
-    plugins.push(resolvePathSync(join(runtimeDir, "vue/plugins/color-mode"), { extensions: [".ts", ".mjs", ".js"] }));
+    plugins.push(resolvePathSync("../runtime/vue/plugins/color-mode", { extensions: [".ts", ".mjs", ".js"], url: import.meta.url }));
   }
   return {
     name: "nuxt:ui:plugins",
@@ -69,6 +70,18 @@ ${plugins.map((p) => `    app.use(${genSafeVariableName(p)})`).join("\n")}
   }
 }
         `;
+    },
+    // Argument Vite specific configuration
+    vite: {
+      config() {
+        return {
+          // Opt-out Nuxt UI from Vite's pre-bundling,
+          // as we need Vite's pipeline to resolve imports like `#imports`
+          optimizeDeps: {
+            exclude: ["@nuxt/ui"]
+          }
+        };
+      }
     }
   };
 }
@@ -91,11 +104,23 @@ 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) => `${options.prefix}${c.replace(/\.vue$/, "")}`));
   const overrides = globSync("**/*.vue", { cwd: join(runtimeDir, "vue/components") });
   const overrideNames = new Set(overrides.map((c) => `${options.prefix}${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(options.prefix.length)}.vue`) };
+        if (componentNames.has(componentName))
+          return { name: "default", from: join(runtimeDir, "components", `${componentName.slice(options.prefix.length)}.vue`) };
+      }
+    ]
+  });
   return [
     /**
      * This plugin aims to ensure we override certain components with Vue-compatible versions:
@@ -117,24 +142,13 @@ function ComponentImportPlugin(framework, options) {
         }
       }
     },
-    AutoImportComponents[framework]({
-      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(options.prefix.length)}.vue`) };
-          if (componentNames.has(componentName))
-            return { name: "default", from: join(runtimeDir, "components", `${componentName.slice(options.prefix.length)}.vue`) };
-        }
-      ]
-    })
+    AutoImportComponents.raw(pluginOptions, meta)
   ];
 }
 const RELATIVE_IMPORT_RE = /^\.{1,2}\//;
 
 function NuxtEnvironmentPlugin() {
-  const stubPath = resolvePathSync(join(runtimeDir, "vue/stubs"), { extensions: [".ts", ".mjs", ".js"] });
+  const stubPath = resolvePathSync("../runtime/vue/stubs", { extensions: [".ts", ".mjs", ".js"], url: import.meta.url });
   return {
     name: "nuxt:ui",
     enforce: "pre",
@@ -161,21 +175,43 @@ function NuxtEnvironmentPlugin() {
   };
 }
 
-const runtimeDir = fileURLToPath(new URL("./runtime", import.meta.url));
+function AutoImportPlugin(options, meta) {
+  const pluginOptions = defu(options.autoImport, {
+    dts: options.dts ?? true,
+    dirs: [join(runtimeDir, "composables"), join(runtimeDir, "vue/composables")]
+  });
+  return AutoImport.raw(pluginOptions, meta);
+}
+
+const runtimeDir = normalize(fileURLToPath(new URL("./runtime", import.meta.url)));
 const NuxtUIPlugin = createUnplugin((_options = {}, meta) => {
-  const options = defu(_options, { fonts: false, devtools: { enabled: false } }, defaultOptions);
+  const options = defu(_options, { fonts: false }, defaultOptions);
   options.theme = options.theme || {};
   options.theme.colors = resolveColors(options.theme.colors);
-  const appConfig = defu({ ui: options.ui }, { ui: getDefaultUiConfig(options.theme.colors) });
+  const appConfig = defu({ ui: options.ui, colorMode: options.colorMode }, { ui: getDefaultUiConfig(options.theme.colors) });
   return [
     NuxtEnvironmentPlugin(),
-    ...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, appConfig),
-    AppConfigPlugin(options, appConfig)
-  ];
+    AppConfigPlugin(options, appConfig),
+    {
+      name: "nuxt:ui:plugins-duplication-detection",
+      vite: {
+        configResolved(config) {
+          const plugins = config.plugins || [];
+          if (plugins.filter((i) => i.name === "unplugin-auto-import").length > 1) {
+            throw new Error("[Nuxt UI] Multiple instances of `unplugin-auto-import` detected. Nuxt UI includes `unplugin-auto-import` already, and you can configure it using `autoImport` option in Nuxt UI module options.");
+          }
+          if (plugins.filter((i) => i.name === "unplugin-vue-components").length > 1) {
+            throw new Error("[Nuxt UI] Multiple instances of `unplugin-vue-components` detected. Nuxt UI includes `unplugin-vue-components` already, and you can configure it using `components` option in Nuxt UI module options.");
+          }
+        }
+      }
+    }
+  ].flat(1);
 });
 
 export { NuxtUIPlugin, runtimeDir };

package/dist/vite.cjs

@@ -4,18 +4,19 @@ const unplugin = require('./unplugin.cjs');
 require('node:url');
 require('pathe');
 require('unplugin');
-require('unplugin-auto-import');
 require('defu');
 require('@tailwindcss/vite');
-require('./shared/ui.BPnAe4QS.cjs');
+require('./shared/ui.DfK2RX6G.cjs');
 require('../dist/runtime/utils/index.js');
 require('scule');
 require('@nuxt/kit');
+require('tailwindcss/colors');
 require('tinyglobby');
 require('knitwork');
 require('magic-string');
 require('mlly');
 require('unplugin-vue-components');
+require('unplugin-auto-import');
 
 const vite = unplugin.NuxtUIPlugin.vite;
 

package/dist/vite.d.cts

@@ -1,6 +1,8 @@
 import * as vite from 'vite';
 import { NuxtUIOptions } from './unplugin.cjs';
 import 'unplugin';
+import 'unplugin-auto-import/types';
+import 'unplugin-vue-components/types';
 import 'tailwindcss/colors';
 import '#build/ui';
 import './module.cjs';

package/dist/vite.d.mts

@@ -1,6 +1,8 @@
 import * as vite from 'vite';
 import { NuxtUIOptions } from './unplugin.mjs';
 import 'unplugin';
+import 'unplugin-auto-import/types';
+import 'unplugin-vue-components/types';
 import 'tailwindcss/colors';
 import '#build/ui';
 import './module.mjs';

package/dist/vite.d.ts

@@ -1,6 +1,8 @@
 import * as vite from 'vite';
 import { NuxtUIOptions } from './unplugin.js';
 import 'unplugin';
+import 'unplugin-auto-import/types';
+import 'unplugin-vue-components/types';
 import 'tailwindcss/colors';
 import '#build/ui';
 import './module.js';

package/dist/vite.mjs

@@ -2,18 +2,19 @@ import { NuxtUIPlugin } from './unplugin.mjs';
 import 'node:url';
 import 'pathe';
 import 'unplugin';
-import 'unplugin-auto-import';
 import 'defu';
 import '@tailwindcss/vite';
-import './shared/ui.d52SSCwA.mjs';
+import './shared/ui.DSPu6Y8j.mjs';
 import '../dist/runtime/utils/index.js';
 import 'scule';
 import '@nuxt/kit';
+import 'tailwindcss/colors';
 import 'tinyglobby';
 import 'knitwork';
 import 'magic-string';
 import 'mlly';
 import 'unplugin-vue-components';
+import 'unplugin-auto-import';
 
 const vite = NuxtUIPlugin.vite;