@life-and-dev/mdsite 0.1.0 → 0.2.1

package/mdsite-nuxt/nuxt.config.ts

@@ -1,6 +1,6 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 import path from 'path'
-import { getDomainThemes } from './app/config/themes'
+import { buildDarkOverrideCss, getDomainThemes } from './app/config/themes'
 import { createBibleReferencePatterns } from './app/utils/bible-book-names'
 import { runBuildFallbackHooks } from './scripts/renderer-hooks'
 import { withBasePath } from './utils/base-url'
@@ -59,6 +59,16 @@ export default defineNuxtConfig({
   app: {
     baseURL: appBaseURL,
     head: {
+      style: [
+        { innerHTML: buildDarkOverrideCss() }
+      ],
+      script: [
+        {
+          tagPosition: 'head',
+          tagPriority: 'critical',
+          innerHTML: `(function(){try{var t=localStorage.getItem('theme-preference');if(t!=='light'&&t!=='dark'){t=(window.matchMedia&&window.matchMedia('(prefers-color-scheme: dark)').matches)?'dark':'light';}document.documentElement.setAttribute('data-mdsite-theme',t);}catch(e){document.documentElement.setAttribute('data-mdsite-theme','light');}})();`
+        }
+      ],
       link: [
         { rel: 'icon', type: 'image/svg+xml', href: withBasePath('/favicon.svg', appBaseURL), sizes: 'any' },
         { rel: 'icon', type: 'image/x-icon', href: withBasePath('/favicon.ico', appBaseURL), sizes: '32x32' },

package/mdsite-nuxt/scripts/generate-favicons.ts

@@ -19,45 +19,49 @@ const FAVICON_SIZES = {
 /**
  * Generate favicons from the active mdsite config
  */
-export async function generateFavicons() {
+export async function generateFavicons(): Promise<boolean> {
   const { contentDir, config } = loadMdsiteConfigSync()
-  const logoPath = path.join(contentDir, 'logo.svg')
-  const faviconDir = path.join(contentDir, 'favicon')
 
-  // Check if logo exists
-  if (!await fs.pathExists(logoPath)) {
-    console.error(`❌ Logo not found: ${logoPath}`)
+  if (!config.favicon || !config.favicon.trim()) {
+    console.warn(`⚠️ No favicon source configured (config.favicon is empty). Skipping favicon generation.`)
     return false
   }
 
-  await fs.ensureDir(faviconDir)
+  const sourcePath = path.resolve(contentDir, config.favicon)
+
+  if (!await fs.pathExists(sourcePath)) {
+    console.error(`❌ Favicon source not found: ${sourcePath}`)
+    return false
+  }
+
+  const publicDir = path.resolve(__dirname, '..', 'public')
+  await fs.ensureDir(publicDir)
 
   console.log(`🎨 Generating favicons for site: ${config.site.name}`)
-  console.log(`   Source: ${logoPath}`)
-  console.log(`   Output: ${faviconDir}`)
+  console.log(`   Source: ${sourcePath}`)
+  console.log(`   Output: ${publicDir}`)
 
   try {
     // Copy SVG as-is (for modern browsers)
-    const svgTargetPath = path.join(faviconDir, 'favicon.svg')
-    await fs.copy(logoPath, svgTargetPath)
+    const svgTargetPath = path.join(publicDir, 'favicon.svg')
+    await fs.copy(sourcePath, svgTargetPath)
     console.log(`   ✓ SVG: favicon.svg`)
 
     // Generate ICO (32x32 with transparent padding)
-    const icoTargetPath = path.join(faviconDir, 'favicon.ico')
-    const png32Buffer = await sharp(logoPath)
+    const icoTargetPath = path.join(publicDir, 'favicon.ico')
+    const png32Buffer = await sharp(sourcePath)
       .resize(32, 32, {
         fit: 'contain',
         background: { r: 255, g: 255, b: 255, alpha: 0 }
       })
       .png()
       .toBuffer()
-
     await fs.writeFile(icoTargetPath, png32Buffer)
     console.log(`   ✓ ICO: favicon.ico`)
 
     // Generate Apple Touch Icon (180x180 with transparent padding)
-    const appleTouchPath = path.join(faviconDir, 'apple-touch-icon.png')
-    await sharp(logoPath)
+    const appleTouchPath = path.join(publicDir, 'apple-touch-icon.png')
+    await sharp(sourcePath)
       .resize(FAVICON_SIZES.appleTouchIcon, FAVICON_SIZES.appleTouchIcon, {
         fit: 'contain',
         background: { r: 255, g: 255, b: 255, alpha: 0 }
@@ -67,8 +71,8 @@ export async function generateFavicons() {
     console.log(`   ✓ Apple Touch Icon: apple-touch-icon.png`)
 
     // Generate PWA Icon 192x192
-    const icon192Path = path.join(faviconDir, 'icon-192.png')
-    await sharp(logoPath)
+    const icon192Path = path.join(publicDir, 'icon-192.png')
+    await sharp(sourcePath)
       .resize(FAVICON_SIZES.pwaIcon192, FAVICON_SIZES.pwaIcon192, {
         fit: 'contain',
         background: { r: 255, g: 255, b: 255, alpha: 0 }
@@ -78,8 +82,8 @@ export async function generateFavicons() {
     console.log(`   ✓ PWA Icon 192: icon-192.png`)
 
     // Generate PWA Icon 512x512
-    const icon512Path = path.join(faviconDir, 'icon-512.png')
-    await sharp(logoPath)
+    const icon512Path = path.join(publicDir, 'icon-512.png')
+    await sharp(sourcePath)
       .resize(FAVICON_SIZES.pwaIcon512, FAVICON_SIZES.pwaIcon512, {
         fit: 'contain',
         background: { r: 255, g: 255, b: 255, alpha: 0 }
@@ -96,40 +100,6 @@ export async function generateFavicons() {
   }
 }
 
-/**
- * Copy favicon files from content submodule to public directory
- */
-export async function copyFaviconsToPublic() {
-  const projectRoot = path.resolve(__dirname, '..')
-  const { contentDir, config } = loadMdsiteConfigSync()
-  const faviconDir = path.join(contentDir, 'favicon')
-  const publicDir = path.join(projectRoot, 'public')
-
-  console.log(`📋 Copying ${config.site.name} favicons to public...`)
-
-  const files = [
-    'favicon.svg',
-    'favicon.ico',
-    'apple-touch-icon.png',
-    'icon-192.png',
-    'icon-512.png'
-  ]
-
-  for (const file of files) {
-    const sourcePath = path.join(faviconDir, file)
-    const targetPath = path.join(publicDir, file)
-
-    if (await fs.pathExists(sourcePath)) {
-      await fs.copy(sourcePath, targetPath)
-      console.log(`   ✓ ${file}`)
-    } else {
-      console.warn(`   ⚠ Missing: ${file}`)
-    }
-  }
-
-  console.log(`✅ Favicon copy complete\n`)
-}
-
 /**
  * Generate web manifest for PWA support
  */
@@ -183,7 +153,6 @@ if (import.meta.url === `file://${process.argv[1]}`) {
     ; (async () => {
       const success = await generateFavicons()
       if (success) {
-        await copyFaviconsToPublic()
         await generateWebManifest(config.site.name)
       } else {
         process.exit(1)

package/mdsite-nuxt/scripts/renderer-hooks.test.ts

@@ -4,7 +4,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const {
   buildContentDataMock,
-  copyFaviconsToPublicMock,
   existsSyncMock,
   generateFaviconsMock,
   generateWebManifestMock,
@@ -20,7 +19,6 @@ const {
   writeFileSyncMock,
 } = vi.hoisted(() => ({
   buildContentDataMock: vi.fn(),
-  copyFaviconsToPublicMock: vi.fn(),
   existsSyncMock: vi.fn(),
   generateFaviconsMock: vi.fn(),
   generateWebManifestMock: vi.fn(),
@@ -60,7 +58,6 @@ vi.mock('./generate-indices.js', () => ({
 }))
 
 vi.mock('./generate-favicons.js', () => ({
-  copyFaviconsToPublic: copyFaviconsToPublicMock,
   generateFavicons: generateFaviconsMock,
   generateWebManifest: generateWebManifestMock,
 }))
@@ -99,7 +96,6 @@ describe('renderer hooks orchestration', () => {
     stringifyYamlMock.mockReturnValue('compat-config')
     generateFaviconsMock.mockResolvedValue(true)
     buildContentDataMock.mockResolvedValue(undefined)
-    copyFaviconsToPublicMock.mockResolvedValue(undefined)
     generateWebManifestMock.mockResolvedValue(undefined)
     startWatcherMock.mockResolvedValue(undefined)
     syncContentMock.mockResolvedValue(undefined)
@@ -255,7 +251,6 @@ describe('renderer hooks orchestration', () => {
     expect(syncContentMock).toHaveBeenCalledTimes(1)
     expect(buildContentDataMock).toHaveBeenCalledTimes(1)
     expect(generateFaviconsMock).toHaveBeenCalledTimes(1)
-    expect(copyFaviconsToPublicMock).toHaveBeenCalledTimes(1)
     expect(generateWebManifestMock).toHaveBeenCalledWith('Docs')
     expect(syncContentMock.mock.invocationCallOrder[0]).toBeLessThan(buildContentDataMock.mock.invocationCallOrder[0])
     expect(buildContentDataMock.mock.invocationCallOrder[0]).toBeLessThan(generateFaviconsMock.mock.invocationCallOrder[0])
@@ -268,7 +263,6 @@ describe('renderer hooks orchestration', () => {
     expect(syncContentMock).toHaveBeenCalledTimes(1)
     expect(buildContentDataMock).toHaveBeenCalledTimes(1)
     expect(generateFaviconsMock).toHaveBeenCalledTimes(1)
-    expect(copyFaviconsToPublicMock).toHaveBeenCalledTimes(1)
     expect(generateWebManifestMock).toHaveBeenCalledWith('Docs')
     expect(startWatcherMock).not.toHaveBeenCalled()
     expect(rmMock).not.toHaveBeenCalled()
@@ -292,7 +286,6 @@ describe('renderer hooks orchestration', () => {
 
     expect(buildContentDataMock).toHaveBeenCalledTimes(1)
     expect(generateFaviconsMock).toHaveBeenCalledTimes(1)
-    expect(copyFaviconsToPublicMock).not.toHaveBeenCalled()
     expect(generateWebManifestMock).not.toHaveBeenCalled()
   })
 
@@ -304,7 +297,6 @@ describe('renderer hooks orchestration', () => {
     expect(syncContentMock).toHaveBeenCalledTimes(1)
     expect(buildContentDataMock).toHaveBeenCalledTimes(1)
     expect(generateFaviconsMock).toHaveBeenCalledTimes(1)
-    expect(copyFaviconsToPublicMock).not.toHaveBeenCalled()
     expect(generateWebManifestMock).not.toHaveBeenCalled()
     expect(process.env.MDSITE_RENDERER_ORCHESTRATED).toBe('1')
   })

package/mdsite-nuxt/scripts/renderer-hooks.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import YAML from 'yaml'
 
 import { buildContentData } from './generate-indices.js'
-import { generateFavicons, copyFaviconsToPublic, generateWebManifest } from './generate-favicons.js'
+import { generateFavicons, generateWebManifest } from './generate-favicons.js'
 import { startWatcher, syncContent } from './sync-content.js'
 import { loadMdsiteConfigSync, resolveMdsiteConfigPath } from '../utils/mdsite-config.js'
 
@@ -95,7 +95,6 @@ async function generateFaviconAssets(siteName: string): Promise<void> {
   const success = await generateFavicons()
 
   if (success) {
-    await copyFaviconsToPublic()
     await generateWebManifest(siteName)
     console.log(`✅ Favicons ready for ${siteName}\n`)
   }

package/mdsite-nuxt/scripts/sync-content.ts

@@ -18,15 +18,6 @@ const STATIC_FILES = [
     'site.webmanifest',
     'robots.txt'
 ]
-const LOGO_FILE = 'logo.svg'
-const FAVICON_DIR = 'favicon'
-const FAVICON_FILES = [
-    'favicon.svg',
-    'favicon.ico',
-    'apple-touch-icon.png',
-    'icon-192.png',
-    'icon-512.png'
-]
 
 // Debounce timers for JSON regeneration (5 second delay)
 let navigationDebounceTimer: NodeJS.Timeout | null = null
@@ -118,45 +109,26 @@ export async function generateJsonFiles() {
 }
 
 /**
- * Copy all images and favicons from content to public directory (one-time)
+ * Copy all images from content to public directory (one-time)
  */
 export async function copyAllImages() {
     const sourceDir = getSourceDir()
     const targetDir = getTargetDir()
 
-    console.log(`📦 Copying images and favicons from: ${sourceDir}`)
+    console.log(`📦 Copying images from: ${sourceDir}`)
     console.log(`📦 Target directory: ${targetDir}`)
 
     let copiedCount = 0
 
-    // Copy images (excluding logo.svg and favicon directory - handled separately)
     for (const ext of IMAGE_EXTS) {
         const files = await getAllFiles(sourceDir, ext)
 
         for (const sourcePath of files) {
-
-            // Skip files in favicon directory - handled separately
-            if (sourcePath.includes(`${path.sep}${FAVICON_DIR}${path.sep}`)) {
-                continue
-            }
-
             await copyImage(sourcePath, false)
             copiedCount++
         }
     }
 
-    // Copy favicon files
-    const faviconDir = path.join(sourceDir, FAVICON_DIR)
-    if (await fs.pathExists(faviconDir)) {
-        for (const faviconFile of FAVICON_FILES) {
-            const sourcePath = path.join(faviconDir, faviconFile)
-            if (await fs.pathExists(sourcePath)) {
-                await copyFaviconFile(sourcePath, false)
-                copiedCount++
-            }
-        }
-    }
-
     console.log(`✓ Copied ${copiedCount} file(s)\n`)
 }
 
@@ -221,9 +193,7 @@ export async function startWatcher() {
     watcher
         .on('add', (filePath) => {
             const fileName = path.basename(filePath)
-            if (fileName === LOGO_FILE) {
-                handleLogoChange(filePath, 'added')
-            } else if (fileName.endsWith('.md')) {
+            if (fileName.endsWith('.md')) {
                 // Markdown file added - regenerate both navigation and search
                 console.log(`📝 Markdown added: ${fileName}`)
                 regenerateNavigation()
@@ -234,9 +204,7 @@ export async function startWatcher() {
         })
         .on('change', (filePath) => {
             const fileName = path.basename(filePath)
-            if (fileName === LOGO_FILE) {
-                handleLogoChange(filePath, 'updated')
-            } else if (fileName.endsWith('.md')) {
+            if (fileName.endsWith('.md')) {
                 // Markdown file changed - regenerate both navigation and search
                 console.log(`📝 Markdown updated: ${fileName}`)
                 regenerateNavigation()
@@ -247,9 +215,7 @@ export async function startWatcher() {
         })
         .on('unlink', (filePath) => {
             const fileName = path.basename(filePath)
-            if (fileName === LOGO_FILE) {
-                console.log(`🗑️ Logo removed: ${fileName}`)
-            } else if (fileName.endsWith('.md')) {
+            if (fileName.endsWith('.md')) {
                 // Markdown file deleted - regenerate both navigation and search
                 console.log(`📝 Markdown deleted: ${fileName}`)
                 regenerateNavigation()
@@ -363,46 +329,6 @@ async function isDraftOnlyImage(imagePath: string): Promise<boolean> {
     return !hasPublishedVersion && hasDraftVersion
 }
 
-/**
- * Copy a single favicon file from content to public
- */
-async function copyFaviconFile(sourcePath: string, log: boolean = true, action: string = 'copied') {
-    try {
-        const targetDir = getTargetDir()
-        const fileName = path.basename(sourcePath)
-        const targetPath = path.join(targetDir, fileName)
-
-        await fs.ensureDir(targetDir)
-        await fs.copy(sourcePath, targetPath)
-
-        if (log) {
-            console.log(`✓ Favicon ${action}: ${fileName}`)
-        }
-    } catch (error) {
-        console.error(`❌ Failed to copy favicon ${sourcePath}:`, error)
-    }
-}
-
-/**
- * Handle logo.svg changes - regenerate favicons
- */
-async function handleLogoChange(logoPath: string, action: string) {
-    const domain = getContentDomain()
-    console.log(`🎨 Logo ${action}, regenerating favicons for ${domain}...`)
-
-    try {
-        const { generateFavicons, copyFaviconsToPublic } = await import('./generate-favicons.js')
-        const success = await generateFavicons(domain)
-
-        if (success) {
-            await copyFaviconsToPublic(domain)
-            console.log(`✓ Favicons regenerated for ${domain}\n`)
-        }
-    } catch (error) {
-        console.error(`❌ Failed to regenerate favicons:`, error)
-    }
-}
-
 /**
  * Get all files with specific extension recursively
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@life-and-dev/mdsite",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "type": "module",
   "private": false,
   "description": "Local-first CLI that orchestrates mdsite-nuxt",