livemark 0.11.3 → 0.11.4

package/build/plugins/vite-livemark.js

@@ -1,5 +1,6 @@
 import { cpSync, existsSync, rmSync } from "node:fs";
 import { join, sep } from "node:path";
+import { watch as chokidarWatch } from "chokidar";
 import { mergeConfig } from "vite";
 import { buildTarget } from "../actions/target/build.js";
 import { WebsiteConfig } from "../models/config.js";
@@ -67,25 +68,30 @@ export function livemark(opts) {
             return `export const config = ${JSON.stringify(config)}`;
         },
         configureServer(server) {
-            // Vite 8's chokidar runs with `disableGlobbing: true`, so passing
-            // a glob to `.add()` is treated as a literal path and silently
-            // does nothing. Pass the directories directly — chokidar watches
-            // them recursively by default.
-            //
-            // Watch only the escapable surfaces under `.livemark/` so we
-            // don't burn watches on `.livemark/build/` (the prerendered
-            // output dir) or other generated subdirs sitting alongside.
-            server.watcher.add(opts.config.configPath);
+            // Run our own chokidar instance instead of `server.watcher.add()`.
+            // Vite 8 bundles chokidar 3 with `disableGlobbing: true`, and paths
+            // added via `.add()` for surfaces outside its root (the consumer's
+            // `.livemark/` here) silently never fire — getWatched() reports
+            // them but no events arrive for external editors. A dedicated
+            // chokidar 5 watcher set up directly on those paths fires reliably.
+            // The cpSync into targetDir below is a same-process write, which
+            // Vite's own watcher on its root sees fine, so HMR triggers from
+            // there without needing to forward events manually.
+            const overlayPaths = [];
             for (const folder of ESCAPABLE_FOLDERS) {
-                server.watcher.add(join(overridesRoot, folder));
+                overlayPaths.push(join(overridesRoot, folder));
             }
             for (const file of ESCAPABLE_FILES) {
-                server.watcher.add(join(overridesRoot, file));
+                overlayPaths.push(join(overridesRoot, file));
             }
-            server.watcher.add(SOURCE_DIR);
-            server.watcher.on("change", file => onChange(file, "change"));
-            server.watcher.on("add", file => onChange(file, "add"));
-            server.watcher.on("unlink", file => onChange(file, "unlink"));
+            const watcher = chokidarWatch([opts.config.configPath, ...overlayPaths, SOURCE_DIR], { ignoreInitial: true, ignorePermissionErrors: true });
+            watcher.on("change", file => onChange(file, "change"));
+            watcher.on("add", file => onChange(file, "add"));
+            watcher.on("unlink", file => onChange(file, "unlink"));
+            const closeWatcher = () => {
+                watcher.close();
+            };
+            server.httpServer?.once("close", closeWatcher);
             function onChange(file, kind) {
                 if (file === opts.config.configPath) {
                     server.restart();
@@ -184,4 +190,4 @@ async function resolveViteOverride(vite, env) {
 function isObject(v) {
     return v !== null && typeof v === "object";
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"vite-livemark.js","sourceRoot":"","sources":["../../source/plugins/vite-livemark.ts"],"names":[],"mappings":"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","sourcesContent":["import { cpSync, existsSync, rmSync } from \"node:fs\"\nimport { join, sep } from \"node:path\"\nimport type {\n  ConfigEnv,\n  Plugin,\n  UserConfig as ViteUserConfig,\n  ViteDevServer,\n} from \"vite\"\nimport { mergeConfig } from \"vite\"\nimport { buildTarget } from \"../actions/target/build.ts\"\nimport type { Config } from \"../models/config.ts\"\nimport { WebsiteConfig } from \"../models/config.ts\"\nimport { ESCAPABLE_FILES, ESCAPABLE_FOLDERS } from \"../settings.ts\"\n\nexport interface LivemarkOptions {\n  config: Config\n}\n\nconst SOURCE_DIR = join(import.meta.dirname, \"..\")\n\n/** Single virtual module exposing livemark's runtime values to consumer\n *  override files via named exports:\n *\n *      import { config } from \"livemark:virtual\"\n *\n *  Currently exports `config` (validated `WebsiteConfig`); future\n *  additions (e.g. `articles`, `sections`) land here as new named\n *  exports without consumers changing their import statements.\n *\n *  The `\\0` prefix on the resolved id is Vite's convention to signal\n *  \"this is a virtual module — no other plugin should try to resolve\n *  or load it from disk\". */\nconst VIRTUAL_ID = \"livemark:virtual\"\nconst VIRTUAL_RESOLVED_ID = `\\0${VIRTUAL_ID}`\n\n/** Owns the per-consumer `targets/<hash>/` mount: synthesizes it via\n *  `buildTarget()`, returns the Vite config that anchors there, and\n *  watches the consumer's `.livemark/` (plus livemark's `source/` in\n *  dev) for changes that need to be re-copied into the target. The\n *  override mechanism is pure file-system (full copies) — no resolveId\n *  redirection, no realpath surprises. */\nexport function livemark(opts: LivemarkOptions): Plugin {\n  const overridesRoot = join(opts.config.root, \".livemark\")\n  let targetDir = \"\"\n  return {\n    name: \"livemark\",\n    enforce: \"pre\",\n    async config(_, env) {\n      targetDir = buildTarget(opts.config.configPath)\n      const base: ViteUserConfig = {\n        root: targetDir,\n        // outDir lives outside the target root (in the consumer's\n        // .livemark/) so the consumer can find their deployable output\n        // without digging into node_modules. Vite's default refusal to\n        // empty out-of-root directories doesn't apply here because the\n        // target/ root is livemark's, not the consumer's.\n        build: { outDir: join(overridesRoot, \"build\"), emptyOutDir: true },\n        resolve: { dedupe: [\"react\", \"react-dom\"] },\n        // For the SSR build only, inline every node_modules dep into\n        // server.js. The prerender step (which runs server.js with\n        // Node) walks node_modules from the build/ dir and can't reach\n        // packages buried in pnpm's `.pnpm/*/node_modules/` (e.g.\n        // TanStack-internal aliases like `h3-v2`). Self-contained\n        // bundle bypasses the issue. Dev SSR keeps externals (faster).\n        ...(env.command === \"build\" && {\n          environments: { ssr: { resolve: { noExternal: true } } },\n        }),\n      }\n      const override = await resolveViteOverride(opts.config.vite, env)\n      return override ? mergeConfig(base, override) : base\n    },\n    resolveId(id) {\n      if (id === VIRTUAL_ID) return VIRTUAL_RESOLVED_ID\n      return null\n    },\n    load(id) {\n      if (id !== VIRTUAL_RESOLVED_ID) return null\n      const config = WebsiteConfig.parse(opts.config)\n      return `export const config = ${JSON.stringify(config)}`\n    },\n    configureServer(server) {\n      // Vite 8's chokidar runs with `disableGlobbing: true`, so passing\n      // a glob to `.add()` is treated as a literal path and silently\n      // does nothing. Pass the directories directly — chokidar watches\n      // them recursively by default.\n      //\n      // Watch only the escapable surfaces under `.livemark/` so we\n      // don't burn watches on `.livemark/build/` (the prerendered\n      // output dir) or other generated subdirs sitting alongside.\n      server.watcher.add(opts.config.configPath)\n      for (const folder of ESCAPABLE_FOLDERS) {\n        server.watcher.add(join(overridesRoot, folder))\n      }\n      for (const file of ESCAPABLE_FILES) {\n        server.watcher.add(join(overridesRoot, file))\n      }\n      server.watcher.add(SOURCE_DIR)\n\n      server.watcher.on(\"change\", file => onChange(file, \"change\"))\n      server.watcher.on(\"add\", file => onChange(file, \"add\"))\n      server.watcher.on(\"unlink\", file => onChange(file, \"unlink\"))\n\n      function onChange(file: string, kind: \"change\" | \"add\" | \"unlink\") {\n        if (file === opts.config.configPath) {\n          server.restart()\n          return\n        }\n        const overlayHit = matchOverlay(file, overridesRoot)\n        if (overlayHit) {\n          syncOverlay(overlayHit, kind, targetDir, overridesRoot)\n          if (kind !== \"change\") fullReload(server)\n          return\n        }\n        const sourceHit = matchSource(file)\n        if (sourceHit) {\n          syncSource(sourceHit, kind, targetDir, overridesRoot)\n          if (kind !== \"change\") fullReload(server)\n        }\n      }\n    },\n  }\n}\n\ninterface Hit {\n  rel: string\n  category: \"folder\" | \"file\" | null\n}\n\nfunction matchOverlay(file: string, overridesRoot: string): Hit | null {\n  const prefix = `${overridesRoot}${sep}`\n  if (!file.startsWith(prefix)) return null\n  const rel = file.slice(prefix.length)\n  return { rel, category: classify(rel) }\n}\n\nfunction matchSource(file: string): Hit | null {\n  const prefix = `${SOURCE_DIR}${sep}`\n  if (!file.startsWith(prefix)) return null\n  // Skip the targets/ output dir itself (sibling of source/) and any\n  // `.gen.ts` files that downstream tools regenerate inside the target.\n  const rel = file.slice(prefix.length)\n  if (rel === \"\" || rel.includes(\"routeTree.gen.ts\")) return null\n  return { rel, category: classify(rel) }\n}\n\nfunction classify(rel: string): \"folder\" | \"file\" | null {\n  const [head] = rel.split(sep)\n  if (head && ESCAPABLE_FOLDERS.includes(head)) return \"folder\"\n  if (ESCAPABLE_FILES.includes(rel)) return \"file\"\n  // Non-escapable source files still need to flow into target during\n  // livemark's own dev — the user is editing the canonical source.\n  return null\n}\n\nfunction syncOverlay(\n  hit: Hit,\n  kind: \"change\" | \"add\" | \"unlink\",\n  targetDir: string,\n  overridesRoot: string,\n) {\n  if (!hit.category) return\n  const dest = join(targetDir, hit.rel)\n  const source = join(SOURCE_DIR, hit.rel)\n  if (kind === \"unlink\") {\n    rmSync(dest, { force: true, recursive: true })\n    if (existsSync(source))\n      cpSync(source, dest, { recursive: true, force: true })\n    return\n  }\n  const overlay = join(overridesRoot, hit.rel)\n  if (existsSync(overlay))\n    cpSync(overlay, dest, { recursive: true, force: true })\n}\n\nfunction syncSource(\n  hit: Hit,\n  kind: \"change\" | \"add\" | \"unlink\",\n  targetDir: string,\n  overridesRoot: string,\n) {\n  // If the consumer has an overlay for this file (and it's escapable),\n  // the overlay wins — ignore source changes.\n  if (hit.category && existsSync(join(overridesRoot, hit.rel))) return\n  const dest = join(targetDir, hit.rel)\n  const source = join(SOURCE_DIR, hit.rel)\n  if (kind === \"unlink\") {\n    rmSync(dest, { force: true, recursive: true })\n    return\n  }\n  if (existsSync(source)) cpSync(source, dest, { recursive: true, force: true })\n}\n\nfunction fullReload(server: ViteDevServer) {\n  server.ws.send({ type: \"full-reload\" })\n}\n\n/** Resolve livemark.config.ts's `vite` field — either a config object\n *  or a function `(env) => config` (matching Vite's own `defineConfig`).\n *  Schema stores it as `unknown`; typing for the consumer's editor\n *  lives on {@link ViteOverride}. */\nasync function resolveViteOverride(\n  vite: unknown,\n  env: ConfigEnv,\n): Promise<Record<string, unknown> | null> {\n  if (!vite) return null\n  if (typeof vite === \"function\") {\n    const result = await Reflect.apply(vite, undefined, [env])\n    return isObject(result) ? result : null\n  }\n  return isObject(vite) ? vite : null\n}\n\nfunction isObject(v: unknown): v is Record<string, unknown> {\n  return v !== null && typeof v === \"object\"\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"vite-livemark.js","sourceRoot":"","sources":["../../source/plugins/vite-livemark.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,KAAK,IAAI,aAAa,EAAE,MAAM,UAAU,CAAA;AAOjD,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAMnE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAElD;;;;;;;;;;;6BAW6B;AAC7B,MAAM,UAAU,GAAG,kBAAkB,CAAA;AACrC,MAAM,mBAAmB,GAAG,KAAK,UAAU,EAAE,CAAA;AAE7C;;;;;0CAK0C;AAC1C,MAAM,UAAU,QAAQ,CAAC,IAAqB;IAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IACzD,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,KAAK;QACd,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG;YACjB,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAC/C,MAAM,IAAI,GAAmB;gBAC3B,IAAI,EAAE,SAAS;gBACf,0DAA0D;gBAC1D,+DAA+D;gBAC/D,+DAA+D;gBAC/D,+DAA+D;gBAC/D,kDAAkD;gBAClD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE;gBAClE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE;gBAC3C,6DAA6D;gBAC7D,2DAA2D;gBAC3D,+DAA+D;gBAC/D,0DAA0D;gBAC1D,0DAA0D;gBAC1D,+DAA+D;gBAC/D,GAAG,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,IAAI;oBAC7B,YAAY,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE;iBACzD,CAAC;aACH,CAAA;YACD,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;YACjE,OAAO,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACtD,CAAC;QACD,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,UAAU;gBAAE,OAAO,mBAAmB,CAAA;YACjD,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,CAAC,EAAE;YACL,IAAI,EAAE,KAAK,mBAAmB;gBAAE,OAAO,IAAI,CAAA;YAC3C,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YAC/C,OAAO,yBAAyB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAA;QAC1D,CAAC;QACD,eAAe,CAAC,MAAM;YACpB,mEAAmE;YACnE,oEAAoE;YACpE,mEAAmE;YACnE,gEAAgE;YAChE,8DAA8D;YAC9D,oEAAoE;YACpE,iEAAiE;YACjE,iEAAiE;YACjE,oDAAoD;YACpD,MAAM,YAAY,GAAa,EAAE,CAAA;YACjC,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE,CAAC;gBACvC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAA;YAChD,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;gBACnC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAA;YAC9C,CAAC;YACD,MAAM,OAAO,GAAG,aAAa,CAC3B,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,YAAY,EAAE,UAAU,CAAC,EACrD,EAAE,aAAa,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,CACtD,CAAA;YACD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;YACtD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;YAChD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;YACtD,MAAM,YAAY,GAAG,GAAG,EAAE;gBACxB,OAAO,CAAC,KAAK,EAAE,CAAA;YACjB,CAAC,CAAA;YACD,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YAE9C,SAAS,QAAQ,CAAC,IAAY,EAAE,IAAiC;gBAC/D,IAAI,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oBACpC,MAAM,CAAC,OAAO,EAAE,CAAA;oBAChB,OAAM;gBACR,CAAC;gBACD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;gBACpD,IAAI,UAAU,EAAE,CAAC;oBACf,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;oBACvD,IAAI,IAAI,KAAK,QAAQ;wBAAE,UAAU,CAAC,MAAM,CAAC,CAAA;oBACzC,OAAM;gBACR,CAAC;gBACD,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;gBACnC,IAAI,SAAS,EAAE,CAAC;oBACd,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;oBACrD,IAAI,IAAI,KAAK,QAAQ;wBAAE,UAAU,CAAC,MAAM,CAAC,CAAA;gBAC3C,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAOD,SAAS,YAAY,CAAC,IAAY,EAAE,aAAqB;IACvD,MAAM,MAAM,GAAG,GAAG,aAAa,GAAG,GAAG,EAAE,CAAA;IACvC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACrC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAA;AACzC,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,MAAM,GAAG,GAAG,UAAU,GAAG,GAAG,EAAE,CAAA;IACpC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IACzC,mEAAmE;IACnE,sEAAsE;IACtE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACrC,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAAE,OAAO,IAAI,CAAA;IAC/D,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAA;AACzC,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAI,IAAI,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAA;IAC7D,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,MAAM,CAAA;IAChD,mEAAmE;IACnE,iEAAiE;IACjE,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,WAAW,CAClB,GAAQ,EACR,IAAiC,EACjC,SAAiB,EACjB,aAAqB;IAErB,IAAI,CAAC,GAAG,CAAC,QAAQ;QAAE,OAAM;IACzB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;IACrC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;IACxC,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9C,IAAI,UAAU,CAAC,MAAM,CAAC;YACpB,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACxD,OAAM;IACR,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;IAC5C,IAAI,UAAU,CAAC,OAAO,CAAC;QACrB,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AAC3D,CAAC;AAED,SAAS,UAAU,CACjB,GAAQ,EACR,IAAiC,EACjC,SAAiB,EACjB,aAAqB;IAErB,qEAAqE;IACrE,4CAA4C;IAC5C,IAAI,GAAG,CAAC,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QAAE,OAAM;IACpE,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;IACrC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;IACxC,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9C,OAAM;IACR,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,CAAC;QAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;AAChF,CAAC;AAED,SAAS,UAAU,CAAC,MAAqB;IACvC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAA;AACzC,CAAC;AAED;;;qCAGqC;AACrC,KAAK,UAAU,mBAAmB,CAChC,IAAa,EACb,GAAc;IAEd,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;QAC1D,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAA;IACzC,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;AACrC,CAAC;AAED,SAAS,QAAQ,CAAC,CAAU;IAC1B,OAAO,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,CAAA;AAC5C,CAAC","sourcesContent":["import { cpSync, existsSync, rmSync } from \"node:fs\"\nimport { join, sep } from \"node:path\"\nimport { watch as chokidarWatch } from \"chokidar\"\nimport type {\n  ConfigEnv,\n  Plugin,\n  UserConfig as ViteUserConfig,\n  ViteDevServer,\n} from \"vite\"\nimport { mergeConfig } from \"vite\"\nimport { buildTarget } from \"../actions/target/build.ts\"\nimport type { Config } from \"../models/config.ts\"\nimport { WebsiteConfig } from \"../models/config.ts\"\nimport { ESCAPABLE_FILES, ESCAPABLE_FOLDERS } from \"../settings.ts\"\n\nexport interface LivemarkOptions {\n  config: Config\n}\n\nconst SOURCE_DIR = join(import.meta.dirname, \"..\")\n\n/** Single virtual module exposing livemark's runtime values to consumer\n *  override files via named exports:\n *\n *      import { config } from \"livemark:virtual\"\n *\n *  Currently exports `config` (validated `WebsiteConfig`); future\n *  additions (e.g. `articles`, `sections`) land here as new named\n *  exports without consumers changing their import statements.\n *\n *  The `\\0` prefix on the resolved id is Vite's convention to signal\n *  \"this is a virtual module — no other plugin should try to resolve\n *  or load it from disk\". */\nconst VIRTUAL_ID = \"livemark:virtual\"\nconst VIRTUAL_RESOLVED_ID = `\\0${VIRTUAL_ID}`\n\n/** Owns the per-consumer `targets/<hash>/` mount: synthesizes it via\n *  `buildTarget()`, returns the Vite config that anchors there, and\n *  watches the consumer's `.livemark/` (plus livemark's `source/` in\n *  dev) for changes that need to be re-copied into the target. The\n *  override mechanism is pure file-system (full copies) — no resolveId\n *  redirection, no realpath surprises. */\nexport function livemark(opts: LivemarkOptions): Plugin {\n  const overridesRoot = join(opts.config.root, \".livemark\")\n  let targetDir = \"\"\n  return {\n    name: \"livemark\",\n    enforce: \"pre\",\n    async config(_, env) {\n      targetDir = buildTarget(opts.config.configPath)\n      const base: ViteUserConfig = {\n        root: targetDir,\n        // outDir lives outside the target root (in the consumer's\n        // .livemark/) so the consumer can find their deployable output\n        // without digging into node_modules. Vite's default refusal to\n        // empty out-of-root directories doesn't apply here because the\n        // target/ root is livemark's, not the consumer's.\n        build: { outDir: join(overridesRoot, \"build\"), emptyOutDir: true },\n        resolve: { dedupe: [\"react\", \"react-dom\"] },\n        // For the SSR build only, inline every node_modules dep into\n        // server.js. The prerender step (which runs server.js with\n        // Node) walks node_modules from the build/ dir and can't reach\n        // packages buried in pnpm's `.pnpm/*/node_modules/` (e.g.\n        // TanStack-internal aliases like `h3-v2`). Self-contained\n        // bundle bypasses the issue. Dev SSR keeps externals (faster).\n        ...(env.command === \"build\" && {\n          environments: { ssr: { resolve: { noExternal: true } } },\n        }),\n      }\n      const override = await resolveViteOverride(opts.config.vite, env)\n      return override ? mergeConfig(base, override) : base\n    },\n    resolveId(id) {\n      if (id === VIRTUAL_ID) return VIRTUAL_RESOLVED_ID\n      return null\n    },\n    load(id) {\n      if (id !== VIRTUAL_RESOLVED_ID) return null\n      const config = WebsiteConfig.parse(opts.config)\n      return `export const config = ${JSON.stringify(config)}`\n    },\n    configureServer(server) {\n      // Run our own chokidar instance instead of `server.watcher.add()`.\n      // Vite 8 bundles chokidar 3 with `disableGlobbing: true`, and paths\n      // added via `.add()` for surfaces outside its root (the consumer's\n      // `.livemark/` here) silently never fire — getWatched() reports\n      // them but no events arrive for external editors. A dedicated\n      // chokidar 5 watcher set up directly on those paths fires reliably.\n      // The cpSync into targetDir below is a same-process write, which\n      // Vite's own watcher on its root sees fine, so HMR triggers from\n      // there without needing to forward events manually.\n      const overlayPaths: string[] = []\n      for (const folder of ESCAPABLE_FOLDERS) {\n        overlayPaths.push(join(overridesRoot, folder))\n      }\n      for (const file of ESCAPABLE_FILES) {\n        overlayPaths.push(join(overridesRoot, file))\n      }\n      const watcher = chokidarWatch(\n        [opts.config.configPath, ...overlayPaths, SOURCE_DIR],\n        { ignoreInitial: true, ignorePermissionErrors: true },\n      )\n      watcher.on(\"change\", file => onChange(file, \"change\"))\n      watcher.on(\"add\", file => onChange(file, \"add\"))\n      watcher.on(\"unlink\", file => onChange(file, \"unlink\"))\n      const closeWatcher = () => {\n        watcher.close()\n      }\n      server.httpServer?.once(\"close\", closeWatcher)\n\n      function onChange(file: string, kind: \"change\" | \"add\" | \"unlink\") {\n        if (file === opts.config.configPath) {\n          server.restart()\n          return\n        }\n        const overlayHit = matchOverlay(file, overridesRoot)\n        if (overlayHit) {\n          syncOverlay(overlayHit, kind, targetDir, overridesRoot)\n          if (kind !== \"change\") fullReload(server)\n          return\n        }\n        const sourceHit = matchSource(file)\n        if (sourceHit) {\n          syncSource(sourceHit, kind, targetDir, overridesRoot)\n          if (kind !== \"change\") fullReload(server)\n        }\n      }\n    },\n  }\n}\n\ninterface Hit {\n  rel: string\n  category: \"folder\" | \"file\" | null\n}\n\nfunction matchOverlay(file: string, overridesRoot: string): Hit | null {\n  const prefix = `${overridesRoot}${sep}`\n  if (!file.startsWith(prefix)) return null\n  const rel = file.slice(prefix.length)\n  return { rel, category: classify(rel) }\n}\n\nfunction matchSource(file: string): Hit | null {\n  const prefix = `${SOURCE_DIR}${sep}`\n  if (!file.startsWith(prefix)) return null\n  // Skip the targets/ output dir itself (sibling of source/) and any\n  // `.gen.ts` files that downstream tools regenerate inside the target.\n  const rel = file.slice(prefix.length)\n  if (rel === \"\" || rel.includes(\"routeTree.gen.ts\")) return null\n  return { rel, category: classify(rel) }\n}\n\nfunction classify(rel: string): \"folder\" | \"file\" | null {\n  const [head] = rel.split(sep)\n  if (head && ESCAPABLE_FOLDERS.includes(head)) return \"folder\"\n  if (ESCAPABLE_FILES.includes(rel)) return \"file\"\n  // Non-escapable source files still need to flow into target during\n  // livemark's own dev — the user is editing the canonical source.\n  return null\n}\n\nfunction syncOverlay(\n  hit: Hit,\n  kind: \"change\" | \"add\" | \"unlink\",\n  targetDir: string,\n  overridesRoot: string,\n) {\n  if (!hit.category) return\n  const dest = join(targetDir, hit.rel)\n  const source = join(SOURCE_DIR, hit.rel)\n  if (kind === \"unlink\") {\n    rmSync(dest, { force: true, recursive: true })\n    if (existsSync(source))\n      cpSync(source, dest, { recursive: true, force: true })\n    return\n  }\n  const overlay = join(overridesRoot, hit.rel)\n  if (existsSync(overlay))\n    cpSync(overlay, dest, { recursive: true, force: true })\n}\n\nfunction syncSource(\n  hit: Hit,\n  kind: \"change\" | \"add\" | \"unlink\",\n  targetDir: string,\n  overridesRoot: string,\n) {\n  // If the consumer has an overlay for this file (and it's escapable),\n  // the overlay wins — ignore source changes.\n  if (hit.category && existsSync(join(overridesRoot, hit.rel))) return\n  const dest = join(targetDir, hit.rel)\n  const source = join(SOURCE_DIR, hit.rel)\n  if (kind === \"unlink\") {\n    rmSync(dest, { force: true, recursive: true })\n    return\n  }\n  if (existsSync(source)) cpSync(source, dest, { recursive: true, force: true })\n}\n\nfunction fullReload(server: ViteDevServer) {\n  server.ws.send({ type: \"full-reload\" })\n}\n\n/** Resolve livemark.config.ts's `vite` field — either a config object\n *  or a function `(env) => config` (matching Vite's own `defineConfig`).\n *  Schema stores it as `unknown`; typing for the consumer's editor\n *  lives on {@link ViteOverride}. */\nasync function resolveViteOverride(\n  vite: unknown,\n  env: ConfigEnv,\n): Promise<Record<string, unknown> | null> {\n  if (!vite) return null\n  if (typeof vite === \"function\") {\n    const result = await Reflect.apply(vite, undefined, [env])\n    return isObject(result) ? result : null\n  }\n  return isObject(vite) ? vite : null\n}\n\nfunction isObject(v: unknown): v is Record<string, unknown> {\n  return v !== null && typeof v === \"object\"\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livemark",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "Livemark description",
   "license": "MIT",
   "author": "Evgeny Karev",
@@ -48,6 +48,7 @@
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
     "@vitejs/plugin-react": "6.0.1",
+    "chokidar": "^5.0.0",
     "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
     "cmdk": "1.1.1",
@@ -128,7 +129,7 @@
     "lint": "vp fmt --check && vp lint",
     "release": "pnpm publish --access public --ignore-scripts --no-git-checks",
     "setversion": "pnpm version --no-git-tag-version",
-    "start": "pnpm build && livemark start",
+    "start": "node source/entrypoints/main.ts",
     "unit": "vp test",
     "test": "pnpm lint && pnpm type && pnpm unit",
     "type": "tsgo --noEmit"

package/source/plugins/vite-livemark.ts

@@ -1,5 +1,6 @@
 import { cpSync, existsSync, rmSync } from "node:fs"
 import { join, sep } from "node:path"
+import { watch as chokidarWatch } from "chokidar"
 import type {
   ConfigEnv,
   Plugin,
@@ -79,26 +80,33 @@ export function livemark(opts: LivemarkOptions): Plugin {
       return `export const config = ${JSON.stringify(config)}`
     },
     configureServer(server) {
-      // Vite 8's chokidar runs with `disableGlobbing: true`, so passing
-      // a glob to `.add()` is treated as a literal path and silently
-      // does nothing. Pass the directories directly — chokidar watches
-      // them recursively by default.
-      //
-      // Watch only the escapable surfaces under `.livemark/` so we
-      // don't burn watches on `.livemark/build/` (the prerendered
-      // output dir) or other generated subdirs sitting alongside.
-      server.watcher.add(opts.config.configPath)
+      // Run our own chokidar instance instead of `server.watcher.add()`.
+      // Vite 8 bundles chokidar 3 with `disableGlobbing: true`, and paths
+      // added via `.add()` for surfaces outside its root (the consumer's
+      // `.livemark/` here) silently never fire — getWatched() reports
+      // them but no events arrive for external editors. A dedicated
+      // chokidar 5 watcher set up directly on those paths fires reliably.
+      // The cpSync into targetDir below is a same-process write, which
+      // Vite's own watcher on its root sees fine, so HMR triggers from
+      // there without needing to forward events manually.
+      const overlayPaths: string[] = []
       for (const folder of ESCAPABLE_FOLDERS) {
-        server.watcher.add(join(overridesRoot, folder))
+        overlayPaths.push(join(overridesRoot, folder))
       }
       for (const file of ESCAPABLE_FILES) {
-        server.watcher.add(join(overridesRoot, file))
+        overlayPaths.push(join(overridesRoot, file))
       }
-      server.watcher.add(SOURCE_DIR)
-
-      server.watcher.on("change", file => onChange(file, "change"))
-      server.watcher.on("add", file => onChange(file, "add"))
-      server.watcher.on("unlink", file => onChange(file, "unlink"))
+      const watcher = chokidarWatch(
+        [opts.config.configPath, ...overlayPaths, SOURCE_DIR],
+        { ignoreInitial: true, ignorePermissionErrors: true },
+      )
+      watcher.on("change", file => onChange(file, "change"))
+      watcher.on("add", file => onChange(file, "add"))
+      watcher.on("unlink", file => onChange(file, "unlink"))
+      const closeWatcher = () => {
+        watcher.close()
+      }
+      server.httpServer?.once("close", closeWatcher)
 
       function onChange(file: string, kind: "change" | "add" | "unlink") {
         if (file === opts.config.configPath) {