livemark 0.28.4 → 0.28.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/build/actions/changelog/build.d.ts +1 -1
- package/build/actions/changelog/build.js +5 -5
- package/build/actions/changelog/build.unit.js +6 -6
- package/build/actions/target/build.d.ts +9 -5
- package/build/actions/target/build.js +14 -9
- package/build/actions/target/build.unit.js +17 -2
- package/build/actions/target/clear.d.ts +2 -2
- package/build/actions/target/clear.js +11 -9
- package/build/actions/target/clear.unit.js +10 -3
- package/build/commands/clear.d.ts +1 -1
- package/build/commands/clear.js +6 -5
- package/build/helpers/tailwind-sources.unit.js +4 -4
- package/build/helpers/target-dir.d.ts +2 -0
- package/build/helpers/target-dir.js +11 -0
- package/build/helpers/target-export.unit.js +2 -2
- package/build/plugins/vite-livemark.d.ts +2 -1
- package/build/plugins/vite-livemark.js +20 -9
- package/package.json +1 -1
- package/skills/livemark-configuration/SKILL.md +1 -1
- package/skills/livemark-customization/SKILL.md +1 -1
- package/skills/livemark-deployment/SKILL.md +1 -1
- package/source/actions/changelog/build.ts +4 -5
- package/source/actions/changelog/build.unit.ts +5 -5
- package/source/actions/target/build.ts +29 -9
- package/source/actions/target/build.unit.ts +24 -1
- package/source/actions/target/clear.ts +9 -8
- package/source/actions/target/clear.unit.ts +9 -2
- package/source/commands/clear.ts +5 -4
- package/source/helpers/tailwind-sources.unit.ts +3 -3
- package/source/helpers/target-dir.ts +12 -0
- package/source/helpers/target-export.unit.ts +1 -1
- package/source/plugins/vite-livemark.ts +19 -9
|
@@ -3,21 +3,28 @@ import { mkdir, symlink, writeFile } from "node:fs/promises";
|
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { temporaryDirectoryTask } from "tempy";
|
|
5
5
|
import { describe, expect, it } from "vite-plus/test";
|
|
6
|
+
import { cacheDirFor } from "../../helpers/target-dir.js";
|
|
6
7
|
import { targetDirFor } from "./build.js";
|
|
7
8
|
import { clearTarget } from "./clear.js";
|
|
8
9
|
describe("clearTarget", () => {
|
|
9
|
-
it("removes the target
|
|
10
|
+
it("removes the target dirs without following their dependency link", () => temporaryDirectoryTask(async (root) => {
|
|
10
11
|
const configPath = join(root, "livemark.config.ts");
|
|
11
12
|
const targetDir = targetDirFor(configPath);
|
|
13
|
+
const buildDir = targetDirFor(configPath, "build");
|
|
14
|
+
const cacheDir = cacheDirFor(configPath);
|
|
15
|
+
await mkdir(buildDir, { recursive: true });
|
|
16
|
+
await mkdir(cacheDir, { recursive: true });
|
|
12
17
|
await mkdir(join(targetDir, "cache"), { recursive: true });
|
|
13
18
|
await writeFile(join(targetDir, "cache", "entry.md"), "cached");
|
|
14
19
|
await mkdir(join(root, "deps"));
|
|
15
20
|
await writeFile(join(root, "deps", "kept.js"), "");
|
|
16
21
|
await symlink(join(root, "deps"), join(targetDir, "node_modules"), "junction");
|
|
17
|
-
expect(clearTarget(configPath)).
|
|
22
|
+
expect(clearTarget(configPath)).toEqual([targetDir, buildDir, cacheDir]);
|
|
18
23
|
expect(existsSync(targetDir)).toBe(false);
|
|
24
|
+
expect(existsSync(buildDir)).toBe(false);
|
|
25
|
+
expect(existsSync(cacheDir)).toBe(false);
|
|
19
26
|
expect(existsSync(join(root, "deps", "kept.js"))).toBe(true);
|
|
20
27
|
expect(() => clearTarget(configPath)).not.toThrow();
|
|
21
28
|
}));
|
|
22
29
|
});
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXIudW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NvdXJjZS9hY3Rpb25zL3RhcmdldC9jbGVhci51bml0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxTQUFTLENBQUE7QUFDcEMsT0FBTyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDNUQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUNoQyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxPQUFPLENBQUE7QUFDOUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDZCQUE2QixDQUFBO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV4QyxRQUFRLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRTtJQUMzQixFQUFFLENBQUMsaUVBQWlFLEVBQUUsR0FBRyxFQUFFLENBQ3pFLHNCQUFzQixDQUFDLEtBQUssRUFBQyxJQUFJLEVBQUMsRUFBRTtRQUNsQyxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLG9CQUFvQixDQUFDLENBQUE7UUFDbkQsTUFBTSxTQUFTLEdBQUcsWUFBWSxDQUFDLFVBQVUsQ0FBQyxDQUFBO1FBQzFDLE1BQU0sUUFBUSxHQUFHLFlBQVksQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDbEQsTUFBTSxRQUFRLEdBQUcsV0FBVyxDQUFDLFVBQVUsQ0FBQyxDQUFBO1FBQ3hDLE1BQU0sS0FBSyxDQUFDLFFBQVEsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO1FBQzFDLE1BQU0sS0FBSyxDQUFDLFFBQVEsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO1FBQzFDLE1BQU0sS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtRQUMxRCxNQUFNLFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxVQUFVLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQTtRQUMvRCxNQUFNLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUE7UUFDL0IsTUFBTSxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDbEQsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxFQUFFLFVBQVUsQ0FBQyxDQUFBO1FBRTlFLE1BQU0sQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxTQUFTLEVBQUUsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUE7UUFDeEUsTUFBTSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUN6QyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3hDLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDeEMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQzVELE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDckQsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNQLENBQUMsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZXhpc3RzU3luYyB9IGZyb20gXCJub2RlOmZzXCJcbmltcG9ydCB7IG1rZGlyLCBzeW1saW5rLCB3cml0ZUZpbGUgfSBmcm9tIFwibm9kZTpmcy9wcm9taXNlc1wiXG5pbXBvcnQgeyBqb2luIH0gZnJvbSBcIm5vZGU6cGF0aFwiXG5pbXBvcnQgeyB0ZW1wb3JhcnlEaXJlY3RvcnlUYXNrIH0gZnJvbSBcInRlbXB5XCJcbmltcG9ydCB7IGRlc2NyaWJlLCBleHBlY3QsIGl0IH0gZnJvbSBcInZpdGUtcGx1cy90ZXN0XCJcbmltcG9ydCB7IGNhY2hlRGlyRm9yIH0gZnJvbSBcIi4uLy4uL2hlbHBlcnMvdGFyZ2V0LWRpci50c1wiXG5pbXBvcnQgeyB0YXJnZXREaXJGb3IgfSBmcm9tIFwiLi9idWlsZC50c1wiXG5pbXBvcnQgeyBjbGVhclRhcmdldCB9IGZyb20gXCIuL2NsZWFyLnRzXCJcblxuZGVzY3JpYmUoXCJjbGVhclRhcmdldFwiLCAoKSA9PiB7XG4gIGl0KFwicmVtb3ZlcyB0aGUgdGFyZ2V0IGRpcnMgd2l0aG91dCBmb2xsb3dpbmcgdGhlaXIgZGVwZW5kZW5jeSBsaW5rXCIsICgpID0+XG4gICAgdGVtcG9yYXJ5RGlyZWN0b3J5VGFzayhhc3luYyByb290ID0+IHtcbiAgICAgIGNvbnN0IGNvbmZpZ1BhdGggPSBqb2luKHJvb3QsIFwibGl2ZW1hcmsuY29uZmlnLnRzXCIpXG4gICAgICBjb25zdCB0YXJnZXREaXIgPSB0YXJnZXREaXJGb3IoY29uZmlnUGF0aClcbiAgICAgIGNvbnN0IGJ1aWxkRGlyID0gdGFyZ2V0RGlyRm9yKGNvbmZpZ1BhdGgsIFwiYnVpbGRcIilcbiAgICAgIGNvbnN0IGNhY2hlRGlyID0gY2FjaGVEaXJGb3IoY29uZmlnUGF0aClcbiAgICAgIGF3YWl0IG1rZGlyKGJ1aWxkRGlyLCB7IHJlY3Vyc2l2ZTogdHJ1ZSB9KVxuICAgICAgYXdhaXQgbWtkaXIoY2FjaGVEaXIsIHsgcmVjdXJzaXZlOiB0cnVlIH0pXG4gICAgICBhd2FpdCBta2Rpcihqb2luKHRhcmdldERpciwgXCJjYWNoZVwiKSwgeyByZWN1cnNpdmU6IHRydWUgfSlcbiAgICAgIGF3YWl0IHdyaXRlRmlsZShqb2luKHRhcmdldERpciwgXCJjYWNoZVwiLCBcImVudHJ5Lm1kXCIpLCBcImNhY2hlZFwiKVxuICAgICAgYXdhaXQgbWtkaXIoam9pbihyb290LCBcImRlcHNcIikpXG4gICAgICBhd2FpdCB3cml0ZUZpbGUoam9pbihyb290LCBcImRlcHNcIiwgXCJrZXB0LmpzXCIpLCBcIlwiKVxuICAgICAgYXdhaXQgc3ltbGluayhqb2luKHJvb3QsIFwiZGVwc1wiKSwgam9pbih0YXJnZXREaXIsIFwibm9kZV9tb2R1bGVzXCIpLCBcImp1bmN0aW9uXCIpXG5cbiAgICAgIGV4cGVjdChjbGVhclRhcmdldChjb25maWdQYXRoKSkudG9FcXVhbChbdGFyZ2V0RGlyLCBidWlsZERpciwgY2FjaGVEaXJdKVxuICAgICAgZXhwZWN0KGV4aXN0c1N5bmModGFyZ2V0RGlyKSkudG9CZShmYWxzZSlcbiAgICAgIGV4cGVjdChleGlzdHNTeW5jKGJ1aWxkRGlyKSkudG9CZShmYWxzZSlcbiAgICAgIGV4cGVjdChleGlzdHNTeW5jKGNhY2hlRGlyKSkudG9CZShmYWxzZSlcbiAgICAgIGV4cGVjdChleGlzdHNTeW5jKGpvaW4ocm9vdCwgXCJkZXBzXCIsIFwia2VwdC5qc1wiKSkpLnRvQmUodHJ1ZSlcbiAgICAgIGV4cGVjdCgoKSA9PiBjbGVhclRhcmdldChjb25maWdQYXRoKSkubm90LnRvVGhyb3coKVxuICAgIH0pKVxufSlcbiJdfQ==
|
package/build/commands/clear.js
CHANGED
|
@@ -3,13 +3,14 @@ import pc from "picocolors";
|
|
|
3
3
|
import { loadConfig } from "../actions/config/load.js";
|
|
4
4
|
import { clearTarget } from "../actions/target/clear.js";
|
|
5
5
|
/**
|
|
6
|
-
* Wipe the generated `.livemark/.
|
|
6
|
+
* Wipe the generated `.livemark/.serve/` and `.livemark/.build/` mounts and `.livemark/.cache/`.
|
|
7
7
|
*/
|
|
8
8
|
export const clear = new Command("clear")
|
|
9
|
-
.description("Wipe the generated .livemark/.
|
|
9
|
+
.description("Wipe the generated .livemark/.serve/, .build/ and .cache/")
|
|
10
10
|
.action(async () => {
|
|
11
11
|
const config = await loadConfig();
|
|
12
|
-
const targetDir
|
|
13
|
-
|
|
12
|
+
for (const targetDir of clearTarget(config.configPath)) {
|
|
13
|
+
console.log(`Cleared ${pc.dim(targetDir)}`);
|
|
14
|
+
}
|
|
14
15
|
});
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zb3VyY2UvY29tbWFuZHMvY2xlYXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUNuQyxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ3RELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQTtBQUV4RDs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUM7S0FDdEMsV0FBVyxDQUFDLDJEQUEyRCxDQUFDO0tBQ3hFLE1BQU0sQ0FBQyxLQUFLLElBQUksRUFBRTtJQUNqQixNQUFNLE1BQU0sR0FBRyxNQUFNLFVBQVUsRUFBRSxDQUFBO0lBQ2pDLEtBQUssTUFBTSxTQUFTLElBQUksV0FBVyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1FBQ3ZELE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxFQUFFLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUM3QyxDQUFDO0FBQ0gsQ0FBQyxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb21tYW5kIH0gZnJvbSBcImNvbW1hbmRlclwiXG5pbXBvcnQgcGMgZnJvbSBcInBpY29jb2xvcnNcIlxuaW1wb3J0IHsgbG9hZENvbmZpZyB9IGZyb20gXCIuLi9hY3Rpb25zL2NvbmZpZy9sb2FkLnRzXCJcbmltcG9ydCB7IGNsZWFyVGFyZ2V0IH0gZnJvbSBcIi4uL2FjdGlvbnMvdGFyZ2V0L2NsZWFyLnRzXCJcblxuLyoqXG4gKiBXaXBlIHRoZSBnZW5lcmF0ZWQgYC5saXZlbWFyay8uc2VydmUvYCBhbmQgYC5saXZlbWFyay8uYnVpbGQvYCBtb3VudHMgYW5kIGAubGl2ZW1hcmsvLmNhY2hlL2AuXG4gKi9cbmV4cG9ydCBjb25zdCBjbGVhciA9IG5ldyBDb21tYW5kKFwiY2xlYXJcIilcbiAgLmRlc2NyaXB0aW9uKFwiV2lwZSB0aGUgZ2VuZXJhdGVkIC5saXZlbWFyay8uc2VydmUvLCAuYnVpbGQvIGFuZCAuY2FjaGUvXCIpXG4gIC5hY3Rpb24oYXN5bmMgKCkgPT4ge1xuICAgIGNvbnN0IGNvbmZpZyA9IGF3YWl0IGxvYWRDb25maWcoKVxuICAgIGZvciAoY29uc3QgdGFyZ2V0RGlyIG9mIGNsZWFyVGFyZ2V0KGNvbmZpZy5jb25maWdQYXRoKSkge1xuICAgICAgY29uc29sZS5sb2coYENsZWFyZWQgJHtwYy5kaW0odGFyZ2V0RGlyKX1gKVxuICAgIH1cbiAgfSlcbiJdfQ==
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { describe, expect, it } from "vite-plus/test";
|
|
2
2
|
import { excludeTailwindSources } from "./tailwind-sources.js";
|
|
3
|
-
const targetDir = "/project/.livemark/.
|
|
3
|
+
const targetDir = "/project/.livemark/.serve";
|
|
4
4
|
describe("excludeTailwindSources", () => {
|
|
5
5
|
it("excludes the dependency link and the content cache from a Tailwind entry", () => {
|
|
6
6
|
const css = `@import "tailwindcss";\n@import "./shape.css";`;
|
|
7
|
-
expect(excludeTailwindSources({ css, targetDir })).toBe(`${css}\n@source not "/project/.livemark/.
|
|
8
|
-
`@source not "/project/.livemark/.
|
|
7
|
+
expect(excludeTailwindSources({ css, targetDir })).toBe(`${css}\n@source not "/project/.livemark/.serve/node_modules";\n` +
|
|
8
|
+
`@source not "/project/.livemark/.serve/.content-collections/cache";\n`);
|
|
9
9
|
});
|
|
10
10
|
it("accepts single quotes, import options and a bare utilities layer", () => {
|
|
11
11
|
for (const css of [
|
|
@@ -20,4 +20,4 @@ describe("excludeTailwindSources", () => {
|
|
|
20
20
|
expect(excludeTailwindSources({ css: `@import "tailwindcss/theme";`, targetDir })).toBeUndefined();
|
|
21
21
|
});
|
|
22
22
|
});
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFpbHdpbmQtc291cmNlcy51bml0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc291cmNlL2hlbHBlcnMvdGFpbHdpbmQtc291cmNlcy51bml0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVCQUF1QixDQUFBO0FBRTlELE1BQU0sU0FBUyxHQUFHLDJCQUEyQixDQUFBO0FBRTdDLFFBQVEsQ0FBQyx3QkFBd0IsRUFBRSxHQUFHLEVBQUU7SUFDdEMsRUFBRSxDQUFDLDBFQUEwRSxFQUFFLEdBQUcsRUFBRTtRQUNsRixNQUFNLEdBQUcsR0FBRyxnREFBZ0QsQ0FBQTtRQUM1RCxNQUFNLENBQUMsc0JBQXNCLENBQUMsRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDckQsR0FBRyxHQUFHLDJEQUEyRDtZQUMvRCx1RUFBdUUsQ0FDMUUsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLGtFQUFrRSxFQUFFLEdBQUcsRUFBRTtRQUMxRSxLQUFLLE1BQU0sR0FBRyxJQUFJO1lBQ2hCLHFDQUFxQztZQUNyQyxtREFBbUQ7U0FDcEQsRUFBRSxDQUFDO1lBQ0YsTUFBTSxDQUFDLHNCQUFzQixDQUFDLEVBQUUsR0FBRyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsYUFBYSxDQUFDLENBQUE7UUFDN0UsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLGdDQUFnQyxFQUFFLEdBQUcsRUFBRTtRQUN4QyxNQUFNLENBQ0osc0JBQXNCLENBQUMsRUFBRSxHQUFHLEVBQUUsMkJBQTJCLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FDeEUsQ0FBQyxhQUFhLEVBQUUsQ0FBQTtRQUNqQixNQUFNLENBQ0osc0JBQXNCLENBQUMsRUFBRSxHQUFHLEVBQUUsOEJBQThCLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FDM0UsQ0FBQyxhQUFhLEVBQUUsQ0FBQTtJQUNuQixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGVzY3JpYmUsIGV4cGVjdCwgaXQgfSBmcm9tIFwidml0ZS1wbHVzL3Rlc3RcIlxuaW1wb3J0IHsgZXhjbHVkZVRhaWx3aW5kU291cmNlcyB9IGZyb20gXCIuL3RhaWx3aW5kLXNvdXJjZXMudHNcIlxuXG5jb25zdCB0YXJnZXREaXIgPSBcIi9wcm9qZWN0Ly5saXZlbWFyay8uc2VydmVcIlxuXG5kZXNjcmliZShcImV4Y2x1ZGVUYWlsd2luZFNvdXJjZXNcIiwgKCkgPT4ge1xuICBpdChcImV4Y2x1ZGVzIHRoZSBkZXBlbmRlbmN5IGxpbmsgYW5kIHRoZSBjb250ZW50IGNhY2hlIGZyb20gYSBUYWlsd2luZCBlbnRyeVwiLCAoKSA9PiB7XG4gICAgY29uc3QgY3NzID0gYEBpbXBvcnQgXCJ0YWlsd2luZGNzc1wiO1xcbkBpbXBvcnQgXCIuL3NoYXBlLmNzc1wiO2BcbiAgICBleHBlY3QoZXhjbHVkZVRhaWx3aW5kU291cmNlcyh7IGNzcywgdGFyZ2V0RGlyIH0pKS50b0JlKFxuICAgICAgYCR7Y3NzfVxcbkBzb3VyY2Ugbm90IFwiL3Byb2plY3QvLmxpdmVtYXJrLy5zZXJ2ZS9ub2RlX21vZHVsZXNcIjtcXG5gICtcbiAgICAgICAgYEBzb3VyY2Ugbm90IFwiL3Byb2plY3QvLmxpdmVtYXJrLy5zZXJ2ZS8uY29udGVudC1jb2xsZWN0aW9ucy9jYWNoZVwiO1xcbmAsXG4gICAgKVxuICB9KVxuXG4gIGl0KFwiYWNjZXB0cyBzaW5nbGUgcXVvdGVzLCBpbXBvcnQgb3B0aW9ucyBhbmQgYSBiYXJlIHV0aWxpdGllcyBsYXllclwiLCAoKSA9PiB7XG4gICAgZm9yIChjb25zdCBjc3Mgb2YgW1xuICAgICAgYEBpbXBvcnQgJ3RhaWx3aW5kY3NzJyBzb3VyY2Uobm9uZSk7YCxcbiAgICAgIGBAaW1wb3J0IFwidGFpbHdpbmRjc3MvdXRpbGl0aWVzXCIgbGF5ZXIodXRpbGl0aWVzKTtgLFxuICAgIF0pIHtcbiAgICAgIGV4cGVjdChleGNsdWRlVGFpbHdpbmRTb3VyY2VzKHsgY3NzLCB0YXJnZXREaXIgfSkpLnRvQ29udGFpbihcIkBzb3VyY2Ugbm90XCIpXG4gICAgfVxuICB9KVxuXG4gIGl0KFwibGVhdmVzIG90aGVyIHN0eWxlc2hlZXRzIGFsb25lXCIsICgpID0+IHtcbiAgICBleHBlY3QoXG4gICAgICBleGNsdWRlVGFpbHdpbmRTb3VyY2VzKHsgY3NzOiBgQGltcG9ydCBcInR3LWFuaW1hdGUtY3NzXCI7YCwgdGFyZ2V0RGlyIH0pLFxuICAgICkudG9CZVVuZGVmaW5lZCgpXG4gICAgZXhwZWN0KFxuICAgICAgZXhjbHVkZVRhaWx3aW5kU291cmNlcyh7IGNzczogYEBpbXBvcnQgXCJ0YWlsd2luZGNzcy90aGVtZVwiO2AsIHRhcmdldERpciB9KSxcbiAgICApLnRvQmVVbmRlZmluZWQoKVxuICB9KVxufSlcbiJdfQ==
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { rmSync } from "node:fs";
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
|
+
export function removeTargetDir(targetDir) {
|
|
4
|
+
// Unlink the dependency link first so the recursive remove cannot reach the store.
|
|
5
|
+
rmSync(join(targetDir, "node_modules"), { force: true });
|
|
6
|
+
rmSync(targetDir, { recursive: true, force: true });
|
|
7
|
+
}
|
|
8
|
+
export function cacheDirFor(configPath) {
|
|
9
|
+
return join(dirname(configPath), ".livemark", ".cache");
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFyZ2V0LWRpci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NvdXJjZS9oZWxwZXJzL3RhcmdldC1kaXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQTtBQUNoQyxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUV6QyxNQUFNLFVBQVUsZUFBZSxDQUFDLFNBQWlCO0lBQy9DLG1GQUFtRjtJQUNuRixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxjQUFjLENBQUMsRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0lBQ3hELE1BQU0sQ0FBQyxTQUFTLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0FBQ3JELENBQUM7QUFFRCxNQUFNLFVBQVUsV0FBVyxDQUFDLFVBQWtCO0lBQzVDLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRSxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUE7QUFDekQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJtU3luYyB9IGZyb20gXCJub2RlOmZzXCJcbmltcG9ydCB7IGRpcm5hbWUsIGpvaW4gfSBmcm9tIFwibm9kZTpwYXRoXCJcblxuZXhwb3J0IGZ1bmN0aW9uIHJlbW92ZVRhcmdldERpcih0YXJnZXREaXI6IHN0cmluZykge1xuICAvLyBVbmxpbmsgdGhlIGRlcGVuZGVuY3kgbGluayBmaXJzdCBzbyB0aGUgcmVjdXJzaXZlIHJlbW92ZSBjYW5ub3QgcmVhY2ggdGhlIHN0b3JlLlxuICBybVN5bmMoam9pbih0YXJnZXREaXIsIFwibm9kZV9tb2R1bGVzXCIpLCB7IGZvcmNlOiB0cnVlIH0pXG4gIHJtU3luYyh0YXJnZXREaXIsIHsgcmVjdXJzaXZlOiB0cnVlLCBmb3JjZTogdHJ1ZSB9KVxufVxuXG5leHBvcnQgZnVuY3Rpb24gY2FjaGVEaXJGb3IoY29uZmlnUGF0aDogc3RyaW5nKSB7XG4gIHJldHVybiBqb2luKGRpcm5hbWUoY29uZmlnUGF0aCksIFwiLmxpdmVtYXJrXCIsIFwiLmNhY2hlXCIpXG59XG4iXX0=
|
|
@@ -2,7 +2,7 @@ import { join } from "node:path";
|
|
|
2
2
|
import { describe, expect, it } from "vite-plus/test";
|
|
3
3
|
import packageJson from "../../package.json" with { type: "json" };
|
|
4
4
|
import { resolveTargetExport } from "./target-export.js";
|
|
5
|
-
const targetDir = "/project/.livemark/.
|
|
5
|
+
const targetDir = "/project/.livemark/.serve";
|
|
6
6
|
function resolveId(id) {
|
|
7
7
|
return resolveTargetExport({ id, targetDir, exports: packageJson.exports });
|
|
8
8
|
}
|
|
@@ -22,4 +22,4 @@ describe("resolveTargetExport", () => {
|
|
|
22
22
|
expect(resolveId("react")).toBeUndefined();
|
|
23
23
|
});
|
|
24
24
|
});
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFyZ2V0LWV4cG9ydC51bml0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc291cmNlL2hlbHBlcnMvdGFyZ2V0LWV4cG9ydC51bml0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFDaEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDckQsT0FBTyxXQUFXLE1BQU0sb0JBQW9CLENBQUMsT0FBTyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUE7QUFDbEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFFeEQsTUFBTSxTQUFTLEdBQUcsMkJBQTJCLENBQUE7QUFFN0MsU0FBUyxTQUFTLENBQUMsRUFBVTtJQUMzQixPQUFPLG1CQUFtQixDQUFDLEVBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsV0FBVyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDN0UsQ0FBQztBQUVELFFBQVEsQ0FBQyxxQkFBcUIsRUFBRSxHQUFHLEVBQUU7SUFDbkMsRUFBRSxDQUFDLGlEQUFpRCxFQUFFLEdBQUcsRUFBRTtRQUN6RCxNQUFNLENBQUMsU0FBUyxDQUFDLDRCQUE0QixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ2xELElBQUksQ0FBQyxTQUFTLEVBQUUsdUJBQXVCLENBQUMsQ0FDekMsQ0FBQTtRQUNELE1BQU0sQ0FBQyxTQUFTLENBQUMsMEJBQTBCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDaEQsSUFBSSxDQUFDLFNBQVMsRUFBRSxxQkFBcUIsQ0FBQyxDQUN2QyxDQUFBO1FBQ0QsTUFBTSxDQUFDLFNBQVMsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsa0JBQWtCLENBQUMsQ0FBQyxDQUFBO1FBQ3JGLE1BQU0sQ0FBQyxTQUFTLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDL0MsSUFBSSxDQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxDQUN0QyxDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsaUJBQWlCLEVBQUUsR0FBRyxFQUFFO1FBQ3pCLE1BQU0sQ0FBQyxTQUFTLENBQUMsNkJBQTZCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDbkQsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLG9CQUFvQixDQUFDLE1BQU0sQ0FDL0MsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLCtCQUErQixFQUFFLEdBQUcsRUFBRTtRQUN2QyxNQUFNLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsYUFBYSxFQUFFLENBQUE7UUFDN0MsTUFBTSxDQUFDLFNBQVMsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDLENBQUMsYUFBYSxFQUFFLENBQUE7UUFDM0QsTUFBTSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLGFBQWEsRUFBRSxDQUFBO0lBQzVDLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBqb2luIH0gZnJvbSBcIm5vZGU6cGF0aFwiXG5pbXBvcnQgeyBkZXNjcmliZSwgZXhwZWN0LCBpdCB9IGZyb20gXCJ2aXRlLXBsdXMvdGVzdFwiXG5pbXBvcnQgcGFja2FnZUpzb24gZnJvbSBcIi4uLy4uL3BhY2thZ2UuanNvblwiIHdpdGggeyB0eXBlOiBcImpzb25cIiB9XG5pbXBvcnQgeyByZXNvbHZlVGFyZ2V0RXhwb3J0IH0gZnJvbSBcIi4vdGFyZ2V0LWV4cG9ydC50c1wiXG5cbmNvbnN0IHRhcmdldERpciA9IFwiL3Byb2plY3QvLmxpdmVtYXJrLy5zZXJ2ZVwiXG5cbmZ1bmN0aW9uIHJlc29sdmVJZChpZDogc3RyaW5nKSB7XG4gIHJldHVybiByZXNvbHZlVGFyZ2V0RXhwb3J0KHsgaWQsIHRhcmdldERpciwgZXhwb3J0czogcGFja2FnZUpzb24uZXhwb3J0cyB9KVxufVxuXG5kZXNjcmliZShcInJlc29sdmVUYXJnZXRFeHBvcnRcIiwgKCkgPT4ge1xuICBpdChcIm1hcHMgZWFjaCBzb3VyY2Ugc3VicGF0aCBleHBvcnQgaW50byB0aGUgdGFyZ2V0XCIsICgpID0+IHtcbiAgICBleHBlY3QocmVzb2x2ZUlkKFwibGl2ZW1hcmsvY29tcG9uZW50cy9Gb290ZXJcIikpLnRvQmUoXG4gICAgICBqb2luKHRhcmdldERpciwgXCJjb21wb25lbnRzL0Zvb3Rlci50c3hcIiksXG4gICAgKVxuICAgIGV4cGVjdChyZXNvbHZlSWQoXCJsaXZlbWFyay9lbGVtZW50cy9idXR0b25cIikpLnRvQmUoXG4gICAgICBqb2luKHRhcmdldERpciwgXCJlbGVtZW50cy9idXR0b24udHN4XCIpLFxuICAgIClcbiAgICBleHBlY3QocmVzb2x2ZUlkKFwibGl2ZW1hcmsvaG9va3MvaW4tdmlld1wiKSkudG9CZShqb2luKHRhcmdldERpciwgXCJob29rcy9pbi12aWV3LnRzXCIpKVxuICAgIGV4cGVjdChyZXNvbHZlSWQoXCJsaXZlbWFyay9zdHlsZXMvZ2VuZXJhbFwiKSkudG9CZShcbiAgICAgIGpvaW4odGFyZ2V0RGlyLCBcInN0eWxlcy9nZW5lcmFsLmNzc1wiKSxcbiAgICApXG4gIH0pXG5cbiAgaXQoXCJrZWVwcyB0aGUgcXVlcnlcIiwgKCkgPT4ge1xuICAgIGV4cGVjdChyZXNvbHZlSWQoXCJsaXZlbWFyay9zdHlsZXMvZ2VuZXJhbD91cmxcIikpLnRvQmUoXG4gICAgICBgJHtqb2luKHRhcmdldERpciwgXCJzdHlsZXMvZ2VuZXJhbC5jc3NcIil9P3VybGAsXG4gICAgKVxuICB9KVxuXG4gIGl0KFwibGVhdmVzIG90aGVyIHNwZWNpZmllcnMgYWxvbmVcIiwgKCkgPT4ge1xuICAgIGV4cGVjdChyZXNvbHZlSWQoXCJsaXZlbWFya1wiKSkudG9CZVVuZGVmaW5lZCgpXG4gICAgZXhwZWN0KHJlc29sdmVJZChcImxpdmVtYXJrL3Vua25vd24vdGhpbmdcIikpLnRvQmVVbmRlZmluZWQoKVxuICAgIGV4cGVjdChyZXNvbHZlSWQoXCJyZWFjdFwiKSkudG9CZVVuZGVmaW5lZCgpXG4gIH0pXG59KVxuIl19
|
|
@@ -3,7 +3,8 @@ import type { Config } from "../models/config.ts";
|
|
|
3
3
|
export interface LivemarkOptions {
|
|
4
4
|
config: Config;
|
|
5
5
|
}
|
|
6
|
-
/** Owns the project's `.livemark/.
|
|
6
|
+
/** Owns the project's `.livemark/.serve/` mount (`.build/` when building, so a build
|
|
7
|
+
* never rewrites a running dev server's files): synthesizes it via
|
|
7
8
|
* `buildTarget()`, returns the Vite config that anchors there, and
|
|
8
9
|
* copies `.livemark/` edits (plus livemark's `source/` in its own dev)
|
|
9
10
|
* into the target. Vite watches the target natively, so its own HMR
|
|
@@ -33,7 +33,8 @@ const LOCKFILES = [
|
|
|
33
33
|
* or load it from disk". */
|
|
34
34
|
const VIRTUAL_ID = "livemark:virtual";
|
|
35
35
|
const VIRTUAL_RESOLVED_ID = `\0${VIRTUAL_ID}`;
|
|
36
|
-
/** Owns the project's `.livemark/.
|
|
36
|
+
/** Owns the project's `.livemark/.serve/` mount (`.build/` when building, so a build
|
|
37
|
+
* never rewrites a running dev server's files): synthesizes it via
|
|
37
38
|
* `buildTarget()`, returns the Vite config that anchors there, and
|
|
38
39
|
* copies `.livemark/` edits (plus livemark's `source/` in its own dev)
|
|
39
40
|
* into the target. Vite watches the target natively, so its own HMR
|
|
@@ -49,6 +50,7 @@ export function livemark(opts) {
|
|
|
49
50
|
targetDir = buildTarget({
|
|
50
51
|
configPath: opts.config.configPath,
|
|
51
52
|
sourceDir: SOURCE_DIR,
|
|
53
|
+
command: env.command === "build" || env.isPreview ? "build" : "serve",
|
|
52
54
|
});
|
|
53
55
|
const base = {
|
|
54
56
|
root: targetDir,
|
|
@@ -132,14 +134,23 @@ export function livemark(opts) {
|
|
|
132
134
|
}
|
|
133
135
|
if (isWithin(file, targetDir) || isWithin(file, outDir))
|
|
134
136
|
return;
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
137
|
+
// A watcher callback that throws kills the server, and a copy racing another
|
|
138
|
+
// writer of the target (an editor's atomic save, `livemark clear`) fails.
|
|
139
|
+
try {
|
|
140
|
+
const overlayHit = matchPath(file, overridesRoot);
|
|
141
|
+
if (overlayHit) {
|
|
142
|
+
syncOverlay(overlayHit, kind, targetDir, overridesRoot);
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
const sourceHit = matchPath(file, SOURCE_DIR);
|
|
146
|
+
if (sourceHit && !sourceHit.rel.includes("routeTree.gen.ts")) {
|
|
147
|
+
syncSource(sourceHit, kind, targetDir, overridesRoot);
|
|
148
|
+
}
|
|
139
149
|
}
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
150
|
+
catch (error) {
|
|
151
|
+
server.config.logger.error(`[livemark] failed to sync ${file}: ${error}`, {
|
|
152
|
+
error: error instanceof Error ? error : undefined,
|
|
153
|
+
});
|
|
143
154
|
}
|
|
144
155
|
}
|
|
145
156
|
},
|
|
@@ -259,4 +270,4 @@ async function resolveViteOverride(vite, env) {
|
|
|
259
270
|
function isObject(v) {
|
|
260
271
|
return v !== null && typeof v === "object";
|
|
261
272
|
}
|
|
262
|
-
//# 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, readFileSync, rmSync, statSync } from \"node:fs\"\nimport { dirname, join, sep } from \"node:path\"\nimport type { ConfigEnv, Plugin, UserConfig as ViteUserConfig, ViteDevServer } from \"vite\"\nimport { mergeConfig } from \"vite\"\nimport packageJson from \"../../package.json\" with { type: \"json\" }\nimport { buildTarget } from \"../actions/target/build.ts\"\nimport { collectLocalImports } from \"../helpers/local-imports.ts\"\nimport { renderInlineMarkdown } from \"../helpers/render-inline-markdown.ts\"\nimport { excludeTailwindSources } from \"../helpers/tailwind-sources.ts\"\nimport { resolveTargetExport } from \"../helpers/target-export.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, \"..\")\nconst IS_INSTALLED = SOURCE_DIR.includes(`${sep}node_modules${sep}`)\nconst LOCKFILES = [\n  \"pnpm-lock.yaml\",\n  \"package-lock.json\",\n  \"yarn.lock\",\n  \"bun.lock\",\n  \"bun.lockb\",\n]\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`) and `bannerHtml`\n *  (`config.banner` rendered from inline Markdown at build time); 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 project's `.livemark/.target/` mount: synthesizes it via\n *  `buildTarget()`, returns the Vite config that anchors there, and\n *  copies `.livemark/` edits (plus livemark's `source/` in its own dev)\n *  into the target. Vite watches the target natively, so its own HMR\n *  decides between Fast Refresh, CSS updates and a page reload. */\nexport function livemark(opts: LivemarkOptions): Plugin {\n  const overridesRoot = join(opts.config.root, \".livemark\")\n  const outDir = join(overridesRoot, \"build\")\n  let targetDir = \"\"\n  return {\n    name: \"livemark\",\n    enforce: \"pre\",\n    async config(_, env) {\n      targetDir = buildTarget({\n        configPath: opts.config.configPath,\n        sourceDir: SOURCE_DIR,\n      })\n      const base: ViteUserConfig = {\n        root: targetDir,\n        // The default `<root>/node_modules/.vite` would land inside the\n        // dependency link, i.e. in livemark's shared install.\n        cacheDir: join(targetDir, \".vite\"),\n        // Mount everything (asset URLs, modulepreloads, dev server) under\n        // `config.base` so the same build works at root or at a sub-path\n        // (e.g. GitHub Pages `https://user.github.io/repo/`). The router\n        // and asset-path resolver mirror this at runtime.\n        base: opts.config.base ? `${opts.config.base}/` : \"/\",\n        // outDir lives outside the target root, so Vite's refusal to\n        // empty out-of-root directories needs `emptyOutDir`.\n        build: { outDir, 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    // Here, not in `styles/general.css`, so an escaped stylesheet keeps it. Works only\n    // while this plugin precedes `tailwind()`: both are `pre`, so array order decides.\n    transform: {\n      filter: { id: /\\.css(\\?|$)/ },\n      handler(css) {\n        return excludeTailwindSources({ css, targetDir })\n      },\n    },\n    resolveId(id) {\n      if (id === VIRTUAL_ID) return VIRTUAL_RESOLVED_ID\n      return resolveTargetExport({ id, targetDir, exports: packageJson.exports }) ?? null\n    },\n    load(id) {\n      if (id !== VIRTUAL_RESOLVED_ID) return null\n      const config = WebsiteConfig.parse(opts.config)\n      const bannerHtml = config.banner\n        ? renderInlineMarkdown(config.banner, config.base)\n        : undefined\n      return [\n        `export const config = ${JSON.stringify(config)}`,\n        `export const bannerHtml = ${JSON.stringify(bannerHtml)}`,\n      ].join(\"\\n\")\n    },\n    configureServer(server) {\n      // Vite restarts only for its own config's imports; the project config's\n      // imports and, in livemark's own dev, the content-collections config's\n      // imports need it too. A restart rebuilds the target, so no sync is lost.\n      const restartFiles = new Set([\n        opts.config.configPath,\n        ...opts.config.configDependencies,\n        ...(IS_INSTALLED\n          ? []\n          : collectLocalImports(join(SOURCE_DIR, \"content-collections.ts\"))),\n      ])\n      // Vite watches only its root (the target); the files the target is\n      // copied from join its watcher here. `.livemark/` always exists\n      // because the target lives inside it.\n      server.watcher.add([...restartFiles, overridesRoot])\n      if (IS_INSTALLED) watchInstalledVersion(server, opts.config.root)\n      else server.watcher.add(SOURCE_DIR)\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      server.watcher.on(\"unlinkDir\", file => onChange(file, \"unlink\"))\n\n      function onChange(file: string, kind: \"change\" | \"add\" | \"unlink\") {\n        if (restartFiles.has(file)) {\n          server.restart()\n          return\n        }\n        if (isWithin(file, targetDir) || isWithin(file, outDir)) return\n        const overlayHit = matchPath(file, overridesRoot)\n        if (overlayHit) {\n          syncOverlay(overlayHit, kind, targetDir, overridesRoot)\n          return\n        }\n        const sourceHit = matchPath(file, SOURCE_DIR)\n        if (sourceHit && !sourceHit.rel.includes(\"routeTree.gen.ts\")) {\n          syncSource(sourceHit, kind, targetDir, overridesRoot)\n        }\n      }\n    },\n  }\n}\n\ninterface Hit {\n  rel: string\n  category: \"folder\" | \"file\" | null\n}\n\nfunction matchPath(file: string, root: string): Hit | null {\n  if (!isWithin(file, root) || file === root) return null\n  const rel = file.slice(root.length + sep.length)\n  return { rel, category: classify(rel) }\n}\n\nfunction isWithin(file: string, dir: string) {\n  return file === dir || file.startsWith(`${dir}${sep}`)\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    // Copy a file's default over the escape in one write: an unlink then\n    // an add reaches Vite as two events and costs a page reload.\n    if (!existsSync(source) || statSync(source).isDirectory()) {\n      rmSync(dest, { force: true, recursive: true })\n    }\n    if (existsSync(source)) cpSync(source, dest, { recursive: true, force: true })\n    return\n  }\n  const overlay = join(overridesRoot, hit.rel)\n  if (existsSync(overlay)) 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\n// A running server keeps the livemark it started with: an in-process restart cannot\n// reload the package's own modules, so an upgrade is reported instead.\nfunction watchInstalledVersion(server: ViteDevServer, root: string) {\n  const packageDir = findInstalledPackageDir(root)\n  if (!packageDir) return\n  // Vite's watcher ignores node_modules, so the lockfile is what signals an install.\n  const projectDir = dirname(dirname(packageDir))\n  const manifest = join(packageDir, \"package.json\")\n  const watched = LOCKFILES.map(name => join(projectDir, name))\n  server.watcher.add(watched)\n  let timer: NodeJS.Timeout | undefined\n  server.watcher.on(\"all\", (_, file) => {\n    if (!watched.includes(file)) return\n    clearTimeout(timer)\n    // Let the package manager finish relinking after it writes the lockfile.\n    timer = setTimeout(reportUpgrade, 1000)\n  })\n\n  function reportUpgrade() {\n    const version = readPackageVersion(manifest)\n    if (!version || version === packageJson.version) return\n    server.config.logger.warn(\n      `livemark ${packageJson.version} → ${version} installed; restart the dev server to use it`,\n      { timestamp: true },\n    )\n  }\n}\n\nfunction findInstalledPackageDir(root: string) {\n  for (let dir = root; ; dir = dirname(dir)) {\n    const packageDir = join(dir, \"node_modules\", packageJson.name)\n    if (existsSync(packageDir)) return packageDir\n    if (dirname(dir) === dir) return undefined\n  }\n}\n\nfunction readPackageVersion(manifest: string) {\n  try {\n    const parsed: unknown = JSON.parse(readFileSync(manifest, \"utf8\"))\n    return isObject(parsed) && typeof parsed.version === \"string\"\n      ? parsed.version\n      : undefined\n  } catch {\n    return undefined\n  }\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"]}
|
|
273
|
+
//# 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, readFileSync, rmSync, statSync } from \"node:fs\"\nimport { dirname, join, sep } from \"node:path\"\nimport type { ConfigEnv, Plugin, UserConfig as ViteUserConfig, ViteDevServer } from \"vite\"\nimport { mergeConfig } from \"vite\"\nimport packageJson from \"../../package.json\" with { type: \"json\" }\nimport { buildTarget } from \"../actions/target/build.ts\"\nimport { collectLocalImports } from \"../helpers/local-imports.ts\"\nimport { renderInlineMarkdown } from \"../helpers/render-inline-markdown.ts\"\nimport { excludeTailwindSources } from \"../helpers/tailwind-sources.ts\"\nimport { resolveTargetExport } from \"../helpers/target-export.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, \"..\")\nconst IS_INSTALLED = SOURCE_DIR.includes(`${sep}node_modules${sep}`)\nconst LOCKFILES = [\n  \"pnpm-lock.yaml\",\n  \"package-lock.json\",\n  \"yarn.lock\",\n  \"bun.lock\",\n  \"bun.lockb\",\n]\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`) and `bannerHtml`\n *  (`config.banner` rendered from inline Markdown at build time); 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 project's `.livemark/.serve/` mount (`.build/` when building, so a build\n *  never rewrites a running dev server's files): synthesizes it via\n *  `buildTarget()`, returns the Vite config that anchors there, and\n *  copies `.livemark/` edits (plus livemark's `source/` in its own dev)\n *  into the target. Vite watches the target natively, so its own HMR\n *  decides between Fast Refresh, CSS updates and a page reload. */\nexport function livemark(opts: LivemarkOptions): Plugin {\n  const overridesRoot = join(opts.config.root, \".livemark\")\n  const outDir = join(overridesRoot, \"build\")\n  let targetDir = \"\"\n  return {\n    name: \"livemark\",\n    enforce: \"pre\",\n    async config(_, env) {\n      targetDir = buildTarget({\n        configPath: opts.config.configPath,\n        sourceDir: SOURCE_DIR,\n        command: env.command === \"build\" || env.isPreview ? \"build\" : \"serve\",\n      })\n      const base: ViteUserConfig = {\n        root: targetDir,\n        // The default `<root>/node_modules/.vite` would land inside the\n        // dependency link, i.e. in livemark's shared install.\n        cacheDir: join(targetDir, \".vite\"),\n        // Mount everything (asset URLs, modulepreloads, dev server) under\n        // `config.base` so the same build works at root or at a sub-path\n        // (e.g. GitHub Pages `https://user.github.io/repo/`). The router\n        // and asset-path resolver mirror this at runtime.\n        base: opts.config.base ? `${opts.config.base}/` : \"/\",\n        // outDir lives outside the target root, so Vite's refusal to\n        // empty out-of-root directories needs `emptyOutDir`.\n        build: { outDir, 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    // Here, not in `styles/general.css`, so an escaped stylesheet keeps it. Works only\n    // while this plugin precedes `tailwind()`: both are `pre`, so array order decides.\n    transform: {\n      filter: { id: /\\.css(\\?|$)/ },\n      handler(css) {\n        return excludeTailwindSources({ css, targetDir })\n      },\n    },\n    resolveId(id) {\n      if (id === VIRTUAL_ID) return VIRTUAL_RESOLVED_ID\n      return resolveTargetExport({ id, targetDir, exports: packageJson.exports }) ?? null\n    },\n    load(id) {\n      if (id !== VIRTUAL_RESOLVED_ID) return null\n      const config = WebsiteConfig.parse(opts.config)\n      const bannerHtml = config.banner\n        ? renderInlineMarkdown(config.banner, config.base)\n        : undefined\n      return [\n        `export const config = ${JSON.stringify(config)}`,\n        `export const bannerHtml = ${JSON.stringify(bannerHtml)}`,\n      ].join(\"\\n\")\n    },\n    configureServer(server) {\n      // Vite restarts only for its own config's imports; the project config's\n      // imports and, in livemark's own dev, the content-collections config's\n      // imports need it too. A restart rebuilds the target, so no sync is lost.\n      const restartFiles = new Set([\n        opts.config.configPath,\n        ...opts.config.configDependencies,\n        ...(IS_INSTALLED\n          ? []\n          : collectLocalImports(join(SOURCE_DIR, \"content-collections.ts\"))),\n      ])\n      // Vite watches only its root (the target); the files the target is\n      // copied from join its watcher here. `.livemark/` always exists\n      // because the target lives inside it.\n      server.watcher.add([...restartFiles, overridesRoot])\n      if (IS_INSTALLED) watchInstalledVersion(server, opts.config.root)\n      else server.watcher.add(SOURCE_DIR)\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      server.watcher.on(\"unlinkDir\", file => onChange(file, \"unlink\"))\n\n      function onChange(file: string, kind: \"change\" | \"add\" | \"unlink\") {\n        if (restartFiles.has(file)) {\n          server.restart()\n          return\n        }\n        if (isWithin(file, targetDir) || isWithin(file, outDir)) return\n        // A watcher callback that throws kills the server, and a copy racing another\n        // writer of the target (an editor's atomic save, `livemark clear`) fails.\n        try {\n          const overlayHit = matchPath(file, overridesRoot)\n          if (overlayHit) {\n            syncOverlay(overlayHit, kind, targetDir, overridesRoot)\n            return\n          }\n          const sourceHit = matchPath(file, SOURCE_DIR)\n          if (sourceHit && !sourceHit.rel.includes(\"routeTree.gen.ts\")) {\n            syncSource(sourceHit, kind, targetDir, overridesRoot)\n          }\n        } catch (error) {\n          server.config.logger.error(`[livemark] failed to sync ${file}: ${error}`, {\n            error: error instanceof Error ? error : undefined,\n          })\n        }\n      }\n    },\n  }\n}\n\ninterface Hit {\n  rel: string\n  category: \"folder\" | \"file\" | null\n}\n\nfunction matchPath(file: string, root: string): Hit | null {\n  if (!isWithin(file, root) || file === root) return null\n  const rel = file.slice(root.length + sep.length)\n  return { rel, category: classify(rel) }\n}\n\nfunction isWithin(file: string, dir: string) {\n  return file === dir || file.startsWith(`${dir}${sep}`)\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    // Copy a file's default over the escape in one write: an unlink then\n    // an add reaches Vite as two events and costs a page reload.\n    if (!existsSync(source) || statSync(source).isDirectory()) {\n      rmSync(dest, { force: true, recursive: true })\n    }\n    if (existsSync(source)) cpSync(source, dest, { recursive: true, force: true })\n    return\n  }\n  const overlay = join(overridesRoot, hit.rel)\n  if (existsSync(overlay)) 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\n// A running server keeps the livemark it started with: an in-process restart cannot\n// reload the package's own modules, so an upgrade is reported instead.\nfunction watchInstalledVersion(server: ViteDevServer, root: string) {\n  const packageDir = findInstalledPackageDir(root)\n  if (!packageDir) return\n  // Vite's watcher ignores node_modules, so the lockfile is what signals an install.\n  const projectDir = dirname(dirname(packageDir))\n  const manifest = join(packageDir, \"package.json\")\n  const watched = LOCKFILES.map(name => join(projectDir, name))\n  server.watcher.add(watched)\n  let timer: NodeJS.Timeout | undefined\n  server.watcher.on(\"all\", (_, file) => {\n    if (!watched.includes(file)) return\n    clearTimeout(timer)\n    // Let the package manager finish relinking after it writes the lockfile.\n    timer = setTimeout(reportUpgrade, 1000)\n  })\n\n  function reportUpgrade() {\n    const version = readPackageVersion(manifest)\n    if (!version || version === packageJson.version) return\n    server.config.logger.warn(\n      `livemark ${packageJson.version} → ${version} installed; restart the dev server to use it`,\n      { timestamp: true },\n    )\n  }\n}\n\nfunction findInstalledPackageDir(root: string) {\n  for (let dir = root; ; dir = dirname(dir)) {\n    const packageDir = join(dir, \"node_modules\", packageJson.name)\n    if (existsSync(packageDir)) return packageDir\n    if (dirname(dir) === dir) return undefined\n  }\n}\n\nfunction readPackageVersion(manifest: string) {\n  try {\n    const parsed: unknown = JSON.parse(readFileSync(manifest, \"utf8\"))\n    return isObject(parsed) && typeof parsed.version === \"string\"\n      ? parsed.version\n      : undefined\n  } catch {\n    return undefined\n  }\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
CHANGED
|
@@ -80,7 +80,7 @@ export default defineConfig({
|
|
|
80
80
|
|
|
81
81
|
- **Article** (default when `type` is omitted): flat docs with a tree sidebar.
|
|
82
82
|
- **Blog** (`type: "blog"`): auto-generated index at `prefix`, sorts by `date`, exposes `/prefix/tags/<tag>/` pages.
|
|
83
|
-
- **Changelog** (`type: "changelog"`): reads `source` file; with `version: true`, splits on semver headings into per-version articles. Several changelog sections may coexist as long as their prefixes differ — each is cached in its own
|
|
83
|
+
- **Changelog** (`type: "changelog"`): reads `source` file; with `version: true`, splits on semver headings into per-version articles. Several changelog sections may coexist as long as their prefixes differ — each is cached in its own `.livemark/.cache/changelog/<slug-of-prefix>-<hash-of-prefix>/` directory (the hash keeps prefixes that slugify alike, like `/python/changelog/` and `/python-changelog/`, apart), so a version shared by two changelogs never collides. The `(version)` suffix only renders for `position: "header"` sections.
|
|
84
84
|
|
|
85
85
|
Shared fields on every section: `title`, `prefix` (keep trailing-slashed), `type`, `icon` (lucide), `position` (`"header"` default, `"sidebar"` also available). Header sections and links never overflow: past the bar's width Search turns icon-only, then the rest fold into a "More" menu.
|
|
86
86
|
|
|
@@ -118,7 +118,7 @@ Custom routes win over the Markdown catch-all at exact URLs. Don't create a rout
|
|
|
118
118
|
3. **Override files are full replacements**, not diffs. Copy the default first (via `escape`), then edit.
|
|
119
119
|
4. **Import Livemark internals via `livemark/*`**, not via relative paths — the plugin resolves those to the project's copy, so chained overrides (e.g., your Layout using your Header) compose correctly.
|
|
120
120
|
5. **Static files belong in `.livemark/public/`**, which Vite exposes at the site root.
|
|
121
|
-
6. **Never edit `.livemark/.
|
|
121
|
+
6. **Never edit `.livemark/.serve/` or `.livemark/.build/`** — they are the generated mounts Vite runs for the dev server and the production build (Livemark's source with your overrides copied in), rebuilt on every run, so stack traces point there but edits are lost. Each carries its own `.gitignore`.
|
|
122
122
|
7. **Keyboard shortcuts live in the component they drive** — bare keys through `@tanstack/react-hotkeys`, ignored while typing: `L` sidebar (`Sidebar`), `S` search (`Search`), `T` theme (`Theme`), `J`/`K` scroll (`Root`), `B` back to top (`BackToTop`). Overriding one of these drops its key unless the copy keeps the `useHotkey` call; register a key in a component that mounts once, or one press fires twice.
|
|
123
123
|
8. **Search highlights live in `Article`** — picking a result opens the page with `?highlight=<query>`, and `Article` passes it to `useSearchHighlight` with a ref on its `.prose` wrapper. An overridden `components/Article.tsx` must keep that call and ref, or matches stop being marked. Theme the mark through the `--highlight` and `--highlight-foreground` tokens; code blocks are never marked.
|
|
124
124
|
9. **Edited Markdown reaches the page through `router.tsx`** — articles are route loader data, and route HMR keeps loader data, so `getRouter` re-runs loaders on Vite's `vite:afterUpdate`. An overridden `router.tsx` must keep that hook, or Markdown edits show only after a reload.
|
|
@@ -23,7 +23,7 @@ npx livemark build # prerender every route into .livemark/build/client/
|
|
|
23
23
|
npx livemark preview # serve that build locally on port 8000
|
|
24
24
|
```
|
|
25
25
|
|
|
26
|
-
`.livemark/build/client/` is the **only** directory to publish: an `index.html` per route plus assets, `sitemap.xml`, `robots.txt`, RSS feeds, Markdown twins, `llms.txt` and a `_headers` file. Not `dist/`, and not `.livemark/build/` itself — its `server/` sibling is the prerender bundle, not a site. Gitignore `.livemark/build
|
|
26
|
+
`.livemark/build/client/` is the **only** directory to publish: an `index.html` per route plus assets, `sitemap.xml`, `robots.txt`, RSS feeds, Markdown twins, `llms.txt` and a `_headers` file. Not `dist/`, and not `.livemark/build/` itself — its `server/` sibling is the prerender bundle, not a site. Gitignore `.livemark/build/`; it is regenerated on every build.
|
|
27
27
|
|
|
28
28
|
## Config that affects deployment
|
|
29
29
|
|
|
@@ -11,7 +11,7 @@ import { visit } from "unist-util-visit"
|
|
|
11
11
|
import type { Config } from "../../models/config.ts"
|
|
12
12
|
import type { ChangelogSection } from "../../models/section.ts"
|
|
13
13
|
import { isGitHubUrl, parseGitHubRepo } from "../../helpers/changelog-source.ts"
|
|
14
|
-
import {
|
|
14
|
+
import { cacheDirFor } from "../../helpers/target-dir.ts"
|
|
15
15
|
|
|
16
16
|
interface Release {
|
|
17
17
|
tag_name: string
|
|
@@ -34,8 +34,6 @@ interface ChangelogEntry {
|
|
|
34
34
|
sourceUrl?: string
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
const CACHE_SUBDIR = "cache/changelog"
|
|
38
|
-
|
|
39
37
|
const parser = unified().use(remarkParse)
|
|
40
38
|
const stringifier = unified().use(remarkStringify, {
|
|
41
39
|
bullet: "-",
|
|
@@ -52,7 +50,7 @@ export function cacheIncludeGlob(section: ChangelogSection, config: Config) {
|
|
|
52
50
|
|
|
53
51
|
/** Directory holding one changelog section's cache state: the rendered
|
|
54
52
|
* `.md` entries plus a `meta.json` holding the etag for conditional
|
|
55
|
-
* GETs. Each section gets its own subdirectory of
|
|
53
|
+
* GETs. Each section gets its own subdirectory of `.livemark/.cache/changelog/`,
|
|
56
54
|
* keyed by its prefix's slug plus a hash of the raw prefix
|
|
57
55
|
* (`/python/changelog/` → `python-changelog-<hash>`), so several
|
|
58
56
|
* changelogs never overwrite each other's entries even when their
|
|
@@ -60,7 +58,7 @@ export function cacheIncludeGlob(section: ChangelogSection, config: Config) {
|
|
|
60
58
|
export function changelogCacheDir(section: ChangelogSection, config: Config) {
|
|
61
59
|
const slug = slugify(section.prefix) || "index"
|
|
62
60
|
const hash = createHash("sha256").update(section.prefix).digest("hex").slice(0, 8)
|
|
63
|
-
return join(
|
|
61
|
+
return join(cacheDirFor(config.configPath), "changelog", `${slug}-${hash}`)
|
|
64
62
|
}
|
|
65
63
|
|
|
66
64
|
/** Build the per-version changelog cache files of one changelog section
|
|
@@ -77,6 +75,7 @@ export async function buildChangelog(section: ChangelogSection, config: Config)
|
|
|
77
75
|
if (entries === undefined) return
|
|
78
76
|
|
|
79
77
|
await mkdir(cacheDir, { recursive: true })
|
|
78
|
+
await writeFile(join(cacheDirFor(config.configPath), ".gitignore"), "*\n")
|
|
80
79
|
for (const f of await readdir(cacheDir).catch(() => [])) {
|
|
81
80
|
if (f.endsWith(".md")) await rm(join(cacheDir, f), { force: true })
|
|
82
81
|
}
|
|
@@ -5,7 +5,7 @@ import { describe, expect, it } from "vite-plus/test"
|
|
|
5
5
|
import { partitionBySection } from "../../helpers/section.ts"
|
|
6
6
|
import { Config } from "../../models/config.ts"
|
|
7
7
|
import type { ChangelogSection } from "../../models/section.ts"
|
|
8
|
-
import {
|
|
8
|
+
import { cacheDirFor } from "../../helpers/target-dir.ts"
|
|
9
9
|
import {
|
|
10
10
|
buildChangelog,
|
|
11
11
|
cacheIncludeGlob,
|
|
@@ -49,7 +49,7 @@ describe("buildChangelog", () => {
|
|
|
49
49
|
|
|
50
50
|
const standardDir = changelogCacheDir(standard, config)
|
|
51
51
|
const pythonDir = changelogCacheDir(python, config)
|
|
52
|
-
const cacheRoot = join(
|
|
52
|
+
const cacheRoot = join(cacheDirFor(configPath), "changelog")
|
|
53
53
|
expect(dirname(standardDir)).toBe(cacheRoot)
|
|
54
54
|
expect(dirname(pythonDir)).toBe(cacheRoot)
|
|
55
55
|
expect(basename(standardDir)).toMatch(/^changelog-[0-9a-f]{8}$/)
|
|
@@ -79,7 +79,7 @@ describe("buildChangelog", () => {
|
|
|
79
79
|
"/python/changelog/0-2-0/",
|
|
80
80
|
])
|
|
81
81
|
} finally {
|
|
82
|
-
await rm(
|
|
82
|
+
await rm(cacheDirFor(configPath), { recursive: true, force: true })
|
|
83
83
|
}
|
|
84
84
|
}))
|
|
85
85
|
|
|
@@ -114,7 +114,7 @@ describe("buildChangelog", () => {
|
|
|
114
114
|
expect(await readdir(changelogCacheDir(standard, config))).toEqual(["0-4-0.md"])
|
|
115
115
|
expect(await readdir(changelogCacheDir(python, config))).toEqual(["0-3-0.md"])
|
|
116
116
|
} finally {
|
|
117
|
-
await rm(
|
|
117
|
+
await rm(cacheDirFor(configPath), { recursive: true, force: true })
|
|
118
118
|
}
|
|
119
119
|
}))
|
|
120
120
|
|
|
@@ -150,7 +150,7 @@ describe("buildChangelog", () => {
|
|
|
150
150
|
expect(await readdir(nestedDir)).toEqual(["0-1-0.md"])
|
|
151
151
|
expect(await readdir(flatDir)).toEqual(["0-2-0.md"])
|
|
152
152
|
} finally {
|
|
153
|
-
await rm(
|
|
153
|
+
await rm(cacheDirFor(configPath), { recursive: true, force: true })
|
|
154
154
|
}
|
|
155
155
|
}))
|
|
156
156
|
})
|
|
@@ -1,18 +1,35 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
cpSync,
|
|
3
|
+
existsSync,
|
|
4
|
+
mkdirSync,
|
|
5
|
+
readlinkSync,
|
|
6
|
+
rmSync,
|
|
7
|
+
symlinkSync,
|
|
8
|
+
writeFileSync,
|
|
9
|
+
} from "node:fs"
|
|
2
10
|
import { basename, dirname, join, relative, resolve } from "node:path"
|
|
3
11
|
import { resolveDependencyDir } from "../../helpers/dependency-dir.ts"
|
|
12
|
+
import { removeTargetDir } from "../../helpers/target-dir.ts"
|
|
4
13
|
import { ESCAPABLE_FILES, ESCAPABLE_FOLDERS } from "../../settings.ts"
|
|
5
14
|
|
|
6
15
|
/**
|
|
7
|
-
* Synthesize the project's Vite mount
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
16
|
+
* Synthesize the project's Vite mount — `.livemark/.serve/` for the dev server,
|
|
17
|
+
* `.livemark/.build/` for a production build or preview: livemark's `source/` with the
|
|
18
|
+
* project's `.livemark/` escapes copied over it, plus a `node_modules` link to livemark's
|
|
19
|
+
* dependencies. Escapable folders are rebuilt on every run, so a removed escape never
|
|
20
|
+
* keeps rendering. Returns the target dir.
|
|
11
21
|
*/
|
|
12
|
-
export function buildTarget(props: {
|
|
13
|
-
|
|
22
|
+
export function buildTarget(props: {
|
|
23
|
+
configPath: string
|
|
24
|
+
sourceDir: string
|
|
25
|
+
command?: TargetCommand
|
|
26
|
+
}) {
|
|
27
|
+
const targetDir = targetDirFor(props.configPath, props.command)
|
|
14
28
|
const overridesRoot = dirname(targetDir)
|
|
29
|
+
// `.target/` was the mount before `.serve/` and `.build/`; an upgrade must not keep it.
|
|
30
|
+
removeTargetDir(join(overridesRoot, ".target"))
|
|
15
31
|
mkdirSync(targetDir, { recursive: true })
|
|
32
|
+
writeFileSync(join(targetDir, ".gitignore"), "*\n")
|
|
16
33
|
|
|
17
34
|
cpSync(props.sourceDir, targetDir, {
|
|
18
35
|
recursive: true,
|
|
@@ -36,9 +53,12 @@ export function buildTarget(props: { configPath: string; sourceDir: string }) {
|
|
|
36
53
|
return targetDir
|
|
37
54
|
}
|
|
38
55
|
|
|
56
|
+
/** Which mount a run uses: the dev server's, or the production build's. */
|
|
57
|
+
export type TargetCommand = "serve" | "build"
|
|
58
|
+
|
|
39
59
|
/** Locate the project's target dir without building it. */
|
|
40
|
-
export function targetDirFor(configPath: string) {
|
|
41
|
-
return join(dirname(configPath), ".livemark",
|
|
60
|
+
export function targetDirFor(configPath: string, command: TargetCommand = "serve") {
|
|
61
|
+
return join(dirname(configPath), ".livemark", `.${command}`)
|
|
42
62
|
}
|
|
43
63
|
|
|
44
64
|
function isPackageFile(src: string) {
|
|
@@ -14,7 +14,7 @@ describe("buildTarget", () => {
|
|
|
14
14
|
|
|
15
15
|
const targetDir = buildTarget({ configPath, sourceDir })
|
|
16
16
|
|
|
17
|
-
expect(targetDir).toBe(join(root, "project/.livemark/.
|
|
17
|
+
expect(targetDir).toBe(join(root, "project/.livemark/.serve"))
|
|
18
18
|
expect(read(targetDir, "components/Footer.tsx")).toBe("escaped")
|
|
19
19
|
expect(read(targetDir, "components/Header.tsx")).toBe("default")
|
|
20
20
|
expect(read(targetDir, "head.ts")).toBe("escaped head")
|
|
@@ -22,6 +22,29 @@ describe("buildTarget", () => {
|
|
|
22
22
|
expect(existsSync(join(targetDir, "helpers/util.unit.ts"))).toBe(false)
|
|
23
23
|
}))
|
|
24
24
|
|
|
25
|
+
it("mounts a production build apart from the dev server's target", () =>
|
|
26
|
+
temporaryDirectoryTask(async root => {
|
|
27
|
+
const { configPath, sourceDir } = await createFixture(root)
|
|
28
|
+
|
|
29
|
+
const targetDir = buildTarget({ configPath, sourceDir, command: "build" })
|
|
30
|
+
|
|
31
|
+
expect(targetDir).toBe(join(root, "project/.livemark/.build"))
|
|
32
|
+
expect(read(targetDir, "routes/index.tsx")).toBe("index")
|
|
33
|
+
expect(existsSync(targetDirFor(configPath))).toBe(false)
|
|
34
|
+
}))
|
|
35
|
+
|
|
36
|
+
it("ignores itself in git and removes the legacy .target mount", () =>
|
|
37
|
+
temporaryDirectoryTask(async root => {
|
|
38
|
+
const { configPath, sourceDir } = await createFixture(root)
|
|
39
|
+
const legacyDir = join(root, "project/.livemark/.target")
|
|
40
|
+
await put(join(legacyDir, "routes/index.tsx"), "stale")
|
|
41
|
+
|
|
42
|
+
const targetDir = buildTarget({ configPath, sourceDir })
|
|
43
|
+
|
|
44
|
+
expect(read(targetDir, ".gitignore")).toBe("*\n")
|
|
45
|
+
expect(existsSync(legacyDir)).toBe(false)
|
|
46
|
+
}))
|
|
47
|
+
|
|
25
48
|
it("drops escapes removed since the last run", () =>
|
|
26
49
|
temporaryDirectoryTask(async root => {
|
|
27
50
|
const { configPath, sourceDir } = await createFixture(root)
|