@mframework/ui 0.0.6-beta4 → 0.0.6-beta6

package/module.ts

@@ -4,22 +4,22 @@ import {
   addPlugin,
   addComponentsDir,
   createResolver,
-  installModule
+  installModule,
+  resolveModule
 } from '@nuxt/kit'
 
 export interface MFrameworkUiOptions {
-  image ? : Record < string, any >
-    fonts ? : Record < string, any >
-    vuetify ? : {
-      vuetifyOptions ? : Record < string,
-      any >
-    }
-  tailwind ? : {
-    enable ? : boolean
+  image?: Record<string, any>
+  fonts?: Record<string, any>
+  vuetify?: {
+    vuetifyOptions?: Record<string, any>
+  }
+  tailwind?: {
+    enable?: boolean
   }
 }
 
-export default defineNuxtModule < MFrameworkUiOptions > ({
+export default defineNuxtModule<MFrameworkUiOptions>({
   meta: {
     name: '@mframework/ui',
     configKey: 'mframeworkUi'
@@ -38,10 +38,9 @@ export default defineNuxtModule < MFrameworkUiOptions > ({
       enable: true
     }
   },
+
   async setup(options, nuxt) {
-    const {
-      resolve
-    } = createResolver(import.meta.url)
+    const { resolve } = createResolver(import.meta.url)
 
     //
     // 1. Expose options to runtime
@@ -49,89 +48,25 @@ export default defineNuxtModule < MFrameworkUiOptions > ({
     nuxt.options.runtimeConfig.public.mframeworkUi = options
 
     //
-    // 3. Install @nuxt/fonts
+    // 2. Install @nuxt/fonts
     //
     await installModule('@nuxt/fonts', options.fonts || {})
 
     //
-    // 4. Install Vuetify via vuetify-nuxt-module (optional).
+    // 3. Install Vuetify via vuetify-nuxt-module (optional).
     //    First check whether the consuming project actually has `vuetify`
     //    installed to avoid Nuxt failing during module resolution.
     //
-    let vuetifyInstalled = false
+    let vuetifyModulePath: string | null = null
     try {
-      // Use Node resolution from this project's root to detect installed package
-      // without triggering Nuxt's module loader.
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const {
-        createRequire
-      } = await import('module')
-      const req = createRequire(import.meta.url)
-      try {
-        req.resolve('vuetify')
-        // Vuetify is present in the project's node_modules. We won't call
-        // `installModule` here to avoid forcing Nuxt to load the module
-        // during `nuxt prepare` (which can fail in some install environments).
-        vuetifyInstalled = true
-      } catch (e) {
-        // Vuetify not found — skip installing the module
-        // eslint-disable-next-line no-console
-        console.warn('@mframework/ui: Vuetify not found in project dependencies; skipping Vuetify integration.')
-      }
+      vuetifyModulePath = resolveModule('vuetify-nuxt-module', { paths: [nuxt.options.modulesDir] })
     } catch (err) {
-      // If resolution itself fails for any reason, avoid breaking the setup.
-      // eslint-disable-next-line no-console
-      console.warn('@mframework/ui: Failed to detect Vuetify availability; skipping Vuetify integration.')
-      vuetifyInstalled = false
+      // Module not found, skip Vuetify installation
+      console.warn('[mframework-ui] Vuetify not found, skipping Vuetify setup.')
     }
 
-    //
-    // 5. Tailwind + Vuetify coexistence
-    //
-    if (options.tailwind?.enable !== false) {
-      nuxt.options.css = nuxt.options.css || []
-      nuxt.options.css.push(resolve('./runtime/assets/css/tailwind.css'))
-
-      nuxt.options.postcss = nuxt.options.postcss || {
-        plugins: {},
-        order: []
-      }
-      nuxt.options.postcss.plugins = nuxt.options.postcss.plugins || {}
-      // Use the new PostCSS adapter package name so Nuxt doesn't try to
-      // use the old `tailwindcss` package as a PostCSS plugin.
-      nuxt.options.postcss.plugins['@tailwindcss/postcss'] = {}
-      nuxt.options.postcss.plugins['autoprefixer'] = {}
-
-      nuxt.options.tailwindcss = {
-        configPath: resolve('./runtime/assets/config/tailwind.config.cjs')
-      }
+    if (vuetifyModulePath) {
+      await installModule(vuetifyModulePath, options.vuetify || {})
     }
-
-    //
-    // 6. Register plugins (icons, theme, icon switching, search).
-    //    Only register plugins that require Vuetify when Vuetify is available.
-    //
-    // Install Vuetify first
-    await installModule(resolveModule('vuetify-nuxt-module'), {
-      vuetifyOptions: options.vuetify?.vuetifyOptions || {}
-    })
-
-    // THEN load plugins that depend on Vuetify
-    addPlugin(resolve('./runtime/plugins/theme'))
-    addPlugin(resolve('./runtime/plugins/icon-switcher'))
-
-    //
-    // 7. Auto-import components from this module
-    //
-    addComponentsDir({
-      path: resolve('./runtime/components'),
-      pathPrefix: false,
-      prefix: 'M'
-    })
-
-    addComponentsDir({
-      path: resolve('./runtime/search/components'),
-      prefix: 'M'
-    })
   }
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mframework/ui",
-  "version": "0.0.6-beta4",
+  "version": "0.0.6-beta6",
   "description": "Official opinionated UI module for the M Framework.",
   "keywords": [
     "ui",