@jant/core 0.10.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/db/execute-file.js +1 -1
- package/bin/commands/db/export.js +1 -1
- package/bin/commands/deploy.js +179 -0
- package/bin/commands/migrate.js +4 -4
- package/bin/commands/posts/rebuild-html.js +1 -1
- package/bin/commands/reset-password.js +1 -1
- package/bin/commands/search/reindex.js +1 -1
- package/bin/commands/setup.js +4 -2
- package/bin/commands/site/export.js +3 -0
- package/bin/commands/site/import.js +178 -91
- package/bin/commands/site/pull-media.js +3 -2
- package/bin/commands/site/snapshot/export.js +3 -1
- package/bin/commands/site/snapshot/import.js +3 -2
- package/bin/commands/start.js +44 -0
- package/bin/commands/telegram/register-webhooks.js +1 -1
- package/bin/commands/uploads/cleanup.js +48 -9
- package/bin/jant.js +39 -4
- package/bin/lib/cloudflare-setup.js +499 -0
- package/bin/lib/d1-query.js +26 -1
- package/bin/lib/import-sources.js +151 -0
- package/bin/lib/node-env.js +14 -9
- package/bin/lib/r2-query.js +2 -2
- package/bin/lib/runtime-target.js +1 -1
- package/bin/lib/site-pull-media.js +56 -4
- package/bin/lib/site-snapshot.js +39 -2
- package/bin/lib/sql-export.js +66 -10
- package/dist/{app-DIVtyB4m.js → app-DSwsDBD0.js} +38257 -9662
- package/dist/client/.vite/manifest.json +38 -38
- package/dist/client/_assets/chunks/{create-editor-B-m7X7S5.js → create-editor-5Y49x7h5.js} +2 -2
- package/dist/client/_assets/chunks/{footnote-rail-CmeoVtnU.js → footnote-rail-BJwswtVQ.js} +1 -1
- package/dist/client/_assets/chunks/{settings-paths-C-ZZBTau.js → settings-paths-h6RjIe3C.js} +2 -2
- package/dist/client/_assets/chunks/{slug-format-BcIsNKz-.js → slug-format-Dsi0e9Xn.js} +1 -1
- package/dist/client/_assets/chunks/{slugify-373citbs.js → slugify-DlHLyUHS.js} +1 -1
- package/dist/client/_assets/chunks/sortable-list-DYMcJrlS.js +2 -0
- package/dist/client/_assets/chunks/unsafe-svg-DxrzM_Gb.js +2 -0
- package/dist/client/_assets/client-BaqmpPQ-.css +2 -0
- package/dist/client/_assets/client-DPByjWoU.js +296 -0
- package/dist/client/_assets/{client-auth-BpkkKTsV.js → client-auth-CPqPTX1B.js} +2 -2
- package/dist/client/_assets/client-author-CGVvrNZ8.css +2 -0
- package/dist/client/_assets/{client-compose-C-DXzcFR.js → client-compose-CzEwT5qX.js} +4 -4
- package/dist/client/_assets/{client-manage-BfT7ht4M.js → client-manage-CF7x21L4.js} +37 -37
- package/dist/client/_assets/{client-settings-CGR_nZ78.js → client-settings-DIM44Zqh.js} +2 -2
- package/dist/{url-CKlGzvdN.js → constants-DEgyqWDl.js} +340 -1
- package/dist/index.d.ts +44 -0
- package/dist/index.js +33 -1
- package/dist/node.js +57 -13
- package/package.json +43 -48
- package/src/__tests__/api-docs.test.ts +168 -1
- package/src/__tests__/bin/deploy.test.ts +163 -0
- package/src/__tests__/bin/import-sources.test.ts +85 -0
- package/src/__tests__/bin/uploads-cleanup.test.ts +66 -26
- package/src/__tests__/cli-commands.test.ts +40 -0
- package/src/__tests__/config-docs.test.ts +119 -16
- package/src/__tests__/custom-url-redirects.test.ts +108 -0
- package/src/__tests__/export-collection-custom-urls.test.ts +69 -0
- package/src/__tests__/export-docs.test.ts +113 -41
- package/src/__tests__/export-feed-ids.test.ts +1 -0
- package/src/__tests__/export-format-version.test.ts +88 -0
- package/src/__tests__/export-hugo-build.test.ts +143 -8
- package/src/__tests__/export-import-roundtrip.test.ts +3 -2
- package/src/__tests__/export-service.test.ts +44 -15
- package/src/__tests__/export-smart-collection.test.ts +1 -1
- package/src/__tests__/feed-docs.test.ts +287 -21
- package/src/__tests__/feed-reply-addresses.test.ts +100 -0
- package/src/__tests__/feeds-disabled.test.ts +98 -0
- package/src/__tests__/fixtures/export-format/1.json +76 -0
- package/src/__tests__/fixtures/export-format/2.json +80 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2u5e5/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/faqyt/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/bought-too-many-lemons-again/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/city-walks/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.10.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.10.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/evf9j/_index.md +152 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/3zqv7/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/_index.md +39 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/j4v0q/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +57 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +46 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.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.10.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/data/jant.toml +124 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/_redirects +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/40bc6cd1f12e-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/meta.json +11 -0
- 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/app.ts +6 -1
- package/src/__tests__/helpers/d1-round-trips.ts +213 -0
- package/src/__tests__/helpers/export-fixtures.ts +1 -0
- package/src/__tests__/import-refused-aliases.test.ts +98 -0
- package/src/__tests__/import-site-command.test.ts +73 -8
- package/src/__tests__/package-dependencies.test.ts +123 -0
- package/src/__tests__/public-page-round-trips.test.ts +203 -0
- package/src/__tests__/public-types.test.ts +64 -0
- package/src/__tests__/release-fixtures.test.ts +79 -24
- package/src/__tests__/release-version.test.ts +84 -0
- package/src/__tests__/site-pull-media.test.ts +48 -0
- package/src/__tests__/snapshot-tables.test.ts +37 -0
- package/src/__tests__/sql-export.test.ts +21 -1
- package/src/__tests__/stored-file-headers.test.ts +94 -0
- package/src/__tests__/template-deploy-workflow.test.ts +57 -0
- package/src/__tests__/theme-docs.test.ts +113 -24
- package/src/__tests__/toolchain-versions.test.ts +54 -0
- package/src/__tests__/trailing-slash-redirect.test.ts +61 -0
- package/src/__tests__/vite-config-graph.test.ts +98 -0
- package/src/__tests__/vite-config.test.ts +32 -0
- package/src/app.tsx +96 -67
- package/src/client/__tests__/compose-bridge-image-upload.test.ts +1 -0
- package/src/client/__tests__/compose-bridge.test.ts +87 -0
- package/src/client/__tests__/compose-shortcuts.test.ts +4 -4
- package/src/client/__tests__/footnote-rail.test.ts +1 -1
- package/src/client/__tests__/lazy-entries.test.ts +1 -1
- package/src/client/__tests__/media-scroll-hint.test.ts +2 -2
- package/src/client/avatar-upload.ts +10 -10
- package/src/client/components/__tests__/jant-compose-dialog.test.ts +295 -4
- package/src/client/components/__tests__/jant-compose-editor.test.ts +34 -0
- package/src/client/components/__tests__/jant-settings-general.test.ts +0 -32
- package/src/client/components/compose-types.ts +14 -0
- package/src/client/components/jant-compose-dialog.ts +96 -41
- package/src/client/components/jant-compose-editor.ts +21 -4
- package/src/client/components/jant-config-editor.ts +4 -6
- package/src/client/components/jant-media-lightbox.ts +4 -4
- package/src/client/components/jant-settings-general.ts +0 -4
- package/src/client/components/nav-manager-types.ts +6 -5
- package/src/client/compose-bridge.ts +15 -4
- package/src/client/compose-launch.ts +4 -6
- package/src/client/compose-shortcuts.ts +1 -1
- package/src/client/footnote-rail.ts +1 -1
- package/src/client/icons.ts +5 -6
- package/src/client/lazy-entries.ts +1 -1
- package/src/client/media-scroll-hint.ts +2 -2
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +55 -0
- package/src/client/tiptap/markdown-clipboard.ts +50 -2
- package/src/client/upload-session.ts +7 -6
- package/src/db/__tests__/backfill-external-redirects.test.ts +59 -0
- package/src/db/__tests__/backfill-featured-discover.test.ts +56 -0
- package/src/db/__tests__/d1-query.test.ts +29 -0
- package/src/db/__tests__/migration-rehearsal.test.ts +2 -2
- package/src/db/backfills/0007_restore_external_redirect_scheme.sql +20 -0
- package/src/db/backfills/0008_turn_off_featured_only_discover.sql +11 -0
- package/src/i18n/locales/public/en.po +46 -48
- package/src/i18n/locales/public/en.ts +1 -1
- package/src/i18n/locales/public/zh-Hans.po +45 -46
- package/src/i18n/locales/public/zh-Hans.ts +1 -1
- package/src/i18n/locales/public/zh-Hant.po +45 -46
- package/src/i18n/locales/public/zh-Hant.ts +1 -1
- package/src/i18n/locales/settings/en.po +15 -29
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +15 -29
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +15 -29
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/index.ts +43 -2
- package/src/lib/__tests__/api-settings.test.ts +3 -3
- package/src/lib/__tests__/constants.test.ts +10 -0
- package/src/lib/__tests__/discover.test.ts +8 -9
- package/src/lib/__tests__/env-values.test.ts +125 -0
- package/src/lib/__tests__/feed-path.test.ts +29 -0
- package/src/lib/__tests__/feed.test.ts +50 -22
- package/src/lib/__tests__/filter-dimensions.test.ts +22 -8
- package/src/lib/__tests__/icons.test.ts +21 -10
- package/src/lib/__tests__/post-list-cursor.test.ts +0 -10
- package/src/lib/__tests__/rate-limit.test.ts +22 -7
- package/src/lib/__tests__/resolve-config.test.ts +5 -3
- package/src/lib/__tests__/schemas.test.ts +72 -23
- package/src/lib/__tests__/slugify.test.ts +9 -0
- package/src/lib/__tests__/startup-config.test.ts +12 -0
- package/src/lib/__tests__/storage-s3.test.ts +214 -0
- package/src/lib/__tests__/theme.test.ts +20 -1
- package/src/lib/__tests__/time.test.ts +56 -0
- package/src/lib/__tests__/timeline.test.ts +46 -0
- package/src/lib/__tests__/url-fetch.test.ts +65 -1
- package/src/lib/__tests__/url.test.ts +60 -1
- package/src/lib/api-nav-items.ts +16 -20
- package/src/lib/api-post-input.ts +34 -1
- package/src/lib/api-posts.ts +128 -24
- package/src/lib/api-public-posts.ts +31 -38
- package/src/lib/api-search.ts +49 -2
- package/src/lib/api-settings.ts +159 -54
- package/src/lib/api-threads.ts +34 -11
- package/src/lib/constants.ts +26 -0
- package/src/lib/discover.ts +7 -23
- package/src/lib/env-values.ts +140 -0
- package/src/lib/env.ts +203 -12
- package/src/lib/feed-path.ts +8 -2
- package/src/lib/feed-policy.ts +110 -7
- package/src/lib/feed.ts +69 -25
- package/src/lib/filter-dimensions.ts +17 -10
- package/src/lib/github-sync-site-config.ts +1 -0
- package/src/lib/hugo-markdown.ts +5 -6
- package/src/lib/icons.ts +96 -34
- package/src/lib/navigation.ts +4 -1
- package/src/lib/post-display.ts +13 -9
- package/src/lib/post-list-cursor.ts +33 -29
- package/src/lib/public-storage.ts +43 -0
- package/src/lib/rate-limit.ts +31 -16
- package/src/lib/render.tsx +5 -0
- package/src/lib/resolve-config.ts +16 -19
- package/src/lib/schemas.ts +248 -180
- package/src/lib/slugify.ts +6 -1
- package/src/lib/sse.ts +1 -1
- package/src/lib/startup-config.ts +20 -1
- package/src/lib/theme.ts +8 -5
- package/src/lib/thread-fold.ts +6 -0
- package/src/lib/thread-query.ts +19 -24
- package/src/lib/time.ts +137 -17
- package/src/lib/timeline.ts +76 -31
- package/src/lib/url-fetch.ts +141 -40
- package/src/lib/url.ts +86 -1
- package/src/lib/view.ts +3 -2
- package/src/middleware/__tests__/auth.test.ts +27 -0
- package/src/middleware/__tests__/cors.test.ts +54 -0
- package/src/middleware/__tests__/cross-origin.test.ts +149 -0
- package/src/middleware/__tests__/onboarding.test.ts +5 -3
- package/src/middleware/__tests__/public-content-access.test.ts +2 -42
- package/src/middleware/__tests__/secure-headers.test.ts +40 -42
- package/src/middleware/auth.ts +34 -3
- package/src/middleware/config.ts +44 -2
- package/src/middleware/cors.ts +4 -4
- package/src/middleware/cross-origin.ts +124 -0
- package/src/middleware/error-handler.ts +7 -0
- package/src/middleware/onboarding.ts +12 -3
- package/src/middleware/public-content-access.ts +3 -26
- package/src/middleware/secure-headers.ts +32 -37
- package/src/node/__tests__/cli-deploy-setup.test.ts +373 -0
- package/src/node/__tests__/cli-deploy.test.ts +55 -0
- package/src/node/__tests__/cli-migrate.test.ts +2 -2
- package/src/node/__tests__/cli-runtime-target.test.ts +13 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +57 -0
- package/src/node/__tests__/cli-snapshot-meta.test.ts +11 -1
- package/src/node/__tests__/cli-sql-export.test.ts +25 -1
- package/src/node/__tests__/cli-start.test.ts +66 -0
- package/src/node/__tests__/request-handler.test.ts +37 -0
- package/src/node/__tests__/runtime.test.ts +56 -1
- package/src/node/request-handler.ts +58 -5
- package/src/node/runtime.ts +37 -11
- package/src/preset.css +3 -3
- package/src/routes/__tests__/compose.test.ts +84 -0
- package/src/routes/api/__tests__/collections.test.ts +68 -0
- package/src/routes/api/__tests__/mcp.test.ts +164 -9
- package/src/routes/api/__tests__/media.test.ts +9 -1
- package/src/routes/api/__tests__/nav-items.test.ts +27 -1
- package/src/routes/api/__tests__/posts.test.ts +269 -78
- package/src/routes/api/__tests__/search.test.ts +17 -4
- package/src/routes/api/__tests__/settings.test.ts +119 -85
- package/src/routes/api/__tests__/telegram.test.ts +11 -6
- package/src/routes/api/__tests__/threads.test.ts +11 -0
- package/src/routes/api/__tests__/upload-response.test.ts +48 -0
- package/src/routes/api/__tests__/uploads.test.ts +35 -2
- package/src/routes/api/collections.ts +3 -3
- package/src/routes/api/custom-urls.ts +2 -1
- package/src/routes/api/export.ts +1 -0
- package/src/routes/api/internal/__tests__/post-body-html.test.ts +19 -0
- package/src/routes/api/internal/__tests__/uploads.test.ts +2 -0
- package/src/routes/api/internal/sites.ts +16 -4
- package/src/routes/api/mcp.ts +1 -0
- package/src/routes/api/media.ts +7 -8
- package/src/routes/api/nav-items.ts +2 -1
- package/src/routes/api/posts.ts +18 -24
- package/src/routes/api/public/__tests__/posts.test.ts +15 -0
- package/src/routes/api/public/__tests__/threads-collections.test.ts +12 -45
- package/src/routes/api/public/__tests__/threads.test.ts +41 -9
- package/src/routes/api/public/posts.ts +2 -2
- package/src/routes/api/public/threads.ts +16 -26
- package/src/routes/api/search.ts +7 -41
- package/src/routes/api/settings.ts +32 -28
- package/src/routes/api/smart-collections.ts +6 -1
- package/src/routes/api/threads.ts +25 -26
- package/src/routes/api/upload.ts +6 -21
- package/src/routes/api/uploads.ts +14 -20
- package/src/routes/auth/__tests__/dev.test.ts +16 -13
- package/src/routes/auth/__tests__/hosted-sso.test.ts +51 -0
- package/src/routes/auth/__tests__/setup-auth.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-discover.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-flow.test.ts +32 -0
- package/src/routes/auth/__tests__/setup-rate-limit.test.ts +72 -0
- package/src/routes/auth/__tests__/setup-steps.test.ts +2 -0
- package/src/routes/auth/__tests__/signin.test.ts +167 -2
- package/src/routes/auth/dev.ts +4 -6
- package/src/routes/auth/hosted-sso.ts +9 -6
- package/src/routes/auth/setup.tsx +35 -5
- package/src/routes/auth/signin.tsx +96 -1
- package/src/routes/compose.tsx +47 -47
- package/src/routes/dash/__tests__/settings-avatar.test.ts +59 -4
- package/src/routes/dash/__tests__/settings-demo-locks.test.ts +147 -0
- package/src/routes/dash/custom-urls.tsx +2 -0
- package/src/routes/dash/settings.tsx +79 -32
- package/src/routes/feed/__tests__/feed.test.ts +93 -3
- package/src/routes/feed/__tests__/sitemap.test.ts +42 -0
- package/src/routes/feed/feed.ts +130 -175
- package/src/routes/feed/sitemap.ts +9 -7
- package/src/routes/pages/__tests__/archive-years.test.ts +45 -0
- package/src/routes/pages/__tests__/collection-routing.test.ts +40 -0
- package/src/routes/pages/__tests__/collections.test.ts +3 -0
- package/src/routes/pages/__tests__/language-routing.test.ts +31 -0
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +44 -12
- package/src/routes/pages/__tests__/search.test.ts +5 -2
- package/src/routes/pages/__tests__/thread-gap.test.ts +207 -0
- package/src/routes/pages/archive.tsx +69 -111
- package/src/routes/pages/brand.tsx +1 -0
- package/src/routes/pages/collection.tsx +86 -120
- package/src/routes/pages/collections.tsx +2 -0
- package/src/routes/pages/featured.tsx +7 -2
- package/src/routes/pages/home.tsx +1 -0
- package/src/routes/pages/latest.tsx +6 -2
- package/src/routes/pages/new.tsx +1 -0
- package/src/routes/pages/page.tsx +113 -66
- package/src/routes/pages/search.tsx +8 -4
- package/src/routes/pages/smart-collection.tsx +11 -70
- package/src/routes/pages/subscribe.tsx +1 -0
- package/src/routes/pages/theme-sample.tsx +1 -0
- package/src/runtime/__tests__/readiness.test.ts +16 -0
- package/src/runtime/cloudflare.ts +2 -3
- package/src/runtime/index.ts +3 -1
- package/src/runtime/node.ts +3 -5
- package/src/runtime/readiness.ts +5 -0
- package/src/services/__tests__/auth.test.ts +115 -0
- package/src/services/__tests__/collection.test.ts +11 -4
- package/src/services/__tests__/github-sync-webhook.test.ts +78 -0
- package/src/services/__tests__/hosted-handoff.test.ts +208 -1
- package/src/services/__tests__/media.test.ts +47 -27
- package/src/services/__tests__/navigation.test.ts +67 -15
- package/src/services/__tests__/post.test.ts +103 -56
- package/src/services/__tests__/search.test.ts +38 -0
- package/src/services/__tests__/settings.test.ts +2 -14
- package/src/services/__tests__/smart-collection.test.ts +2 -2
- package/src/services/__tests__/telegram-ingest.test.ts +113 -0
- package/src/services/__tests__/thread.test.ts +26 -11
- package/src/services/auth.ts +36 -4
- package/src/services/collection.ts +141 -76
- package/src/services/custom-url.ts +11 -4
- package/src/services/export-theme/assets/client-site.css +1 -1
- package/src/services/export-theme/assets/client-site.js +2 -2
- package/src/services/export-theme/layouts/_default/baseof.html +1 -1
- package/src/services/export-theme/layouts/collection/single.html +1 -1
- package/src/services/export-theme/layouts/partials/featured-thread.html +8 -1
- package/src/services/export-theme/layouts/partials/head.html +1 -1
- package/src/services/export-theme/layouts/partials/media-gallery.html +6 -3
- package/src/services/export-theme/layouts/smart_collection/list.html +1 -1
- package/src/services/export-theme/styles/main.css +3 -3
- package/src/services/export.ts +70 -20
- package/src/services/github-sync.ts +10 -10
- package/src/services/hosted-handoff.ts +106 -6
- package/src/services/index.ts +3 -1
- package/src/services/language.ts +33 -0
- package/src/services/mcp.ts +176 -438
- package/src/services/media.ts +69 -21
- package/src/services/navigation.ts +19 -4
- package/src/services/path.ts +45 -3
- package/src/services/post.ts +460 -400
- package/src/services/search.ts +22 -3
- package/src/services/settings.ts +40 -11
- package/src/services/site-admin.ts +1 -0
- package/src/services/smart-collection.ts +10 -3
- package/src/services/telegram.ts +23 -6
- package/src/services/thread.ts +11 -3
- package/src/services/upload-session.ts +14 -15
- package/src/styles/components.css +2 -2
- package/src/styles/site-media.css +2 -2
- package/src/styles/tokens.css +19 -22
- package/src/styles/ui-author.css +73 -94
- package/src/styles/ui.css +62 -62
- package/src/types/app-context.ts +10 -1
- package/src/types/bindings.ts +11 -0
- package/src/types/config.ts +4 -4
- package/src/types/constants.ts +20 -0
- package/src/types/props.ts +34 -8
- package/src/types/views.ts +28 -13
- package/src/ui/color-themes.ts +6 -5
- package/src/ui/dash/settings/GeneralContent.tsx +0 -22
- package/src/ui/dash/settings/__tests__/GeneralContent.test.tsx +0 -21
- package/src/ui/feed/CuratedThreadPreview.tsx +7 -2
- package/src/ui/feed/LinkCard.tsx +1 -2
- package/src/ui/feed/NoteCard.tsx +1 -2
- package/src/ui/feed/QuoteCard.tsx +2 -2
- package/src/ui/feed/ThreadPreview.tsx +6 -6
- package/src/ui/feed/TimelineFeed.tsx +1 -7
- package/src/ui/feed/__tests__/thread-preview.test.ts +123 -10
- package/src/ui/feed/__tests__/timeline-cards.test.ts +18 -1
- package/src/ui/layouts/BaseLayout.tsx +5 -0
- package/src/ui/pages/ArchivePage.tsx +35 -35
- package/src/ui/pages/BrandPage.tsx +1 -1
- package/src/ui/pages/CollectionPage.tsx +1 -2
- package/src/ui/pages/CollectionsPage.tsx +2 -2
- package/src/ui/pages/ComposePage.tsx +1 -1
- package/src/ui/pages/FeaturedPage.tsx +1 -1
- package/src/ui/pages/HomePage.tsx +1 -1
- package/src/ui/pages/PostPage.tsx +1 -1
- package/src/ui/pages/SearchPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +4 -5
- package/src/ui/pages/SubscribePage.tsx +3 -5
- package/src/ui/pages/ThemeSamplePage.tsx +1 -1
- 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/MediaGallery.tsx +1 -1
- package/src/ui/shared/custom-icons.ts +38 -7
- package/src/ui/shared/icon-collector.ts +7 -5
- package/src/vendor/datastar.js +9 -1956
- package/src/vendor/datastar.js.map +4 -4
- package/dist/client/_assets/chunks/sortable-list-BJyd-LXE.js +0 -2
- package/dist/client/_assets/chunks/unsafe-svg-DU_DNMy5.js +0 -2
- package/dist/client/_assets/client-D4AT9Iqr.js +0 -295
- package/dist/client/_assets/client-DRuw7XCt.css +0 -2
- package/dist/client/_assets/client-author-DQ8R-8KR.css +0 -2
|
@@ -3,6 +3,8 @@ import { resolveSiteUrl } from "../../lib/site-url.js";
|
|
|
3
3
|
|
|
4
4
|
const INTERNAL_ADMIN_TOKEN_ENV_VAR = "INTERNAL_ADMIN_TOKEN";
|
|
5
5
|
const DEFAULT_LIMIT = 20;
|
|
6
|
+
/** The largest batch the server runs; a larger `limit` is read as this. */
|
|
7
|
+
const MAX_LIMIT = 200;
|
|
6
8
|
|
|
7
9
|
function normalizeBaseUrl(value) {
|
|
8
10
|
const trimmed = value.trim();
|
|
@@ -22,8 +24,10 @@ function parseLimit(rawLimit) {
|
|
|
22
24
|
}
|
|
23
25
|
|
|
24
26
|
const limit = Number.parseInt(rawLimit, 10);
|
|
25
|
-
if (!Number.isInteger(limit) || limit < 1 || limit >
|
|
26
|
-
throw new Error(
|
|
27
|
+
if (!Number.isInteger(limit) || limit < 1 || limit > MAX_LIMIT) {
|
|
28
|
+
throw new Error(
|
|
29
|
+
`Cleanup limit must be an integer between 1 and ${MAX_LIMIT}.`,
|
|
30
|
+
);
|
|
27
31
|
}
|
|
28
32
|
|
|
29
33
|
return limit;
|
|
@@ -55,6 +59,7 @@ export async function run(argv) {
|
|
|
55
59
|
env: { type: "string" },
|
|
56
60
|
help: { type: "boolean", short: "h" },
|
|
57
61
|
limit: { type: "string" },
|
|
62
|
+
once: { type: "boolean", default: false },
|
|
58
63
|
token: { type: "string" },
|
|
59
64
|
url: { type: "string" },
|
|
60
65
|
},
|
|
@@ -63,11 +68,22 @@ export async function run(argv) {
|
|
|
63
68
|
if (values.help) {
|
|
64
69
|
console.log("Usage: jant uploads cleanup [--url <url>] [options]");
|
|
65
70
|
console.log("");
|
|
66
|
-
console.log(
|
|
71
|
+
console.log(
|
|
72
|
+
"Delete expired upload sessions and their temporary files, and purge",
|
|
73
|
+
);
|
|
74
|
+
console.log(
|
|
75
|
+
"deleted media whose 30-day recycle window has passed. Runs batch after",
|
|
76
|
+
);
|
|
77
|
+
console.log("batch until nothing is left.");
|
|
67
78
|
console.log("");
|
|
68
79
|
console.log("Options:");
|
|
69
80
|
console.log(" --url Target site URL");
|
|
70
|
-
console.log(
|
|
81
|
+
console.log(
|
|
82
|
+
` --limit Cleanup batch size (default: ${DEFAULT_LIMIT}, max: ${MAX_LIMIT})`,
|
|
83
|
+
);
|
|
84
|
+
console.log(
|
|
85
|
+
" --once Run a single batch and exit (default: loop until done)",
|
|
86
|
+
);
|
|
71
87
|
console.log(" --token Internal admin token");
|
|
72
88
|
console.log(
|
|
73
89
|
" --config Wrangler config file (default: wrangler.toml)",
|
|
@@ -113,9 +129,32 @@ export async function run(argv) {
|
|
|
113
129
|
const cleanupUrl = buildCleanupUrl(siteUrl);
|
|
114
130
|
|
|
115
131
|
console.log(`Cleaning expired uploads for ${siteUrl}...`);
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
132
|
+
const totals = {
|
|
133
|
+
deletedSessions: 0,
|
|
134
|
+
abortedMultipartUploads: 0,
|
|
135
|
+
purgedStorageObjects: 0,
|
|
136
|
+
};
|
|
137
|
+
let stalled = false;
|
|
138
|
+
for (;;) {
|
|
139
|
+
const result = await requestCleanup(cleanupUrl, token, limit);
|
|
140
|
+
totals.deletedSessions += result.deletedSessions;
|
|
141
|
+
totals.abortedMultipartUploads += result.abortedMultipartUploads;
|
|
142
|
+
totals.purgedStorageObjects += result.purgedStorageObjects;
|
|
143
|
+
if (values.once || result.done) break;
|
|
144
|
+
// A full batch that removed nothing would come back unchanged next time.
|
|
145
|
+
if (result.deletedSessions === 0 && result.purgedStorageObjects === 0) {
|
|
146
|
+
stalled = true;
|
|
147
|
+
break;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
console.log(`Deleted sessions: ${totals.deletedSessions}`);
|
|
152
|
+
console.log(`Aborted multipart uploads: ${totals.abortedMultipartUploads}`);
|
|
153
|
+
console.log(`Purged storage objects: ${totals.purgedStorageObjects}`);
|
|
154
|
+
if (stalled) {
|
|
155
|
+
console.error(
|
|
156
|
+
"Stopped early: the last batch removed nothing, though more is due. The server log says why; the next run tries again.",
|
|
157
|
+
);
|
|
158
|
+
process.exit(1);
|
|
159
|
+
}
|
|
121
160
|
}
|
package/bin/jant.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
|
-
import { readdir } from "node:fs/promises";
|
|
3
|
+
import { readdir, readFile } from "node:fs/promises";
|
|
4
4
|
import { fileURLToPath } from "node:url";
|
|
5
5
|
import { dirname, join, relative } from "node:path";
|
|
6
6
|
import { PUBLIC_COMMAND_GROUPS } from "./lib/command-registry.js";
|
|
@@ -49,13 +49,27 @@ function showHelp() {
|
|
|
49
49
|
}
|
|
50
50
|
console.log("");
|
|
51
51
|
console.log("Run 'jant <command> --help' for command-specific help.");
|
|
52
|
+
console.log("Run 'jant --version' for the installed version.");
|
|
52
53
|
}
|
|
53
54
|
|
|
54
55
|
const argv = process.argv.slice(2);
|
|
55
56
|
const commandStart = argv.findIndex((arg) => !arg.startsWith("-"));
|
|
56
57
|
if (commandStart === -1) {
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
const [option] = argv;
|
|
59
|
+
if (option === "--version" || option === "-v") {
|
|
60
|
+
const packageJson = JSON.parse(
|
|
61
|
+
await readFile(join(__dirname, "../package.json"), "utf8"),
|
|
62
|
+
);
|
|
63
|
+
console.log(packageJson.version);
|
|
64
|
+
process.exit(0);
|
|
65
|
+
}
|
|
66
|
+
if (option === undefined || option === "--help" || option === "-h") {
|
|
67
|
+
showHelp();
|
|
68
|
+
process.exit(0);
|
|
69
|
+
}
|
|
70
|
+
console.error(`Unknown option: ${option}`);
|
|
71
|
+
console.error("Run 'jant --help' for the list of commands.");
|
|
72
|
+
process.exit(1);
|
|
59
73
|
}
|
|
60
74
|
|
|
61
75
|
const commands = await listCommands();
|
|
@@ -107,6 +121,27 @@ if (!matched) {
|
|
|
107
121
|
process.exit(1);
|
|
108
122
|
}
|
|
109
123
|
|
|
124
|
+
/**
|
|
125
|
+
* The codes `node:util`'s `parseArgs` throws for arguments a command doesn't
|
|
126
|
+
* take. They are the user's mistake, so they get one line and a pointer to the
|
|
127
|
+
* command's help, not a stack trace.
|
|
128
|
+
*/
|
|
129
|
+
const ARGUMENT_ERROR_CODES = new Set([
|
|
130
|
+
"ERR_PARSE_ARGS_UNKNOWN_OPTION",
|
|
131
|
+
"ERR_PARSE_ARGS_INVALID_OPTION_VALUE",
|
|
132
|
+
"ERR_PARSE_ARGS_UNEXPECTED_POSITIONAL",
|
|
133
|
+
]);
|
|
134
|
+
|
|
110
135
|
const commandIndex = commandStart + matched.length - 1;
|
|
111
136
|
const mod = await import(join(commandsDir, `${matched.join("/")}.js`));
|
|
112
|
-
|
|
137
|
+
try {
|
|
138
|
+
await mod.run(argv.slice(commandIndex + 1));
|
|
139
|
+
} catch (error) {
|
|
140
|
+
if (!ARGUMENT_ERROR_CODES.has(error?.code)) throw error;
|
|
141
|
+
// parseArgs appends its own advice about `--`, which names none of Jant's
|
|
142
|
+
// options; the first sentence is the part that says what went wrong.
|
|
143
|
+
const [reason] = String(error.message).split(/\. (?=To specify|Did you)/);
|
|
144
|
+
console.error(`Error: ${reason.replace(/\.$/, "")}.`);
|
|
145
|
+
console.error(`Run 'jant ${matched.join(" ")} --help' for its options.`);
|
|
146
|
+
process.exit(1);
|
|
147
|
+
}
|
|
@@ -0,0 +1,499 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* First-deploy setup for a Cloudflare project.
|
|
3
|
+
*
|
|
4
|
+
* `create-jant` writes `database_id = "local"` into `wrangler.toml`: enough for
|
|
5
|
+
* `npm run dev`, which only touches the local D1, and a placeholder no remote
|
|
6
|
+
* command can use. `jant deploy` sees it and creates what the site needs on
|
|
7
|
+
* Cloudflare before the first deploy — the D1 database, the R2 buckets, and a
|
|
8
|
+
* production `AUTH_SECRET` — so a new project deploys with one command.
|
|
9
|
+
*
|
|
10
|
+
* Every step looks before it creates. A database or bucket with the configured
|
|
11
|
+
* name is reused, and an `AUTH_SECRET` the Worker already has is never
|
|
12
|
+
* replaced, so a rerun after a failure, or a project scaffolded again under the
|
|
13
|
+
* same name, picks up where the last run stopped.
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import { randomBytes } from "node:crypto";
|
|
17
|
+
import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
|
18
|
+
import { tmpdir } from "node:os";
|
|
19
|
+
import { join } from "node:path";
|
|
20
|
+
import { createInterface } from "node:readline/promises";
|
|
21
|
+
import { parse as parseToml } from "smol-toml";
|
|
22
|
+
import {
|
|
23
|
+
readWranglerDatabaseConfig,
|
|
24
|
+
resolveWranglerConfigPath,
|
|
25
|
+
} from "./migration-artifacts.js";
|
|
26
|
+
import { runLocalWrangler } from "./wrangler-cli.js";
|
|
27
|
+
import { extractWranglerJson } from "./wrangler-json.js";
|
|
28
|
+
|
|
29
|
+
/** The `database_id` create-jant writes for local development. */
|
|
30
|
+
export const PLACEHOLDER_DATABASE_ID = "local";
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Where the first deploy sends the author next. Written out here rather than
|
|
34
|
+
* through `getJantDocsUrl()`, which lives in the TypeScript runtime the CLI
|
|
35
|
+
* doesn't load; the CLI always links the released docs.
|
|
36
|
+
*/
|
|
37
|
+
export const BEFORE_GOING_LIVE_URL =
|
|
38
|
+
"https://jant.me/docs/deployment#before-going-live";
|
|
39
|
+
|
|
40
|
+
const R2_DASHBOARD_URL = "https://dash.cloudflare.com/?to=/:account/r2";
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Whether the D1 binding still has no real database behind it.
|
|
44
|
+
*
|
|
45
|
+
* A config with no such binding needs no setup: whatever needs the database
|
|
46
|
+
* later reports the missing binding itself.
|
|
47
|
+
*
|
|
48
|
+
* @param {{ configPath?: string, env?: string, database?: string }} options
|
|
49
|
+
* @returns {boolean} True when `database_id` is missing or create-jant's placeholder
|
|
50
|
+
* @example
|
|
51
|
+
* needsFirstDeploySetup({ configPath: "wrangler.toml" }); // true right after `npm create jant`
|
|
52
|
+
*/
|
|
53
|
+
export function needsFirstDeploySetup(options = {}) {
|
|
54
|
+
let databaseId;
|
|
55
|
+
try {
|
|
56
|
+
({ databaseId } = readWranglerDatabaseConfig(options));
|
|
57
|
+
} catch {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
return !databaseId || databaseId === PLACEHOLDER_DATABASE_ID;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
function wranglerOutput(error) {
|
|
64
|
+
return `${error?.stdout ?? ""}\n${error?.stderr ?? ""}\n${error?.message ?? ""}`;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* The first error line Wrangler printed, without its color codes and banner.
|
|
69
|
+
*
|
|
70
|
+
* @param {unknown} error - What `runLocalWrangler` threw
|
|
71
|
+
* @returns {string} One line to show the author
|
|
72
|
+
*/
|
|
73
|
+
function wranglerErrorLine(error) {
|
|
74
|
+
const lines = wranglerOutput(error)
|
|
75
|
+
.replace(/\u001b\[[0-9;]*m/g, "")
|
|
76
|
+
.split("\n")
|
|
77
|
+
.map((line) => line.trim())
|
|
78
|
+
.filter(Boolean);
|
|
79
|
+
const errorLine = lines.find((line) => line.startsWith("✘"));
|
|
80
|
+
const detail = errorLine
|
|
81
|
+
? lines[lines.indexOf(errorLine) + 1]
|
|
82
|
+
: lines.find((line) => !line.startsWith("🪵"));
|
|
83
|
+
const head = errorLine?.replace(/^✘\s*\[ERROR\]\s*/, "");
|
|
84
|
+
return [head, detail].filter(Boolean).join(" ") || "unknown error";
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function isInteractive(io) {
|
|
88
|
+
return Boolean(io.stdin.isTTY && io.stdout.isTTY) && !process.env.CI;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
function contextArgs(context) {
|
|
92
|
+
const args = ["--config", context.configPath];
|
|
93
|
+
if (context.env) args.push("--env", context.env);
|
|
94
|
+
return args;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
function readJson(output) {
|
|
98
|
+
return JSON.parse(extractWranglerJson(output).trim());
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* Make sure Wrangler is signed in, running `wrangler login` when a person is
|
|
103
|
+
* at the terminal. A script or coding agent gets an error that says what to
|
|
104
|
+
* run instead, since the sign-in happens in a browser.
|
|
105
|
+
*/
|
|
106
|
+
function ensureSignedIn(context) {
|
|
107
|
+
const whoami = () => {
|
|
108
|
+
try {
|
|
109
|
+
return readJson(context.wrangler(["whoami", "--json"]));
|
|
110
|
+
} catch (error) {
|
|
111
|
+
try {
|
|
112
|
+
return readJson(String(error?.stdout ?? ""));
|
|
113
|
+
} catch {
|
|
114
|
+
throw new Error(
|
|
115
|
+
`Could not check the Cloudflare sign-in: ${wranglerErrorLine(error)}`,
|
|
116
|
+
);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
};
|
|
120
|
+
|
|
121
|
+
let user = whoami();
|
|
122
|
+
if (user.loggedIn) return user;
|
|
123
|
+
|
|
124
|
+
if (!isInteractive(context.io)) {
|
|
125
|
+
throw new Error(
|
|
126
|
+
"Not signed in to Cloudflare. Run `npx wrangler login` and finish the sign-in in the browser, or set CLOUDFLARE_API_TOKEN. Then deploy again.",
|
|
127
|
+
);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
context.log("Not signed in to Cloudflare. Opening the browser to sign in...");
|
|
131
|
+
context.wrangler(["login"], { stdio: "inherit" });
|
|
132
|
+
user = whoami();
|
|
133
|
+
if (!user.loggedIn) {
|
|
134
|
+
throw new Error(
|
|
135
|
+
"Cloudflare sign-in didn't finish. Run `npx wrangler login`, then deploy again.",
|
|
136
|
+
);
|
|
137
|
+
}
|
|
138
|
+
return user;
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
function configuredAccountId(context) {
|
|
142
|
+
if (process.env.CLOUDFLARE_ACCOUNT_ID)
|
|
143
|
+
return process.env.CLOUDFLARE_ACCOUNT_ID;
|
|
144
|
+
const config = parseToml(readFileSync(context.absoluteConfigPath, "utf-8"));
|
|
145
|
+
const scoped = context.env ? config.env?.[context.env] : undefined;
|
|
146
|
+
return scoped?.account_id ?? config.account_id ?? null;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* Pick the account to create resources in when the sign-in reaches more than
|
|
151
|
+
* one, and remember it in `wrangler.toml` so later deploys don't ask again.
|
|
152
|
+
*/
|
|
153
|
+
async function ensureAccount(user, context) {
|
|
154
|
+
const accounts = Array.isArray(user.accounts) ? user.accounts : [];
|
|
155
|
+
if (accounts.length < 2 || configuredAccountId(context)) return;
|
|
156
|
+
|
|
157
|
+
const listing = accounts
|
|
158
|
+
.map((account, index) => ` ${index + 1}. ${account.name} (${account.id})`)
|
|
159
|
+
.join("\n");
|
|
160
|
+
|
|
161
|
+
if (!isInteractive(context.io)) {
|
|
162
|
+
throw new Error(
|
|
163
|
+
`This Cloudflare sign-in can use more than one account:\n${listing}\nAdd account_id = "<id>" to wrangler.toml, or set CLOUDFLARE_ACCOUNT_ID, then deploy again.`,
|
|
164
|
+
);
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
context.log("This Cloudflare sign-in can use more than one account:");
|
|
168
|
+
context.log(listing);
|
|
169
|
+
const answer = await context.ask(
|
|
170
|
+
`Deploy to which account? [1-${accounts.length}] `,
|
|
171
|
+
);
|
|
172
|
+
const account = accounts[Number.parseInt(answer, 10) - 1];
|
|
173
|
+
if (!account) {
|
|
174
|
+
throw new Error(`"${answer}" isn't one of the listed accounts.`);
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
const raw = readFileSync(context.absoluteConfigPath, "utf-8");
|
|
178
|
+
writeFileSync(context.absoluteConfigPath, setAccountId(raw, account.id));
|
|
179
|
+
context.log(`Using ${account.name}. Saved its account_id in wrangler.toml.`);
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
function findD1Database(name, context) {
|
|
183
|
+
const databases = readJson(
|
|
184
|
+
context.wrangler(["d1", "list", "--json", ...contextArgs(context)]),
|
|
185
|
+
);
|
|
186
|
+
return databases.find((database) => database.name === name) ?? null;
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
function ensureD1Database(databaseName, context) {
|
|
190
|
+
const existing = findD1Database(databaseName, context);
|
|
191
|
+
if (existing) {
|
|
192
|
+
context.log(`D1 database ${databaseName}: found, reusing it.`);
|
|
193
|
+
return existing.uuid;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
try {
|
|
197
|
+
context.wrangler(["d1", "create", databaseName, ...contextArgs(context)]);
|
|
198
|
+
} catch (error) {
|
|
199
|
+
throw new Error(
|
|
200
|
+
`Could not create the D1 database ${databaseName}: ${wranglerErrorLine(error)}`,
|
|
201
|
+
);
|
|
202
|
+
}
|
|
203
|
+
const created = findD1Database(databaseName, context);
|
|
204
|
+
if (!created) {
|
|
205
|
+
throw new Error(
|
|
206
|
+
`Created the D1 database ${databaseName}, but it isn't in \`wrangler d1 list\` yet. Deploy again in a minute.`,
|
|
207
|
+
);
|
|
208
|
+
}
|
|
209
|
+
context.log(`D1 database ${databaseName}: created.`);
|
|
210
|
+
return created.uuid;
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
function r2NotEnabled(error) {
|
|
214
|
+
return /code: 10042|enable R2/i.test(wranglerOutput(error));
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
function r2NotEnabledError() {
|
|
218
|
+
return new Error(
|
|
219
|
+
`R2 isn't enabled on this Cloudflare account. Open ${R2_DASHBOARD_URL}, click Enable R2, then deploy again.`,
|
|
220
|
+
);
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
function ensureR2Bucket(bucket, context) {
|
|
224
|
+
const name = String(bucket.bucket_name);
|
|
225
|
+
const jurisdiction = bucket.jurisdiction
|
|
226
|
+
? ["--jurisdiction", String(bucket.jurisdiction)]
|
|
227
|
+
: [];
|
|
228
|
+
|
|
229
|
+
try {
|
|
230
|
+
context.wrangler([
|
|
231
|
+
"r2",
|
|
232
|
+
"bucket",
|
|
233
|
+
"info",
|
|
234
|
+
name,
|
|
235
|
+
"--json",
|
|
236
|
+
...jurisdiction,
|
|
237
|
+
...contextArgs(context),
|
|
238
|
+
]);
|
|
239
|
+
context.log(`R2 bucket ${name}: found, reusing it.`);
|
|
240
|
+
return;
|
|
241
|
+
} catch (error) {
|
|
242
|
+
if (r2NotEnabled(error)) throw r2NotEnabledError();
|
|
243
|
+
if (!/code: 10006|does not exist/i.test(wranglerOutput(error))) {
|
|
244
|
+
throw new Error(
|
|
245
|
+
`Could not check the R2 bucket ${name}: ${wranglerErrorLine(error)}`,
|
|
246
|
+
);
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
try {
|
|
251
|
+
context.wrangler([
|
|
252
|
+
"r2",
|
|
253
|
+
"bucket",
|
|
254
|
+
"create",
|
|
255
|
+
name,
|
|
256
|
+
...jurisdiction,
|
|
257
|
+
...contextArgs(context),
|
|
258
|
+
]);
|
|
259
|
+
} catch (error) {
|
|
260
|
+
if (r2NotEnabled(error)) throw r2NotEnabledError();
|
|
261
|
+
throw new Error(
|
|
262
|
+
`Could not create the R2 bucket ${name}: ${wranglerErrorLine(error)}`,
|
|
263
|
+
);
|
|
264
|
+
}
|
|
265
|
+
context.log(`R2 bucket ${name}: created.`);
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
function workerHasSecret(secretName, context) {
|
|
269
|
+
try {
|
|
270
|
+
const secrets = readJson(
|
|
271
|
+
context.wrangler([
|
|
272
|
+
"secret",
|
|
273
|
+
"list",
|
|
274
|
+
"--format",
|
|
275
|
+
"json",
|
|
276
|
+
...contextArgs(context),
|
|
277
|
+
]),
|
|
278
|
+
);
|
|
279
|
+
return secrets.some((secret) => secret.name === secretName);
|
|
280
|
+
} catch (error) {
|
|
281
|
+
// A Worker that was never deployed has no secrets yet.
|
|
282
|
+
if (/Worker ".*" not found|code: 10007/i.test(wranglerOutput(error))) {
|
|
283
|
+
return false;
|
|
284
|
+
}
|
|
285
|
+
throw new Error(
|
|
286
|
+
`Could not read the Worker's secrets: ${wranglerErrorLine(error)}`,
|
|
287
|
+
);
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
/**
|
|
292
|
+
* Write a generated `AUTH_SECRET` to a file `wrangler deploy --secrets-file`
|
|
293
|
+
* reads, so the Worker's first version starts with it. The file is readable by
|
|
294
|
+
* the current user only and removed once the deploy is over.
|
|
295
|
+
*/
|
|
296
|
+
function writeAuthSecretFile() {
|
|
297
|
+
const dir = mkdtempSync(join(tmpdir(), "jant-deploy-"));
|
|
298
|
+
const path = join(dir, "secrets.json");
|
|
299
|
+
writeFileSync(
|
|
300
|
+
path,
|
|
301
|
+
JSON.stringify({ AUTH_SECRET: randomBytes(32).toString("base64") }),
|
|
302
|
+
{ mode: 0o600 },
|
|
303
|
+
);
|
|
304
|
+
return { path, remove: () => rmSync(dir, { recursive: true, force: true }) };
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
function findTableHeader(line) {
|
|
308
|
+
const match = line.match(/^\s*\[\[?\s*([^\]]+?)\s*\]\]?\s*(?:#.*)?$/);
|
|
309
|
+
return match ? match[1] : null;
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
/**
|
|
313
|
+
* Put a D1 database ID into `wrangler.toml` text, keeping its comments and
|
|
314
|
+
* layout: the `database_id` line of the binding's `[[d1_databases]]` entry is
|
|
315
|
+
* replaced, or added after `database_name` when the entry has none.
|
|
316
|
+
*
|
|
317
|
+
* @param {string} raw - The file's text
|
|
318
|
+
* @param {{ binding: string, databaseId: string, env?: string }} target
|
|
319
|
+
* @returns {string} The updated text
|
|
320
|
+
* @example
|
|
321
|
+
* setD1DatabaseId(raw, { binding: "DB", databaseId: "7c1e…" });
|
|
322
|
+
*/
|
|
323
|
+
export function setD1DatabaseId(raw, { binding, databaseId, env }) {
|
|
324
|
+
const tableName = env ? `env.${env}.d1_databases` : "d1_databases";
|
|
325
|
+
const lines = raw.split("\n");
|
|
326
|
+
const headers = lines
|
|
327
|
+
.map((line, index) => ({ index, name: findTableHeader(line) }))
|
|
328
|
+
.filter((header) => header.name !== null);
|
|
329
|
+
const blocks = headers.map((header, position) => ({
|
|
330
|
+
name: header.name,
|
|
331
|
+
start: header.index,
|
|
332
|
+
end: headers[position + 1]?.index ?? lines.length,
|
|
333
|
+
}));
|
|
334
|
+
const block = blocks.find(
|
|
335
|
+
({ name, start, end }) =>
|
|
336
|
+
name === tableName &&
|
|
337
|
+
entryHasBinding(lines.slice(start + 1, end), binding),
|
|
338
|
+
);
|
|
339
|
+
|
|
340
|
+
if (!block) {
|
|
341
|
+
throw new Error(`No [[${tableName}]] entry for binding "${binding}".`);
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
const { start, end } = block;
|
|
345
|
+
const entry = lines.slice(start + 1, end);
|
|
346
|
+
const idLine = entry.findIndex((line) => /^\s*database_id\s*=/.test(line));
|
|
347
|
+
if (idLine !== -1) {
|
|
348
|
+
lines[start + 1 + idLine] = lines[start + 1 + idLine].replace(
|
|
349
|
+
/^(\s*database_id\s*=\s*)(["'])[^"']*\2/,
|
|
350
|
+
`$1"${databaseId}"`,
|
|
351
|
+
);
|
|
352
|
+
} else {
|
|
353
|
+
const nameLine = entry.findIndex((line) =>
|
|
354
|
+
/^\s*database_name\s*=/.test(line),
|
|
355
|
+
);
|
|
356
|
+
const bindingLine = entry.findIndex((line) => /^\s*binding\s*=/.test(line));
|
|
357
|
+
const after = start + 1 + (nameLine !== -1 ? nameLine : bindingLine);
|
|
358
|
+
lines.splice(after + 1, 0, `database_id = "${databaseId}"`);
|
|
359
|
+
}
|
|
360
|
+
|
|
361
|
+
return lines.join("\n");
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
function entryHasBinding(entryLines, binding) {
|
|
365
|
+
return entryLines.some((line) => {
|
|
366
|
+
const match = line.match(/^\s*binding\s*=\s*(["'])([^"']*)\1/);
|
|
367
|
+
return match?.[2] === binding;
|
|
368
|
+
});
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
/**
|
|
372
|
+
* Add a top-level `account_id` to `wrangler.toml` text, after `name` or
|
|
373
|
+
* before the first table. Environments inherit it.
|
|
374
|
+
*
|
|
375
|
+
* @param {string} raw - The file's text
|
|
376
|
+
* @param {string} accountId - The Cloudflare account ID
|
|
377
|
+
* @returns {string} The updated text
|
|
378
|
+
* @example
|
|
379
|
+
* setAccountId('name = "blog"\n[vars]\n', "abc"); // 'name = "blog"\naccount_id = "abc"\n[vars]\n'
|
|
380
|
+
*/
|
|
381
|
+
export function setAccountId(raw, accountId) {
|
|
382
|
+
const lines = raw.split("\n");
|
|
383
|
+
const firstTable = lines.findIndex((line) => findTableHeader(line) !== null);
|
|
384
|
+
const topLevel = firstTable === -1 ? lines.length : firstTable;
|
|
385
|
+
const nameLine = lines
|
|
386
|
+
.slice(0, topLevel)
|
|
387
|
+
.findIndex((line) => /^\s*name\s*=/.test(line));
|
|
388
|
+
const insertAt = nameLine !== -1 ? nameLine + 1 : topLevel;
|
|
389
|
+
lines.splice(insertAt, 0, `account_id = "${accountId}"`);
|
|
390
|
+
return lines.join("\n");
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
function readR2Buckets(context) {
|
|
394
|
+
const config = parseToml(readFileSync(context.absoluteConfigPath, "utf-8"));
|
|
395
|
+
const scoped = context.env ? config.env?.[context.env] : config;
|
|
396
|
+
const buckets = scoped?.r2_buckets;
|
|
397
|
+
return Array.isArray(buckets)
|
|
398
|
+
? buckets.filter((bucket) => bucket?.bucket_name)
|
|
399
|
+
: [];
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
/**
|
|
403
|
+
* Create what a first deploy needs on Cloudflare and point `wrangler.toml` at
|
|
404
|
+
* the D1 database.
|
|
405
|
+
*
|
|
406
|
+
* Call it only when {@link needsFirstDeploySetup} says so. The returned
|
|
407
|
+
* `restore` puts the placeholder back, for a deploy that fails: the next run
|
|
408
|
+
* then sets up again, reusing what this one created, and still hands the
|
|
409
|
+
* Worker its `AUTH_SECRET`.
|
|
410
|
+
*
|
|
411
|
+
* @param {{ configPath: string, env?: string, database: string }} options
|
|
412
|
+
* @param {object} [deps] - Injected for tests
|
|
413
|
+
* @returns {Promise<{ secretsFile: string | null, restore: () => void, cleanup: () => void }>}
|
|
414
|
+
* @example
|
|
415
|
+
* const setup = await runFirstDeploySetup({ configPath: "wrangler.toml", database: "DB" });
|
|
416
|
+
*/
|
|
417
|
+
export async function runFirstDeploySetup(options, deps = {}) {
|
|
418
|
+
const io = deps.io ?? { stdin: process.stdin, stdout: process.stdout };
|
|
419
|
+
const context = {
|
|
420
|
+
configPath: options.configPath,
|
|
421
|
+
absoluteConfigPath: resolveWranglerConfigPath(options.configPath),
|
|
422
|
+
env: options.env,
|
|
423
|
+
io,
|
|
424
|
+
log: deps.log ?? ((message) => console.log(message)),
|
|
425
|
+
wrangler:
|
|
426
|
+
deps.wrangler ??
|
|
427
|
+
((args, runOptions = {}) => runLocalWrangler(args, runOptions)),
|
|
428
|
+
ask:
|
|
429
|
+
deps.ask ??
|
|
430
|
+
(async (question) => {
|
|
431
|
+
const readline = createInterface({
|
|
432
|
+
input: io.stdin,
|
|
433
|
+
output: io.stdout,
|
|
434
|
+
});
|
|
435
|
+
try {
|
|
436
|
+
return (await readline.question(question)).trim();
|
|
437
|
+
} finally {
|
|
438
|
+
readline.close();
|
|
439
|
+
}
|
|
440
|
+
}),
|
|
441
|
+
};
|
|
442
|
+
|
|
443
|
+
const { databaseName } = readWranglerDatabaseConfig({
|
|
444
|
+
configPath: options.configPath,
|
|
445
|
+
env: options.env,
|
|
446
|
+
database: options.database,
|
|
447
|
+
});
|
|
448
|
+
if (!databaseName) {
|
|
449
|
+
throw new Error(
|
|
450
|
+
`Add database_name to the [[d1_databases]] entry for "${options.database}" in ${options.configPath}, then deploy again.`,
|
|
451
|
+
);
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
context.log("First deploy: setting up Cloudflare resources...");
|
|
455
|
+
const user = ensureSignedIn(context);
|
|
456
|
+
await ensureAccount(user, context);
|
|
457
|
+
|
|
458
|
+
const databaseId = ensureD1Database(databaseName, context);
|
|
459
|
+
for (const bucket of readR2Buckets(context)) {
|
|
460
|
+
ensureR2Bucket(bucket, context);
|
|
461
|
+
}
|
|
462
|
+
|
|
463
|
+
let secrets = null;
|
|
464
|
+
if (workerHasSecret("AUTH_SECRET", context)) {
|
|
465
|
+
context.log("AUTH_SECRET: already set on the Worker, keeping it.");
|
|
466
|
+
} else {
|
|
467
|
+
secrets = writeAuthSecretFile();
|
|
468
|
+
context.log("AUTH_SECRET: generated. It goes to the Worker as a secret.");
|
|
469
|
+
}
|
|
470
|
+
|
|
471
|
+
const configured = readFileSync(context.absoluteConfigPath, "utf-8");
|
|
472
|
+
const updated = setD1DatabaseId(configured, {
|
|
473
|
+
binding: options.database,
|
|
474
|
+
databaseId,
|
|
475
|
+
env: options.env,
|
|
476
|
+
});
|
|
477
|
+
writeFileSync(context.absoluteConfigPath, updated);
|
|
478
|
+
if (
|
|
479
|
+
readWranglerDatabaseConfig({
|
|
480
|
+
configPath: options.configPath,
|
|
481
|
+
env: options.env,
|
|
482
|
+
database: options.database,
|
|
483
|
+
}).databaseId !== databaseId
|
|
484
|
+
) {
|
|
485
|
+
writeFileSync(context.absoluteConfigPath, configured);
|
|
486
|
+
secrets?.remove();
|
|
487
|
+
throw new Error(
|
|
488
|
+
`Could not write the database ID to ${options.configPath}. Set database_id = "${databaseId}" in the [[d1_databases]] entry for "${options.database}", then deploy again.`,
|
|
489
|
+
);
|
|
490
|
+
}
|
|
491
|
+
context.log(`Wrote database_id to ${options.configPath}.`);
|
|
492
|
+
|
|
493
|
+
return {
|
|
494
|
+
secretsFile: secrets?.path ?? null,
|
|
495
|
+
// Back to the placeholder, keeping an account_id chosen above.
|
|
496
|
+
restore: () => writeFileSync(context.absoluteConfigPath, configured),
|
|
497
|
+
cleanup: () => secrets?.remove(),
|
|
498
|
+
};
|
|
499
|
+
}
|
package/bin/lib/d1-query.js
CHANGED
|
@@ -68,6 +68,31 @@ export function parseWranglerError(output) {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
/**
|
|
72
|
+
* Read the `--json` error out of a failed Wrangler call.
|
|
73
|
+
*
|
|
74
|
+
* Wrangler writes that error to stdout and its warnings to stderr, and a
|
|
75
|
+
* warning such as "Proxy environment variables detected" comes with any
|
|
76
|
+
* failure on a machine behind a proxy. Read together, the warning trails the
|
|
77
|
+
* JSON and breaks the parse, so the message fell back to the warning alone and
|
|
78
|
+
* the cause went unseen. Each stream is read on its own.
|
|
79
|
+
*
|
|
80
|
+
* @param {{ stdout?: string, stderr?: string } | undefined} error - The error a failed Wrangler call threw
|
|
81
|
+
* @returns {string | undefined} The error text and its notes, when Wrangler printed one
|
|
82
|
+
* @example
|
|
83
|
+
* parseWranglerFailure({
|
|
84
|
+
* stdout: '{"error":{"text":"Couldn\'t find a D1 DB with name or binding \'DB\'"}}',
|
|
85
|
+
* stderr: "▲ [WARNING] Proxy environment variables detected.",
|
|
86
|
+
* });
|
|
87
|
+
* // => "Couldn't find a D1 DB with name or binding 'DB'"
|
|
88
|
+
*/
|
|
89
|
+
export function parseWranglerFailure(error) {
|
|
90
|
+
return (
|
|
91
|
+
parseWranglerError(error?.stdout?.trim()) ??
|
|
92
|
+
parseWranglerError(error?.stderr?.trim())
|
|
93
|
+
);
|
|
94
|
+
}
|
|
95
|
+
|
|
71
96
|
function sleepSync(ms) {
|
|
72
97
|
if (!Number.isFinite(ms) || ms <= 0) {
|
|
73
98
|
return;
|
|
@@ -162,7 +187,7 @@ function runWrangler(args, options = {}) {
|
|
|
162
187
|
return runLocalWrangler(args, getWranglerExecutionOptions(options));
|
|
163
188
|
} catch (error) {
|
|
164
189
|
const output = `${error.stdout ?? ""}${error.stderr ?? ""}`.trim();
|
|
165
|
-
const wranglerError =
|
|
190
|
+
const wranglerError = parseWranglerFailure(error);
|
|
166
191
|
const retryable = isRetryableWranglerD1Failure(output, error);
|
|
167
192
|
|
|
168
193
|
if (retryable && attempt < retryAttempts) {
|