@dynect/base 0.10.4 → 0.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynect/base",
-  "version": "0.10.4",
+  "version": "0.11.0",
   "description": "Reusable Nuxt base module — components, composables, utils, plugins and i18n from the Dynect design system.",
   "type": "module",
   "license": "MIT",

package/src/module.ts

@@ -1,5 +1,4 @@
 import { addComponentsDir, addImports, addImportsDir, addPlugin, createResolver, defineNuxtModule, installModule } from '@nuxt/kit';
-import { defu } from 'defu';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 
@@ -46,7 +45,7 @@ export default defineNuxtModule<DynectBaseOptions>({
 		veeValidate: {},
 		colorMode: {},
 		i18n: {},
-		shadcn: { prefix: '' },
+		shadcn: {},
 		icon: {},
 		plugins: { toast: true, ssrWidth: true },
 	},
@@ -97,78 +96,66 @@ export default defineNuxtModule<DynectBaseOptions>({
 		}
 
 		// ── Install required Nuxt modules ────────────────────────────────────────
-		// installModule is marked @deprecated in @nuxt/kit but is the only practical
-		// API for installing sub-modules with dynamic options during a module's setup.
 		if (options.shadcn !== false) {
-			// Extract componentDir separately — keeping it out of defaults prevents
-			// defu from always populating it, which would override the computed path.
-			const { componentDir: userComponentDir, ...shadcnRest } = (options.shadcn ?? {}) as { prefix?: string; componentDir?: string };
-			const shadcnComponentDir = userComponentDir ?? (isStandalone ? join(runtimeComponentsDir, 'ui') : '~/components/ui');
+			const shadcnComponentDir = isStandalone ? join(runtimeComponentsDir, 'ui') : '~/components/ui';
 
-			await installModule('shadcn-nuxt', { prefix: '', ...shadcnRest, componentDir: shadcnComponentDir }); // NOSONAR
+			await installModule('shadcn-nuxt', {
+				prefix: '',
+				componentDir: shadcnComponentDir,
+			});
 		}
 
 		if (options.veeValidate !== false) {
-			await installModule('@vee-validate/nuxt', options.veeValidate ?? {}); // NOSONAR
+			await installModule('@vee-validate/nuxt', options.veeValidate ?? {});
 		}
 
 		if (options.colorMode !== false) {
-			// defu(user, defaults): user keys win; nested objects are deep-merged, not replaced
-			await installModule(
-				'@nuxtjs/color-mode',
-				defu(options.colorMode ?? {}, {
-					// NOSONAR
-					preference: 'system',
-					fallback: 'light',
-					classPrefix: '',
-					classSuffix: '',
-					storage: 'cookie',
-					storageKey: 'dynect_color_mode',
-				})
-			);
+			await installModule('@nuxtjs/color-mode', {
+				preference: 'system',
+				fallback: 'light',
+				classPrefix: '',
+				classSuffix: '',
+				storage: 'cookie',
+				storageKey: 'dynect_color_mode',
+				...options.colorMode,
+			});
 		}
 
 		if (options.i18n !== false) {
 			const langDir = isStandalone ? resolver.resolve('./runtime/assets/lang') : resolver.resolve('../../../app/assets/lang');
 
-			await installModule(
-				'@nuxtjs/i18n',
-				defu(options.i18n ?? {}, {
-					// NOSONAR
-					locales: [
-						{ code: 'en', iso: 'en_US', file: 'en.json', name: 'English' },
-						{ code: 'ms', iso: 'ms_MY', file: 'ms.json', name: 'Bahasa' },
-					],
-					langDir,
-					defaultLocale: 'en',
-					strategy: 'no_prefix',
-					detectBrowserLanguage: {
-						useCookie: true,
-						cookieKey: 'dynect_language',
-						cookieSecure: true,
-						redirectOn: 'root',
-						alwaysRedirect: true,
-					},
-				})
-			);
+			await installModule('@nuxtjs/i18n', {
+				locales: [
+					{ code: 'en', iso: 'en_US', file: 'en.json', name: 'English' },
+					{ code: 'ms', iso: 'ms_MY', file: 'ms.json', name: 'Bahasa' },
+				],
+				langDir,
+				defaultLocale: 'en',
+				strategy: 'no_prefix',
+				detectBrowserLanguage: {
+					useCookie: true,
+					cookieKey: 'dynect_language',
+					cookieSecure: true,
+					redirectOn: 'root',
+					alwaysRedirect: true,
+				},
+				...options.i18n,
+			});
 		}
 
 		if (options.icon !== false) {
-			await installModule(
-				'@nuxt/icon',
-				defu(options.icon ?? {}, {
-					// NOSONAR
-					provider: 'server',
-					mode: 'svg',
-					serverBundle: {
-						collections: ['heroicons', 'lucide', 'mdi'],
-						remote: false,
-					},
-				})
-			);
+			await installModule('@nuxt/icon', {
+				provider: 'server',
+				mode: 'svg',
+				serverBundle: {
+					collections: ['heroicons', 'lucide', 'mdi'],
+					remote: false,
+				},
+				...options.icon,
+			});
 		}
 
-		await installModule('@pinia/nuxt'); // NOSONAR
+		await installModule('@pinia/nuxt');
 
 		// ── CSS ──────────────────────────────────────────────────────────────────
 		const cssPath = isStandalone ? resolver.resolve('./runtime/assets/css/main.css') : resolver.resolve('../../../app/assets/css/main.css');
@@ -178,13 +165,13 @@ export default defineNuxtModule<DynectBaseOptions>({
 		}
 
 		// ── Components ───────────────────────────────────────────────────────────
-		for (const dir of options.dirs) {
+		for (const dir of options.dirs!) {
 			const dirPath = join(componentsBase, dir);
 			if (!existsSync(dirPath)) continue;
 
 			addComponentsDir({
 				path: dirPath,
-				prefix: DIR_CONFIGS[dir].prefix,
+				prefix: DIR_CONFIGS[dir]!.prefix,
 				pathPrefix: false,
 				global: options.global,
 			});