@terrymooreii/sia 2.1.10 → 2.1.13

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.13",
   "description": "A simple, powerful static site generator with markdown, front matter, and Nunjucks templates",
   "main": "lib/index.js",
   "bin": {

package/themes/main/includes/header.njk

@@ -9,7 +9,9 @@
       <a href="{{ '/tags/' | url }}" class="nav-link{% if page.url and page.url.startsWith('/tags') %} active{% endif %}">Tags</a>
       {% if collections.pages %}
       {% for p in collections.pages | limit(3) %}
+      {% if not p.hideFromHeader %}
       <a href="{{ p.url }}" class="nav-link{% if page.url == p.url %} active{% endif %}">{{ p.title }}</a>
+      {% endif %}
       {% endfor %}
       {% endif %}
       

package/themes/minimal/includes/header.njk

@@ -9,7 +9,9 @@
       <a href="{{ '/tags/' | url }}" class="nav-link{% if page.url and page.url.startsWith('/tags') %} active{% endif %}">Tags</a>
       {% if collections.pages %}
       {% for p in collections.pages | limit(3) %}
+      {% if not p.hideFromHeader %}
       <a href="{{ p.url }}" class="nav-link{% if page.url == p.url %} active{% endif %}">{{ p.title }}</a>
+      {% endif %}
       {% endfor %}
       {% endif %}
       

package/_config.yml

@@ -1,37 +0,0 @@
-site:
-  title: "Terry Moore II"
-  description: "A personal blog built with Sia"
-  url: "http://localhost:3000"
-  author: "Terry Moore II"
-
-theme:
-  name: main
-  showHero: true
-
-input: src
-output: dist
-
-collections:
-  posts:
-    path: posts
-    layout: post
-    permalink: /blog/:slug/
-    sortBy: date
-    sortOrder: desc
-  pages:
-    path: pages
-    layout: page
-    permalink: /:slug/
-  notes:
-    path: notes
-    layout: note
-    permalink: /notes/:slug/
-    sortBy: date
-    sortOrder: desc
-
-pagination:
-  size: 10
-
-server:
-  port: 3000
-  showDrafts: false  # Set to true to show draft posts in dev server

package/src/images/.gitkeep

@@ -1,3 +0,0 @@
-# This file keeps the images directory in git
-# Add your images here - they will be copied to dist/images/
-

package/src/notes/2024-12-17-first-note.md

@@ -1,6 +0,0 @@
----
-date: 2024-12-17T10:30:00Z
-tags: [thoughts]
----
-
-Just set up my new blog with Sia! The live reload feature is super handy for writing.

package/src/pages/about.md

@@ -1,29 +0,0 @@
----
-title: "About"
-layout: page
----
-
-## About This Site
-
-This site is built with **Sia**, a simple and powerful static site generator.
-
-### About Me
-
-Hello! I'm the author of this blog. Feel free to customize this page with your own information.
-
-### Contact
-
-You can reach me at:
-
-- Email: your.email@example.com
-- Twitter: @yourhandle
-- GitHub: @yourusername
-
-### Colophon
-
-This site is:
-
-- Generated with [Sia](https://github.com/terrymooreii/sia)
-- Written in Markdown
-- Styled with CSS
-- Hosted on [your hosting provider]

package/src/posts/2024-12-16-markdown-features.md

@@ -1,76 +0,0 @@
----
-title: "Markdown Features Guide"
-date: 2024-12-16
-tags: [markdown, tutorial]
----
-
-This post demonstrates the markdown features supported by Static Forge.
-
-## Headers
-
-Use `#` for headers. The more `#` symbols, the smaller the header.
-
-## Text Formatting
-
-You can make text **bold**, *italic*, or ***both***. You can also use ~~strikethrough~~.
-
-## Links and Images
-
-[This is a link](https://example.com) and here's how to add images:
-
-```markdown
-![Alt text](/images/photo.jpg)
-```
-
-## Lists
-
-### Unordered Lists
-
-- First item
-- Second item
-  - Nested item
-  - Another nested item
-- Third item
-
-### Ordered Lists
-
-1. First step
-2. Second step
-3. Third step
-
-## Blockquotes
-
-> "The best way to predict the future is to create it."
-> — Peter Drucker
-
-## Code
-
-Inline `code` looks like this.
-
-Code blocks with syntax highlighting:
-
-```javascript
-function greet(name) {
-  return `Hello, ${name}!`;
-}
-
-console.log(greet('World'));
-```
-
-## Tables
-
-| Feature | Supported |
-|---------|-----------|
-| Markdown | ✅ |
-| Front Matter | ✅ |
-| Tags | ✅ |
-| Pagination | ✅ |
-
-## Horizontal Rule
-
-Use `---` for a horizontal rule:
-
----
-
-That's it! Enjoy writing in markdown.
-

package/src/posts/2024-12-17-welcome-to-sia.md

@@ -1,78 +0,0 @@
----
-title: "Welcome to Sia"
-date: 2024-12-17
-tags: [getting-started, sia]
----
-
-Welcome to your new blog powered by **Sia**! This is a sample post to help you get started.
-
-## What is Sia?
-
-Sia is a simple, powerful static site generator that supports:
-
-- **Markdown** with front matter for easy content creation
-- **Nunjucks templates** for flexible layouts
-- **Tags** for organizing your content
-- **Pagination** for listing pages
-- **Live reload** during development
-- **Clean, light theme** out of the box
-
-## Getting Started
-
-### Creating Content
-
-To create a new blog post:
-
-```bash
-npx sia new post "My New Post"
-```
-
-To create a new page:
-
-```bash
-npx sia new page "About Me"
-```
-
-To create a short note (like a tweet):
-
-```bash
-npx sia new note "Just discovered something cool!"
-```
-
-### Running the Development Server
-
-```bash
-npm run dev
-```
-
-This will start a local server with live reload at `http://localhost:3000`.
-
-### Building for Production
-
-```bash
-npm run build
-```
-
-This will generate your static site in the `dist` folder, ready to deploy!
-
-## Front Matter
-
-Each markdown file can have front matter at the top:
-
-```yaml
----
-title: "My Post Title"
-date: 2024-12-17
-tags: [tag1, tag2]
-draft: true  # Set to true to hide from production
----
-```
-
-## Customization
-
-- Edit `_config.yml` to change site settings
-- Add custom layouts in `_layouts/`
-- Add custom includes in `_includes/`
-- Override default styles by adding `styles/main.css`
-
-Happy blogging! 🚀

package/src/posts/2024-12-17-welcome-to-static-forge.md

@@ -1,78 +0,0 @@
----
-title: "Welcome to Sia"
-date: 2024-12-17
-tags: [getting-started, sia]
----
-
-Welcome to your new blog powered by **Sia**! This is a sample post to help you get started.
-
-## What is Sia?
-
-Sia is a simple, powerful static site generator that supports:
-
-- **Markdown** with front matter for easy content creation
-- **Nunjucks templates** for flexible layouts
-- **Tags** for organizing your content
-- **Pagination** for listing pages
-- **Live reload** during development
-- **Clean, light theme** out of the box
-
-## Getting Started
-
-### Creating Content
-
-To create a new blog post:
-
-```bash
-npx sia new post "My New Post"
-```
-
-To create a new page:
-
-```bash
-npx sia new page "About Me"
-```
-
-To create a short note (like a tweet):
-
-```bash
-npx sia new note "Just discovered something cool!"
-```
-
-### Running the Development Server
-
-```bash
-npm run dev
-```
-
-This will start a local server with live reload at `http://localhost:3000`.
-
-### Building for Production
-
-```bash
-npm run build
-```
-
-This will generate your static site in the `dist` folder, ready to deploy!
-
-## Front Matter
-
-Each markdown file can have front matter at the top:
-
-```yaml
----
-title: "My Post Title"
-date: 2024-12-17
-tags: [tag1, tag2]
-draft: true  # Set to true to hide from production
----
-```
-
-## Customization
-
-- Edit `_config.yml` to change site settings
-- Add custom layouts in `_layouts/`
-- Add custom includes in `_includes/`
-- Override default styles by adding `styles/main.css`
-
-Happy blogging! 🚀