livemark 0.28.4 → 0.28.5

package/source/actions/target/clear.ts

@@ -1,14 +1,15 @@
-import { rmSync } from "node:fs"
-import { join } from "node:path"
+import { cacheDirFor, removeTargetDir } from "../../helpers/target-dir.ts"
 import { targetDirFor } from "./build.ts"
 
 /**
- * Wipe the project's target dir so the next run rebuilds it from scratch.
+ * Wipe the project's target dirs and cache so the next run rebuilds them from scratch.
  */
 export function clearTarget(configPath: string) {
-  const targetDir = targetDirFor(configPath)
-  // Unlink the dependency link first so the recursive remove cannot reach the store.
-  rmSync(join(targetDir, "node_modules"), { force: true })
-  rmSync(targetDir, { recursive: true, force: true })
-  return targetDir
+  const targetDirs = [
+    targetDirFor(configPath, "serve"),
+    targetDirFor(configPath, "build"),
+    cacheDirFor(configPath),
+  ]
+  for (const targetDir of targetDirs) removeTargetDir(targetDir)
+  return targetDirs
 }

package/source/actions/target/clear.unit.ts

@@ -3,22 +3,29 @@ import { mkdir, symlink, writeFile } from "node:fs/promises"
 import { join } from "node:path"
 import { temporaryDirectoryTask } from "tempy"
 import { describe, expect, it } from "vite-plus/test"
+import { cacheDirFor } from "../../helpers/target-dir.ts"
 import { targetDirFor } from "./build.ts"
 import { clearTarget } from "./clear.ts"
 
 describe("clearTarget", () => {
-  it("removes the target dir without following its dependency link", () =>
+  it("removes the target dirs without following their dependency link", () =>
     temporaryDirectoryTask(async root => {
       const configPath = join(root, "livemark.config.ts")
       const targetDir = targetDirFor(configPath)
+      const buildDir = targetDirFor(configPath, "build")
+      const cacheDir = cacheDirFor(configPath)
+      await mkdir(buildDir, { recursive: true })
+      await mkdir(cacheDir, { recursive: true })
       await mkdir(join(targetDir, "cache"), { recursive: true })
       await writeFile(join(targetDir, "cache", "entry.md"), "cached")
       await mkdir(join(root, "deps"))
       await writeFile(join(root, "deps", "kept.js"), "")
       await symlink(join(root, "deps"), join(targetDir, "node_modules"), "junction")
 
-      expect(clearTarget(configPath)).toBe(targetDir)
+      expect(clearTarget(configPath)).toEqual([targetDir, buildDir, cacheDir])
       expect(existsSync(targetDir)).toBe(false)
+      expect(existsSync(buildDir)).toBe(false)
+      expect(existsSync(cacheDir)).toBe(false)
       expect(existsSync(join(root, "deps", "kept.js"))).toBe(true)
       expect(() => clearTarget(configPath)).not.toThrow()
     }))

package/source/commands/clear.ts

@@ -4,12 +4,13 @@ import { loadConfig } from "../actions/config/load.ts"
 import { clearTarget } from "../actions/target/clear.ts"
 
 /**
- * Wipe the generated `.livemark/.target/` mount.
+ * Wipe the generated `.livemark/.serve/` and `.livemark/.build/` mounts and `.livemark/.cache/`.
  */
 export const clear = new Command("clear")
-  .description("Wipe the generated .livemark/.target/ mount")
+  .description("Wipe the generated .livemark/.serve/, .build/ and .cache/")
   .action(async () => {
     const config = await loadConfig()
-    const targetDir = clearTarget(config.configPath)
-    console.log(`Cleared ${pc.dim(targetDir)}`)
+    for (const targetDir of clearTarget(config.configPath)) {
+      console.log(`Cleared ${pc.dim(targetDir)}`)
+    }
   })

package/source/helpers/tailwind-sources.unit.ts

@@ -1,14 +1,14 @@
 import { describe, expect, it } from "vite-plus/test"
 import { excludeTailwindSources } from "./tailwind-sources.ts"
 
-const targetDir = "/project/.livemark/.target"
+const targetDir = "/project/.livemark/.serve"
 
 describe("excludeTailwindSources", () => {
   it("excludes the dependency link and the content cache from a Tailwind entry", () => {
     const css = `@import "tailwindcss";\n@import "./shape.css";`
     expect(excludeTailwindSources({ css, targetDir })).toBe(
-      `${css}\n@source not "/project/.livemark/.target/node_modules";\n` +
-        `@source not "/project/.livemark/.target/.content-collections/cache";\n`,
+      `${css}\n@source not "/project/.livemark/.serve/node_modules";\n` +
+        `@source not "/project/.livemark/.serve/.content-collections/cache";\n`,
     )
   })
 

package/source/helpers/target-dir.ts

@@ -0,0 +1,12 @@
+import { rmSync } from "node:fs"
+import { dirname, join } from "node:path"
+
+export function removeTargetDir(targetDir: string) {
+  // Unlink the dependency link first so the recursive remove cannot reach the store.
+  rmSync(join(targetDir, "node_modules"), { force: true })
+  rmSync(targetDir, { recursive: true, force: true })
+}
+
+export function cacheDirFor(configPath: string) {
+  return join(dirname(configPath), ".livemark", ".cache")
+}

package/source/helpers/target-export.unit.ts

@@ -3,7 +3,7 @@ import { describe, expect, it } from "vite-plus/test"
 import packageJson from "../../package.json" with { type: "json" }
 import { resolveTargetExport } from "./target-export.ts"
 
-const targetDir = "/project/.livemark/.target"
+const targetDir = "/project/.livemark/.serve"
 
 function resolveId(id: string) {
   return resolveTargetExport({ id, targetDir, exports: packageJson.exports })

package/source/plugins/vite-livemark.ts

@@ -42,7 +42,8 @@ const LOCKFILES = [
 const VIRTUAL_ID = "livemark:virtual"
 const VIRTUAL_RESOLVED_ID = `\0${VIRTUAL_ID}`
 
-/** Owns the project's `.livemark/.target/` mount: synthesizes it via
+/** Owns the project's `.livemark/.serve/` mount (`.build/` when building, so a build
+ *  never rewrites a running dev server's files): synthesizes it via
  *  `buildTarget()`, returns the Vite config that anchors there, and
  *  copies `.livemark/` edits (plus livemark's `source/` in its own dev)
  *  into the target. Vite watches the target natively, so its own HMR
@@ -58,6 +59,7 @@ export function livemark(opts: LivemarkOptions): Plugin {
       targetDir = buildTarget({
         configPath: opts.config.configPath,
         sourceDir: SOURCE_DIR,
+        command: env.command === "build" || env.isPreview ? "build" : "serve",
       })
       const base: ViteUserConfig = {
         root: targetDir,
@@ -137,14 +139,22 @@ export function livemark(opts: LivemarkOptions): Plugin {
           return
         }
         if (isWithin(file, targetDir) || isWithin(file, outDir)) return
-        const overlayHit = matchPath(file, overridesRoot)
-        if (overlayHit) {
-          syncOverlay(overlayHit, kind, targetDir, overridesRoot)
-          return
-        }
-        const sourceHit = matchPath(file, SOURCE_DIR)
-        if (sourceHit && !sourceHit.rel.includes("routeTree.gen.ts")) {
-          syncSource(sourceHit, kind, targetDir, overridesRoot)
+        // A watcher callback that throws kills the server, and a copy racing another
+        // writer of the target (an editor's atomic save, `livemark clear`) fails.
+        try {
+          const overlayHit = matchPath(file, overridesRoot)
+          if (overlayHit) {
+            syncOverlay(overlayHit, kind, targetDir, overridesRoot)
+            return
+          }
+          const sourceHit = matchPath(file, SOURCE_DIR)
+          if (sourceHit && !sourceHit.rel.includes("routeTree.gen.ts")) {
+            syncSource(sourceHit, kind, targetDir, overridesRoot)
+          }
+        } catch (error) {
+          server.config.logger.error(`[livemark] failed to sync ${file}: ${error}`, {
+            error: error instanceof Error ? error : undefined,
+          })
         }
       }
     },