@webmate-studio/builder 0.2.89 → 0.2.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webmate-studio/builder",
-  "version": "0.2.89",
+  "version": "0.2.90",
   "type": "module",
   "description": "Webmate Studio Component Builder",
   "keywords": [

package/src/css-deduplicator.js

@@ -66,7 +66,8 @@ export function deduplicateCSS(cssArray) {
 		base: new Set(),
 		properties: new Set(),
 		theme: new Set(),
-		utilities: new Set()
+		components: new Set(), // Component utilities (wrapped from utilities layer)
+		utilities: new Set()  // Design token utilities (should override components)
 	};
 	const regularRules = {
 		charset: [], // @charset declarations
@@ -157,6 +158,9 @@ export function deduplicateCSS(cssArray) {
 		parts.push(...regularRules.imports);
 	}
 
+	// Layer order declaration (MUST be first to define precedence)
+	parts.push('@layer base, components, utilities;');
+
 	// Tailwind layers in correct order
 	if (tailwindLayers.base.size > 0) {
 		parts.push(`@layer base {\n${Array.from(tailwindLayers.base).join('\n\n')}\n}`);
@@ -167,6 +171,11 @@ export function deduplicateCSS(cssArray) {
 	if (tailwindLayers.theme.size > 0) {
 		parts.push(`@layer theme {\n${Array.from(tailwindLayers.theme).join('\n\n')}\n}`);
 	}
+	if (tailwindLayers.components.size > 0) {
+		// Sort component utilities by breakpoint before joining
+		const sortedComponents = sortUtilityRules(Array.from(tailwindLayers.components));
+		parts.push(`@layer components {\n${sortedComponents.join('\n\n')}\n}`);
+	}
 	if (tailwindLayers.utilities.size > 0) {
 		// Sort utilities by breakpoint before joining
 		const sortedUtilities = sortUtilityRules(Array.from(tailwindLayers.utilities));

package/src/design-tokens.js

@@ -1010,10 +1010,8 @@ export function generateTailwindConfig(tokens) {
 export function generateCSSFromTokens(tokens) {
 	const lines = [];
 
-	// Define layer order FIRST (before any other CSS)
-	lines.push('/* CSS Layer Order Declaration */');
-	lines.push('@layer base, components, utilities;');
-	lines.push('');
+	// NOTE: @layer order declaration is now handled by css-deduplicator.js
+	// to ensure it appears only once and in the correct position
 	lines.push(':root {');
 
 	// Colors