@jant/core 0.6.10 → 0.6.12

package/src/ui/dash/appearance/NavigationContent.tsx

@@ -7,12 +7,14 @@ import { useLingui } from "../../../i18n/context.js";
 import type {
   CollectionsDirectoryData,
   NavItem,
+  SuggestedNavLink,
   SystemNavKey,
 } from "../../../types.js";
 import { SYSTEM_NAV_KEYS } from "../../../types.js";
 import type {
   NavManagerCollection,
   NavManagerLabels,
+  NavManagerSuggestedLink,
   SystemNavConfig,
 } from "../../../client/components/nav-manager-types.js";
 import { toPublicHref, toPublicPath } from "../../../lib/url.js";
@@ -30,12 +32,14 @@ import {
 export function NavigationContent({
   navItems,
   directoryData,
+  suggestedLinks,
   mainRssFeed,
   siteName,
   sitePathPrefix = "",
 }: {
   navItems: NavItem[];
   directoryData: CollectionsDirectoryData;
+  suggestedLinks: SuggestedNavLink[];
   mainRssFeed: string;
   siteName: string;
   sitePathPrefix?: string;
@@ -61,6 +65,27 @@ export function NavigationContent({
   );
   const moreLabel = i18n._(NAV_MORE_LABEL);
 
+  const suggestedTargetLabels = {
+    page: i18n._(
+      msg({
+        message: "Page",
+        comment: "@context: Suggested navigation link target type",
+      }),
+    ),
+    collection: i18n._(
+      msg({
+        message: "Collection",
+        comment: "@context: Suggested navigation link target type",
+      }),
+    ),
+    archive: i18n._(
+      msg({
+        message: "Archive",
+        comment: "@context: Suggested navigation link target type",
+      }),
+    ),
+  } satisfies Record<SuggestedNavLink["targetType"], string>;
+
   // Serialize nav items for the Lit component
   const itemsData = navItems.map((item) => {
     // System link URLs are always computed from constants, never from DB
@@ -110,6 +135,13 @@ export function NavigationContent({
     return result;
   })();
 
+  const suggestedLinksData: NavManagerSuggestedLink[] = suggestedLinks.map(
+    (link) => ({
+      ...link,
+      targetLabel: suggestedTargetLabels[link.targetType],
+    }),
+  );
+
   // Build system nav config array for the Lit component
   const systemNavData: SystemNavConfig[] = (
     Object.keys(SYSTEM_NAV_KEYS) as SystemNavKey[]
@@ -297,6 +329,30 @@ export function NavigationContent({
         comment: "@context: Error toast when nav link fields are empty",
       }),
     ),
+    suggestedLinks: i18n._(
+      msg({
+        message: "Suggested links",
+        comment: "@context: Section heading for suggested nav links",
+      }),
+    ),
+    suggestedLinksDescription: i18n._(
+      msg({
+        message: "Add common destinations that already exist on your site.",
+        comment: "@context: Description for suggested nav links",
+      }),
+    ),
+    addSuggestedLink: i18n._(
+      msg({
+        message: "Add",
+        comment: "@context: Button to add a suggested nav link",
+      }),
+    ),
+    suggestedLinkAdded: i18n._(
+      msg({
+        message: "Link added to navigation.",
+        comment: "@context: Toast after adding a suggested nav link",
+      }),
+    ),
     collection: i18n._(
       msg({
         message: "collection",
@@ -356,6 +412,7 @@ export function NavigationContent({
         labels={escapeJson(labels)}
         system-nav-items={escapeJson(systemNavData)}
         collections={escapeJson(collectionsData)}
+        suggested-links={escapeJson(suggestedLinksData)}
         site-name={siteName}
       >
         {/* SSR fallback: static preview until JS hydrates */}

package/src/ui/dash/appearance/__tests__/NavigationContent.test.tsx

@@ -22,6 +22,7 @@ function renderNavigationContent(
     NavigationContent({
       navItems: [],
       directoryData: { collections: [], items: [], directoryItems: [] },
+      suggestedLinks: [],
       mainRssFeed: "latest",
       siteName: "Test Site",
       ...props,
@@ -51,4 +52,22 @@ describe("NavigationContent", () => {
 
     expect(html).toContain("Built-in links");
   });
+
+  it("serializes suggested links with translated target labels", () => {
+    const html = renderNavigationContent({
+      suggestedLinks: [
+        {
+          key: "now",
+          label: "Now",
+          url: "/now",
+          targetType: "collection",
+          navItemType: "collection",
+          collectionId: "col_now",
+        },
+      ],
+    });
+
+    expect(html).toContain("suggested-links=");
+    expect(html).toContain(""targetLabel":"Collection"");
+  });
 });

package/src/ui/dash/settings/GeneralContent.tsx

@@ -10,6 +10,7 @@
 import { msg } from "@lingui/core/macro";
 import { useLingui } from "../../../i18n/context.js";
 import type { TimezoneEntry } from "../../../lib/timezones.js";
+import type { AboutPageStatus } from "../../../services/about-page.js";
 
 export function GeneralContent({
   siteName,
@@ -30,6 +31,9 @@ export function GeneralContent({
   noindex,
   demoMode,
   timezones,
+  aboutPage,
+  aboutEditUrl,
+  aboutCreateUrl,
 }: {
   siteName: string;
   siteDescription: string;
@@ -49,6 +53,9 @@ export function GeneralContent({
   noindex: boolean;
   demoMode: boolean;
   timezones: TimezoneEntry[];
+  aboutPage: AboutPageStatus;
+  aboutEditUrl: string;
+  aboutCreateUrl: string;
 }) {
   const { i18n } = useLingui();
 
@@ -65,6 +72,38 @@ export function GeneralContent({
         comment: "@context: Settings subsection heading for basic site fields",
       }),
     ),
+    aboutPage: i18n._(
+      msg({
+        message: "About page",
+        comment: "@context: Link label for editing or creating the About page",
+      }),
+    ),
+    aboutPagePrompt: i18n._(
+      msg({
+        message: "Want to write a fuller introduction?",
+        comment:
+          "@context: Prompt shown below the short site description, before the About page action",
+      }),
+    ),
+    createAboutPage: i18n._(
+      msg({
+        message: "Create About page",
+        comment: "@context: Button to create the standard About page",
+      }),
+    ),
+    editAboutPage: i18n._(
+      msg({
+        message: "Edit About page",
+        comment: "@context: Link to edit the standard About page",
+      }),
+    ),
+    aboutPageConflict: i18n._(
+      msg({
+        message:
+          "/about is already used. Rename that item before creating an About page.",
+        comment: "@context: Compact conflict message when /about is occupied",
+      }),
+    ),
     languageAndTime: i18n._(
       msg({
         message: "Language & Time",
@@ -369,6 +408,8 @@ export function GeneralContent({
     { value: "ko", label: "\uD55C\uAD6D\uC5B4 (Korean)" },
   ]).replace(/</g, "\\u003c");
 
+  const aboutPageJson = JSON.stringify(aboutPage).replace(/</g, "\\u003c");
+
   const initialData = JSON.stringify({
     siteName,
     siteDescription,
@@ -397,6 +438,9 @@ export function GeneralContent({
           featured-feed-url={featuredFeedUrl}
           archive-feed-url={archiveFeedUrl}
           demo-mode={demoMode || undefined}
+          about-page={aboutPageJson}
+          about-edit-url={aboutEditUrl}
+          about-create-url={aboutCreateUrl}
         >
           {/* SSR fallback skeleton */}
           <div>

package/src/ui/dash/settings/__tests__/GeneralContent.test.tsx

@@ -37,6 +37,8 @@ function createProps(
     siteName: "My Blog",
     siteDescription: "A test blog",
     siteLanguage: "en",
+    dashboardLanguage: "en",
+    cjkSerifFont: "off",
     siteNameFallback: "Fallback Name",
     siteDescriptionFallback: "Fallback Description",
     mainRssFeed: "featured" as const,
@@ -49,6 +51,12 @@ function createProps(
     showJantBrandingOnHome: false,
     noindex: false,
     demoMode,
+    aboutPage: {
+      state: "missing" as const,
+      path: "/about" as const,
+    },
+    aboutEditUrl: "/about?edit=1",
+    aboutCreateUrl: "/settings/general/about-page",
     timezones: [
       {
         value: "UTC",

package/src/ui/feed/__tests__/timeline-cards.test.ts

@@ -104,13 +104,43 @@ describe("timeline cards", () => {
   });
 
   it("preserves authored line breaks in quote cards", () => {
+    const tokens = readFileSync(
+      new URL("../../../styles/tokens.css", import.meta.url),
+      "utf8",
+    );
     const css = readFileSync(
       new URL("../../../styles/ui.css", import.meta.url),
       "utf8",
     );
+    const exportCss = readFileSync(
+      new URL(
+        "../../../services/export-theme/styles/main.css",
+        import.meta.url,
+      ),
+      "utf8",
+    );
 
+    expect(tokens).toMatch(
+      /--feed-note-title-size:\s*calc\(var\(--type-content-body\) \* 1\.36\);/,
+    );
+    expect(tokens).toMatch(
+      /--type-content-quote:\s*calc\(var\(--type-content-body\) \* 1\.16\);/,
+    );
+    expect(tokens).toMatch(/--type-content-quote-leading:\s*1\.4;/);
+    expect(css).toMatch(
+      /\.feed-note-title\s*\{[\s\S]*font-size:\s*var\(--feed-note-title-size\);/,
+    );
+    expect(css).toMatch(
+      /\.feed-link-title\s*\{[\s\S]*font-size:\s*var\(--feed-note-title-size\);/,
+    );
+    expect(exportCss).toMatch(
+      /\.post-card-title\s*\{[\s\S]*font-size:\s*var\(--feed-note-title-size\);/,
+    );
     expect(css).toMatch(
-      /\.feed-quote-content\s*\{[\s\S]*white-space:\s*pre-line;/,
+      /\.feed-quote-content\s*\{[\s\S]*font-size:\s*var\(--type-content-quote\);[\s\S]*line-height:\s*var\(--type-content-quote-leading\);[\s\S]*white-space:\s*pre-line;/,
+    );
+    expect(exportCss).toMatch(
+      /\.post-card-quote-content\s*\{[\s\S]*font-size:\s*var\(--type-content-quote\);[\s\S]*line-height:\s*var\(--type-content-quote-leading\);[\s\S]*white-space:\s*pre-line;/,
     );
   });
 
@@ -136,6 +166,123 @@ describe("timeline cards", () => {
     expect(css).toContain("margin-bottom: 0;");
   });
 
+  it("keeps prose list rhythm compact in live and exported reading", () => {
+    const presetCss = readFileSync(
+      new URL("../../../preset.css", import.meta.url),
+      "utf8",
+    );
+    const exportCss = readFileSync(
+      new URL(
+        "../../../services/export-theme/styles/main.css",
+        import.meta.url,
+      ),
+      "utf8",
+    );
+
+    expect(presetCss).toMatch(
+      /:where\(ul,\s*ol\)\s*\{[\s\S]*padding-left:\s*1\.4em;/,
+    );
+    expect(exportCss).toMatch(
+      /ul,\s*[\s\S]*ol\s*\{[\s\S]*padding-left:\s*1\.4em;/,
+    );
+    expect(presetCss).toMatch(
+      /:where\(li,\s*dt\)\s*\{[\s\S]*margin-top:\s*0\.65em;[\s\S]*margin-bottom:\s*0\.65em;/,
+    );
+    expect(exportCss).toMatch(
+      /li\s*\{[\s\S]*margin-top:\s*0\.65em;[\s\S]*margin-bottom:\s*0\.65em;/,
+    );
+  });
+
+  it("uses dedicated markdown code surfaces in live and exported prose", () => {
+    const presetCss = readFileSync(
+      new URL("../../../preset.css", import.meta.url),
+      "utf8",
+    );
+    const tokenCss = readFileSync(
+      new URL("../../../styles/tokens.css", import.meta.url),
+      "utf8",
+    );
+    const exportCss = readFileSync(
+      new URL(
+        "../../../services/export-theme/styles/main.css",
+        import.meta.url,
+      ),
+      "utf8",
+    );
+
+    expect(tokenCss).toContain("--site-code-bg:");
+    expect(tokenCss).toContain("--site-code-block-bg:");
+    expect(tokenCss).toContain(
+      "--type-code: calc(var(--type-body-size) * 0.94);",
+    );
+    expect(tokenCss).toContain(
+      "--type-code-block: calc(var(--type-body-size) * 0.9);",
+    );
+    expect(presetCss).toContain("background-color: var(--site-code-bg);");
+    expect(presetCss).toContain("background-color: var(--site-code-block-bg);");
+    expect(exportCss).toContain("background-color: var(--site-code-bg);");
+    expect(exportCss).toContain("background-color: var(--site-code-block-bg);");
+  });
+
+  it("keeps markdown h2 and h3 headings upright across surfaces", () => {
+    const presetCss = readFileSync(
+      new URL("../../../preset.css", import.meta.url),
+      "utf8",
+    );
+    const uiCss = readFileSync(
+      new URL("../../../styles/ui.css", import.meta.url),
+      "utf8",
+    );
+    const exportCss = readFileSync(
+      new URL(
+        "../../../services/export-theme/styles/main.css",
+        import.meta.url,
+      ),
+      "utf8",
+    );
+
+    expect(presetCss).not.toMatch(
+      /:where\(h[23]\)\s*\{[^}]*font-style:\s*italic;/,
+    );
+    expect(uiCss).not.toMatch(
+      /\.compose-tiptap-body\s+\.tiptap\s+h[23]\s*\{[^}]*font-style:\s*italic;/,
+    );
+    expect(exportCss).not.toMatch(/h[23]\s*\{[^}]*font-style:\s*italic;/);
+  });
+
+  it("compacts authored headings inside feed body prose", () => {
+    const presetCss = readFileSync(
+      new URL("../../../preset.css", import.meta.url),
+      "utf8",
+    );
+    const exportCss = readFileSync(
+      new URL(
+        "../../../services/export-theme/styles/main.css",
+        import.meta.url,
+      ),
+      "utf8",
+    );
+
+    expect(presetCss).toContain(
+      '[data-post]:not([data-page="post"]) [data-post-body].prose',
+    );
+    expect(presetCss).toMatch(
+      /:where\(h1,\s*h2\)\s*\{[\s\S]*font-size:\s*calc\(var\(--type-content-body\) \* 1\.12\);/,
+    );
+    expect(presetCss).toMatch(
+      /:where\(h3,\s*h4\)\s*\{[\s\S]*font-size:\s*var\(--type-content-body\);/,
+    );
+    expect(presetCss).toMatch(
+      /:where\(h5,\s*h6\)\s*\{[\s\S]*font-size:\s*var\(--type-secondary\);/,
+    );
+    expect(exportCss).toMatch(
+      /\.post-card > \.post-card-summary :is\(h1,\s*h2\),/,
+    );
+    expect(exportCss).toMatch(
+      /\.post-card > \.post-card-summary :is\(h5,\s*h6\),/,
+    );
+  });
+
   it("keeps quote footers on the shared card spacing baseline", () => {
     const css = readFileSync(
       new URL("../../../styles/ui.css", import.meta.url),
@@ -266,6 +413,20 @@ describe("timeline cards", () => {
     );
   });
 
+  it("keeps titled detail headers spaced as one reading group", () => {
+    const css = readFileSync(
+      new URL("../../../styles/ui.css", import.meta.url),
+      "utf8",
+    );
+
+    expect(css).toMatch(
+      /\.post-header-block\s*\{[\s\S]*margin-bottom:\s*1\.7rem;/,
+    );
+    expect(css).toMatch(
+      /\.post-header-block-detail\s*\{[\s\S]*gap:\s*0\.7rem;/,
+    );
+  });
+
   it("renders titled note feed summaries as secondary prose without shrinking detail reading", () => {
     const post = createPostView({
       format: "note",

package/src/ui/layouts/BaseLayout.tsx

@@ -18,6 +18,7 @@ import {
   toPublicAssetPath,
 } from "../../lib/asset-path.js";
 import { getJantIconHref } from "../../lib/jant-branding.js";
+import { getPublicUrlForProvider } from "../../lib/image.js";
 import { getThemeBrowserColors, resolveBuiltinTheme } from "../../lib/theme.js";
 import { toAbsoluteAssetUrl, toPublicPath } from "../../lib/url.js";
 import {
@@ -133,6 +134,16 @@ export const BaseLayout: FC<PropsWithChildren<BaseLayoutProps>> = ({
   const assetBasePath = IS_VITE_DEV
     ? "/"
     : appConfig?.assetBasePath || getPublicAssetBasePath(sitePathPrefix);
+  // Public base URL for the active media provider, exposed so the client can
+  // tell which pasted images are already ours and skip rehosting them. Empty
+  // means media is served same-origin (the client's same-origin check covers it).
+  const mediaBase =
+    getPublicUrlForProvider(
+      appConfig?.storageDriver ?? "",
+      appConfig?.r2PublicUrl,
+      appConfig?.s3PublicUrl,
+      appConfig?.localPublicUrl,
+    ) ?? "";
   const currentUrl = c ? c.get("publicRequestUrl") : undefined;
   const rawPath = c?.req?.path ?? "/";
   const manifestStartPath = sitePathPrefix
@@ -281,6 +292,7 @@ export const BaseLayout: FC<PropsWithChildren<BaseLayoutProps>> = ({
         data-theme-mode={themeMode}
         data-site-path-prefix={sitePathPrefix}
         data-asset-base-path={assetBasePath}
+        data-media-base={mediaBase}
       >
         <head>
           <meta charset="UTF-8" />

package/dist/app-D24n0DoH.js

@@ -1,6 +0,0 @@
-import "./url-BMYO-Zlt.js";
-import { t as createApp } from "./app-CGHkOdme.js";
-import "./export-DY1v5Iqu.js";
-import "./env-OHRKGcMj.js";
-import "./github-sync-2_T7nbOv.js";
-export { createApp };