@terrymooreii/sia 2.1.10 → 2.1.11

package/lib/assets.js

@@ -134,39 +134,41 @@ function hasCssFiles(dir) {
 export function copyDefaultStyles(config, resolvedTheme = null) {
   const outputStylesDir = join(config.outputDir, 'styles');
   
-  // Check if user has custom styles (must actually have CSS files)
-  const userStylesDir = join(config.rootDir, 'styles');
-  
-  if (hasCssFiles(userStylesDir)) {
-    // Copy user styles
-    const copied = copyAssets(userStylesDir, outputStylesDir);
-    console.log(`🎨 Copied ${copied.length} custom style files`);
-    return copied;
-  }
-  
-  // Resolve theme if not already resolved
+  // Always copy theme styles first
   const themeName = config.theme?.name || 'main';
   const theme = resolvedTheme || resolveTheme(themeName, config.rootDir);
   const themeStylesDir = join(theme.themeDir, 'styles');
   
+  let themeCopied = [];
   if (existsSync(themeStylesDir)) {
-    const copied = copyAssets(themeStylesDir, outputStylesDir);
+    themeCopied = copyAssets(themeStylesDir, outputStylesDir);
     if (!theme.isExternal) {
       console.log(`🎨 Using "${theme.themeName}" theme`);
     }
-    return copied;
+  } else {
+    // Fallback to main theme if theme styles not found
+    const fallbackStylesDir = join(getBuiltInThemesDir(), 'main', 'styles');
+    if (existsSync(fallbackStylesDir)) {
+      console.log(`⚠️  Theme "${themeName}" styles not found, using "main" theme styles`);
+      themeCopied = copyAssets(fallbackStylesDir, outputStylesDir);
+    }
   }
   
-  // Fallback to main theme if theme styles not found
-  const fallbackStylesDir = join(getBuiltInThemesDir(), 'main', 'styles');
-  if (existsSync(fallbackStylesDir)) {
-    console.log(`⚠️  Theme "${themeName}" styles not found, using "main" theme styles`);
-    const copied = copyAssets(fallbackStylesDir, outputStylesDir);
-    return copied;
+  // Then copy user custom styles (can override theme styles)
+  const userStylesDir = join(config.rootDir, 'styles');
+  let userCopied = [];
+  
+  if (hasCssFiles(userStylesDir)) {
+    userCopied = copyAssets(userStylesDir, outputStylesDir);
+    console.log(`🎨 Copied ${userCopied.length} custom style file(s)`);
+  }
+  
+  const totalCopied = themeCopied.length + userCopied.length;
+  if (totalCopied === 0) {
+    console.log('⚠️  No styles found');
   }
   
-  console.log('⚠️  No styles found');
-  return [];
+  return [...themeCopied, ...userCopied];
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrymooreii/sia",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "description": "A simple, powerful static site generator with markdown, front matter, and Nunjucks templates",
   "main": "lib/index.js",
   "bin": {