livemark 0.13.1 → 0.15.0
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/build/components/Layout.js +3 -2
- package/build/components/SidebarArticles.js +10 -12
- package/build/components/SidebarLinks.js +3 -2
- package/build/components/SiteTitle.js +3 -2
- package/build/content-collections.js +3 -2
- package/build/helpers/prefix-url.d.ts +6 -0
- package/build/helpers/prefix-url.js +24 -0
- package/build/helpers/prefix-url.unit.d.ts +1 -0
- package/build/helpers/prefix-url.unit.js +45 -0
- package/build/helpers/resolve-asset-path.d.ts +1 -1
- package/build/helpers/resolve-asset-path.js +9 -5
- package/build/helpers/resolve-asset-path.unit.d.ts +1 -0
- package/build/helpers/resolve-asset-path.unit.js +34 -0
- package/build/models/config.d.ts +3 -0
- package/build/models/config.js +11 -1
- package/build/plugins/remark-image.d.ts +1 -0
- package/build/plugins/remark-image.js +3 -3
- package/build/plugins/vite-livemark.js +6 -1
- package/build/router.js +3 -1
- package/build/routes/__root.js +3 -2
- package/build/vite.config.js +18 -4
- package/package.json +1 -1
- package/source/components/Layout.tsx +2 -1
- package/source/components/SidebarArticles.tsx +34 -30
- package/source/components/SidebarLinks.tsx +2 -1
- package/source/components/SiteTitle.tsx +2 -1
- package/source/content-collections.ts +2 -1
- package/source/helpers/prefix-url.ts +22 -0
- package/source/helpers/prefix-url.unit.ts +57 -0
- package/source/helpers/resolve-asset-path.ts +12 -5
- package/source/helpers/resolve-asset-path.unit.ts +59 -0
- package/source/models/config.ts +9 -0
- package/source/plugins/remark-image.ts +3 -3
- package/source/plugins/vite-livemark.ts +5 -0
- package/source/router.tsx +2 -0
- package/source/routes/__root.tsx +5 -1
- package/source/vite.config.ts +17 -3
package/build/models/config.js
CHANGED
|
@@ -5,6 +5,15 @@ import { Section } from "./section.js";
|
|
|
5
5
|
import { CodeThemeDark, CodeThemeLight } from "./theme.js";
|
|
6
6
|
export const UserConfig = z.object({
|
|
7
7
|
site: z.string().optional(),
|
|
8
|
+
base: z
|
|
9
|
+
.string()
|
|
10
|
+
.optional()
|
|
11
|
+
.transform(v => {
|
|
12
|
+
if (!v)
|
|
13
|
+
return undefined;
|
|
14
|
+
const trimmed = v.replace(/^\/|\/$/g, "");
|
|
15
|
+
return trimmed ? `/${trimmed}` : undefined;
|
|
16
|
+
}),
|
|
8
17
|
favicon: z.string().optional(),
|
|
9
18
|
logo: z.string().optional(),
|
|
10
19
|
title: z.string().default("Livemark"),
|
|
@@ -25,6 +34,7 @@ export const WebsiteConfig = UserConfig.pick({
|
|
|
25
34
|
title: true,
|
|
26
35
|
description: true,
|
|
27
36
|
site: true,
|
|
37
|
+
base: true,
|
|
28
38
|
favicon: true,
|
|
29
39
|
logo: true,
|
|
30
40
|
links: true,
|
|
@@ -35,4 +45,4 @@ export const SystemConfig = z.object({
|
|
|
35
45
|
configPath: z.string(),
|
|
36
46
|
});
|
|
37
47
|
export const Config = UserConfig.merge(SystemConfig);
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc291cmNlL21vZGVscy9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQTtBQUV2QixPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQ2hDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQWtCMUQsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFDakMsSUFBSSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDM0IsSUFBSSxFQUFFLENBQUM7U0FDSixNQUFNLEVBQUU7U0FDUixRQUFRLEVBQUU7U0FDVixTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDYixJQUFJLENBQUMsQ0FBQztZQUFFLE9BQU8sU0FBUyxDQUFBO1FBQ3hCLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ3pDLE9BQU8sT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUE7SUFDNUMsQ0FBQyxDQUFDO0lBQ0osT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDOUIsSUFBSSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDM0IsS0FBSyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDO0lBQ3JDLFdBQVcsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDLHlCQUF5QixDQUFDO0lBQzFELE9BQU8sRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUM7SUFDdEUsT0FBTyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQzlELGNBQWMsRUFBRSxjQUFjLENBQUMsT0FBTyxDQUFDLGtCQUFrQixDQUFDO0lBQzFELGFBQWEsRUFBRSxhQUFhLENBQUMsT0FBTyxDQUFDLGtCQUFrQixDQUFDO0lBQ3hELEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUMvQixRQUFRLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDckMsT0FBTyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQ2xDLHNFQUFzRTtJQUN0RSxtRUFBbUU7SUFDbkUsa0VBQWtFO0lBQ2xFLElBQUksRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsUUFBUSxFQUFFO0NBQzdCLENBQUMsQ0FBQTtBQUlGLE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO0lBQzNDLEtBQUssRUFBRSxJQUFJO0lBQ1gsV0FBVyxFQUFFLElBQUk7SUFDakIsSUFBSSxFQUFFLElBQUk7SUFDVixJQUFJLEVBQUUsSUFBSTtJQUNWLE9BQU8sRUFBRSxJQUFJO0lBQ2IsSUFBSSxFQUFFLElBQUk7SUFDVixLQUFLLEVBQUUsSUFBSTtJQUNYLFFBQVEsRUFBRSxJQUFJO0NBQ2YsQ0FBQyxDQUFBO0FBTUYsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFDbkMsSUFBSSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7SUFDaEIsVUFBVSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7Q0FDdkIsQ0FBQyxDQUFBO0FBVUYsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyB6IH0gZnJvbSBcInpvZFwiXG5pbXBvcnQgdHlwZSB7IENvbmZpZ0VudiwgVXNlckNvbmZpZyBhcyBWaXRlVXNlckNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCB7IExpbmsgfSBmcm9tIFwiLi9saW5rLnRzXCJcbmltcG9ydCB7IFBhdGNoIH0gZnJvbSBcIi4vcGF0Y2gudHNcIlxuaW1wb3J0IHsgU2VjdGlvbiB9IGZyb20gXCIuL3NlY3Rpb24udHNcIlxuaW1wb3J0IHsgQ29kZVRoZW1lRGFyaywgQ29kZVRoZW1lTGlnaHQgfSBmcm9tIFwiLi90aGVtZS50c1wiXG5cbi8qKiBFc2NhcGUgaGF0Y2ggZm9yIGFyYml0cmFyeSBWaXRlIGNvbmZpZyDigJQgYWNjZXB0cyBlaXRoZXIgYSBjb25maWdcbiAqICBvYmplY3QgKHNpbXBsZSBvdmVycmlkZXMpIG9yIGEgZnVuY3Rpb24gZm9ybSAoYChlbnYpID0+IGNvbmZpZ2AsXG4gKiAgbWF0Y2hpbmcgVml0ZSdzIG93biBgZGVmaW5lQ29uZmlnYCkuIE1lcmdlZCBvbiB0b3Agb2YgbGl2ZW1hcmsnc1xuICogIGRlZmF1bHRzIHZpYSBgbWVyZ2VDb25maWdgLCBzbyBwbHVnaW4gYXJyYXlzIGNvbmNhdGVuYXRlLCBkZWZpbmVzXG4gKiAgbWVyZ2UsIGV0Yy4gVXNlIHRoaXMgZm9yIGRlcGxveW1lbnQtdGFyZ2V0IHR3ZWFrcyAoZS5nLiBDRiBXb3JrZXJzXG4gKiAgdmlhIGBlbnZpcm9ubWVudHMuc3NyLnJlc29sdmUuY29uZGl0aW9uczogW1wid29ya2VyZFwiLCAuLi5dYCkuICovXG5leHBvcnQgdHlwZSBWaXRlT3ZlcnJpZGUgPVxuICB8IFZpdGVVc2VyQ29uZmlnXG4gIHwgKChlbnY6IENvbmZpZ0VudikgPT4gVml0ZVVzZXJDb25maWcgfCBQcm9taXNlPFZpdGVVc2VyQ29uZmlnPilcblxuLyoqXG4gKiBVc2VyLXByb3ZpZGVkIGNvbmZpZ3VyYXRpb24gZm9yIExpdmVtYXJrLlxuICovXG5leHBvcnQgdHlwZSBVc2VyQ29uZmlnID0gT21pdDx6LmluZmVyPHR5cGVvZiBVc2VyQ29uZmlnPiwgXCJ2aXRlXCI+ICYge1xuICB2aXRlPzogVml0ZU92ZXJyaWRlXG59XG5leHBvcnQgY29uc3QgVXNlckNvbmZpZyA9IHoub2JqZWN0KHtcbiAgc2l0ZTogei5zdHJpbmcoKS5vcHRpb25hbCgpLFxuICBiYXNlOiB6XG4gICAgLnN0cmluZygpXG4gICAgLm9wdGlvbmFsKClcbiAgICAudHJhbnNmb3JtKHYgPT4ge1xuICAgICAgaWYgKCF2KSByZXR1cm4gdW5kZWZpbmVkXG4gICAgICBjb25zdCB0cmltbWVkID0gdi5yZXBsYWNlKC9eXFwvfFxcLyQvZywgXCJcIilcbiAgICAgIHJldHVybiB0cmltbWVkID8gYC8ke3RyaW1tZWR9YCA6IHVuZGVmaW5lZFxuICAgIH0pLFxuICBmYXZpY29uOiB6LnN0cmluZygpLm9wdGlvbmFsKCksXG4gIGxvZ286IHouc3RyaW5nKCkub3B0aW9uYWwoKSxcbiAgdGl0bGU6IHouc3RyaW5nKCkuZGVmYXVsdChcIkxpdmVtYXJrXCIpLFxuICBkZXNjcmlwdGlvbjogei5zdHJpbmcoKS5kZWZhdWx0KFwiTWFya2Rvd24gc2l0ZSBnZW5lcmF0b3JcIiksXG4gIGluY2x1ZGU6IHoudW5pb24oW3ouc3RyaW5nKCksIHouYXJyYXkoei5zdHJpbmcoKSldKS5kZWZhdWx0KFwiKiovKi5tZFwiKSxcbiAgZXhjbHVkZTogei51bmlvbihbei5zdHJpbmcoKSwgei5hcnJheSh6LnN0cmluZygpKV0pLm9wdGlvbmFsKCksXG4gIGNvZGVUaGVtZUxpZ2h0OiBDb2RlVGhlbWVMaWdodC5kZWZhdWx0KFwiY2F0cHB1Y2Npbi1sYXR0ZVwiKSxcbiAgY29kZVRoZW1lRGFyazogQ29kZVRoZW1lRGFyay5kZWZhdWx0KFwiY2F0cHB1Y2Npbi1tb2NoYVwiKSxcbiAgbGlua3M6IHouYXJyYXkoTGluaykub3B0aW9uYWwoKSxcbiAgc2VjdGlvbnM6IHouYXJyYXkoU2VjdGlvbikub3B0aW9uYWwoKSxcbiAgcGF0Y2hlczogei5hcnJheShQYXRjaCkub3B0aW9uYWwoKSxcbiAgLy8gU3RvcmVkIGFzIGB1bmtub3duYCBpbiB0aGUgc2NoZW1hICh6b2QgY2FuJ3QgdHlwZSBhIFZpdGUgVXNlckNvbmZpZ1xuICAvLyBvciBhIGZ1bmN0aW9uIHJldHVybmluZyBvbmUgbWVhbmluZ2Z1bGx5KTsgdGhlIHB1YmxpYyBUeXBlU2NyaXB0XG4gIC8vIHN1cmZhY2UgYWJvdmUgbGlmdHMgaXQgYmFjayB0byBWaXRlT3ZlcnJpZGUgZm9yIGVkaXRvciBzdXBwb3J0LlxuICB2aXRlOiB6LnVua25vd24oKS5vcHRpb25hbCgpLFxufSlcblxuLyoqIFdlYnNpdGUgY29uZmlndXJhdGlvbiBpbmplY3RlZCBhdCBidWlsZCB0aW1lIHZpYSBWaXRlIGRlZmluZSAqL1xuZXhwb3J0IHR5cGUgV2Vic2l0ZUNvbmZpZyA9IHouaW5mZXI8dHlwZW9mIFdlYnNpdGVDb25maWc+XG5leHBvcnQgY29uc3QgV2Vic2l0ZUNvbmZpZyA9IFVzZXJDb25maWcucGljayh7XG4gIHRpdGxlOiB0cnVlLFxuICBkZXNjcmlwdGlvbjogdHJ1ZSxcbiAgc2l0ZTogdHJ1ZSxcbiAgYmFzZTogdHJ1ZSxcbiAgZmF2aWNvbjogdHJ1ZSxcbiAgbG9nbzogdHJ1ZSxcbiAgbGlua3M6IHRydWUsXG4gIHNlY3Rpb25zOiB0cnVlLFxufSlcblxuLyoqXG4gKiBTeXN0ZW0tY29tcHV0ZWQgY29uZmlndXJhdGlvbiBkZXJpdmVkIGZyb20gdGhlIGNvbmZpZyBmaWxlIGxvY2F0aW9uLlxuICovXG5leHBvcnQgdHlwZSBTeXN0ZW1Db25maWcgPSB6LmluZmVyPHR5cGVvZiBTeXN0ZW1Db25maWc+XG5leHBvcnQgY29uc3QgU3lzdGVtQ29uZmlnID0gei5vYmplY3Qoe1xuICByb290OiB6LnN0cmluZygpLFxuICBjb25maWdQYXRoOiB6LnN0cmluZygpLFxufSlcblxuLyoqXG4gKiBGdWxseSByZXNvbHZlZCBMaXZlbWFyayBjb25maWd1cmF0aW9uLlxuICpcbiAqIGB2aXRlYCBzdGF5cyBgdW5rbm93bmAgaGVyZSBiZWNhdXNlIHRoYXQncyB3aGF0IHRoZSBydW50aW1lIHNjaGVtYVxuICogcHJvZHVjZXMg4oCUIGNvbnN1bWVyLWZhY2luZyB0eXBpbmcgaGFwcGVucyB2aWEge0BsaW5rIFVzZXJDb25maWd9IHNvXG4gKiBgZGVmaW5lQ29uZmlnYCBzaG93cyB0aGUgcmlnaHQgc2hhcGUgaW4gZWRpdG9ycy5cbiAqL1xuZXhwb3J0IHR5cGUgQ29uZmlnID0gei5pbmZlcjx0eXBlb2YgQ29uZmlnPlxuZXhwb3J0IGNvbnN0IENvbmZpZyA9IFVzZXJDb25maWcubWVyZ2UoU3lzdGVtQ29uZmlnKVxuIl19
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { visit } from "unist-util-visit";
|
|
2
2
|
import { resolveAssetPath } from "../helpers/resolve-asset-path.js";
|
|
3
3
|
/** Remark plugin that resolves relative image paths and unwraps image-only paragraphs */
|
|
4
|
-
export const remarkImage = ({ filePath, root }) => {
|
|
4
|
+
export const remarkImage = ({ filePath, root, base }) => {
|
|
5
5
|
return tree => {
|
|
6
6
|
visit(tree, "image", node => {
|
|
7
|
-
node.url = resolveAssetPath(node.url, filePath, root);
|
|
7
|
+
node.url = resolveAssetPath(node.url, filePath, root, base);
|
|
8
8
|
});
|
|
9
9
|
visit(tree, "paragraph", (node, index, parent) => {
|
|
10
10
|
if (!parent || typeof index !== "number")
|
|
@@ -23,4 +23,4 @@ export const remarkImage = ({ filePath, root }) => {
|
|
|
23
23
|
});
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtYXJrLWltYWdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc291cmNlL3BsdWdpbnMvcmVtYXJrLWltYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN4QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQTtBQUVuRSx5RkFBeUY7QUFDekYsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUdwQixDQUFDLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFO0lBQy9CLE9BQU8sSUFBSSxDQUFDLEVBQUU7UUFDWixLQUFLLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRTtZQUMxQixJQUFJLENBQUMsR0FBRyxHQUFHLGdCQUFnQixDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQTtRQUM3RCxDQUFDLENBQUMsQ0FBQTtRQUVGLEtBQUssQ0FBQyxJQUFJLEVBQUUsV0FBVyxFQUFFLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtZQUMvQyxJQUFJLENBQUMsTUFBTSxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVE7Z0JBQUUsT0FBTTtZQUNoRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FDckMsS0FBSyxDQUFDLEVBQUUsQ0FDTixLQUFLLENBQUMsSUFBSSxLQUFLLE9BQU87Z0JBQ3RCLEtBQUssQ0FBQyxJQUFJLEtBQUssZ0JBQWdCO2dCQUMvQixLQUFLLENBQUMsSUFBSSxLQUFLLE9BQU87Z0JBQ3RCLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxNQUFNLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FDdkQsQ0FBQTtZQUNELElBQUksQ0FBQyxXQUFXO2dCQUFFLE9BQU07WUFDeEIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQ2pDLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxPQUFPLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxnQkFBZ0IsQ0FDbkUsQ0FBQTtZQUNELElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDO2dCQUFFLE9BQU07WUFDL0IsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUMsRUFBRSxHQUFHLE1BQU0sQ0FBQyxDQUFBO1lBQzNDLE9BQU8sS0FBSyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUE7UUFDOUIsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLENBQUE7QUFDSCxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFJvb3QgfSBmcm9tIFwibWRhc3RcIlxuaW1wb3J0IHR5cGUgeyBQbHVnaW4gfSBmcm9tIFwidW5pZmllZFwiXG5pbXBvcnQgeyB2aXNpdCB9IGZyb20gXCJ1bmlzdC11dGlsLXZpc2l0XCJcbmltcG9ydCB7IHJlc29sdmVBc3NldFBhdGggfSBmcm9tIFwiLi4vaGVscGVycy9yZXNvbHZlLWFzc2V0LXBhdGgudHNcIlxuXG4vKiogUmVtYXJrIHBsdWdpbiB0aGF0IHJlc29sdmVzIHJlbGF0aXZlIGltYWdlIHBhdGhzIGFuZCB1bndyYXBzIGltYWdlLW9ubHkgcGFyYWdyYXBocyAqL1xuZXhwb3J0IGNvbnN0IHJlbWFya0ltYWdlOiBQbHVnaW48XG4gIFt7IGZpbGVQYXRoOiBzdHJpbmc7IHJvb3Q6IHN0cmluZzsgYmFzZT86IHN0cmluZyB9XSxcbiAgUm9vdFxuPiA9ICh7IGZpbGVQYXRoLCByb290LCBiYXNlIH0pID0+IHtcbiAgcmV0dXJuIHRyZWUgPT4ge1xuICAgIHZpc2l0KHRyZWUsIFwiaW1hZ2VcIiwgbm9kZSA9PiB7XG4gICAgICBub2RlLnVybCA9IHJlc29sdmVBc3NldFBhdGgobm9kZS51cmwsIGZpbGVQYXRoLCByb290LCBiYXNlKVxuICAgIH0pXG5cbiAgICB2aXNpdCh0cmVlLCBcInBhcmFncmFwaFwiLCAobm9kZSwgaW5kZXgsIHBhcmVudCkgPT4ge1xuICAgICAgaWYgKCFwYXJlbnQgfHwgdHlwZW9mIGluZGV4ICE9PSBcIm51bWJlclwiKSByZXR1cm5cbiAgICAgIGNvbnN0IGlzSW1hZ2VPbmx5ID0gbm9kZS5jaGlsZHJlbi5ldmVyeShcbiAgICAgICAgY2hpbGQgPT5cbiAgICAgICAgICBjaGlsZC50eXBlID09PSBcImltYWdlXCIgfHxcbiAgICAgICAgICBjaGlsZC50eXBlID09PSBcImltYWdlUmVmZXJlbmNlXCIgfHxcbiAgICAgICAgICBjaGlsZC50eXBlID09PSBcImJyZWFrXCIgfHxcbiAgICAgICAgICAoY2hpbGQudHlwZSA9PT0gXCJ0ZXh0XCIgJiYgY2hpbGQudmFsdWUudHJpbSgpID09PSBcIlwiKSxcbiAgICAgIClcbiAgICAgIGlmICghaXNJbWFnZU9ubHkpIHJldHVyblxuICAgICAgY29uc3QgaW1hZ2VzID0gbm9kZS5jaGlsZHJlbi5maWx0ZXIoXG4gICAgICAgIGNoaWxkID0+IGNoaWxkLnR5cGUgPT09IFwiaW1hZ2VcIiB8fCBjaGlsZC50eXBlID09PSBcImltYWdlUmVmZXJlbmNlXCIsXG4gICAgICApXG4gICAgICBpZiAoaW1hZ2VzLmxlbmd0aCA9PT0gMCkgcmV0dXJuXG4gICAgICBwYXJlbnQuY2hpbGRyZW4uc3BsaWNlKGluZGV4LCAxLCAuLi5pbWFnZXMpXG4gICAgICByZXR1cm4gaW5kZXggKyBpbWFnZXMubGVuZ3RoXG4gICAgfSlcbiAgfVxufVxuIl19
|
|
@@ -36,6 +36,11 @@ export function livemark(opts) {
|
|
|
36
36
|
targetDir = buildTarget(opts.config.configPath);
|
|
37
37
|
const base = {
|
|
38
38
|
root: targetDir,
|
|
39
|
+
// Mount everything (asset URLs, modulepreloads, dev server) under
|
|
40
|
+
// `config.base` so the same build works at root or at a sub-path
|
|
41
|
+
// (e.g. GitHub Pages `https://user.github.io/repo/`). The router
|
|
42
|
+
// and asset-path resolver mirror this at runtime.
|
|
43
|
+
base: opts.config.base ? `${opts.config.base}/` : "/",
|
|
39
44
|
// outDir lives outside the target root (in the consumer's
|
|
40
45
|
// .livemark/) so the consumer can find their deployable output
|
|
41
46
|
// without digging into node_modules. Vite's default refusal to
|
|
@@ -213,4 +218,4 @@ async function resolveViteOverride(vite, env) {
|
|
|
213
218
|
function isObject(v) {
|
|
214
219
|
return v !== null && typeof v === "object";
|
|
215
220
|
}
|
|
216
|
-
//# 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 { 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      // Two reasons we don't use Vite's own `server.watcher`:\n      //   1. Vite 8 bundles chokidar 3 with `disableGlobbing: true`, and\n      //      paths added via `server.watcher.add()` for surfaces outside\n      //      Vite's root never fire — getWatched() reports them but no\n      //      events arrive for external editors.\n      //   2. Vite's chokidar ignores `**\\/node_modules/**` by default, so\n      //      even if (1) were fixed, our targetDir (which lives inside\n      //      livemark's own node_modules in consumer projects) would be\n      //      silently filtered. We emit the change event manually onto\n      //      `server.watcher` after cpSync — see {@link notifyVite}.\n      // A dedicated chokidar 5 watcher set up directly on these paths\n      // fires reliably; we forward events into Vite's HMR pipeline below.\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          notifyVite(server, join(targetDir, overlayHit.rel), kind)\n          if (kind !== \"change\") fullReload(server)\n          return\n        }\n        const sourceHit = matchSource(file)\n        if (sourceHit) {\n          syncSource(sourceHit, kind, targetDir, overridesRoot)\n          notifyVite(server, join(targetDir, sourceHit.rel), kind)\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/** Drive Vite's HMR pipeline manually for a target file we just synced.\n *  Vite's chokidar ignores `**\\/node_modules/**` by default and our\n *  targetDir lives inside livemark's own node_modules in consumer\n *  projects, so cpSync writes there are silently filtered out.\n *\n *  Emitting on `server.watcher` runs Vite's HMR analysis per environment\n *  (CSS gets `hmr update`, route modules trigger `(ssr) page reload`).\n *  But `(ssr) page reload` only sends `full-reload` on the SSR\n *  environment's hot channel — the browser is connected to the *client*\n *  channel and never sees it. So we also fire `full-reload` on the\n *  client hot directly, which is what TanStack Start needs for route\n *  edits to actually refresh the page. CSS HMR still works because\n *  Vite's analysis runs first and updates already-flushed before our\n *  reload. */\nfunction notifyVite(\n  server: ViteDevServer,\n  targetFile: string,\n  kind: \"change\" | \"add\" | \"unlink\",\n) {\n  server.watcher.emit(kind, targetFile)\n  server.environments.client.hot.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"]}
|
|
221
|
+
//# 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 { 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        // 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 (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      // Two reasons we don't use Vite's own `server.watcher`:\n      //   1. Vite 8 bundles chokidar 3 with `disableGlobbing: true`, and\n      //      paths added via `server.watcher.add()` for surfaces outside\n      //      Vite's root never fire — getWatched() reports them but no\n      //      events arrive for external editors.\n      //   2. Vite's chokidar ignores `**\\/node_modules/**` by default, so\n      //      even if (1) were fixed, our targetDir (which lives inside\n      //      livemark's own node_modules in consumer projects) would be\n      //      silently filtered. We emit the change event manually onto\n      //      `server.watcher` after cpSync — see {@link notifyVite}.\n      // A dedicated chokidar 5 watcher set up directly on these paths\n      // fires reliably; we forward events into Vite's HMR pipeline below.\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          notifyVite(server, join(targetDir, overlayHit.rel), kind)\n          if (kind !== \"change\") fullReload(server)\n          return\n        }\n        const sourceHit = matchSource(file)\n        if (sourceHit) {\n          syncSource(sourceHit, kind, targetDir, overridesRoot)\n          notifyVite(server, join(targetDir, sourceHit.rel), kind)\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/** Drive Vite's HMR pipeline manually for a target file we just synced.\n *  Vite's chokidar ignores `**\\/node_modules/**` by default and our\n *  targetDir lives inside livemark's own node_modules in consumer\n *  projects, so cpSync writes there are silently filtered out.\n *\n *  Emitting on `server.watcher` runs Vite's HMR analysis per environment\n *  (CSS gets `hmr update`, route modules trigger `(ssr) page reload`).\n *  But `(ssr) page reload` only sends `full-reload` on the SSR\n *  environment's hot channel — the browser is connected to the *client*\n *  channel and never sees it. So we also fire `full-reload` on the\n *  client hot directly, which is what TanStack Start needs for route\n *  edits to actually refresh the page. CSS HMR still works because\n *  Vite's analysis runs first and updates already-flushed before our\n *  reload. */\nfunction notifyVite(\n  server: ViteDevServer,\n  targetFile: string,\n  kind: \"change\" | \"add\" | \"unlink\",\n) {\n  server.watcher.emit(kind, targetFile)\n  server.environments.client.hot.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/build/router.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { config } from "livemark:virtual";
|
|
2
3
|
import { QueryClient } from "@tanstack/react-query";
|
|
3
4
|
import { createRouter } from "@tanstack/react-router";
|
|
4
5
|
import { setupRouterSsrQueryIntegration } from "@tanstack/react-router-ssr-query";
|
|
@@ -9,6 +10,7 @@ export function getRouter() {
|
|
|
9
10
|
const queryClient = new QueryClient();
|
|
10
11
|
const router = createRouter({
|
|
11
12
|
routeTree,
|
|
13
|
+
basepath: config.base,
|
|
12
14
|
context: { queryClient },
|
|
13
15
|
trailingSlash: "always",
|
|
14
16
|
defaultPreload: "intent",
|
|
@@ -23,4 +25,4 @@ export function getRouter() {
|
|
|
23
25
|
});
|
|
24
26
|
return router;
|
|
25
27
|
}
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc291cmNlL3JvdXRlci50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUE7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHdCQUF3QixDQUFBO0FBQ3JELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pGLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHNDQUF1QyxDQUFBO0FBQzVFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMkIsQ0FBQTtBQUNwRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFFOUMsTUFBTSxVQUFVLFNBQVM7SUFDdkIsTUFBTSxXQUFXLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQTtJQUVyQyxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUM7UUFDMUIsU0FBUztRQUNULFFBQVEsRUFBRSxNQUFNLENBQUMsSUFBSTtRQUNyQixPQUFPLEVBQUUsRUFBRSxXQUFXLEVBQUU7UUFDeEIsYUFBYSxFQUFFLFFBQVE7UUFDdkIsY0FBYyxFQUFFLFFBQVE7UUFDeEIscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixxQkFBcUIsRUFBRSxvQkFBb0I7UUFDM0Msd0JBQXdCLEVBQUUsR0FBRyxFQUFFLENBQUMsS0FBQyxRQUFRLEtBQUc7UUFDNUMsaUJBQWlCLEVBQUUsSUFBSTtLQUN4QixDQUFDLENBQUE7SUFFRiw4QkFBOEIsQ0FBQztRQUM3QixNQUFNO1FBQ04sV0FBVztLQUNaLENBQUMsQ0FBQTtJQUVGLE9BQU8sTUFBTSxDQUFBO0FBQ2YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNvbmZpZyB9IGZyb20gXCJsaXZlbWFyazp2aXJ0dWFsXCJcbmltcG9ydCB7IFF1ZXJ5Q2xpZW50IH0gZnJvbSBcIkB0YW5zdGFjay9yZWFjdC1xdWVyeVwiXG5pbXBvcnQgeyBjcmVhdGVSb3V0ZXIgfSBmcm9tIFwiQHRhbnN0YWNrL3JlYWN0LXJvdXRlclwiXG5pbXBvcnQgeyBzZXR1cFJvdXRlclNzclF1ZXJ5SW50ZWdyYXRpb24gfSBmcm9tIFwiQHRhbnN0YWNrL3JlYWN0LXJvdXRlci1zc3ItcXVlcnlcIlxuaW1wb3J0IHsgRGVmYXVsdENhdGNoQm91bmRhcnkgfSBmcm9tIFwiLi9jb21wb25lbnRzL0RlZmF1bHRDYXRjaEJvdW5kYXJ5LnRzeFwiXG5pbXBvcnQgeyBOb3RGb3VuZCB9IGZyb20gXCIuL2NvbXBvbmVudHMvTm90Rm91bmQudHN4XCJcbmltcG9ydCB7IHJvdXRlVHJlZSB9IGZyb20gXCIuL3JvdXRlVHJlZS5nZW4udHNcIlxuXG5leHBvcnQgZnVuY3Rpb24gZ2V0Um91dGVyKCkge1xuICBjb25zdCBxdWVyeUNsaWVudCA9IG5ldyBRdWVyeUNsaWVudCgpXG5cbiAgY29uc3Qgcm91dGVyID0gY3JlYXRlUm91dGVyKHtcbiAgICByb3V0ZVRyZWUsXG4gICAgYmFzZXBhdGg6IGNvbmZpZy5iYXNlLFxuICAgIGNvbnRleHQ6IHsgcXVlcnlDbGllbnQgfSxcbiAgICB0cmFpbGluZ1NsYXNoOiBcImFsd2F5c1wiLFxuICAgIGRlZmF1bHRQcmVsb2FkOiBcImludGVudFwiLFxuICAgIGRlZmF1bHRWaWV3VHJhbnNpdGlvbjogdHJ1ZSxcbiAgICBkZWZhdWx0RXJyb3JDb21wb25lbnQ6IERlZmF1bHRDYXRjaEJvdW5kYXJ5LFxuICAgIGRlZmF1bHROb3RGb3VuZENvbXBvbmVudDogKCkgPT4gPE5vdEZvdW5kIC8+LFxuICAgIHNjcm9sbFJlc3RvcmF0aW9uOiB0cnVlLFxuICB9KVxuXG4gIHNldHVwUm91dGVyU3NyUXVlcnlJbnRlZ3JhdGlvbih7XG4gICAgcm91dGVyLFxuICAgIHF1ZXJ5Q2xpZW50LFxuICB9KVxuXG4gIHJldHVybiByb3V0ZXJcbn1cblxuZGVjbGFyZSBtb2R1bGUgXCJAdGFuc3RhY2svcmVhY3Qtcm91dGVyXCIge1xuICBpbnRlcmZhY2UgUmVnaXN0ZXIge1xuICAgIHJvdXRlcjogUmV0dXJuVHlwZTx0eXBlb2YgZ2V0Um91dGVyPlxuICB9XG59XG4iXX0=
|
package/build/routes/__root.js
CHANGED
|
@@ -9,12 +9,13 @@ import { DefaultCatchBoundary } from "../components/DefaultCatchBoundary.js";
|
|
|
9
9
|
import { NotFound } from "../components/NotFound.js";
|
|
10
10
|
import { Toaster } from "../elements/sonner.js";
|
|
11
11
|
import { faviconType } from "../helpers/favicon.js";
|
|
12
|
+
import { prefixUrl } from "../helpers/prefix-url.js";
|
|
12
13
|
import defaultFavicon from "../assets/logo.svg";
|
|
13
14
|
import generalCss from "../styles/general.css?url";
|
|
14
15
|
import markdownCss from "../styles/markdown.css?url";
|
|
15
16
|
export const Route = createRootRoute({
|
|
16
17
|
head: () => {
|
|
17
|
-
const favicon = config.favicon ?? config.logo ?? defaultFavicon;
|
|
18
|
+
const favicon = prefixUrl(config.favicon ?? config.logo ?? defaultFavicon, config.base);
|
|
18
19
|
return {
|
|
19
20
|
meta: [
|
|
20
21
|
{ charSet: "utf-8" },
|
|
@@ -68,4 +69,4 @@ function Document(props) {
|
|
|
68
69
|
] })
|
|
69
70
|
] }));
|
|
70
71
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX19yb290LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc291cmNlL3JvdXRlcy9fX3Jvb3QudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDekMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFDM0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sZ0NBQWdDLENBQUE7QUFDeEUsT0FBTyxFQUNMLGVBQWUsRUFDZixXQUFXLEVBQ1gsTUFBTSxFQUNOLE9BQU8sRUFDUCxRQUFRLEdBQ1QsTUFBTSx3QkFBd0IsQ0FBQTtBQUMvQixPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUU3RSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0seUJBQTBCLENBQUE7QUFDakQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sdUNBQXdDLENBQUE7QUFDN0UsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJCQUE0QixDQUFBO0FBQ3JELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSx1QkFBd0IsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUE7QUFDbkQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDBCQUEwQixDQUFBO0FBQ3BELE9BQU8sY0FBYyxNQUFNLG9CQUFvQixDQUFBO0FBQy9DLE9BQU8sVUFBVSxNQUFNLDJCQUEyQixDQUFBO0FBQ2xELE9BQU8sV0FBVyxNQUFNLDRCQUE0QixDQUFBO0FBRXBELE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxlQUFlLENBQUM7SUFDbkMsSUFBSSxFQUFFLEdBQUcsRUFBRTtRQUNULE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FDdkIsTUFBTSxDQUFDLE9BQU8sSUFBSSxNQUFNLENBQUMsSUFBSSxJQUFJLGNBQWMsRUFDL0MsTUFBTSxDQUFDLElBQUks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dmlydHVhbFwiXG5pbXBvcnQgeyBUYW5TdGFja0RldnRvb2xzIH0gZnJvbSBcIkB0YW5zdGFjay9yZWFjdC1kZXZ0b29sc1wiXG5pbXBvcnQgeyBSZWFjdFF1ZXJ5RGV2dG9vbHNQYW5lbCB9IGZyb20gXCJAdGFuc3RhY2svcmVhY3QtcXVlcnktZGV2dG9vbHNcIlxuaW1wb3J0IHtcbiAgY3JlYXRlUm9vdFJvdXRlLFxuICBIZWFkQ29udGVudCxcbiAgT3V0bGV0LFxuICBTY3JpcHRzLFxuICB1c2VNYXRjaCxcbn0gZnJvbSBcIkB0YW5zdGFjay9yZWFjdC1yb3V0ZXJcIlxuaW1wb3J0IHsgVGFuU3RhY2tSb3V0ZXJEZXZ0b29sc1BhbmVsIH0gZnJvbSBcIkB0YW5zdGFjay9yZWFjdC1yb3V0ZXItZGV2dG9vbHNcIlxuaW1wb3J0IHR5cGUgKiBhcyBSZWFjdCBmcm9tIFwicmVhY3RcIlxuaW1wb3J0IHsgTGF5b3V0IH0gZnJvbSBcIi4uL2NvbXBvbmVudHMvTGF5b3V0LnRzeFwiXG5pbXBvcnQgeyBEZWZhdWx0Q2F0Y2hCb3VuZGFyeSB9IGZyb20gXCIuLi9jb21wb25lbnRzL0RlZmF1bHRDYXRjaEJvdW5kYXJ5LnRzeFwiXG5pbXBvcnQgeyBOb3RGb3VuZCB9IGZyb20gXCIuLi9jb21wb25lbnRzL05vdEZvdW5kLnRzeFwiXG5pbXBvcnQgeyBUb2FzdGVyIH0gZnJvbSBcIi4uL2VsZW1lbnRzL3Nvbm5lci50c3hcIlxuaW1wb3J0IHsgZmF2aWNvblR5cGUgfSBmcm9tIFwiLi4vaGVscGVycy9mYXZpY29uLnRzXCJcbmltcG9ydCB7IHByZWZpeFVybCB9IGZyb20gXCIuLi9oZWxwZXJzL3ByZWZpeC11cmwudHNcIlxuaW1wb3J0IGRlZmF1bHRGYXZpY29uIGZyb20gXCIuLi9hc3NldHMvbG9nby5zdmdcIlxuaW1wb3J0IGdlbmVyYWxDc3MgZnJvbSBcIi4uL3N0eWxlcy9nZW5lcmFsLmNzcz91cmxcIlxuaW1wb3J0IG1hcmtkb3duQ3NzIGZyb20gXCIuLi9zdHlsZXMvbWFya2Rvd24uY3NzP3VybFwiXG5cbmV4cG9ydCBjb25zdCBSb3V0ZSA9IGNyZWF0ZVJvb3RSb3V0ZSh7XG4gIGhlYWQ6ICgpID0+IHtcbiAgICBjb25zdCBmYXZpY29uID0gcHJlZml4VXJsKFxuICAgICAgY29uZmlnLmZhdmljb24gPz8gY29uZmlnLmxvZ28gPz8gZGVmYXVsdEZhdmljb24sXG4gICAgICBjb25maWcuYmFzZSxcbiAgICApXG4gICAgcmV0dXJuIHtcbiAgICAgIG1ldGE6IFtcbiAgICAgICAgeyBjaGFyU2V0OiBcInV0Zi04XCIgfSxcbiAgICAgICAgeyB0aXRsZTogY29uZmlnLnRpdGxlIH0sXG4gICAgICAgIHsgbmFtZTogXCJkZXNjcmlwdGlvblwiLCBjb250ZW50OiBjb25maWcuZGVzY3JpcHRpb24gfSxcbiAgICAgICAgeyBwcm9wZXJ0eTogXCJvZzp0aXRsZVwiLCBjb250ZW50OiBjb25maWcudGl0bGUgfSxcbiAgICAgICAge1xuICAgICAgICAgIHByb3BlcnR5OiBcIm9nOmRlc2NyaXB0aW9uXCIsXG4gICAgICAgICAgY29udGVudDogY29uZmlnLmRlc2NyaXB0aW9uLFxuICAgICAgICB9LFxuICAgICAgICB7IHByb3BlcnR5OiBcIm9nOnNpdGVfbmFtZVwiLCBjb250ZW50OiBjb25maWcudGl0bGUgfSxcbiAgICAgICAgeyBwcm9wZXJ0eTogXCJvZzp0eXBlXCIsIGNvbnRlbnQ6IFwid2Vic2l0ZVwiIH0sXG4gICAgICAgIHtcbiAgICAgICAgICBuYW1lOiBcInZpZXdwb3J0XCIsXG4gICAgICAgICAgY29udGVudDogXCJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MVwiLFxuICAgICAgICB9LFxuICAgICAgXSxcbiAgICAgIGxpbmtzOiBbXG4gICAgICAgIHsgcmVsOiBcImljb25cIiwgaHJlZjogZmF2aWNvbiwgdHlwZTogZmF2aWNvblR5cGUoZmF2aWNvbikgfSxcbiAgICAgICAgeyByZWw6IFwic2hvcnRjdXQgaWNvblwiLCBocmVmOiBmYXZpY29uLCB0eXBlOiBmYXZpY29uVHlwZShmYXZpY29uKSB9LFxuICAgICAgICB7IHJlbDogXCJzdHlsZXNoZWV0XCIsIGhyZWY6IGdlbmVyYWxDc3MgfSxcbiAgICAgICAgeyByZWw6IFwic3R5bGVzaGVldFwiLCBocmVmOiBtYXJrZG93bkNzcyB9LFxuICAgICAgXSxcbiAgICB9XG4gIH0sXG4gIG5vdEZvdW5kQ29tcG9uZW50OiAoKSA9PiA8Tm90Rm91bmQgLz4sXG4gIGVycm9yQ29tcG9uZW50OiBwcm9wcyA9PiB7XG4gICAgcmV0dXJuIChcbiAgICAgIDxEb2N1bWVudD5cbiAgICAgICAgPERlZmF1bHRDYXRjaEJvdW5kYXJ5IHsuLi5wcm9wc30gLz5cbiAgICAgIDwvRG9jdW1lbnQ+XG4gICAgKVxuICB9LFxuICBjb21wb25lbnQ6ICgpID0+IHtcbiAgICByZXR1cm4gKFxuICAgICAgPERvY3VtZW50PlxuICAgICAgICA8T3V0bGV0IC8+XG4gICAgICA8L0RvY3VtZW50PlxuICAgIClcbiAgfSxcbn0pXG5cbmZ1bmN0aW9uIERvY3VtZW50KHByb3BzOiB7IGNoaWxkcmVuOiBSZWFjdC5SZWFjdE5vZGUgfSkge1xuICBjb25zdCBhcnRpY2xlUm91dGUgPSB1c2VNYXRjaCh7IGZyb206IFwiLyRcIiwgc2hvdWxkVGhyb3c6IGZhbHNlIH0pXG4gIGNvbnN0IHdpdGhTaWRlYmFyID0gYXJ0aWNsZVJvdXRlPy5sb2FkZXJEYXRhPy5zaWRlYmFyXG5cbiAgcmV0dXJuIChcbiAgICA8aHRtbCBsYW5nPVwiZW5cIj5cbiAgICAgIDxoZWFkPlxuICAgICAgICA8SGVhZENvbnRlbnQgLz5cbiAgICAgIDwvaGVhZD5cbiAgICAgIDxib2R5PlxuICAgICAgICA8TGF5b3V0IHdpdGhTaWRlYmFyPXt3aXRoU2lkZWJhcn0+e3Byb3BzLmNoaWxkcmVufTwvTGF5b3V0PlxuICAgICAgICA8VG9hc3RlciBwb3NpdGlvbj1cInRvcC1jZW50ZXJcIiAvPlxuICAgICAgICA8VGFuU3RhY2tEZXZ0b29sc1xuICAgICAgICAgIGNvbmZpZz17eyBoaWRlVW50aWxIb3ZlcjogdHJ1ZSwgcG9zaXRpb246IFwiYm90dG9tLWxlZnRcIiB9fVxuICAgICAgICAgIHBsdWdpbnM9e1tcbiAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAgbmFtZTogXCJUYW5TdGFjayBRdWVyeVwiLFxuICAgICAgICAgICAgICByZW5kZXI6IDxSZWFjdFF1ZXJ5RGV2dG9vbHNQYW5lbCAvPixcbiAgICAgICAgICAgICAgZGVmYXVsdE9wZW46IHRydWUsXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAge1xuICAgICAgICAgICAgICBuYW1lOiBcIlRhblN0YWNrIFJvdXRlclwiLFxuICAgICAgICAgICAgICByZW5kZXI6IDxUYW5TdGFja1JvdXRlckRldnRvb2xzUGFuZWwgLz4sXG4gICAgICAgICAgICAgIGRlZmF1bHRPcGVuOiBmYWxzZSxcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgXX1cbiAgICAgICAgLz5cbiAgICAgICAgPFNjcmlwdHMgLz5cbiAgICAgIDwvYm9keT5cbiAgICA8L2h0bWw+XG4gIClcbn1cbiJdfQ==
|
package/build/vite.config.js
CHANGED
|
@@ -16,15 +16,29 @@ export default defineConfig({
|
|
|
16
16
|
contentCollections({ configPath: "content-collections.ts" }),
|
|
17
17
|
tanstackStart({
|
|
18
18
|
srcDirectory: ".",
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
// Seed path must match what the crawler produces (router-emitted
|
|
20
|
+
// hrefs include the basepath), otherwise prerender records both
|
|
21
|
+
// shapes and the sitemap ends up with duplicate entries.
|
|
22
|
+
pages: [{ path: config.base ? `${config.base}/` : "/" }],
|
|
23
|
+
// Disable route-tree auto-discovery: it produces basepath-naive
|
|
24
|
+
// paths (e.g. `/`) that duplicate the crawl-derived prefixed paths,
|
|
25
|
+
// bloating pages.json and sitemap. Crawling from the seed already
|
|
26
|
+
// reaches every linked page.
|
|
27
|
+
prerender: {
|
|
28
|
+
enabled: true,
|
|
29
|
+
crawlLinks: true,
|
|
30
|
+
autoStaticPathsDiscovery: false,
|
|
31
|
+
},
|
|
21
32
|
sitemap: config.site
|
|
22
33
|
? { enabled: true, host: config.site }
|
|
23
34
|
: { enabled: false },
|
|
24
|
-
router: {
|
|
35
|
+
router: {
|
|
36
|
+
generatedRouteTree: "routeTree.gen.ts",
|
|
37
|
+
basepath: config.base,
|
|
38
|
+
},
|
|
25
39
|
}),
|
|
26
40
|
react(),
|
|
27
41
|
svgr(),
|
|
28
42
|
],
|
|
29
43
|
});
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZS5jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zb3VyY2Uvdml0ZS5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxrQkFBa0IsTUFBTSwyQkFBMkIsQ0FBQTtBQUMxRCxPQUFPLFFBQVEsTUFBTSxtQkFBbUIsQ0FBQTtBQUN4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDbEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1DQUFtQyxDQUFBO0FBQ2pFLE9BQU8sS0FBSyxNQUFNLHNCQUFzQixDQUFBO0FBQ3hDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxNQUFNLENBQUE7QUFDbkMsT0FBTyxJQUFJLE1BQU0sa0JBQWtCLENBQUE7QUFDbkMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQTtBQUVyRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFVBQVUsRUFBRSxDQUFBO0FBRWpDLGVBQWUsWUFBWSxDQUFDO0lBQzFCLE9BQU8sRUFBRTtRQUNQLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO1FBQ3BCLFFBQVEsRUFBRTtRQUNWLFFBQVEsRUFBRTtRQUNWLGtCQUFrQixDQUFDLEVBQUUsVUFBVSxFQUFFLHdCQUF3QixFQUFFLENBQUM7UUFDNUQsYUFBYSxDQUFDO1lBQ1osWUFBWSxFQUFFLEdBQUc7WUFDakIsaUVBQWlFO1lBQ2pFLGdFQUFnRTtZQUNoRSx5REFBeUQ7WUFDekQsS0FBSyxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxNQUFNLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3hELGdFQUFnRTtZQUNoRSxvRUFBb0U7WUFDcEUsa0VBQWtFO1lBQ2xFLDZCQUE2QjtZQUM3QixTQUFTLEVBQUU7Z0JBQ1QsT0FBTyxFQUFFLElBQUk7Z0JBQ2IsVUFBVSxFQUFFLElBQUk7Z0JBQ2hCLHdCQUF3QixFQUFFLEtBQUs7YUFDaEM7WUFDRCxPQUFPLEVBQUUsTUFBTSxDQUFDLElBQUk7Z0JBQ2xCLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQUU7Z0JBQ3RDLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUU7WUFDdEIsTUFBTSxFQUFFO2dCQUNOLGtCQUFrQixFQUFFLGtCQUFrQjtnQkFDdEMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxJQUFJO2FBQ3RCO1NBQ0YsQ0FBQztRQUNGLEtBQUssRUFBRTtRQUNQLElBQUksRUFBRTtLQUNQO0NBQ0YsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGNvbnRlbnRDb2xsZWN0aW9ucyBmcm9tIFwiQGNvbnRlbnQtY29sbGVjdGlvbnMvdml0ZVwiXG5pbXBvcnQgdGFpbHdpbmQgZnJvbSBcIkB0YWlsd2luZGNzcy92aXRlXCJcbmltcG9ydCB7IGRldnRvb2xzIH0gZnJvbSBcIkB0YW5zdGFjay9kZXZ0b29scy12aXRlXCJcbmltcG9ydCB7IHRhbnN0YWNrU3RhcnQgfSBmcm9tIFwiQHRhbnN0YWNrL3JlYWN0LXN0YXJ0L3BsdWdpbi92aXRlXCJcbmltcG9ydCByZWFjdCBmcm9tIFwiQHZpdGVqcy9wbHVnaW4tcmVhY3RcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVcIlxuaW1wb3J0IHN2Z3IgZnJvbSBcInZpdGUtcGx1Z2luLXN2Z3JcIlxuaW1wb3J0IHsgbG9hZENvbmZpZyB9IGZyb20gXCIuL2FjdGlvbnMvY29uZmlnL2xvYWQudHNcIlxuaW1wb3J0IHsgbGl2ZW1hcmsgfSBmcm9tIFwiLi9wbHVnaW5zL3ZpdGUtbGl2ZW1hcmsudHNcIlxuXG5jb25zdCBjb25maWcgPSBhd2FpdCBsb2FkQ29uZmlnKClcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKHtcbiAgcGx1Z2luczogW1xuICAgIGxpdmVtYXJrKHsgY29uZmlnIH0pLFxuICAgIGRldnRvb2xzKCksXG4gICAgdGFpbHdpbmQoKSxcbiAgICBjb250ZW50Q29sbGVjdGlvbnMoeyBjb25maWdQYXRoOiBcImNvbnRlbnQtY29sbGVjdGlvbnMudHNcIiB9KSxcbiAgICB0YW5zdGFja1N0YXJ0KHtcbiAgICAgIHNyY0RpcmVjdG9yeTogXCIuXCIsXG4gICAgICAvLyBTZWVkIHBhdGggbXVzdCBtYXRjaCB3aGF0IHRoZSBjcmF3bGVyIHByb2R1Y2VzIChyb3V0ZXItZW1pdHRlZFxuICAgICAgLy8gaHJlZnMgaW5jbHVkZSB0aGUgYmFzZXBhdGgpLCBvdGhlcndpc2UgcHJlcmVuZGVyIHJlY29yZHMgYm90aFxuICAgICAgLy8gc2hhcGVzIGFuZCB0aGUgc2l0ZW1hcCBlbmRzIHVwIHdpdGggZHVwbGljYXRlIGVudHJpZXMuXG4gICAgICBwYWdlczogW3sgcGF0aDogY29uZmlnLmJhc2UgPyBgJHtjb25maWcuYmFzZX0vYCA6IFwiL1wiIH1dLFxuICAgICAgLy8gRGlzYWJsZSByb3V0ZS10cmVlIGF1dG8tZGlzY292ZXJ5OiBpdCBwcm9kdWNlcyBiYXNlcGF0aC1uYWl2ZVxuICAgICAgLy8gcGF0aHMgKGUuZy4gYC9gKSB0aGF0IGR1cGxpY2F0ZSB0aGUgY3Jhd2wtZGVyaXZlZCBwcmVmaXhlZCBwYXRocyxcbiAgICAgIC8vIGJsb2F0aW5nIHBhZ2VzLmpzb24gYW5kIHNpdGVtYXAuIENyYXdsaW5nIGZyb20gdGhlIHNlZWQgYWxyZWFkeVxuICAgICAgLy8gcmVhY2hlcyBldmVyeSBsaW5rZWQgcGFnZS5cbiAgICAgIHByZXJlbmRlcjoge1xuICAgICAgICBlbmFibGVkOiB0cnVlLFxuICAgICAgICBjcmF3bExpbmtzOiB0cnVlLFxuICAgICAgICBhdXRvU3RhdGljUGF0aHNEaXNjb3Zlcnk6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHNpdGVtYXA6IGNvbmZpZy5zaXRlXG4gICAgICAgID8geyBlbmFibGVkOiB0cnVlLCBob3N0OiBjb25maWcuc2l0ZSB9XG4gICAgICAgIDogeyBlbmFibGVkOiBmYWxzZSB9LFxuICAgICAgcm91dGVyOiB7XG4gICAgICAgIGdlbmVyYXRlZFJvdXRlVHJlZTogXCJyb3V0ZVRyZWUuZ2VuLnRzXCIsXG4gICAgICAgIGJhc2VwYXRoOiBjb25maWcuYmFzZSxcbiAgICAgIH0sXG4gICAgfSksXG4gICAgcmVhY3QoKSxcbiAgICBzdmdyKCksXG4gIF0sXG59KVxuIl19
|
package/package.json
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
sortedArticles,
|
|
9
9
|
} from "../content/article.ts"
|
|
10
10
|
import { DynamicIcon } from "../helpers/dynamic-icon.tsx"
|
|
11
|
+
import { prefixUrl } from "../helpers/prefix-url.ts"
|
|
11
12
|
import { sectionIcon } from "../helpers/section.ts"
|
|
12
13
|
import {
|
|
13
14
|
SidebarInset,
|
|
@@ -121,7 +122,7 @@ export function Layout(props: {
|
|
|
121
122
|
.map(link => (
|
|
122
123
|
<a
|
|
123
124
|
key={link.url}
|
|
124
|
-
href={link.url}
|
|
125
|
+
href={prefixUrl(link.url, config.base)}
|
|
125
126
|
className="text-foreground opacity-80 hover:opacity-100 transition-opacity"
|
|
126
127
|
>
|
|
127
128
|
{link.icon && (
|
|
@@ -67,37 +67,47 @@ function isActive(articlePathname: string, currentPath: string) {
|
|
|
67
67
|
return articlePathname === normalized
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
function NavNode(props: {
|
|
71
|
-
|
|
70
|
+
function NavNode(props: {
|
|
71
|
+
node: ArticleNode
|
|
72
|
+
currentPath: string
|
|
73
|
+
depth?: number
|
|
74
|
+
}) {
|
|
75
|
+
const { node, currentPath, depth = 0 } = props
|
|
72
76
|
const Icon = resolveArticleIcon(node.icon)
|
|
73
77
|
const active = isActive(node.path, currentPath)
|
|
78
|
+
const isSub = depth > 0
|
|
79
|
+
const Item = isSub ? SidebarMenuSubItem : SidebarMenuItem
|
|
80
|
+
const Button = isSub ? SidebarMenuSubButton : SidebarMenuButton
|
|
81
|
+
|
|
82
|
+
const link = <Link to="/$" params={splatFor(node.path)} />
|
|
83
|
+
const label = <span>{node.label ?? node.title}</span>
|
|
74
84
|
|
|
75
85
|
if (node.children.length === 0) {
|
|
76
86
|
return (
|
|
77
|
-
<
|
|
78
|
-
<
|
|
87
|
+
<Item>
|
|
88
|
+
<Button
|
|
79
89
|
isActive={active}
|
|
80
90
|
className={active ? "" : "opacity-75"}
|
|
81
|
-
render={
|
|
91
|
+
render={link}
|
|
82
92
|
>
|
|
83
|
-
<Icon className="size-4" />
|
|
84
|
-
|
|
85
|
-
</
|
|
86
|
-
</
|
|
93
|
+
{!isSub && <Icon className="size-4" />}
|
|
94
|
+
{label}
|
|
95
|
+
</Button>
|
|
96
|
+
</Item>
|
|
87
97
|
)
|
|
88
98
|
}
|
|
89
99
|
|
|
90
100
|
return (
|
|
91
|
-
<
|
|
101
|
+
<Item>
|
|
92
102
|
<Collapsible defaultOpen className="group/collapsible">
|
|
93
|
-
<
|
|
103
|
+
<Button
|
|
94
104
|
isActive={active}
|
|
95
105
|
className={active ? "" : "opacity-75"}
|
|
96
|
-
render={
|
|
106
|
+
render={link}
|
|
97
107
|
>
|
|
98
|
-
<Icon className="size-4" />
|
|
99
|
-
|
|
100
|
-
</
|
|
108
|
+
{!isSub && <Icon className="size-4" />}
|
|
109
|
+
{label}
|
|
110
|
+
</Button>
|
|
101
111
|
<CollapsibleTrigger
|
|
102
112
|
aria-label={`Toggle ${node.label ?? node.title} submenu`}
|
|
103
113
|
className="absolute right-1 top-1.5 p-1 rounded-md hover:bg-sidebar-accent"
|
|
@@ -106,23 +116,17 @@ function NavNode(props: { node: ArticleNode; currentPath: string }) {
|
|
|
106
116
|
</CollapsibleTrigger>
|
|
107
117
|
<CollapsibleContent>
|
|
108
118
|
<SidebarMenuSub>
|
|
109
|
-
{node.children.map(child =>
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
>
|
|
118
|
-
<span>{child.label ?? child.title}</span>
|
|
119
|
-
</SidebarMenuSubButton>
|
|
120
|
-
</SidebarMenuSubItem>
|
|
121
|
-
)
|
|
122
|
-
})}
|
|
119
|
+
{node.children.map(child => (
|
|
120
|
+
<NavNode
|
|
121
|
+
key={child.path}
|
|
122
|
+
node={child}
|
|
123
|
+
currentPath={currentPath}
|
|
124
|
+
depth={depth + 1}
|
|
125
|
+
/>
|
|
126
|
+
))}
|
|
123
127
|
</SidebarMenuSub>
|
|
124
128
|
</CollapsibleContent>
|
|
125
129
|
</Collapsible>
|
|
126
|
-
</
|
|
130
|
+
</Item>
|
|
127
131
|
)
|
|
128
132
|
}
|
|
@@ -2,6 +2,7 @@ import { config } from "livemark:virtual"
|
|
|
2
2
|
import { useLocation } from "@tanstack/react-router"
|
|
3
3
|
import { currentSection } from "../content/article.ts"
|
|
4
4
|
import { DynamicIcon } from "../helpers/dynamic-icon.tsx"
|
|
5
|
+
import { prefixUrl } from "../helpers/prefix-url.ts"
|
|
5
6
|
import {
|
|
6
7
|
SidebarGroup,
|
|
7
8
|
SidebarGroupContent,
|
|
@@ -41,7 +42,7 @@ export function SidebarLinks() {
|
|
|
41
42
|
>
|
|
42
43
|
<SidebarMenuButton
|
|
43
44
|
className="text-muted-foreground"
|
|
44
|
-
render={<a href={link.url} />}
|
|
45
|
+
render={<a href={prefixUrl(link.url, config.base)} />}
|
|
45
46
|
>
|
|
46
47
|
{link.icon && (
|
|
47
48
|
<DynamicIcon name={link.icon} className="size-4" />
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { config } from "livemark:virtual"
|
|
2
|
+
import { prefixUrl } from "../helpers/prefix-url.ts"
|
|
2
3
|
import defaultLogo from "../assets/logo.svg"
|
|
3
4
|
|
|
4
5
|
/** Renders the site logo, title, and description in the sidebar header */
|
|
5
6
|
export function SiteTitle() {
|
|
6
|
-
const logo = config.logo ?? defaultLogo
|
|
7
|
+
const logo = prefixUrl(config.logo ?? defaultLogo, config.base)
|
|
7
8
|
return (
|
|
8
9
|
<div className="flex items-end gap-2.5 text-sm">
|
|
9
10
|
<img src={logo} alt={config.title} className="size-6.5 mb-1.25" />
|
|
@@ -162,6 +162,7 @@ const articles = defineCollection({
|
|
|
162
162
|
{
|
|
163
163
|
filePath: resolve(config.root, doc._meta.filePath),
|
|
164
164
|
root: config.root,
|
|
165
|
+
base: config.base,
|
|
165
166
|
},
|
|
166
167
|
],
|
|
167
168
|
remarkAnsi,
|
|
@@ -213,7 +214,7 @@ const articles = defineCollection({
|
|
|
213
214
|
const searchText = extractSearchText(content)
|
|
214
215
|
const lastUpdated = getLastUpdated(doc._meta.filePath)
|
|
215
216
|
const image = doc.image
|
|
216
|
-
? resolveAssetPath(doc.image, filePath, config.root)
|
|
217
|
+
? resolveAssetPath(doc.image, filePath, config.root, config.base)
|
|
217
218
|
: undefined
|
|
218
219
|
return {
|
|
219
220
|
...doc,
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/** Prefix a root-relative URL with `base` when the site is mounted at
|
|
2
|
+
* a sub-path. Leaves protocol-absolute (`http(s)://`, `//`), scheme
|
|
3
|
+
* (`mailto:`, `tel:`, `data:`), hash, and relative URLs untouched, and
|
|
4
|
+
* is idempotent — already-prefixed URLs are returned unchanged so
|
|
5
|
+
* config validation or hot reload can't double-prefix. */
|
|
6
|
+
export function prefixUrl(url: string, base: string | undefined) {
|
|
7
|
+
if (!base) return url
|
|
8
|
+
if (
|
|
9
|
+
url.startsWith("http://") ||
|
|
10
|
+
url.startsWith("https://") ||
|
|
11
|
+
url.startsWith("//") ||
|
|
12
|
+
url.startsWith("mailto:") ||
|
|
13
|
+
url.startsWith("tel:") ||
|
|
14
|
+
url.startsWith("data:") ||
|
|
15
|
+
url.startsWith("#")
|
|
16
|
+
) {
|
|
17
|
+
return url
|
|
18
|
+
}
|
|
19
|
+
if (!url.startsWith("/")) return url
|
|
20
|
+
if (url === base || url.startsWith(`${base}/`)) return url
|
|
21
|
+
return `${base}${url}`
|
|
22
|
+
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { describe, expect, it } from "vite-plus/test"
|
|
2
|
+
import { prefixUrl } from "./prefix-url.ts"
|
|
3
|
+
|
|
4
|
+
describe("prefixUrl", () => {
|
|
5
|
+
it("should return url unchanged when base is undefined", () => {
|
|
6
|
+
expect(prefixUrl("/foo", undefined)).toBe("/foo")
|
|
7
|
+
})
|
|
8
|
+
|
|
9
|
+
it("should prefix a root-relative url", () => {
|
|
10
|
+
expect(prefixUrl("/foo", "/repo")).toBe("/repo/foo")
|
|
11
|
+
})
|
|
12
|
+
|
|
13
|
+
it("should prefix a deep root-relative url", () => {
|
|
14
|
+
expect(prefixUrl("/a/b/c.png", "/repo")).toBe("/repo/a/b/c.png")
|
|
15
|
+
})
|
|
16
|
+
|
|
17
|
+
it("should leave protocol-absolute http urls untouched", () => {
|
|
18
|
+
expect(prefixUrl("http://x.com/y", "/repo")).toBe("http://x.com/y")
|
|
19
|
+
expect(prefixUrl("https://x.com/y", "/repo")).toBe("https://x.com/y")
|
|
20
|
+
})
|
|
21
|
+
|
|
22
|
+
it("should leave protocol-relative urls untouched", () => {
|
|
23
|
+
expect(prefixUrl("//cdn.x.com/y", "/repo")).toBe("//cdn.x.com/y")
|
|
24
|
+
})
|
|
25
|
+
|
|
26
|
+
it("should leave scheme urls untouched", () => {
|
|
27
|
+
expect(prefixUrl("mailto:a@b.com", "/repo")).toBe("mailto:a@b.com")
|
|
28
|
+
expect(prefixUrl("tel:+123", "/repo")).toBe("tel:+123")
|
|
29
|
+
expect(prefixUrl("data:image/png;base64,xyz", "/repo")).toBe(
|
|
30
|
+
"data:image/png;base64,xyz",
|
|
31
|
+
)
|
|
32
|
+
})
|
|
33
|
+
|
|
34
|
+
it("should leave hash urls untouched", () => {
|
|
35
|
+
expect(prefixUrl("#section", "/repo")).toBe("#section")
|
|
36
|
+
})
|
|
37
|
+
|
|
38
|
+
it("should leave document-relative urls untouched", () => {
|
|
39
|
+
expect(prefixUrl("foo.png", "/repo")).toBe("foo.png")
|
|
40
|
+
expect(prefixUrl("./foo.png", "/repo")).toBe("./foo.png")
|
|
41
|
+
expect(prefixUrl("../foo.png", "/repo")).toBe("../foo.png")
|
|
42
|
+
})
|
|
43
|
+
|
|
44
|
+
it("should be idempotent on already-prefixed urls", () => {
|
|
45
|
+
expect(prefixUrl("/repo/foo", "/repo")).toBe("/repo/foo")
|
|
46
|
+
expect(prefixUrl("/repo", "/repo")).toBe("/repo")
|
|
47
|
+
})
|
|
48
|
+
|
|
49
|
+
it("should not match prefix-as-substring", () => {
|
|
50
|
+
expect(prefixUrl("/repository/foo", "/repo")).toBe("/repo/repository/foo")
|
|
51
|
+
})
|
|
52
|
+
|
|
53
|
+
it("should support multi-segment base", () => {
|
|
54
|
+
expect(prefixUrl("/foo", "/a/b")).toBe("/a/b/foo")
|
|
55
|
+
expect(prefixUrl("/a/b/foo", "/a/b")).toBe("/a/b/foo")
|
|
56
|
+
})
|
|
57
|
+
})
|