@jant/core 0.11.0 → 0.12.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/bin/commands/deploy.js +179 -0
- package/bin/lib/cloudflare-setup.js +499 -0
- package/bin/lib/d1-query.js +26 -1
- package/bin/lib/r2-query.js +2 -2
- package/dist/{app-jQI4OPRe.js → app-DSwsDBD0.js} +28623 -635
- package/dist/client/.vite/manifest.json +2 -2
- package/dist/client/_assets/{client-52vQhZAv.js → client-DPByjWoU.js} +1 -1
- package/dist/client/_assets/{client-auth-BDcCR6u1.js → client-auth-CPqPTX1B.js} +1 -1
- package/dist/index.js +1 -1
- package/dist/node.js +2 -2
- package/package.json +31 -31
- package/src/__tests__/bin/deploy.test.ts +163 -0
- package/src/__tests__/export-hugo-build.test.ts +5 -5
- package/src/__tests__/export-import-roundtrip.test.ts +1 -1
- package/src/__tests__/export-service.test.ts +2 -2
- package/src/__tests__/fixtures/releases/0.11.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/297kg/_index.md +14 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2u5e5/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/bought-too-many-lemons-again/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/city-walks/_index.md +14 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/evf9j/_index.md +129 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-draft/_index.md +17 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-quotes/_index.md +13 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-text-attachment/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/j4v0q/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +40 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +50 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/data/jant.toml +155 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/_redirects +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/3c46a9ea6fe0-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m50607a6e8h8gfpa8byqtt7h.md +3 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/snapshot/db.sql +339 -0
- package/src/__tests__/fixtures/releases/0.11.0/snapshot/meta.json +11 -0
- package/src/__tests__/helpers/d1-round-trips.ts +213 -0
- package/src/__tests__/package-dependencies.test.ts +123 -0
- package/src/__tests__/public-page-round-trips.test.ts +203 -0
- package/src/__tests__/template-deploy-workflow.test.ts +33 -77
- package/src/__tests__/vite-config.test.ts +32 -0
- package/src/app.tsx +7 -1
- package/src/client/icons.ts +5 -6
- package/src/db/__tests__/d1-query.test.ts +29 -0
- package/src/db/__tests__/migration-rehearsal.test.ts +2 -2
- package/src/lib/__tests__/icons.test.ts +21 -10
- package/src/lib/api-posts.ts +4 -2
- package/src/lib/api-public-posts.ts +4 -2
- package/src/lib/constants.ts +20 -0
- package/src/lib/icons.ts +96 -34
- package/src/lib/post-display.ts +13 -9
- package/src/lib/timeline.ts +23 -21
- package/src/lib/view.ts +3 -2
- package/src/middleware/__tests__/onboarding.test.ts +5 -3
- package/src/middleware/__tests__/secure-headers.test.ts +40 -42
- package/src/middleware/config.ts +44 -2
- package/src/middleware/onboarding.ts +12 -3
- package/src/middleware/secure-headers.ts +25 -36
- package/src/node/__tests__/cli-deploy-setup.test.ts +373 -0
- package/src/node/__tests__/cli-deploy.test.ts +55 -0
- package/src/routes/feed/feed.ts +4 -2
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +10 -10
- package/src/routes/pages/archive.tsx +36 -17
- package/src/routes/pages/collection.tsx +72 -35
- package/src/routes/pages/page.tsx +46 -25
- package/src/routes/pages/search.tsx +3 -1
- package/src/services/__tests__/collection.test.ts +2 -4
- package/src/services/collection.ts +95 -71
- package/src/services/export.ts +2 -1
- package/src/services/post.ts +150 -205
- package/src/services/settings.ts +4 -8
- package/src/types/app-context.ts +5 -0
- package/src/ui/pages/ArchivePage.tsx +34 -34
- package/src/ui/pages/CollectionPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +2 -2
- package/src/ui/pages/SubscribePage.tsx +2 -4
- package/src/ui/shared/CollectionDirectory.tsx +2 -2
- package/src/ui/shared/CollectionsManager.tsx +1 -1
- package/src/ui/shared/CopyField.tsx +1 -1
- package/src/ui/shared/Icon.tsx +5 -5
- package/src/ui/shared/IconSprite.tsx +10 -11
- package/src/ui/shared/custom-icons.ts +38 -7
- package/src/ui/shared/icon-collector.ts +7 -5
|
@@ -35,7 +35,7 @@ import {
|
|
|
35
35
|
serializePostFilterSelection,
|
|
36
36
|
} from "../../lib/filter-dimensions.js";
|
|
37
37
|
import { getFeaturedIconSvg } from "../../lib/featured-icons.js";
|
|
38
|
-
import { getIconSvg } from "../../lib/icons.js";
|
|
38
|
+
import { getIconSvg, type LucideIconName } from "../../lib/icons.js";
|
|
39
39
|
import { toPublicPath } from "../../lib/url.js";
|
|
40
40
|
import { toMediaKind } from "../../lib/upload.js";
|
|
41
41
|
import { PagePagination } from "../shared/Pagination.js";
|
|
@@ -132,14 +132,14 @@ function getFormatLabelPlural(format: Format): string {
|
|
|
132
132
|
}
|
|
133
133
|
|
|
134
134
|
/** Icon name mapping for post formats. */
|
|
135
|
-
const FORMAT_ICONS: Record<
|
|
135
|
+
const FORMAT_ICONS: Record<Format, LucideIconName> = {
|
|
136
136
|
note: "notepad-text",
|
|
137
137
|
link: "external-link",
|
|
138
138
|
quote: "quote",
|
|
139
139
|
};
|
|
140
140
|
|
|
141
141
|
/** Icon name mapping for media kinds. */
|
|
142
|
-
const MEDIA_KIND_ICONS: Record<MediaKind,
|
|
142
|
+
const MEDIA_KIND_ICONS: Record<MediaKind, LucideIconName> = {
|
|
143
143
|
image: "image",
|
|
144
144
|
video: "video",
|
|
145
145
|
audio: "music",
|
|
@@ -171,19 +171,15 @@ function selectedMediaKinds(
|
|
|
171
171
|
// =============================================================================
|
|
172
172
|
|
|
173
173
|
/** Inline SVG icon with specified size class. */
|
|
174
|
-
const Icon: FC<{ name:
|
|
174
|
+
const Icon: FC<{ name: LucideIconName; class?: string }> = ({
|
|
175
175
|
name,
|
|
176
176
|
class: cls = "[&>svg]:size-4",
|
|
177
|
-
}) =>
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
dangerouslySetInnerHTML={{ __html: svg }}
|
|
184
|
-
/>
|
|
185
|
-
);
|
|
186
|
-
};
|
|
177
|
+
}) => (
|
|
178
|
+
<span
|
|
179
|
+
class={`shrink-0 inline-flex ${cls}`}
|
|
180
|
+
dangerouslySetInnerHTML={{ __html: getIconSvg(name) }}
|
|
181
|
+
/>
|
|
182
|
+
);
|
|
187
183
|
|
|
188
184
|
/** Chevron indicator for chip triggers. */
|
|
189
185
|
const ChipChevron: FC = () => (
|
|
@@ -211,7 +207,7 @@ const ChipClearLink: FC<{ href: string; label: string }> = ({
|
|
|
211
207
|
interface ChipSelectOption {
|
|
212
208
|
label: string;
|
|
213
209
|
value: string;
|
|
214
|
-
icon?:
|
|
210
|
+
icon?: LucideIconName;
|
|
215
211
|
iconHtml?: string;
|
|
216
212
|
indent?: boolean;
|
|
217
213
|
}
|
|
@@ -225,13 +221,13 @@ interface ChipSelectOption {
|
|
|
225
221
|
*/
|
|
226
222
|
const ChipSelect: FC<{
|
|
227
223
|
id: string;
|
|
228
|
-
icon:
|
|
224
|
+
icon: LucideIconName;
|
|
229
225
|
options: ChipSelectOption[];
|
|
230
226
|
currentValue: string;
|
|
231
227
|
clearUrl: string;
|
|
232
228
|
activeLabel?: string;
|
|
233
229
|
activeIconHtml?: string;
|
|
234
|
-
activeIcon?:
|
|
230
|
+
activeIcon?: LucideIconName;
|
|
235
231
|
iconOnly?: boolean;
|
|
236
232
|
}> = ({
|
|
237
233
|
id,
|
|
@@ -339,7 +335,7 @@ const ChipSelect: FC<{
|
|
|
339
335
|
*/
|
|
340
336
|
const ChipMediaSelect: FC<{
|
|
341
337
|
id: string;
|
|
342
|
-
icon:
|
|
338
|
+
icon: LucideIconName;
|
|
343
339
|
filters: ArchiveFilters;
|
|
344
340
|
ctx: DimensionContext;
|
|
345
341
|
activeLabel?: string;
|
|
@@ -353,7 +349,7 @@ const ChipMediaSelect: FC<{
|
|
|
353
349
|
const singleKind = activeKinds.length === 1 ? activeKinds[0] : undefined;
|
|
354
350
|
const activeMediaIcon = isActive
|
|
355
351
|
? f.selection.media === "none"
|
|
356
|
-
? "text"
|
|
352
|
+
? "text-align-start"
|
|
357
353
|
: singleKind
|
|
358
354
|
? MEDIA_KIND_ICONS[singleKind]
|
|
359
355
|
: icon
|
|
@@ -409,7 +405,10 @@ const ChipMediaSelect: FC<{
|
|
|
409
405
|
aria-selected={f.selection.media === "none" ? "true" : undefined}
|
|
410
406
|
>
|
|
411
407
|
<span class="flex items-center gap-2">
|
|
412
|
-
<Icon
|
|
408
|
+
<Icon
|
|
409
|
+
name="text-align-start"
|
|
410
|
+
class="[&>svg]:size-4 text-muted-foreground"
|
|
411
|
+
/>
|
|
413
412
|
{i18n._(
|
|
414
413
|
msg({
|
|
415
414
|
message: "Text",
|
|
@@ -457,7 +456,7 @@ const ChipMediaSelect: FC<{
|
|
|
457
456
|
*/
|
|
458
457
|
const ToggleOption: FC<{
|
|
459
458
|
href: string;
|
|
460
|
-
icon:
|
|
459
|
+
icon: LucideIconName;
|
|
461
460
|
label: string;
|
|
462
461
|
active: boolean;
|
|
463
462
|
}> = ({ href, icon, label, active }) => (
|
|
@@ -578,11 +577,14 @@ function getVisibilityLabel(v: ArchiveVisibility): string {
|
|
|
578
577
|
return getSharedVisibilityLabel(v, i18n);
|
|
579
578
|
}
|
|
580
579
|
|
|
581
|
-
|
|
580
|
+
/** Chip icon for each visibility; Featured draws its own sparkle instead. */
|
|
581
|
+
const VISIBILITY_ICONS: Record<
|
|
582
|
+
Exclude<ArchiveVisibility, "featured">,
|
|
583
|
+
LucideIconName
|
|
584
|
+
> = {
|
|
582
585
|
public: "globe",
|
|
583
586
|
latest_hidden: "eye-off",
|
|
584
587
|
private: "lock",
|
|
585
|
-
featured: "star",
|
|
586
588
|
};
|
|
587
589
|
|
|
588
590
|
const FEATURED_VISIBILITY_ICON_HTML = getFeaturedIconSvg({
|
|
@@ -597,13 +599,13 @@ const FILTER_ICONS = {
|
|
|
597
599
|
media: "video",
|
|
598
600
|
thread: "git-branch",
|
|
599
601
|
visibility: "scan-eye",
|
|
600
|
-
} as const
|
|
602
|
+
} as const satisfies Record<string, LucideIconName>;
|
|
601
603
|
|
|
602
604
|
/** Icons for the thread filter options. */
|
|
603
605
|
const THREAD_ICONS = {
|
|
604
606
|
threads: "list-tree",
|
|
605
607
|
single: "git-commit-horizontal",
|
|
606
|
-
} as const
|
|
608
|
+
} as const satisfies Record<string, LucideIconName>;
|
|
607
609
|
|
|
608
610
|
const FilterBar: FC<{
|
|
609
611
|
filters: ArchiveFilters;
|
|
@@ -699,7 +701,7 @@ const FilterBar: FC<{
|
|
|
699
701
|
? selection.title === true
|
|
700
702
|
? "type"
|
|
701
703
|
: selection.title === false
|
|
702
|
-
? "text"
|
|
704
|
+
? "text-align-start"
|
|
703
705
|
: FORMAT_ICONS[selection.format]
|
|
704
706
|
: undefined;
|
|
705
707
|
|
|
@@ -752,7 +754,7 @@ const FilterBar: FC<{
|
|
|
752
754
|
comment: "@context: Archive filter - notes without a title",
|
|
753
755
|
}),
|
|
754
756
|
),
|
|
755
|
-
icon: "text",
|
|
757
|
+
icon: "text-align-start",
|
|
756
758
|
indent: true,
|
|
757
759
|
value: buildFilterUrl(
|
|
758
760
|
filters,
|
|
@@ -1068,7 +1070,7 @@ function getTileBgImage(
|
|
|
1068
1070
|
*/
|
|
1069
1071
|
function getTileBadge(
|
|
1070
1072
|
post: PostView,
|
|
1071
|
-
): { icon:
|
|
1073
|
+
): { icon: LucideIconName; position: "center" | "corner" } | undefined {
|
|
1072
1074
|
const firstMedia = post.media[0];
|
|
1073
1075
|
if (!firstMedia) return undefined;
|
|
1074
1076
|
const kind = toMediaKind(firstMedia.mimeType);
|
|
@@ -1265,7 +1267,7 @@ const ArchiveTile: FC<{ post: PostView; timeZone?: string }> = ({
|
|
|
1265
1267
|
<span
|
|
1266
1268
|
class="archive-tile-link-indicator"
|
|
1267
1269
|
dangerouslySetInnerHTML={{
|
|
1268
|
-
__html: getIconSvg("external-link")
|
|
1270
|
+
__html: getIconSvg("external-link"),
|
|
1269
1271
|
}}
|
|
1270
1272
|
/>
|
|
1271
1273
|
)}
|
|
@@ -1283,7 +1285,7 @@ const ArchiveTile: FC<{ post: PostView; timeZone?: string }> = ({
|
|
|
1283
1285
|
<span
|
|
1284
1286
|
class="archive-tile-badge-row"
|
|
1285
1287
|
dangerouslySetInnerHTML={{
|
|
1286
|
-
__html: getIconSvg(cornerBadge.icon)
|
|
1288
|
+
__html: getIconSvg(cornerBadge.icon),
|
|
1287
1289
|
}}
|
|
1288
1290
|
/>
|
|
1289
1291
|
)}
|
|
@@ -1292,9 +1294,7 @@ const ArchiveTile: FC<{ post: PostView; timeZone?: string }> = ({
|
|
|
1292
1294
|
|
|
1293
1295
|
{badge?.position === "center" && (
|
|
1294
1296
|
<span class="archive-tile-badge archive-tile-badge-center">
|
|
1295
|
-
<span
|
|
1296
|
-
dangerouslySetInnerHTML={{ __html: getIconSvg(badge.icon) ?? "" }}
|
|
1297
|
-
/>
|
|
1297
|
+
<span dangerouslySetInnerHTML={{ __html: getIconSvg(badge.icon) }} />
|
|
1298
1298
|
</span>
|
|
1299
1299
|
)}
|
|
1300
1300
|
</a>
|
|
@@ -1405,7 +1405,7 @@ export const ArchivePage: FC<ArchivePageProps> = ({
|
|
|
1405
1405
|
>
|
|
1406
1406
|
<span
|
|
1407
1407
|
dangerouslySetInnerHTML={{
|
|
1408
|
-
__html: getIconSvg("rss")
|
|
1408
|
+
__html: getIconSvg("rss"),
|
|
1409
1409
|
}}
|
|
1410
1410
|
/>
|
|
1411
1411
|
</a>
|
|
@@ -147,7 +147,7 @@ export const SmartCollectionPage: FC<SmartCollectionPageProps> = ({
|
|
|
147
147
|
title={conditionSummary}
|
|
148
148
|
aria-label={conditionSummary}
|
|
149
149
|
dangerouslySetInnerHTML={{
|
|
150
|
-
__html: getIconSvg("funnel", "icon-fine")
|
|
150
|
+
__html: getIconSvg("funnel", "icon-fine"),
|
|
151
151
|
}}
|
|
152
152
|
/>
|
|
153
153
|
</span>
|
|
@@ -210,7 +210,7 @@ export const SmartCollectionPage: FC<SmartCollectionPageProps> = ({
|
|
|
210
210
|
>
|
|
211
211
|
<span
|
|
212
212
|
dangerouslySetInnerHTML={{
|
|
213
|
-
__html: getIconSvg("rss")
|
|
213
|
+
__html: getIconSvg("rss"),
|
|
214
214
|
}}
|
|
215
215
|
/>
|
|
216
216
|
</a>
|
|
@@ -104,9 +104,7 @@ export const SubscribePage: FC<SubscribePageProps> = ({
|
|
|
104
104
|
// The page is about feeds and carried no feed mark at all. It also
|
|
105
105
|
// ends by telling the reader to look for this glyph elsewhere, which
|
|
106
106
|
// only works once they have seen it here.
|
|
107
|
-
iconHtml={
|
|
108
|
-
getIconSvg("rss", "size-6 text-muted-foreground") ?? undefined
|
|
109
|
-
}
|
|
107
|
+
iconHtml={getIconSvg("rss", "size-6 text-muted-foreground")}
|
|
110
108
|
description={i18n._(
|
|
111
109
|
msg({
|
|
112
110
|
message:
|
|
@@ -154,7 +152,7 @@ export const SubscribePage: FC<SubscribePageProps> = ({
|
|
|
154
152
|
class="mt-0.5 shrink-0 opacity-70"
|
|
155
153
|
aria-hidden="true"
|
|
156
154
|
dangerouslySetInnerHTML={{
|
|
157
|
-
__html: getIconSvg("rss", "size-3.5")
|
|
155
|
+
__html: getIconSvg("rss", "size-3.5"),
|
|
158
156
|
}}
|
|
159
157
|
/>
|
|
160
158
|
<span>
|
|
@@ -157,7 +157,7 @@ const CollectionFeedLink: FC<{
|
|
|
157
157
|
}> = ({ href, title }) =>
|
|
158
158
|
href ? (
|
|
159
159
|
<a href={href} class="feed-link" title={title} rel="noopener noreferrer">
|
|
160
|
-
<span dangerouslySetInnerHTML={{ __html: getIconSvg("rss")
|
|
160
|
+
<span dangerouslySetInnerHTML={{ __html: getIconSvg("rss") }} />
|
|
161
161
|
</a>
|
|
162
162
|
) : null;
|
|
163
163
|
|
|
@@ -359,7 +359,7 @@ export const CollectionDirectory: FC<CollectionDirectoryProps> = ({
|
|
|
359
359
|
aria-label={smartCollectionNoun}
|
|
360
360
|
role="img"
|
|
361
361
|
dangerouslySetInnerHTML={{
|
|
362
|
-
__html: getIconSvg("funnel", "icon-fine")
|
|
362
|
+
__html: getIconSvg("funnel", "icon-fine"),
|
|
363
363
|
}}
|
|
364
364
|
/>
|
|
365
365
|
</span>
|
|
@@ -283,7 +283,7 @@ export const CollectionsManager: FC<CollectionsManagerProps> = ({
|
|
|
283
283
|
class="collections-page-menu-item-icon"
|
|
284
284
|
aria-hidden="true"
|
|
285
285
|
dangerouslySetInnerHTML={{
|
|
286
|
-
__html: getIconSvg("funnel")
|
|
286
|
+
__html: getIconSvg("funnel"),
|
|
287
287
|
}}
|
|
288
288
|
/>
|
|
289
289
|
<span class="collections-page-menu-item-label">
|
|
@@ -91,7 +91,7 @@ export const CopyField: FC<CopyFieldProps> = ({
|
|
|
91
91
|
class="text-muted-foreground transition-transform duration-150 group-hover:translate-x-0.5 group-focus-visible:translate-x-0.5"
|
|
92
92
|
aria-hidden="true"
|
|
93
93
|
dangerouslySetInnerHTML={{
|
|
94
|
-
__html: getIconSvg("arrow-right", "size-3.5 icon-fine")
|
|
94
|
+
__html: getIconSvg("arrow-right", "size-3.5 icon-fine"),
|
|
95
95
|
}}
|
|
96
96
|
/>
|
|
97
97
|
</a>
|
package/src/ui/shared/Icon.tsx
CHANGED
|
@@ -6,9 +6,9 @@
|
|
|
6
6
|
* sprite (rendered by <IconSprite>) contains exactly the icons used on
|
|
7
7
|
* this page.
|
|
8
8
|
*
|
|
9
|
-
* Name
|
|
10
|
-
* custom symbols defined in `custom-icons.ts
|
|
11
|
-
*
|
|
9
|
+
* Name refers to a Lucide icon listed in `lib/icons.ts` or one of the
|
|
10
|
+
* custom symbols defined in `custom-icons.ts`; any other name fails the
|
|
11
|
+
* type check.
|
|
12
12
|
*
|
|
13
13
|
* Size: outer <svg> width/height in pixels. Defaults to 24 (lucide default).
|
|
14
14
|
* Pass `class` to add CSS classes, e.g. for sizing via stylesheet instead
|
|
@@ -17,11 +17,11 @@
|
|
|
17
17
|
|
|
18
18
|
import type { FC } from "hono/jsx";
|
|
19
19
|
import { collectIcon } from "./icon-collector.js";
|
|
20
|
-
import { getIconViewBox } from "./custom-icons.js";
|
|
20
|
+
import { getIconViewBox, type IconName } from "./custom-icons.js";
|
|
21
21
|
|
|
22
22
|
export interface IconProps {
|
|
23
23
|
/** Kebab-case icon name (lucide or custom). */
|
|
24
|
-
name:
|
|
24
|
+
name: IconName;
|
|
25
25
|
/** Width/height in px. Omit to size via CSS. */
|
|
26
26
|
size?: number;
|
|
27
27
|
/** CSS class for the outer <svg>. */
|
|
@@ -19,24 +19,23 @@ import {
|
|
|
19
19
|
LUCIDE_VIEWBOX,
|
|
20
20
|
} from "../../lib/icons.js";
|
|
21
21
|
import { getCollectedIcons } from "./icon-collector.js";
|
|
22
|
-
import {
|
|
22
|
+
import {
|
|
23
|
+
getCustomSymbol,
|
|
24
|
+
isCustomIconName,
|
|
25
|
+
type IconName,
|
|
26
|
+
} from "./custom-icons.js";
|
|
23
27
|
|
|
24
|
-
function buildSymbol(name:
|
|
25
|
-
|
|
26
|
-
|
|
28
|
+
function buildSymbol(name: IconName): string {
|
|
29
|
+
if (isCustomIconName(name)) {
|
|
30
|
+
const custom = getCustomSymbol(name);
|
|
27
31
|
return `<symbol id="icon-${name}" viewBox="${custom.viewBox}">${custom.inner}</symbol>`;
|
|
28
32
|
}
|
|
29
|
-
|
|
30
|
-
if (inner === null) return null;
|
|
31
|
-
return `<symbol id="icon-${name}" viewBox="${LUCIDE_VIEWBOX}" ${LUCIDE_SYMBOL_ATTRS}>${inner}</symbol>`;
|
|
33
|
+
return `<symbol id="icon-${name}" viewBox="${LUCIDE_VIEWBOX}" ${LUCIDE_SYMBOL_ATTRS}>${getIconInnerSvg(name)}</symbol>`;
|
|
32
34
|
}
|
|
33
35
|
|
|
34
36
|
export const IconSprite: FC = () => {
|
|
35
37
|
const names = Array.from(getCollectedIcons()).sort();
|
|
36
|
-
const symbols = names
|
|
37
|
-
.map(buildSymbol)
|
|
38
|
-
.filter((s): s is string => s !== null)
|
|
39
|
-
.join("");
|
|
38
|
+
const symbols = names.map(buildSymbol).join("");
|
|
40
39
|
|
|
41
40
|
if (!symbols) return null;
|
|
42
41
|
|
|
@@ -22,6 +22,7 @@ import {
|
|
|
22
22
|
DECORATIVE_QUOTE_MARK_PATHS,
|
|
23
23
|
DECORATIVE_QUOTE_MARK_VIEWBOX,
|
|
24
24
|
} from "../../lib/decorative-quote-mark.js";
|
|
25
|
+
import { LUCIDE_VIEWBOX, type LucideIconName } from "../../lib/icons.js";
|
|
25
26
|
|
|
26
27
|
export interface CustomSymbol {
|
|
27
28
|
viewBox: string;
|
|
@@ -34,7 +35,7 @@ const STROKE_THIN =
|
|
|
34
35
|
const STROKE_POST_BADGE =
|
|
35
36
|
'fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"';
|
|
36
37
|
|
|
37
|
-
|
|
38
|
+
const CUSTOM_SYMBOLS = {
|
|
38
39
|
// Featured sparkle (thinner stroke than lucide's stock "sparkles").
|
|
39
40
|
"featured-sparkle": {
|
|
40
41
|
viewBox: "0 0 24 24",
|
|
@@ -116,10 +117,37 @@ export const CUSTOM_SYMBOLS: Record<string, CustomSymbol> = {
|
|
|
116
117
|
viewBox: "0 0 24 24",
|
|
117
118
|
inner: `<path ${STROKE_POST_BADGE} d="M10.733 5.076a10.744 10.744 0 0 1 11.205 6.575 1 1 0 0 1 0 .696 10.747 10.747 0 0 1-1.444 2.49" /><path ${STROKE_POST_BADGE} d="M14.084 14.158a3 3 0 0 1-4.242-4.242" /><path ${STROKE_POST_BADGE} d="M17.479 17.499a10.75 10.75 0 0 1-15.417-5.151 1 1 0 0 1 0-.696 10.75 10.75 0 0 1 4.446-5.143" /><path ${STROKE_POST_BADGE} d="m2 2 20 20" />`,
|
|
118
119
|
},
|
|
119
|
-
}
|
|
120
|
+
} as const satisfies Record<string, CustomSymbol>;
|
|
120
121
|
|
|
121
|
-
|
|
122
|
-
|
|
122
|
+
/** Name of a symbol defined in this file. */
|
|
123
|
+
export type CustomIconName = keyof typeof CUSTOM_SYMBOLS;
|
|
124
|
+
|
|
125
|
+
/** Every name `<Icon>` accepts: a Lucide icon or a custom symbol. */
|
|
126
|
+
export type IconName = LucideIconName | CustomIconName;
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* Whether an icon name refers to a custom symbol rather than a Lucide icon.
|
|
130
|
+
*
|
|
131
|
+
* @param name - Icon name
|
|
132
|
+
* @returns True for names defined in `CUSTOM_SYMBOLS`
|
|
133
|
+
* @example
|
|
134
|
+
* isCustomIconName("post-reply"); // true
|
|
135
|
+
* isCustomIconName("pencil"); // false
|
|
136
|
+
*/
|
|
137
|
+
export function isCustomIconName(name: IconName): name is CustomIconName {
|
|
138
|
+
return Object.hasOwn(CUSTOM_SYMBOLS, name);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/**
|
|
142
|
+
* Get the symbol definition for a custom icon.
|
|
143
|
+
*
|
|
144
|
+
* @param name - Custom icon name
|
|
145
|
+
* @returns Its viewBox and inner markup
|
|
146
|
+
* @example
|
|
147
|
+
* getCustomSymbol("post-reply").viewBox; // "0 0 24 24"
|
|
148
|
+
*/
|
|
149
|
+
export function getCustomSymbol(name: CustomIconName): CustomSymbol {
|
|
150
|
+
return CUSTOM_SYMBOLS[name];
|
|
123
151
|
}
|
|
124
152
|
|
|
125
153
|
/**
|
|
@@ -130,8 +158,11 @@ export function getCustomSymbol(name: string): CustomSymbol | null {
|
|
|
130
158
|
* CSS falls back to the 300×150 replaced-element default instead of the
|
|
131
159
|
* icon's real aspect ratio.
|
|
132
160
|
*
|
|
133
|
-
*
|
|
161
|
+
* @param name - Icon name
|
|
162
|
+
* @returns The custom symbol's viewBox, or Lucide's "0 0 24 24"
|
|
163
|
+
* @example
|
|
164
|
+
* getIconViewBox("link-preview-play"); // "0 0 68 48"
|
|
134
165
|
*/
|
|
135
|
-
export function getIconViewBox(name:
|
|
136
|
-
return CUSTOM_SYMBOLS[name]
|
|
166
|
+
export function getIconViewBox(name: IconName): string {
|
|
167
|
+
return isCustomIconName(name) ? CUSTOM_SYMBOLS[name].viewBox : LUCIDE_VIEWBOX;
|
|
137
168
|
}
|
|
@@ -10,21 +10,23 @@
|
|
|
10
10
|
* synchronously per request, so a module-level singleton is safe.
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
|
-
|
|
13
|
+
import type { IconName } from "./custom-icons.js";
|
|
14
|
+
|
|
15
|
+
let currentCollector: Set<IconName> | null = null;
|
|
14
16
|
|
|
15
17
|
/**
|
|
16
18
|
* Start a new collection scope for the current render pass.
|
|
17
19
|
* Call at the top of the root layout before children render.
|
|
18
20
|
*/
|
|
19
21
|
export function resetIconCollector(): void {
|
|
20
|
-
currentCollector = new Set<
|
|
22
|
+
currentCollector = new Set<IconName>();
|
|
21
23
|
}
|
|
22
24
|
|
|
23
25
|
/**
|
|
24
26
|
* Register an icon as used during this render.
|
|
25
27
|
* Safe to call even when no collector is active (no-op).
|
|
26
28
|
*/
|
|
27
|
-
export function collectIcon(name:
|
|
29
|
+
export function collectIcon(name: IconName): void {
|
|
28
30
|
currentCollector?.add(name);
|
|
29
31
|
}
|
|
30
32
|
|
|
@@ -32,6 +34,6 @@ export function collectIcon(name: string): void {
|
|
|
32
34
|
* Get the icon names collected so far during this render.
|
|
33
35
|
* Returns an empty set if no collection scope is active.
|
|
34
36
|
*/
|
|
35
|
-
export function getCollectedIcons(): ReadonlySet<
|
|
36
|
-
return currentCollector ?? new Set<
|
|
37
|
+
export function getCollectedIcons(): ReadonlySet<IconName> {
|
|
38
|
+
return currentCollector ?? new Set<IconName>();
|
|
37
39
|
}
|