@dynect/base 0.12.0 → 0.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynect/base",
-  "version": "0.12.0",
+  "version": "0.13.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

@@ -69,28 +69,41 @@ export default defineNuxtModule<DynectBaseOptions>({
 
 		const srcDir = nuxt.options.srcDir;
 
-		// @/lib/utils → runtime/lib/utils (when not present in consuming app)
-		// This one works via nuxt.options.alias because lib/utils is not prefixed with @
-		if (!existsSync(join(srcDir, 'lib', 'utils.ts'))) {
-			nuxt.options.alias[join(srcDir, 'lib', 'utils')] = resolver.resolve('./runtime/lib/utils');
-		}
-
-		// @/components/ui/* → runtime/components/ui/*
-		// Must run BEFORE @ is resolved, so we use a regex alias in vite:extendConfig.
-		// Only applied when the consuming app has no own components/ui directory.
-		if (isStandalone && !existsSync(join(srcDir, 'components', 'ui'))) {
+		// In standalone mode, intercept @/lib/utils and @/components/ui BEFORE Vite
+		// expands the @ alias to srcDir. nuxt.options.alias cannot do this because
+		// Vite resolves @ → srcDir in a single pass and never checks aliases again.
+		// We prepend regex aliases via vite:extendConfig so they fire first.
+		if (isStandalone) {
 			const uiRuntimePath = join(runtimeComponentsDir, 'ui');
+			const libUtilsRuntimePath = resolver.resolve('./runtime/lib/utils');
+
+			// Only redirect @/lib/utils when the consuming app has no own lib/utils
+			const hasOwnLibUtils = existsSync(join(srcDir, 'lib', 'utils.ts'));
+			// Only redirect @/components/ui when the consuming app has no own components/ui
+			const hasOwnComponentsUi = existsSync(join(srcDir, 'components', 'ui'));
 
 			nuxt.hook('vite:extendConfig', (config) => {
 				config.resolve ??= {};
 
-				const entry = { find: /^[@~]\/components\/ui/, replacement: uiRuntimePath };
+				const entries: { find: RegExp; replacement: string }[] = [];
+
+				if (!hasOwnComponentsUi) {
+					entries.push({ find: /^[@~]\/components\/ui/, replacement: uiRuntimePath });
+				}
+				if (!hasOwnLibUtils) {
+					entries.push({ find: /^[@~]\/lib\/utils/, replacement: libUtilsRuntimePath });
+				}
+
+				if (entries.length === 0) return;
 
 				if (Array.isArray(config.resolve.alias)) {
-					config.resolve.alias.unshift(entry);
+					config.resolve.alias.unshift(...entries);
 				} else {
 					const existing = config.resolve.alias ?? {};
-					config.resolve.alias = [entry, ...Object.entries(existing).map(([find, replacement]) => ({ find, replacement }))];
+					config.resolve.alias = [
+						...entries,
+						...Object.entries(existing).map(([find, replacement]) => ({ find, replacement })),
+					];
 				}
 			});
 		}