@karaoke-cms/create 0.6.2 → 0.6.3

package/src/index.js

@@ -7,12 +7,13 @@
  */
 
 import { createInterface } from 'readline';
-import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, cpSync } from 'fs';
 import { join, resolve } from 'path';
+import { fileURLToPath } from 'url';
+import { spawnSync } from 'child_process';
 import {
   packageJson, astroConfig, karaokeConfig, contentConfig,
-  envDts, tsConfig, gitignore, cloudflareRedirects,
-  helloWorld, draftPost, gettingStarted,
+  envDts, tsConfig, gitignore, envDefault, cloudflareRedirects,
 } from './templates.js';
 
 // ── ANSI helpers ─────────────────────────────────────────────────────────────
@@ -128,13 +129,10 @@ async function main() {
   // ── Scaffold ────────────────────────────────────────────────────────────────
   console.log(`\n  Scaffolding ${BOLD}${dir}${R}...\n`);
 
-  const date = new Date().toISOString().split('T')[0];
-
   mkdirSync(join(targetDir, 'src'), { recursive: true });
-  mkdirSync(join(targetDir, 'content/blog'), { recursive: true });
-  mkdirSync(join(targetDir, 'content/docs'), { recursive: true });
   mkdirSync(join(targetDir, 'public'), { recursive: true });
 
+  // Config and project files from templates
   const files = {
     'package.json':           packageJson({ name: dir, astroVersion }),
     'astro.config.mjs':       astroConfig({ siteUrl }),
@@ -143,10 +141,8 @@ async function main() {
     'src/env.d.ts':           envDts(),
     'tsconfig.json':          tsConfig(),
     '.gitignore':             gitignore(),
+    '.env.default':           envDefault(),
     'public/_redirects':      cloudflareRedirects(),
-    'content/blog/hello-world.md':      helloWorld({ date }),
-    'content/blog/draft-post.md':       draftPost({ date }),
-    'content/docs/getting-started.md':  gettingStarted({ date }),
   };
 
   for (const [file, content] of Object.entries(files)) {
@@ -154,13 +150,35 @@ async function main() {
     console.log(`  ${GREEN}+${R} ${file}`);
   }
 
+  // Vault content: copy the real Obsidian vault into vault/ subdirectory
+  const vaultSrc = fileURLToPath(new URL('../karaoke-create-vault', import.meta.url));
+  cpSync(vaultSrc, join(targetDir, 'vault'), { recursive: true });
+  console.log(`  ${GREEN}+${R} vault/ (Obsidian vault)`);
+
+  // ── Git init ────────────────────────────────────────────────────────────────
+  const gitOk = (() => {
+    const run = (args) => spawnSync('git', args, { cwd: targetDir, encoding: 'utf8' }).status === 0;
+    return (
+      run(['init']) &&
+      run(['add', '-A']) &&
+      run(['-c', 'user.name=karaoke-cms', '-c', 'user.email=setup@karaoke-cms.org',
+           'commit', '-m', 'chore: initial karaoke-cms setup'])
+    );
+  })();
+
+  if (gitOk) {
+    console.log(`  ${GREEN}+${R} git repository initialized`);
+  } else {
+    console.log(`  ${GRAY}  (git init skipped — install git and run it manually)${R}`);
+  }
+
   // ── Done ────────────────────────────────────────────────────────────────────
   console.log(`\n${GREEN}✓${R} Done! Created ${BOLD}${dir}/${R}\n`);
   console.log(`  Next steps:\n`);
   console.log(`  ${CYAN}cd ${dir}${R}`);
   console.log(`  ${CYAN}npm install${R}`);
   console.log(`  ${CYAN}npm run dev${R}    ${GRAY}→ http://localhost:4321${R}\n`);
-  console.log(`  ${GRAY}Open ${BOLD}${dir}/${R}${GRAY} in Obsidian as a vault to write content.${R}\n`);
+  console.log(`  ${GRAY}Open ${BOLD}${dir}/vault/${R}${GRAY} in Obsidian to write content.${R}\n`);
 }
 
 main().catch(err => {

package/src/templates.js

@@ -66,8 +66,12 @@ export function karaokeConfig({ title, description, theme, search, comments }) {
     : '';
 
   return `import type { KaraokeConfig } from '@karaoke-cms/astro';
+import { loadEnv } from '@karaoke-cms/astro/env';
+
+const env = loadEnv(new URL('.', import.meta.url));
 
 const config: KaraokeConfig = {
+  vault: env.KARAOKE_VAULT,
   title: ${JSON.stringify(title)},
   description: ${JSON.stringify(description)},
   theme: ${JSON.stringify(theme)},${modulesStr}
@@ -79,8 +83,11 @@ export default config;
 
 export function contentConfig() {
   return `import { makeCollections } from '@karaoke-cms/astro/collections';
+import { loadEnv } from '@karaoke-cms/astro/env';
+
+const env = loadEnv(new URL('..', import.meta.url));
 
-export const collections = makeCollections(new URL('..', import.meta.url));
+export const collections = makeCollections(new URL('..', import.meta.url), env.KARAOKE_VAULT);
 `;
 }
 
@@ -103,82 +110,24 @@ node_modules/
 dist/
 .astro/
 .env
-.env.*
+.env.local
+.env.*.local
+# Obsidian workspace state (personal, not shared)
+.obsidian/workspace.json
+.obsidian/workspace-mobile.json
 `;
 }
 
-export function cloudflareRedirects() {
-  return `/* /404.html 404\n`;
-}
-
-/** @param {{ date: string }} opts */
-export function helloWorld({ date }) {
-  return `---
-title: "Hello World"
-publish: true
-date: ${date}
-author: "The Team"
-description: "Our first published post."
----
-
-Welcome! This post has \`publish: true\` so it appears on the site.
-
-## How publishing works
-
-1. Write Markdown in Obsidian (or any editor)
-2. Add \`publish: true\` to the frontmatter when ready to share
-3. Push to \`main\` — GitHub Actions builds and deploys automatically
-
-Posts without \`publish: true\` stay private in your vault.
+export function envDefault() {
+  return `# Obsidian vault location — open this folder in Obsidian to write content.
+# Override in .env (gitignored) to point to a vault elsewhere on your machine.
+# Absolute path: KARAOKE_VAULT=/Users/you/Obsidian/my-vault
+# Relative path: KARAOKE_VAULT=../my-obsidian-vault
+KARAOKE_VAULT=./vault/
 `;
 }
 
-/** @param {{ date: string }} opts */
-export function draftPost({ date }) {
-  return `---
-title: "Draft Post"
-publish: false
-date: ${date}
----
-
-This post has \`publish: false\`. It lives in your vault but never appears on the site.
-
-Change it to \`publish: true\` when you're ready to share it.
-`;
+export function cloudflareRedirects() {
+  return `/* /404.html 404\n`;
 }
 
-/** @param {{ date: string }} opts */
-export function gettingStarted({ date }) {
-  return `---
-title: "Getting Started"
-publish: true
-date: ${date}
-description: "How to set up and use your karaoke-cms site."
----
-
-## Setup
-
-1. Open this folder in Obsidian as a vault
-2. Edit \`karaoke.config.ts\` — set your title, theme, and modules
-3. Set your Cloudflare Pages URL in \`astro.config.mjs\`
-4. Push to \`main\` — your site is live
-
-## Writing content
-
-- Blog posts go in \`content/blog/\`
-- Documentation goes in \`content/docs/\`
-- Set \`publish: true\` to make a file public
-
-## Frontmatter reference
-
-\`\`\`yaml
----
-title: "My Post"        # required
-publish: true           # required to appear on site
-date: 2026-01-15        # optional, YYYY-MM-DD
-author: "Name"          # optional
-description: "..."      # optional, used in OG tags and RSS
----
-\`\`\`
-`;
-}