idcmd 0.0.7 → 0.0.9

package/README.md

@@ -9,29 +9,29 @@ bun install
 bun run dev
 ```
 
-Everything you edit lives in `site/`.
+Everything you edit lives at the project root-level source folders (`content/`, `src/`, `styles/`, `assets/`, `site.jsonc`).
 
 ## CLI
 
 ```bash
 idcmd init [dir]   # scaffold a new site
 idcmd dev          # tailwind watch + SSR dev server
-idcmd build        # static dist/
-idcmd preview      # serve dist/ locally
+idcmd build        # static public/
+idcmd preview      # serve public/ locally
 idcmd deploy       # build + validate Vercel static deploy config
-idcmd client ...   # add/update local site/code implementations
+idcmd client ...   # add/update local src implementations
 ```
 
 ## Layout (V1)
 
-- `site/content/<slug>.md` -> `/<slug>/` (`index.md` -> `/`)
-- `site/code/ui/*` is local UI source code (you own and edit these files)
-- `site/code/runtime/*.ts` is local browser runtime code (compiled to `dist/_idcmd/*.js`)
-- `site/code/routes/**` file-based server routes (dev/server-host only)
-- `site/styles/tailwind.css` -> `dist/styles.css`
-- `site/assets/` static assets
-- `site/site.jsonc` site config
-- `dist/` generated output (gitignored)
+- `content/<slug>.md` -> `/<slug>/` (`index.md` -> `/`)
+- `src/ui/*` is local UI source code (you own and edit these files)
+- `src/runtime/*.ts` is local browser runtime code (compiled to `public/_idcmd/*.js`)
+- `src/routes/**` file-based server routes (dev/server-host only)
+- `styles/tailwind.css` -> `public/styles.css`
+- `assets/` static assets
+- `site.jsonc` site config
+- `public/` generated output (gitignored)
 
 ## Syncing Local Client Code
 
@@ -45,11 +45,11 @@ idcmd client update runtime --yes
 ```
 
 `add` creates missing files. `update` overwrites changed files and requires `--yes` unless `--dry-run` is used.
-Runtime files in `site/code/runtime/` are compiled automatically by `idcmd dev` and `idcmd build`.
+Runtime files in `src/runtime/` are compiled automatically by `idcmd dev` and `idcmd build`.
 
 ## Example: Add A Page
 
-Create `site/content/hello.md`:
+Create `content/hello.md`:
 
 ```md
 ---
@@ -68,7 +68,7 @@ It renders at `/hello/`.
 
 ## Custom Server Routes (V1)
 
-Add `site/code/routes/api/hello.ts`:
+Add `src/routes/api/hello.ts`:
 
 ```ts
 export const GET = (): Response => Response.json({ ok: true });
@@ -94,7 +94,7 @@ It responds at `/api/hello`.
 
 ### Slug and path rules
 
-- Content lives at `site/content/<slug>.md`.
+- Content lives at `content/<slug>.md`.
 - `slug="index"` is the home page.
 - Canonical HTML paths are `/` for index and `/<slug>/` otherwise.
 - Markdown download paths exist in two forms:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "idcmd",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/rustydotwtf/idcmd"
@@ -22,11 +22,11 @@
   },
   "scripts": {
     "dev": "concurrently -k -n css,server -c blue,green \"bun run dev:css\" \"bun run dev:server\"",
-    "dev:css": "bunx @tailwindcss/cli -i content/styles.css -o public/styles.css --watch",
+    "dev:css": "bunx @tailwindcss/cli -i styles/tailwind.css -o public/styles.css --watch",
     "dev:server": "bun --hot src/server.ts",
-    "build:css": "bunx @tailwindcss/cli -i content/styles.css -o dist/styles.css --minify",
+    "build:css": "bunx @tailwindcss/cli -i styles/tailwind.css -o public/styles.css --minify",
     "build": "bun run build:css && bun src/build.ts",
-    "preview": "bunx serve dist",
+    "preview": "bunx serve public",
     "start": "bun src/server.ts",
     "check": "bun run scripts/check.ts",
     "test": "bun test",

package/src/build.ts

@@ -20,7 +20,7 @@ const MIN_SEARCH_QUERY_LENGTH = 2;
 
 const project = await getProjectPaths();
 
-// Find all content files in `site/content/` (`site/content/<slug>.md`).
+// Find all content files in `content/` (`content/<slug>.md`).
 const contentFiles: string[] = [];
 
 const buildStart = performance.now();
@@ -40,26 +40,26 @@ console.log(
   `Found ${navigation.length} groups with ${navigation.reduce((acc, g) => acc + g.items.length, 0)} total pages`
 );
 
-// Ensure dist directory exists
-await Bun.write(`${project.distDir}/.gitkeep`, "");
+// Ensure output directory exists
+await Bun.write(`${project.outputDir}/.gitkeep`, "");
 
-const shouldCopyPublicPath = (relativePath: string): boolean =>
-  // Do not overwrite the minified `dist/styles.css` produced by `build:css`.
+const shouldCopyAssetPath = (relativePath: string): boolean =>
+  // Do not overwrite the minified `public/styles.css` produced by `build:css`.
   relativePath !== "styles.css";
 
-const copyPublicFileToDist = async (relativePath: string): Promise<void> => {
-  const file = Bun.file(`${project.publicDir}/${relativePath}`);
+const copyAssetFileToOutput = async (relativePath: string): Promise<void> => {
+  const file = Bun.file(`${project.assetsDir}/${relativePath}`);
   if (!(await file.exists())) {
     return;
   }
-  await Bun.write(`${project.distDir}/${relativePath}`, file);
+  await Bun.write(`${project.outputDir}/${relativePath}`, file);
 };
 
-const copyPublicToDist = async (): Promise<void> => {
-  const publicFiles = new Bun.Glob("**/*").scan(project.publicDir);
-  for await (const relativePath of publicFiles) {
-    if (shouldCopyPublicPath(relativePath)) {
-      await copyPublicFileToDist(relativePath);
+const copyAssetsToOutput = async (): Promise<void> => {
+  const assetFiles = new Bun.Glob("**/*").scan(project.assetsDir);
+  for await (const relativePath of assetFiles) {
+    if (shouldCopyAssetPath(relativePath)) {
+      await copyAssetFileToOutput(relativePath);
     }
   }
 };
@@ -70,8 +70,8 @@ const writeMarkdownOutputs = async (
 ): Promise<void> => {
   const flatMarkdownPath =
     slug === "index"
-      ? `${project.distDir}/index.md`
-      : `${project.distDir}/${slug}.md`;
+      ? `${project.outputDir}/index.md`
+      : `${project.outputDir}/${slug}.md`;
 
   const expanded = await expandMarkdownForAgent(markdown, {
     currentPath: slug === "index" ? "/" : `/${slug}/`,
@@ -84,14 +84,14 @@ const writeMarkdownOutputs = async (
   console.log(`  markdown -> ${flatMarkdownPath}`);
 };
 
-await copyPublicToDist();
+await copyAssetsToOutput();
 
 const resolveCssSource = async (): Promise<string | null> => {
-  if (await Bun.file(`${project.distDir}/styles.css`).exists()) {
-    return `${project.distDir}/styles.css`;
+  if (await Bun.file(`${project.outputDir}/styles.css`).exists()) {
+    return `${project.outputDir}/styles.css`;
   }
-  if (await Bun.file(`${project.publicDir}/styles.css`).exists()) {
-    return `${project.publicDir}/styles.css`;
+  if (await Bun.file(`${project.assetsDir}/styles.css`).exists()) {
+    return `${project.assetsDir}/styles.css`;
   }
   return null;
 };
@@ -138,10 +138,10 @@ const renderStaticSearchPage = async (): Promise<string> => {
 };
 
 await Bun.write(
-  `${project.distDir}/search/index.html`,
+  `${project.outputDir}/search/index.html`,
   await renderStaticSearchPage()
 );
-console.log(`  generated ${project.distDir}/search/index.html`);
+console.log(`  generated ${project.outputDir}/search/index.html`);
 
 for (const file of contentFiles) {
   const filePath = `${project.contentDir}/${file}`;
@@ -160,11 +160,11 @@ for (const file of contentFiles) {
 
   let outPath: string;
   if (slug === "index") {
-    outPath = `${project.distDir}/index.html`;
+    outPath = `${project.outputDir}/index.html`;
   } else if (slug === "404") {
-    outPath = `${project.distDir}/404.html`;
+    outPath = `${project.outputDir}/404.html`;
   } else {
-    outPath = `${project.distDir}/${slug}/index.html`;
+    outPath = `${project.outputDir}/${slug}/index.html`;
   }
 
   await Bun.write(outPath, html);
@@ -172,24 +172,26 @@ for (const file of contentFiles) {
   await writeMarkdownOutputs(slug, markdown);
 
   if (slug === "404") {
-    const nested404Path = `${project.distDir}/404/index.html`;
+    const nested404Path = `${project.outputDir}/404/index.html`;
     await Bun.write(nested404Path, html);
     console.log(`  ${filePath} -> ${nested404Path}`);
   }
 }
 
 const llmsTxt = await generateLlmsTxt();
-await Bun.write(`${project.distDir}/llms.txt`, llmsTxt);
-console.log(`  generated ${project.distDir}/llms.txt`);
+await Bun.write(`${project.outputDir}/llms.txt`, llmsTxt);
+console.log(`  generated ${project.outputDir}/llms.txt`);
 
 const searchIndex = await generateSearchIndexFromContent({ siteConfig });
 await Bun.write(
-  `${project.distDir}/search-index.json`,
+  `${project.outputDir}/search-index.json`,
   JSON.stringify(searchIndex)
 );
-const searchIndexBytes = Bun.file(`${project.distDir}/search-index.json`).size;
+const searchIndexBytes = Bun.file(
+  `${project.outputDir}/search-index.json`
+).size;
 console.log(
-  `  generated dist/search-index.json (${(searchIndexBytes / (1024 * 1024)).toFixed(2)} MB)`
+  `  generated public/search-index.json (${(searchIndexBytes / (1024 * 1024)).toFixed(2)} MB)`
 );
 if (searchIndexBytes > MAX_INDEX_BYTES) {
   console.warn(
@@ -200,19 +202,19 @@ if (searchIndexBytes > MAX_INDEX_BYTES) {
 if (siteConfig.baseUrl) {
   const sitemapPages = await collectSitemapPagesFromContent();
   await Bun.write(
-    `${project.distDir}/sitemap.xml`,
+    `${project.outputDir}/sitemap.xml`,
     generateSitemapXml(sitemapPages, siteConfig.baseUrl)
   );
-  console.log(`  generated ${project.distDir}/sitemap.xml`);
+  console.log(`  generated ${project.outputDir}/sitemap.xml`);
 
   await Bun.write(
-    `${project.distDir}/robots.txt`,
+    `${project.outputDir}/robots.txt`,
     generateRobotsTxt(siteConfig.baseUrl)
   );
-  console.log(`  generated ${project.distDir}/robots.txt`);
+  console.log(`  generated ${project.outputDir}/robots.txt`);
 } else {
   console.log(
-    "Warning: site/site.jsonc missing baseUrl; skipping sitemap.xml and robots.txt."
+    "Warning: site.jsonc missing baseUrl; skipping sitemap.xml and robots.txt."
   );
 }
 

package/src/cli/commands/build.ts

@@ -1,12 +1,12 @@
 import { compileRuntimeAssetsOnce } from "../runtime-assets";
 
 const findTailwindInput = async (): Promise<string> => {
-  const path = "site/styles/tailwind.css";
+  const path = "styles/tailwind.css";
   if (await Bun.file(path).exists()) {
     return path;
   }
   throw new Error(
-    "Could not find Tailwind input. Expected site/styles/tailwind.css."
+    "Could not find Tailwind input. Expected styles/tailwind.css."
   );
 };
 
@@ -29,7 +29,7 @@ export const buildCommand = async (): Promise<number> => {
       "-i",
       tailwindInput,
       "-o",
-      "dist/styles.css",
+      "public/styles.css",
       "--minify",
     ],
     { stderr: "inherit", stdout: "inherit" }

package/src/cli/commands/client.ts

@@ -8,8 +8,7 @@ const TEMPLATE_UI_DIR = joinPath(
   "..",
   "templates",
   "default",
-  "site",
-  "code",
+  "src",
   "ui"
 );
 const TEMPLATE_RUNTIME_DIR = joinPath(
@@ -19,14 +18,13 @@ const TEMPLATE_RUNTIME_DIR = joinPath(
   "..",
   "templates",
   "default",
-  "site",
-  "code",
+  "src",
   "runtime"
 );
 
-const SITE_UI_DIR = joinPath("site", "code", "ui");
-const SITE_RUNTIME_DIR = joinPath("site", "code", "runtime");
-const SITE_CONFIG_PATH = joinPath("site", "site.jsonc");
+const SITE_UI_DIR = joinPath("src", "ui");
+const SITE_RUNTIME_DIR = joinPath("src", "runtime");
+const SITE_CONFIG_PATH = "site.jsonc";
 
 const CLIENT_PARTS = [
   "layout",
@@ -144,7 +142,7 @@ const parseClientArgs = (positionals: string[]): ParsedClientArgs => {
 const ensureSiteLayout = async (): Promise<void> => {
   if (!(await Bun.file(SITE_CONFIG_PATH).exists())) {
     throw new Error(
-      `Could not find ${SITE_CONFIG_PATH}. Run this command from an idcmd site project root.`
+      `Could not find ${SITE_CONFIG_PATH}. Run this command from an idcmd project root.`
     );
   }
 };

package/src/cli/commands/deploy.ts

@@ -14,23 +14,23 @@ const warnIfVercelMisconfigured = async (): Promise<void> => {
   if (!raw) {
     // eslint-disable-next-line no-console
     console.warn(
-      "Warning: vercel.json not found. Vercel static deploy expects dist/ output."
+      "Warning: vercel.json not found. Vercel static deploy expects public/ output."
     );
     return;
   }
 
   const record = raw as Record<string, unknown>;
   const out = record.outputDirectory;
-  if (out !== "dist") {
+  if (out !== "public") {
     // eslint-disable-next-line no-console
     console.warn(
-      `Warning: vercel.json outputDirectory is not "dist" (got ${JSON.stringify(out)}).`
+      `Warning: vercel.json outputDirectory is not "public" (got ${JSON.stringify(out)}).`
     );
   }
 };
 
 const warnIfBaseUrlMissing = async (): Promise<void> => {
-  const file = Bun.file("site/site.jsonc");
+  const file = Bun.file("site.jsonc");
   if (!(await file.exists())) {
     return;
   }
@@ -42,13 +42,13 @@ const warnIfBaseUrlMissing = async (): Promise<void> => {
     if (!cfg.baseUrl) {
       // eslint-disable-next-line no-console
       console.warn(
-        "Warning: site/site.jsonc missing baseUrl; sitemap.xml and robots.txt will be skipped."
+        "Warning: site.jsonc missing baseUrl; sitemap.xml and robots.txt will be skipped."
       );
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     // eslint-disable-next-line no-console
-    console.warn(`Warning: Failed to parse site/site.jsonc: ${message}`);
+    console.warn(`Warning: Failed to parse site.jsonc: ${message}`);
   }
 };
 
@@ -76,7 +76,7 @@ const printDeployInstructions = (): void => {
   // eslint-disable-next-line no-console
   console.log("  2. Import the repo in Vercel");
   // eslint-disable-next-line no-console
-  console.log("  3. Vercel will run `bun run build` and serve `dist/`");
+  console.log("  3. Vercel will run `bun run build` and serve `public/`");
   // eslint-disable-next-line no-console
   console.log("");
 };

package/src/cli/commands/dev.ts

@@ -11,16 +11,16 @@ export interface DevFlags {
 }
 
 const findTailwindInput = async (): Promise<string> => {
-  const path = "site/styles/tailwind.css";
+  const path = "styles/tailwind.css";
   if (await Bun.file(path).exists()) {
     return path;
   }
   throw new Error(
-    "Could not find Tailwind input. Expected site/styles/tailwind.css."
+    "Could not find Tailwind input. Expected styles/tailwind.css."
   );
 };
 
-const resolveTailwindOutput = (): string => "dist/styles.css";
+const resolveTailwindOutput = (): string => "public/styles.css";
 
 const idcmdServerEntry = (): string =>
   // `src/server.ts` lives two levels up from `src/cli/commands/*`.

package/src/cli/commands/init.ts

@@ -200,7 +200,7 @@ const applySubstitutions = async (args: {
   siteName: string;
   targetDir: string;
 }): Promise<void> => {
-  await replaceInFile(joinPath(args.targetDir, "site", "site.jsonc"), (text) =>
+  await replaceInFile(joinPath(args.targetDir, "site.jsonc"), (text) =>
     fillSiteJsonc({
       baseUrl: args.baseUrl,
       description: args.description,

package/src/cli/commands/preview.ts

@@ -7,7 +7,7 @@ const stripLeadingSlash = (pathname: string): string =>
   pathname.startsWith("/") ? pathname.slice(1) : pathname;
 
 const tryServeFile = async (relativePath: string): Promise<Response | null> => {
-  const file = Bun.file(`dist/${stripLeadingSlash(relativePath)}`);
+  const file = Bun.file(`public/${stripLeadingSlash(relativePath)}`);
   if (!(await file.exists())) {
     return null;
   }
@@ -37,9 +37,9 @@ const serveHtml = async (pathname: string): Promise<Response> => {
 };
 
 export const previewCommand = async (port: number): Promise<number> => {
-  const exists = await Bun.file("dist/index.html").exists();
+  const exists = await Bun.file("public/index.html").exists();
   if (!exists) {
-    throw new Error("dist/ not found. Run `idcmd build` first.");
+    throw new Error("public/ not found. Run `idcmd build` first.");
   }
 
   const server = Bun.serve({

package/src/cli/runtime-assets.ts

@@ -1,7 +1,7 @@
 import { joinPath } from "./path";
 
-const RUNTIME_SOURCE_DIR = joinPath("site", "code", "runtime");
-const RUNTIME_OUTPUT_DIR = joinPath("dist", "_idcmd");
+const RUNTIME_SOURCE_DIR = joinPath("src", "runtime");
+const RUNTIME_OUTPUT_DIR = joinPath("public", "_idcmd");
 
 const RUNTIME_ENTRY_FILES = [
   "live-reload.ts",

package/src/content/paths.ts

@@ -21,7 +21,7 @@ export const slugFromContentFile = (file: string): string => {
 export const scanContentFiles =
   async function* scanContentFiles(): AsyncGenerator<string> {
     const { contentDir } = await getProjectPaths();
-    // `site/content/<slug>.md`
+    // `content/<slug>.md`
     for await (const file of flatContentGlob.scan(contentDir)) {
       yield file;
     }

package/src/project/paths.ts

@@ -1,27 +1,24 @@
-const DEFAULT_SITE_DIR = "site";
-const DEFAULT_DIST_DIR = "dist";
+const DEFAULT_OUTPUT_DIR = "public";
 const ASSET_PREFIX = "/_idcmd" as const;
 const CONTENT_DIR = "content";
-const PUBLIC_DIR = "assets";
+const ASSETS_DIR = "assets";
 const ICONS_DIR = "assets/icons";
-const ROUTES_DIR = "code/routes";
+const ROUTES_DIR = "src/routes";
 const SITE_CONFIG_FILE = "site.jsonc";
 
 export interface ProjectPaths {
   assetPrefix: typeof ASSET_PREFIX;
   contentDir: string;
-  distDir: string;
+  outputDir: string;
   iconsDir: string;
-  publicDir: string;
+  assetsDir: string;
   routesDir: string;
   siteConfigPath: string;
-  siteDir: string | null;
 }
 
 export interface ResolveProjectPathsOptions {
   cwd?: string;
-  distDir?: string;
-  siteDir?: string;
+  outputDir?: string;
 }
 
 const trimTrailingSlash = (value: string): string =>
@@ -44,29 +41,23 @@ const joinPath = (...parts: string[]): string => {
 
 const buildPaths = (args: {
   cwd: string;
-  distDirName: string;
-  siteDirName: string;
-}): ProjectPaths => {
-  const siteRoot = joinPath(args.cwd, args.siteDirName);
-  return {
-    assetPrefix: ASSET_PREFIX,
-    contentDir: joinPath(siteRoot, CONTENT_DIR),
-    distDir: joinPath(args.cwd, args.distDirName),
-    iconsDir: joinPath(siteRoot, ICONS_DIR),
-    publicDir: joinPath(siteRoot, PUBLIC_DIR),
-    routesDir: joinPath(siteRoot, ROUTES_DIR),
-    siteConfigPath: joinPath(siteRoot, SITE_CONFIG_FILE),
-    siteDir: siteRoot,
-  };
-};
+  outputDirName: string;
+}): ProjectPaths => ({
+  assetPrefix: ASSET_PREFIX,
+  assetsDir: joinPath(args.cwd, ASSETS_DIR),
+  contentDir: joinPath(args.cwd, CONTENT_DIR),
+  iconsDir: joinPath(args.cwd, ICONS_DIR),
+  outputDir: joinPath(args.cwd, args.outputDirName),
+  routesDir: joinPath(args.cwd, ROUTES_DIR),
+  siteConfigPath: joinPath(args.cwd, SITE_CONFIG_FILE),
+});
 
 export const resolveProjectPaths = (
   options: ResolveProjectPathsOptions = {}
 ): Promise<ProjectPaths> => {
   const cwd = trimTrailingSlash(options.cwd ?? process.cwd());
-  const distDirName = options.distDir ?? DEFAULT_DIST_DIR;
-  const siteDirName = options.siteDir ?? DEFAULT_SITE_DIR;
-  return Promise.resolve(buildPaths({ cwd, distDirName, siteDirName }));
+  const outputDirName = options.outputDir ?? DEFAULT_OUTPUT_DIR;
+  return Promise.resolve(buildPaths({ cwd, outputDirName }));
 };
 
 let cached: Promise<ProjectPaths> | null = null;

package/src/render/layout-loader.ts

@@ -2,7 +2,7 @@ import type { RenderLayout } from "./layout";
 
 import { renderLayout as defaultRenderLayout } from "./layout";
 
-const USER_LAYOUT_PATH = "site/code/ui/layout.tsx";
+const USER_LAYOUT_PATH = "src/ui/layout.tsx";
 
 const loadUserLayout = async (
   filePath: string

package/src/render/right-rail-loader.ts

@@ -2,7 +2,7 @@ import type { RightRailComponent } from "./right-rail";
 
 import { RightRail as defaultRightRail } from "./right-rail";
 
-const USER_RIGHT_RAIL_PATH = "site/code/ui/right-rail.tsx";
+const USER_RIGHT_RAIL_PATH = "src/ui/right-rail.tsx";
 
 const loadUserRightRail = async (
   filePath: string

package/src/search/index.ts

@@ -26,7 +26,7 @@ export interface SearchIndexV1 {
   documents: SearchIndexDocumentV1[];
 }
 
-const SEARCH_INDEX_PATH = "dist/search-index.json";
+const SEARCH_INDEX_PATH = "public/search-index.json";
 const MIN_QUERY_TOKEN_LENGTH = 2;
 const DEFAULT_BODY_MAX_CHARS = 2000;
 

package/src/search/search-page-loader.ts

@@ -2,7 +2,7 @@ import type { RenderSearchPageContent } from "./page";
 
 import { renderSearchPageContent as defaultRenderSearchPageContent } from "./page";
 
-const USER_SEARCH_PAGE_PATH = "site/code/ui/search-page.tsx";
+const USER_SEARCH_PAGE_PATH = "src/ui/search-page.tsx";
 
 const loadUserSearchPage = async (
   filePath: string

package/src/seo/server.ts

@@ -7,12 +7,12 @@ import {
 } from "./files";
 
 export interface SeoHandlerEnv {
-  distDir: string;
+  outputDir: string;
   isDev: boolean;
   staticCacheHeaders: HeadersInit;
 }
 
-const tryServeDistFile = async (
+const tryServeOutputFile = async (
   filePath: string,
   contentType: string,
   env: SeoHandlerEnv
@@ -42,8 +42,8 @@ export const handleRobotsTxt = async (
     return undefined;
   }
 
-  const served = await tryServeDistFile(
-    `${env.distDir}/robots.txt`,
+  const served = await tryServeOutputFile(
+    `${env.outputDir}/robots.txt`,
     "text/plain; charset=utf-8",
     env
   );
@@ -75,8 +75,8 @@ export const handleSitemapXml = async (
     return undefined;
   }
 
-  const served = await tryServeDistFile(
-    `${env.distDir}/sitemap.xml`,
+  const served = await tryServeOutputFile(
+    `${env.outputDir}/sitemap.xml`,
     "application/xml; charset=utf-8",
     env
   );

package/src/server/live-reload.ts

@@ -59,7 +59,7 @@ export const createLiveReload = (env: LiveReloadEnv): LiveReloadController => {
       return;
     }
 
-    console.log("Watching site/content/ for changes...");
+    console.log("Watching content/ for changes...");
     let snapshot = await getContentSnapshot();
 
     const poll = async (): Promise<void> => {

package/src/server/static.ts

@@ -13,9 +13,9 @@ const mimeTypes: Record<string, string> = {
 };
 
 export interface ServeStaticEnv {
-  distDir: string;
+  outputDir: string;
   isDev: boolean;
-  publicDir: string;
+  assetsDir: string;
   staticCacheHeaders: HeadersInit;
 }
 
@@ -46,7 +46,7 @@ export const serveStaticFile = async (
   pathname: string,
   env: ServeStaticEnv
 ): Promise<Response | null> => {
-  const roots = [env.distDir, env.publicDir];
+  const roots = [env.outputDir, env.assetsDir];
 
   for (const root of roots) {
     const served = await tryServeFileFromRoot(root, pathname, env);