@life-and-dev/mdsite 0.2.3 → 0.3.1

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

@@ -5,7 +5,7 @@ import YAML from 'yaml'
 import { buildContentData } from './generate-indices.js'
 import { generateFavicons, generateWebManifest } from './generate-favicons.js'
 import { startWatcher, syncContent } from './sync-content.js'
-import { loadMdsiteConfigSync, resolveMdsiteConfigPath } from '../utils/mdsite-config.js'
+import { loadMdsiteConfigSync, resolveMdsiteConfigPath, type MdsiteConfig } from '../utils/mdsite-config.js'
 
 export interface RendererRuntime {
   config: ReturnType<typeof loadMdsiteConfigSync>['config']
@@ -69,7 +69,7 @@ export async function runSetupHooks(mode: 'setup' | 'build' | 'generate' | 'dev'
     if (!options.cached) {
       await fs.promises.rm(path.join(rootDir, '.data'), { recursive: true, force: true })
     }
-
+    await generateDevManifestAssets(runtime.config)
     process.env.MDSITE_RENDERER_ORCHESTRATED = '1'
     await startWatcher()
     return runtime
@@ -78,28 +78,32 @@ export async function runSetupHooks(mode: 'setup' | 'build' | 'generate' | 'dev'
   await syncContent()
   console.log(`\n🔨 Generating navigation and search index...`)
   await buildContentData()
-  await generateFaviconAssets(runtime.config.site.name)
+  await generateFaviconAssets(runtime.config)
   process.env.MDSITE_RENDERER_ORCHESTRATED = '1'
 
   return runtime
 }
 
-export async function runBuildFallbackHooks(siteName: string): Promise<void> {
+export async function runBuildFallbackHooks(config: MdsiteConfig): Promise<void> {
   console.log(`\n🔨 Generating navigation and search index...`)
   await buildContentData()
-  await generateFaviconAssets(siteName)
+  await generateFaviconAssets(config)
 }
 
-async function generateFaviconAssets(siteName: string): Promise<void> {
+async function generateFaviconAssets(config: MdsiteConfig): Promise<void> {
   console.log(`\n🎨 Generating favicons for build...`)
   const success = await generateFavicons()
 
   if (success) {
-    await generateWebManifest(siteName)
-    console.log(`✅ Favicons ready for ${siteName}\n`)
+    await generateWebManifest({ name: config.site.name, themes: config.themes })
+    console.log(`✅ Favicons ready for ${config.site.name}\n`)
   }
 }
 
+async function generateDevManifestAssets(config: MdsiteConfig): Promise<void> {
+  await generateWebManifest({ name: config.site.name, themes: config.themes })
+}
+
 function ensureLegacyCompatibilityConfig(rootDir: string): string | undefined {
   const legacyConfigPath = path.join(rootDir, 'content.config.yml')
 

package/mdsite-nuxt/utils/mdsite-config.ts

@@ -164,7 +164,8 @@ export function resolveContentDir(options: {
 
   if (resolvedConfigPath) {
     const configDir = path.dirname(resolvedConfigPath);
-    return typeof rawConfig.content?.path === 'string' ? path.resolve(configDir, rawConfig.content.path) : configDir;
+    const contentPath = resolveContentConfigPath(rawConfig.content);
+    return contentPath ? path.resolve(configDir, contentPath) : configDir;
   }
 
   if (options.searchFrom) {
@@ -174,6 +175,24 @@ export function resolveContentDir(options: {
   return process.cwd();
 }
 
+/**
+ * Extract the content path from either the shorthand string form
+ * (`content: docs`) or the explicit object form (`content:\n  path: docs`).
+ * Returns undefined when no usable path is configured.
+ */
+function resolveContentConfigPath(rawContent: unknown): string | undefined {
+  if (typeof rawContent === 'string') {
+    const trimmed = rawContent.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+  }
+
+  if (rawContent && typeof rawContent === 'object' && typeof (rawContent as { path?: unknown }).path === 'string') {
+    return (rawContent as { path: string }).path;
+  }
+
+  return undefined;
+}
+
 function createDefaultMdsiteConfig(siteName: string): MdsiteConfig {
   return {
     favicon: '',
@@ -204,6 +223,7 @@ function createDefaultMdsiteConfig(siteName: string): MdsiteConfig {
 
 function normalizeMdsiteConfig(rawConfig: Record<string, any>, contentDir: string): MdsiteConfig {
   const fallbackConfig = createDefaultMdsiteConfig(path.basename(contentDir) || 'Site');
+  const contentPath = resolveContentConfigPath(rawConfig.content);
 
   return {
     favicon: typeof rawConfig.favicon === 'string' ? rawConfig.favicon : fallbackConfig.favicon,
@@ -211,7 +231,7 @@ function normalizeMdsiteConfig(rawConfig: Record<string, any>, contentDir: strin
       bibleTooltips: rawConfig.features?.bibleTooltips ?? fallbackConfig.features.bibleTooltips,
       sourceEdit: rawConfig.features?.sourceEdit ?? fallbackConfig.features.sourceEdit
     },
-    content: typeof rawConfig.content?.path === 'string' ? { path: rawConfig.content.path } : fallbackConfig.content,
+    content: contentPath ? { path: contentPath } : fallbackConfig.content,
     menu: Array.isArray(rawConfig.menu) ? rawConfig.menu : fallbackConfig.menu,
     server: {
       output: typeof rawConfig.server?.output === 'string' ? rawConfig.server.output : fallbackConfig.server.output,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@life-and-dev/mdsite",
-  "version": "0.2.3",
+  "version": "0.3.1",
   "type": "module",
   "private": false,
   "description": "Local-first CLI that orchestrates mdsite-nuxt",
@@ -23,12 +23,12 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "install-alias": "node scripts/mdsite-dev-alias.js install",
-    "release:version": "node scripts/release-version.mjs",
-    "uninstall-alias": "node scripts/mdsite-dev-alias.js uninstall",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "install-alias": "node scripts/mdsite-dev-alias.ts install",
+    "release:version": "node scripts/release-version.ts",
+    "uninstall-alias": "node scripts/mdsite-dev-alias.ts uninstall",
+    "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.scripts.json",
     "test": "vitest run",
-    "verify:package": "node --experimental-strip-types scripts/verify-package-artifacts.ts",
+    "verify:package": "node scripts/verify-package-artifacts.ts",
     "prepublishOnly": "npm test && npm run typecheck && npm run build && npm run verify:package"
   },
   "dependencies": {