@jant/core 0.10.0 → 0.11.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.
Files changed (475) hide show
  1. package/bin/commands/db/execute-file.js +1 -1
  2. package/bin/commands/db/export.js +1 -1
  3. package/bin/commands/migrate.js +4 -4
  4. package/bin/commands/posts/rebuild-html.js +1 -1
  5. package/bin/commands/reset-password.js +1 -1
  6. package/bin/commands/search/reindex.js +1 -1
  7. package/bin/commands/setup.js +4 -2
  8. package/bin/commands/site/export.js +3 -0
  9. package/bin/commands/site/import.js +178 -91
  10. package/bin/commands/site/pull-media.js +3 -2
  11. package/bin/commands/site/snapshot/export.js +3 -1
  12. package/bin/commands/site/snapshot/import.js +3 -2
  13. package/bin/commands/start.js +44 -0
  14. package/bin/commands/telegram/register-webhooks.js +1 -1
  15. package/bin/commands/uploads/cleanup.js +48 -9
  16. package/bin/jant.js +39 -4
  17. package/bin/lib/import-sources.js +151 -0
  18. package/bin/lib/node-env.js +14 -9
  19. package/bin/lib/runtime-target.js +1 -1
  20. package/bin/lib/site-pull-media.js +56 -4
  21. package/bin/lib/site-snapshot.js +39 -2
  22. package/bin/lib/sql-export.js +66 -10
  23. package/dist/{app-DIVtyB4m.js → app-jQI4OPRe.js} +5055 -4448
  24. package/dist/client/.vite/manifest.json +38 -38
  25. package/dist/client/_assets/chunks/{create-editor-B-m7X7S5.js → create-editor-5Y49x7h5.js} +2 -2
  26. package/dist/client/_assets/chunks/{footnote-rail-CmeoVtnU.js → footnote-rail-BJwswtVQ.js} +1 -1
  27. package/dist/client/_assets/chunks/{settings-paths-C-ZZBTau.js → settings-paths-h6RjIe3C.js} +2 -2
  28. package/dist/client/_assets/chunks/{slug-format-BcIsNKz-.js → slug-format-Dsi0e9Xn.js} +1 -1
  29. package/dist/client/_assets/chunks/{slugify-373citbs.js → slugify-DlHLyUHS.js} +1 -1
  30. package/dist/client/_assets/chunks/sortable-list-DYMcJrlS.js +2 -0
  31. package/dist/client/_assets/chunks/unsafe-svg-DxrzM_Gb.js +2 -0
  32. package/dist/client/_assets/client-52vQhZAv.js +296 -0
  33. package/dist/client/_assets/client-BaqmpPQ-.css +2 -0
  34. package/dist/client/_assets/{client-auth-BpkkKTsV.js → client-auth-BDcCR6u1.js} +2 -2
  35. package/dist/client/_assets/client-author-CGVvrNZ8.css +2 -0
  36. package/dist/client/_assets/{client-compose-C-DXzcFR.js → client-compose-CzEwT5qX.js} +4 -4
  37. package/dist/client/_assets/{client-manage-BfT7ht4M.js → client-manage-CF7x21L4.js} +37 -37
  38. package/dist/client/_assets/{client-settings-CGR_nZ78.js → client-settings-DIM44Zqh.js} +2 -2
  39. package/dist/{url-CKlGzvdN.js → constants-DEgyqWDl.js} +340 -1
  40. package/dist/index.d.ts +44 -0
  41. package/dist/index.js +33 -1
  42. package/dist/node.js +57 -13
  43. package/package.json +13 -18
  44. package/src/__tests__/api-docs.test.ts +168 -1
  45. package/src/__tests__/bin/import-sources.test.ts +85 -0
  46. package/src/__tests__/bin/uploads-cleanup.test.ts +66 -26
  47. package/src/__tests__/cli-commands.test.ts +40 -0
  48. package/src/__tests__/config-docs.test.ts +119 -16
  49. package/src/__tests__/custom-url-redirects.test.ts +108 -0
  50. package/src/__tests__/export-collection-custom-urls.test.ts +69 -0
  51. package/src/__tests__/export-docs.test.ts +113 -41
  52. package/src/__tests__/export-feed-ids.test.ts +1 -0
  53. package/src/__tests__/export-format-version.test.ts +88 -0
  54. package/src/__tests__/export-hugo-build.test.ts +139 -4
  55. package/src/__tests__/export-import-roundtrip.test.ts +2 -1
  56. package/src/__tests__/export-service.test.ts +42 -13
  57. package/src/__tests__/export-smart-collection.test.ts +1 -1
  58. package/src/__tests__/feed-docs.test.ts +287 -21
  59. package/src/__tests__/feed-reply-addresses.test.ts +100 -0
  60. package/src/__tests__/feeds-disabled.test.ts +98 -0
  61. package/src/__tests__/fixtures/export-format/1.json +76 -0
  62. package/src/__tests__/fixtures/export-format/2.json +80 -0
  63. package/src/__tests__/fixtures/releases/0.10.0/site-export/README.md +130 -0
  64. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2thjq/_index.md +25 -0
  65. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2u5e5/_index.md +35 -0
  66. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/0x4nv/index.md +18 -0
  67. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/_index.md +44 -0
  68. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/faqyt/index.md +30 -0
  69. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
  70. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5kayp/_index.md +23 -0
  71. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/_index.md +31 -0
  72. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/hu597/index.md +21 -0
  73. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/_index.md +5 -0
  74. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
  75. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
  76. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/archive/_index.md +8 -0
  77. 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
  78. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/bought-too-many-lemons-again/_index.md +37 -0
  79. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/city-walks/_index.md +12 -0
  80. 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
  81. 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
  82. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/co344/_index.md +25 -0
  83. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/collections/_index.md +5 -0
  84. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/current-tea-rotation/_index.md +34 -0
  85. 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
  86. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/desk-but-better/_index.md +25 -0
  87. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/e0kcg/_index.md +22 -0
  88. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/egi3c/_index.md +24 -0
  89. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/evf9j/_index.md +152 -0
  90. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/featured/_index.md +8 -0
  91. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-basho/_index.md +25 -0
  92. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-epictetus/_index.md +25 -0
  93. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
  94. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-seneca/_index.md +26 -0
  95. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-thoreau/_index.md +25 -0
  96. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
  97. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/3zqv7/index.md +30 -0
  98. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
  99. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/_index.md +39 -0
  100. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gwob9/_index.md +25 -0
  101. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/home-cooking/_index.md +12 -0
  102. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/hz729/_index.md +24 -0
  103. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +44 -0
  104. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/j4v0q/_index.md +35 -0
  105. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k278t/_index.md +25 -0
  106. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k4eee/_index.md +22 -0
  107. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/_index.md +32 -0
  108. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
  109. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a83qu/index.md +18 -0
  110. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
  111. 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
  112. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/l2m7y/_index.md +29 -0
  113. 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
  114. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
  115. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/n09le/_index.md +23 -0
  116. 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
  117. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
  118. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/_index.md +32 -0
  119. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/c91j0/index.md +18 -0
  120. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/qyucy/index.md +18 -0
  121. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/wsgck/index.md +18 -0
  122. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +46 -0
  123. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/reading-notes/_index.md +12 -0
  124. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/s4r3e/_index.md +25 -0
  125. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
  126. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/_index.md +44 -0
  127. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/cxiu6/index.md +18 -0
  128. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/t77ms/index.md +18 -0
  129. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
  130. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/_index.md +30 -0
  131. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
  132. 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
  133. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
  134. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
  135. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tiny-projects/_index.md +12 -0
  136. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
  137. 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
  138. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/useful-links/_index.md +12 -0
  139. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/weekend-notes/_index.md +12 -0
  140. package/src/__tests__/fixtures/releases/0.10.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +52 -0
  141. package/src/__tests__/fixtures/releases/0.10.0/site-export/data/jant.toml +124 -0
  142. package/src/__tests__/fixtures/releases/0.10.0/site-export/hugo.toml +45 -0
  143. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/_redirects +25 -0
  144. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/40bc6cd1f12e-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
  145. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
  146. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
  147. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
  148. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
  149. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
  150. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
  151. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
  152. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
  153. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
  154. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
  155. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
  156. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
  157. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
  158. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
  159. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
  160. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
  161. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
  162. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
  163. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
  164. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
  165. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
  166. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
  167. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
  168. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
  169. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
  170. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
  171. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
  172. package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
  173. package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
  174. package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/custom.css +0 -0
  175. package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/favicon.ico +0 -0
  176. package/src/__tests__/fixtures/releases/0.10.0/site-export/wrangler.jsonc +24 -0
  177. package/src/__tests__/fixtures/releases/0.10.0/snapshot/db.sql +322 -0
  178. package/src/__tests__/fixtures/releases/0.10.0/snapshot/meta.json +11 -0
  179. package/src/__tests__/helpers/app.ts +6 -1
  180. package/src/__tests__/helpers/export-fixtures.ts +1 -0
  181. package/src/__tests__/import-refused-aliases.test.ts +98 -0
  182. package/src/__tests__/import-site-command.test.ts +73 -8
  183. package/src/__tests__/public-types.test.ts +64 -0
  184. package/src/__tests__/release-fixtures.test.ts +79 -24
  185. package/src/__tests__/release-version.test.ts +84 -0
  186. package/src/__tests__/site-pull-media.test.ts +48 -0
  187. package/src/__tests__/snapshot-tables.test.ts +37 -0
  188. package/src/__tests__/sql-export.test.ts +21 -1
  189. package/src/__tests__/stored-file-headers.test.ts +94 -0
  190. package/src/__tests__/template-deploy-workflow.test.ts +101 -0
  191. package/src/__tests__/theme-docs.test.ts +113 -24
  192. package/src/__tests__/toolchain-versions.test.ts +54 -0
  193. package/src/__tests__/trailing-slash-redirect.test.ts +61 -0
  194. package/src/__tests__/vite-config-graph.test.ts +98 -0
  195. package/src/app.tsx +89 -66
  196. package/src/client/__tests__/compose-bridge-image-upload.test.ts +1 -0
  197. package/src/client/__tests__/compose-bridge.test.ts +87 -0
  198. package/src/client/__tests__/compose-shortcuts.test.ts +4 -4
  199. package/src/client/__tests__/footnote-rail.test.ts +1 -1
  200. package/src/client/__tests__/lazy-entries.test.ts +1 -1
  201. package/src/client/__tests__/media-scroll-hint.test.ts +2 -2
  202. package/src/client/avatar-upload.ts +10 -10
  203. package/src/client/components/__tests__/jant-compose-dialog.test.ts +295 -4
  204. package/src/client/components/__tests__/jant-compose-editor.test.ts +34 -0
  205. package/src/client/components/__tests__/jant-settings-general.test.ts +0 -32
  206. package/src/client/components/compose-types.ts +14 -0
  207. package/src/client/components/jant-compose-dialog.ts +96 -41
  208. package/src/client/components/jant-compose-editor.ts +21 -4
  209. package/src/client/components/jant-config-editor.ts +4 -6
  210. package/src/client/components/jant-media-lightbox.ts +4 -4
  211. package/src/client/components/jant-settings-general.ts +0 -4
  212. package/src/client/components/nav-manager-types.ts +6 -5
  213. package/src/client/compose-bridge.ts +15 -4
  214. package/src/client/compose-launch.ts +4 -6
  215. package/src/client/compose-shortcuts.ts +1 -1
  216. package/src/client/footnote-rail.ts +1 -1
  217. package/src/client/lazy-entries.ts +1 -1
  218. package/src/client/media-scroll-hint.ts +2 -2
  219. package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +55 -0
  220. package/src/client/tiptap/markdown-clipboard.ts +50 -2
  221. package/src/client/upload-session.ts +7 -6
  222. package/src/db/__tests__/backfill-external-redirects.test.ts +59 -0
  223. package/src/db/__tests__/backfill-featured-discover.test.ts +56 -0
  224. package/src/db/backfills/0007_restore_external_redirect_scheme.sql +20 -0
  225. package/src/db/backfills/0008_turn_off_featured_only_discover.sql +11 -0
  226. package/src/i18n/locales/public/en.po +46 -48
  227. package/src/i18n/locales/public/en.ts +1 -1
  228. package/src/i18n/locales/public/zh-Hans.po +45 -46
  229. package/src/i18n/locales/public/zh-Hans.ts +1 -1
  230. package/src/i18n/locales/public/zh-Hant.po +45 -46
  231. package/src/i18n/locales/public/zh-Hant.ts +1 -1
  232. package/src/i18n/locales/settings/en.po +15 -29
  233. package/src/i18n/locales/settings/en.ts +1 -1
  234. package/src/i18n/locales/settings/zh-Hans.po +15 -29
  235. package/src/i18n/locales/settings/zh-Hans.ts +1 -1
  236. package/src/i18n/locales/settings/zh-Hant.po +15 -29
  237. package/src/i18n/locales/settings/zh-Hant.ts +1 -1
  238. package/src/index.ts +43 -2
  239. package/src/lib/__tests__/api-settings.test.ts +3 -3
  240. package/src/lib/__tests__/constants.test.ts +10 -0
  241. package/src/lib/__tests__/discover.test.ts +8 -9
  242. package/src/lib/__tests__/env-values.test.ts +125 -0
  243. package/src/lib/__tests__/feed-path.test.ts +29 -0
  244. package/src/lib/__tests__/feed.test.ts +50 -22
  245. package/src/lib/__tests__/filter-dimensions.test.ts +22 -8
  246. package/src/lib/__tests__/post-list-cursor.test.ts +0 -10
  247. package/src/lib/__tests__/rate-limit.test.ts +22 -7
  248. package/src/lib/__tests__/resolve-config.test.ts +5 -3
  249. package/src/lib/__tests__/schemas.test.ts +72 -23
  250. package/src/lib/__tests__/slugify.test.ts +9 -0
  251. package/src/lib/__tests__/startup-config.test.ts +12 -0
  252. package/src/lib/__tests__/storage-s3.test.ts +214 -0
  253. package/src/lib/__tests__/theme.test.ts +20 -1
  254. package/src/lib/__tests__/time.test.ts +56 -0
  255. package/src/lib/__tests__/timeline.test.ts +46 -0
  256. package/src/lib/__tests__/url-fetch.test.ts +65 -1
  257. package/src/lib/__tests__/url.test.ts +60 -1
  258. package/src/lib/api-nav-items.ts +16 -20
  259. package/src/lib/api-post-input.ts +34 -1
  260. package/src/lib/api-posts.ts +125 -23
  261. package/src/lib/api-public-posts.ts +28 -37
  262. package/src/lib/api-search.ts +49 -2
  263. package/src/lib/api-settings.ts +159 -54
  264. package/src/lib/api-threads.ts +34 -11
  265. package/src/lib/constants.ts +6 -0
  266. package/src/lib/discover.ts +7 -23
  267. package/src/lib/env-values.ts +140 -0
  268. package/src/lib/env.ts +203 -12
  269. package/src/lib/feed-path.ts +8 -2
  270. package/src/lib/feed-policy.ts +110 -7
  271. package/src/lib/feed.ts +69 -25
  272. package/src/lib/filter-dimensions.ts +17 -10
  273. package/src/lib/github-sync-site-config.ts +1 -0
  274. package/src/lib/hugo-markdown.ts +5 -6
  275. package/src/lib/navigation.ts +4 -1
  276. package/src/lib/post-list-cursor.ts +33 -29
  277. package/src/lib/public-storage.ts +43 -0
  278. package/src/lib/rate-limit.ts +31 -16
  279. package/src/lib/render.tsx +5 -0
  280. package/src/lib/resolve-config.ts +16 -19
  281. package/src/lib/schemas.ts +248 -180
  282. package/src/lib/slugify.ts +6 -1
  283. package/src/lib/sse.ts +1 -1
  284. package/src/lib/startup-config.ts +20 -1
  285. package/src/lib/theme.ts +8 -5
  286. package/src/lib/thread-fold.ts +6 -0
  287. package/src/lib/thread-query.ts +19 -24
  288. package/src/lib/time.ts +137 -17
  289. package/src/lib/timeline.ts +56 -13
  290. package/src/lib/url-fetch.ts +141 -40
  291. package/src/lib/url.ts +86 -1
  292. package/src/middleware/__tests__/auth.test.ts +27 -0
  293. package/src/middleware/__tests__/cors.test.ts +54 -0
  294. package/src/middleware/__tests__/cross-origin.test.ts +149 -0
  295. package/src/middleware/__tests__/public-content-access.test.ts +2 -42
  296. package/src/middleware/auth.ts +34 -3
  297. package/src/middleware/cors.ts +4 -4
  298. package/src/middleware/cross-origin.ts +124 -0
  299. package/src/middleware/error-handler.ts +7 -0
  300. package/src/middleware/public-content-access.ts +3 -26
  301. package/src/middleware/secure-headers.ts +8 -2
  302. package/src/node/__tests__/cli-migrate.test.ts +2 -2
  303. package/src/node/__tests__/cli-runtime-target.test.ts +13 -2
  304. package/src/node/__tests__/cli-site-snapshot.test.ts +57 -0
  305. package/src/node/__tests__/cli-snapshot-meta.test.ts +11 -1
  306. package/src/node/__tests__/cli-sql-export.test.ts +25 -1
  307. package/src/node/__tests__/cli-start.test.ts +66 -0
  308. package/src/node/__tests__/request-handler.test.ts +37 -0
  309. package/src/node/__tests__/runtime.test.ts +56 -1
  310. package/src/node/request-handler.ts +58 -5
  311. package/src/node/runtime.ts +37 -11
  312. package/src/preset.css +3 -3
  313. package/src/routes/__tests__/compose.test.ts +84 -0
  314. package/src/routes/api/__tests__/collections.test.ts +68 -0
  315. package/src/routes/api/__tests__/mcp.test.ts +164 -9
  316. package/src/routes/api/__tests__/media.test.ts +9 -1
  317. package/src/routes/api/__tests__/nav-items.test.ts +27 -1
  318. package/src/routes/api/__tests__/posts.test.ts +269 -78
  319. package/src/routes/api/__tests__/search.test.ts +17 -4
  320. package/src/routes/api/__tests__/settings.test.ts +119 -85
  321. package/src/routes/api/__tests__/telegram.test.ts +11 -6
  322. package/src/routes/api/__tests__/threads.test.ts +11 -0
  323. package/src/routes/api/__tests__/upload-response.test.ts +48 -0
  324. package/src/routes/api/__tests__/uploads.test.ts +35 -2
  325. package/src/routes/api/collections.ts +3 -3
  326. package/src/routes/api/custom-urls.ts +2 -1
  327. package/src/routes/api/export.ts +1 -0
  328. package/src/routes/api/internal/__tests__/post-body-html.test.ts +19 -0
  329. package/src/routes/api/internal/__tests__/uploads.test.ts +2 -0
  330. package/src/routes/api/internal/sites.ts +16 -4
  331. package/src/routes/api/mcp.ts +1 -0
  332. package/src/routes/api/media.ts +7 -8
  333. package/src/routes/api/nav-items.ts +2 -1
  334. package/src/routes/api/posts.ts +18 -24
  335. package/src/routes/api/public/__tests__/posts.test.ts +15 -0
  336. package/src/routes/api/public/__tests__/threads-collections.test.ts +12 -45
  337. package/src/routes/api/public/__tests__/threads.test.ts +41 -9
  338. package/src/routes/api/public/posts.ts +2 -2
  339. package/src/routes/api/public/threads.ts +16 -26
  340. package/src/routes/api/search.ts +7 -41
  341. package/src/routes/api/settings.ts +32 -28
  342. package/src/routes/api/smart-collections.ts +6 -1
  343. package/src/routes/api/threads.ts +25 -26
  344. package/src/routes/api/upload.ts +6 -21
  345. package/src/routes/api/uploads.ts +14 -20
  346. package/src/routes/auth/__tests__/dev.test.ts +16 -13
  347. package/src/routes/auth/__tests__/hosted-sso.test.ts +51 -0
  348. package/src/routes/auth/__tests__/setup-auth.test.ts +2 -0
  349. package/src/routes/auth/__tests__/setup-discover.test.ts +2 -0
  350. package/src/routes/auth/__tests__/setup-flow.test.ts +32 -0
  351. package/src/routes/auth/__tests__/setup-rate-limit.test.ts +72 -0
  352. package/src/routes/auth/__tests__/setup-steps.test.ts +2 -0
  353. package/src/routes/auth/__tests__/signin.test.ts +167 -2
  354. package/src/routes/auth/dev.ts +4 -6
  355. package/src/routes/auth/hosted-sso.ts +9 -6
  356. package/src/routes/auth/setup.tsx +35 -5
  357. package/src/routes/auth/signin.tsx +96 -1
  358. package/src/routes/compose.tsx +47 -47
  359. package/src/routes/dash/__tests__/settings-avatar.test.ts +59 -4
  360. package/src/routes/dash/__tests__/settings-demo-locks.test.ts +147 -0
  361. package/src/routes/dash/custom-urls.tsx +2 -0
  362. package/src/routes/dash/settings.tsx +79 -32
  363. package/src/routes/feed/__tests__/feed.test.ts +93 -3
  364. package/src/routes/feed/__tests__/sitemap.test.ts +42 -0
  365. package/src/routes/feed/feed.ts +128 -175
  366. package/src/routes/feed/sitemap.ts +9 -7
  367. package/src/routes/pages/__tests__/archive-years.test.ts +45 -0
  368. package/src/routes/pages/__tests__/collection-routing.test.ts +40 -0
  369. package/src/routes/pages/__tests__/collections.test.ts +3 -0
  370. package/src/routes/pages/__tests__/language-routing.test.ts +31 -0
  371. package/src/routes/pages/__tests__/post-page-round-trips.test.ts +34 -2
  372. package/src/routes/pages/__tests__/search.test.ts +5 -2
  373. package/src/routes/pages/__tests__/thread-gap.test.ts +207 -0
  374. package/src/routes/pages/archive.tsx +33 -94
  375. package/src/routes/pages/brand.tsx +1 -0
  376. package/src/routes/pages/collection.tsx +13 -84
  377. package/src/routes/pages/collections.tsx +2 -0
  378. package/src/routes/pages/featured.tsx +7 -2
  379. package/src/routes/pages/home.tsx +1 -0
  380. package/src/routes/pages/latest.tsx +6 -2
  381. package/src/routes/pages/new.tsx +1 -0
  382. package/src/routes/pages/page.tsx +73 -47
  383. package/src/routes/pages/search.tsx +5 -3
  384. package/src/routes/pages/smart-collection.tsx +11 -70
  385. package/src/routes/pages/subscribe.tsx +1 -0
  386. package/src/routes/pages/theme-sample.tsx +1 -0
  387. package/src/runtime/__tests__/readiness.test.ts +16 -0
  388. package/src/runtime/cloudflare.ts +2 -3
  389. package/src/runtime/index.ts +3 -1
  390. package/src/runtime/node.ts +3 -5
  391. package/src/runtime/readiness.ts +5 -0
  392. package/src/services/__tests__/auth.test.ts +115 -0
  393. package/src/services/__tests__/collection.test.ts +9 -0
  394. package/src/services/__tests__/github-sync-webhook.test.ts +78 -0
  395. package/src/services/__tests__/hosted-handoff.test.ts +208 -1
  396. package/src/services/__tests__/media.test.ts +47 -27
  397. package/src/services/__tests__/navigation.test.ts +67 -15
  398. package/src/services/__tests__/post.test.ts +103 -56
  399. package/src/services/__tests__/search.test.ts +38 -0
  400. package/src/services/__tests__/settings.test.ts +2 -14
  401. package/src/services/__tests__/smart-collection.test.ts +2 -2
  402. package/src/services/__tests__/telegram-ingest.test.ts +113 -0
  403. package/src/services/__tests__/thread.test.ts +26 -11
  404. package/src/services/auth.ts +36 -4
  405. package/src/services/collection.ts +46 -5
  406. package/src/services/custom-url.ts +11 -4
  407. package/src/services/export-theme/assets/client-site.css +1 -1
  408. package/src/services/export-theme/assets/client-site.js +2 -2
  409. package/src/services/export-theme/layouts/_default/baseof.html +1 -1
  410. package/src/services/export-theme/layouts/collection/single.html +1 -1
  411. package/src/services/export-theme/layouts/partials/featured-thread.html +8 -1
  412. package/src/services/export-theme/layouts/partials/head.html +1 -1
  413. package/src/services/export-theme/layouts/partials/media-gallery.html +6 -3
  414. package/src/services/export-theme/layouts/smart_collection/list.html +1 -1
  415. package/src/services/export-theme/styles/main.css +3 -3
  416. package/src/services/export.ts +68 -19
  417. package/src/services/github-sync.ts +10 -10
  418. package/src/services/hosted-handoff.ts +106 -6
  419. package/src/services/index.ts +3 -1
  420. package/src/services/language.ts +33 -0
  421. package/src/services/mcp.ts +176 -438
  422. package/src/services/media.ts +69 -21
  423. package/src/services/navigation.ts +19 -4
  424. package/src/services/path.ts +45 -3
  425. package/src/services/post.ts +329 -214
  426. package/src/services/search.ts +22 -3
  427. package/src/services/settings.ts +36 -3
  428. package/src/services/site-admin.ts +1 -0
  429. package/src/services/smart-collection.ts +10 -3
  430. package/src/services/telegram.ts +23 -6
  431. package/src/services/thread.ts +11 -3
  432. package/src/services/upload-session.ts +14 -15
  433. package/src/styles/components.css +2 -2
  434. package/src/styles/site-media.css +2 -2
  435. package/src/styles/tokens.css +19 -22
  436. package/src/styles/ui-author.css +73 -94
  437. package/src/styles/ui.css +62 -62
  438. package/src/types/app-context.ts +5 -1
  439. package/src/types/bindings.ts +11 -0
  440. package/src/types/config.ts +4 -4
  441. package/src/types/constants.ts +20 -0
  442. package/src/types/props.ts +34 -8
  443. package/src/types/views.ts +28 -13
  444. package/src/ui/color-themes.ts +6 -5
  445. package/src/ui/dash/settings/GeneralContent.tsx +0 -22
  446. package/src/ui/dash/settings/__tests__/GeneralContent.test.tsx +0 -21
  447. package/src/ui/feed/CuratedThreadPreview.tsx +7 -2
  448. package/src/ui/feed/LinkCard.tsx +1 -2
  449. package/src/ui/feed/NoteCard.tsx +1 -2
  450. package/src/ui/feed/QuoteCard.tsx +2 -2
  451. package/src/ui/feed/ThreadPreview.tsx +6 -6
  452. package/src/ui/feed/TimelineFeed.tsx +1 -7
  453. package/src/ui/feed/__tests__/thread-preview.test.ts +123 -10
  454. package/src/ui/feed/__tests__/timeline-cards.test.ts +18 -1
  455. package/src/ui/layouts/BaseLayout.tsx +5 -0
  456. package/src/ui/pages/ArchivePage.tsx +1 -1
  457. package/src/ui/pages/BrandPage.tsx +1 -1
  458. package/src/ui/pages/CollectionPage.tsx +0 -1
  459. package/src/ui/pages/CollectionsPage.tsx +2 -2
  460. package/src/ui/pages/ComposePage.tsx +1 -1
  461. package/src/ui/pages/FeaturedPage.tsx +1 -1
  462. package/src/ui/pages/HomePage.tsx +1 -1
  463. package/src/ui/pages/PostPage.tsx +1 -1
  464. package/src/ui/pages/SearchPage.tsx +1 -1
  465. package/src/ui/pages/SmartCollectionPage.tsx +2 -3
  466. package/src/ui/pages/SubscribePage.tsx +1 -1
  467. package/src/ui/pages/ThemeSamplePage.tsx +1 -1
  468. package/src/ui/shared/MediaGallery.tsx +1 -1
  469. package/src/vendor/datastar.js +9 -1956
  470. package/src/vendor/datastar.js.map +4 -4
  471. package/dist/client/_assets/chunks/sortable-list-BJyd-LXE.js +0 -2
  472. package/dist/client/_assets/chunks/unsafe-svg-DU_DNMy5.js +0 -2
  473. package/dist/client/_assets/client-D4AT9Iqr.js +0 -295
  474. package/dist/client/_assets/client-DRuw7XCt.css +0 -2
  475. package/dist/client/_assets/client-author-DQ8R-8KR.css +0 -2
@@ -31,7 +31,7 @@ function formatUsage() {
31
31
  console.log(" --persist-to Local D1 state directory override");
32
32
  console.log("");
33
33
  console.log(
34
- "`.env.node` next to your project (or in packages/core/) is auto-loaded.",
34
+ "`.env` in the current directory is read, or the file JANT_ENV_FILE names.",
35
35
  );
36
36
  console.log(
37
37
  "If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
@@ -59,7 +59,7 @@ export async function run(argv) {
59
59
  console.log(" --persist-to Local D1 state directory override");
60
60
  console.log("");
61
61
  console.log(
62
- "`.env.node` next to your project (or in packages/core/) is auto-loaded.",
62
+ "`.env` in the current directory is read, or the file JANT_ENV_FILE names.",
63
63
  );
64
64
  console.log(
65
65
  "If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
@@ -229,7 +229,7 @@ export async function run(argv) {
229
229
  console.log(" --persist-to Local D1 state directory override");
230
230
  console.log("");
231
231
  console.log(
232
- "`.env.node` next to your project (or in packages/core/) is auto-loaded.",
232
+ "`.env` in the current directory is read, or the file JANT_ENV_FILE names.",
233
233
  );
234
234
  console.log(
235
235
  "If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
@@ -238,7 +238,7 @@ export async function run(argv) {
238
238
  process.exit(0);
239
239
  }
240
240
 
241
- // bootstrapCliRuntime auto-loads `.env.node` (so DATABASE_URL/DATA_DIR
241
+ // bootstrapCliRuntime loads the env file (so DATABASE_URL/DATA_DIR
242
242
  // resolve without sourcing the file) and prints a one-line banner with
243
243
  // the chosen target.
244
244
  const { runtime, envLoad } = bootstrapCliRuntime(values);
@@ -255,12 +255,12 @@ export async function run(argv) {
255
255
  const databaseUrlSource = nodeEnvLoadResult?.assignedKeys.includes(
256
256
  "DATABASE_URL",
257
257
  )
258
- ? ".env.node"
258
+ ? "env file"
259
259
  : process.env.DATABASE_URL
260
260
  ? "process.env"
261
261
  : "<unset>";
262
262
  const dataDirSource = nodeEnvLoadResult?.assignedKeys.includes("DATA_DIR")
263
- ? ".env.node"
263
+ ? "env file"
264
264
  : process.env.DATA_DIR
265
265
  ? "process.env"
266
266
  : "<unset>";
@@ -91,7 +91,7 @@ export async function run(argv) {
91
91
  console.log("Options:");
92
92
  console.log(" --url Target site or internal core URL");
93
93
  console.log(
94
- " --site Explicit managed site TypeID (host-based mode)",
94
+ " --site Managed site key or TypeID (host-based mode)",
95
95
  );
96
96
  console.log(
97
97
  ` --limit Batch size (default: ${DEFAULT_BATCH_SIZE}, max: ${MAX_BATCH_SIZE})`,
@@ -49,7 +49,7 @@ export async function run(argv) {
49
49
  console.log(" --persist-to Local D1 state directory override");
50
50
  console.log("");
51
51
  console.log(
52
- "`.env.node` next to your project (or in packages/core/) is auto-loaded.",
52
+ "`.env` in the current directory is read, or the file JANT_ENV_FILE names.",
53
53
  );
54
54
  console.log(
55
55
  "If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
@@ -72,7 +72,7 @@ export async function run(argv) {
72
72
  if (values.help) {
73
73
  console.log("Usage: jant search reindex [--url <url>] [options]");
74
74
  console.log("");
75
- console.log("Rebuild the search index for every non-deleted post by");
75
+ console.log("Rebuild the search index for every post by");
76
76
  console.log("recomputing `post.body_text` from the stored TipTap body.");
77
77
  console.log("Useful after changes to the text extraction logic — for");
78
78
  console.log("example, indexing link URLs from inline markdown links.");
@@ -43,9 +43,11 @@ function printHelp() {
43
43
  );
44
44
  console.log("");
45
45
  console.log(
46
- "Node runtime and SITE_RESOLUTION_MODE=single-site only. `.env.node` next to",
46
+ "Node runtime and SITE_RESOLUTION_MODE=single-site only. `.env` in",
47
+ );
48
+ console.log(
49
+ "the current directory is read, or the file JANT_ENV_FILE names.",
47
50
  );
48
- console.log("your project (or in packages/core/) is auto-loaded.");
49
51
  }
50
52
 
51
53
  /**
@@ -244,6 +244,9 @@ export async function run(argv) {
244
244
  pullStats = await pullSiteExportDirectory(workDir, {
245
245
  assetLoader: null,
246
246
  logger: logPullProgress,
247
+ // The site you named, even on 127.0.0.1: its own files are the
248
+ // export's to download.
249
+ siteOrigin: new URL(url).origin,
247
250
  });
248
251
  }
249
252
 
@@ -15,6 +15,7 @@ import {
15
15
  } from "../../lib/site-media-parser.js";
16
16
  import { parseFrontMatter as parseFrontMatterShared } from "../../lib/hugo-markdown.js";
17
17
  import { extractZipFile } from "../../lib/zip-archive.js";
18
+ import { fetchPublic, resolveInside } from "../../lib/import-sources.js";
18
19
  import { findPositionalUrl } from "../../lib/renamed-arguments.js";
19
20
 
20
21
  /**
@@ -28,7 +29,7 @@ const parseFrontMatter = parseFrontMatterShared;
28
29
  * writes `SITE_EXPORT_FORMAT_VERSION` from `src/services/export.ts`; a test
29
30
  * keeps the two equal.
30
31
  */
31
- export const SUPPORTED_SITE_EXPORT_VERSION = 1;
32
+ export const SUPPORTED_SITE_EXPORT_VERSION = 2;
32
33
 
33
34
  /**
34
35
  * Refuse an export written in a format newer than this importer reads.
@@ -181,7 +182,8 @@ async function resolveImportLocalAssetPath(rawUrl, siteConfig, sourceRootDir) {
181
182
  }
182
183
 
183
184
  for (const staticDir of IMPORT_STATIC_DIRS) {
184
- const fullPath = join(sourceRootDir, ...staticDir, pathname);
185
+ const fullPath = resolveInside(sourceRootDir, ...staticDir, pathname);
186
+ if (!fullPath) continue;
185
187
  const fileStat = await stat(fullPath).catch(() => null);
186
188
  if (fileStat?.isFile()) {
187
189
  return fullPath;
@@ -221,7 +223,7 @@ async function readImportAsset(options) {
221
223
  return null;
222
224
  }
223
225
 
224
- const response = await fetch(sourceUrl);
226
+ const response = await fetchPublic(sourceUrl);
225
227
  if (!response.ok) {
226
228
  return null;
227
229
  }
@@ -485,7 +487,9 @@ async function resolveJantMediaDiskPath(ref, sourceRootDir) {
485
487
  if (typeof ref !== "string" || !ref.trim()) return null;
486
488
  if (isAbsoluteUrl(ref)) return null;
487
489
  const normalized = ref.startsWith("/") ? ref.slice(1) : ref;
488
- const fullPath = join(sourceRootDir, "static", normalized);
490
+ // `src` comes from front matter, so it must not climb out of `static/`.
491
+ const fullPath = resolveInside(join(sourceRootDir, "static"), normalized);
492
+ if (!fullPath) return null;
489
493
  const fileStat = await stat(fullPath).catch(() => null);
490
494
  return fileStat?.isFile() ? fullPath : null;
491
495
  }
@@ -811,6 +815,10 @@ function coerceBoolean(value) {
811
815
  * site_footer, avatar urls, display preferences, and the ordered
812
816
  * collections directory under `[[directory]]`.
813
817
  *
818
+ * Where both carry a value, `data/jant.toml` wins: it records the site,
819
+ * while `hugo.toml` configures a Hugo build the author may have edited.
820
+ * `hugo.toml` fills in only for exports that predate `data/jant.toml`.
821
+ *
814
822
  * This merger normalizes them into a single shape that downstream helpers
815
823
  * (`buildSettingsUpdatesFromConfig`, `normalizeImportedNavItems`,
816
824
  * `normalizeImportedCollectionDirectory`, `buildSiteAvatarImport`) already
@@ -837,27 +845,32 @@ async function loadSiteConfig(rootDir) {
837
845
 
838
846
  const params = hugoToml.params ?? {};
839
847
 
840
- const title =
841
- (typeof hugoToml.title === "string" && hugoToml.title) ||
842
- (typeof jantData.site_name === "string" ? jantData.site_name : "");
843
- const description =
844
- (typeof params.description === "string" && params.description) ||
845
- (typeof jantData.site_description === "string"
846
- ? jantData.site_description
847
- : "");
848
+ // `data/jant.toml` is the export's record of the site; `hugo.toml` is the
849
+ // Hugo site's configuration, which the author may have edited to build it.
850
+ // Read jant.toml first, and hugo.toml only for exports that predate it.
851
+ const fromJantData = (jantKey, fallback) =>
852
+ typeof jantData[jantKey] === "string" ? jantData[jantKey] : fallback;
853
+ const title = fromJantData(
854
+ "site_name",
855
+ typeof hugoToml.title === "string" ? hugoToml.title : "",
856
+ );
857
+ const description = fromJantData(
858
+ "site_description",
859
+ typeof params.description === "string" ? params.description : "",
860
+ );
848
861
  const baseUrl =
849
862
  typeof hugoToml.baseURL === "string"
850
863
  ? hugoToml.baseURL
851
864
  : typeof hugoToml.baseurl === "string"
852
865
  ? hugoToml.baseurl
853
866
  : "";
854
- const language =
867
+ const language = fromJantData(
868
+ "site_language",
855
869
  (typeof hugoToml.languageCode === "string" && hugoToml.languageCode) ||
856
- (typeof hugoToml.defaultContentLanguage === "string" &&
857
- hugoToml.defaultContentLanguage) ||
858
- (typeof jantData.site_language === "string"
859
- ? jantData.site_language
860
- : "en");
870
+ (typeof hugoToml.defaultContentLanguage === "string" &&
871
+ hugoToml.defaultContentLanguage) ||
872
+ "en",
873
+ );
861
874
 
862
875
  const directoryItems = Array.isArray(jantData.directory)
863
876
  ? jantData.directory
@@ -872,49 +885,45 @@ async function loadSiteConfig(rootDir) {
872
885
  default_language: language,
873
886
  extra: {
874
887
  jant: {
875
- theme_id:
876
- (typeof params.theme_id === "string" && params.theme_id) ||
877
- (typeof jantData.theme_id === "string" ? jantData.theme_id : ""),
878
- default_theme_id:
879
- (typeof params.default_theme_id === "string" &&
880
- params.default_theme_id) ||
881
- (typeof jantData.default_theme_id === "string"
882
- ? jantData.default_theme_id
883
- : ""),
884
- font_theme_id:
885
- (typeof params.font_theme_id === "string" && params.font_theme_id) ||
886
- (typeof jantData.font_theme_id === "string"
887
- ? jantData.font_theme_id
888
- : ""),
889
- theme_mode:
890
- (typeof params.theme_mode === "string" && params.theme_mode) ||
891
- (typeof jantData.theme_mode === "string" ? jantData.theme_mode : ""),
888
+ theme_id: fromJantData("theme_id", String(params.theme_id ?? "")),
889
+ default_theme_id: fromJantData(
890
+ "default_theme_id",
891
+ String(params.default_theme_id ?? ""),
892
+ ),
893
+ font_theme_id: fromJantData(
894
+ "font_theme_id",
895
+ String(params.font_theme_id ?? ""),
896
+ ),
897
+ theme_mode: fromJantData("theme_mode", String(params.theme_mode ?? "")),
892
898
  show_jant_branding_on_home: coerceBoolean(
893
- params.show_jant_branding_on_home ??
894
- jantData.show_jant_branding_on_home,
899
+ jantData.show_jant_branding_on_home ??
900
+ params.show_jant_branding_on_home,
895
901
  ),
896
902
  show_header_avatar: coerceBoolean(
897
- params.show_header_avatar ?? jantData.show_header_avatar,
903
+ jantData.show_header_avatar ?? params.show_header_avatar,
904
+ ),
905
+ noindex: coerceBoolean(jantData.noindex ?? params.noindex),
906
+ public_api_enabled: coerceBoolean(
907
+ jantData.public_api_enabled ?? params.public_api_enabled ?? true,
908
+ ),
909
+ rss_feeds_enabled: coerceBoolean(
910
+ jantData.rss_feeds_enabled ?? params.rss_feeds_enabled ?? true,
898
911
  ),
899
- noindex: coerceBoolean(params.noindex ?? jantData.noindex),
900
- public_api_enabled:
901
- params.public_api_enabled === undefined &&
902
- jantData.public_api_enabled === undefined
903
- ? true
904
- : coerceBoolean(
905
- params.public_api_enabled ?? jantData.public_api_enabled,
906
- ),
907
- rss_feeds_enabled:
908
- params.rss_feeds_enabled === undefined &&
909
- jantData.rss_feeds_enabled === undefined
910
- ? true
911
- : coerceBoolean(
912
- params.rss_feeds_enabled ?? jantData.rss_feeds_enabled,
913
- ),
914
912
  site_footer_markdown:
915
913
  typeof jantData.site_footer_markdown === "string"
916
914
  ? jantData.site_footer_markdown
917
915
  : "",
916
+ time_zone:
917
+ typeof jantData.time_zone === "string" ? jantData.time_zone : "",
918
+ main_rss_feed:
919
+ typeof jantData.main_rss_feed === "string"
920
+ ? jantData.main_rss_feed
921
+ : "",
922
+ multilingual_enabled: coerceBoolean(jantData.multilingual_enabled),
923
+ additional_languages:
924
+ typeof jantData.additional_languages === "string"
925
+ ? jantData.additional_languages
926
+ : undefined,
918
927
  site_avatar_mode:
919
928
  typeof jantData.site_avatar_mode === "string"
920
929
  ? jantData.site_avatar_mode
@@ -958,6 +967,21 @@ async function loadSiteConfig(rootDir) {
958
967
  };
959
968
  }
960
969
 
970
+ /**
971
+ * A Collection's or Smart Collection's description from its section page:
972
+ * `description` since 1.0, `summary_text` before.
973
+ *
974
+ * @param {Record<string, unknown>} frontMatter - The section page's front matter
975
+ * @returns {string | undefined} The description, or undefined when blank
976
+ */
977
+ function readCollectionDescription(frontMatter) {
978
+ const value =
979
+ typeof frontMatter.description === "string"
980
+ ? frontMatter.description
981
+ : frontMatter.summary_text;
982
+ return typeof value === "string" && value.trim() ? value : undefined;
983
+ }
984
+
961
985
  function buildSettingsUpdatesFromConfig(siteConfig, customCss = "") {
962
986
  const jant = siteConfig?.extra?.jant || {};
963
987
  const themeId = String(jant.theme_id || "");
@@ -975,20 +999,33 @@ function buildSettingsUpdatesFromConfig(siteConfig, customCss = "") {
975
999
  NOINDEX: jant.noindex ? "true" : "false",
976
1000
  PUBLIC_API_ENABLED: jant.public_api_enabled === false ? "false" : "true",
977
1001
  RSS_FEEDS_ENABLED: jant.rss_feeds_enabled === false ? "false" : "true",
978
- SHOW_HEADER_AVATAR: jant.show_header_avatar ? "true" : "",
1002
+ SHOW_HEADER_AVATAR: jant.show_header_avatar ? "true" : "false",
979
1003
  THEME: themeId && themeId !== defaultThemeId ? themeId : "",
980
1004
  FONT_THEME: fontThemeId && fontThemeId !== "default" ? fontThemeId : "",
981
- THEME_MODE: themeMode === "light" || themeMode === "dark" ? themeMode : "",
1005
+ THEME_MODE:
1006
+ themeMode === "light" || themeMode === "dark" ? themeMode : "auto",
982
1007
  CUSTOM_CSS: customCss,
1008
+ ...(typeof jant.time_zone === "string" && jant.time_zone
1009
+ ? { TIME_ZONE: jant.time_zone }
1010
+ : {}),
1011
+ ...(jant.main_rss_feed === "latest" || jant.main_rss_feed === "featured"
1012
+ ? { MAIN_RSS_FEED: jant.main_rss_feed }
1013
+ : {}),
1014
+ // Restored by the server's language service, after SITE_LANGUAGE.
1015
+ ...(typeof jant.additional_languages === "string"
1016
+ ? {
1017
+ ADDITIONAL_LANGUAGES: jant.additional_languages,
1018
+ MULTILINGUAL_ENABLED: jant.multilingual_enabled ? "true" : "false",
1019
+ }
1020
+ : {}),
983
1021
  };
984
1022
  }
985
1023
 
986
1024
  /**
987
- * Internal config keys that the site importer restores via the dedicated
988
- * `/api/settings/import` route. Must stay in sync with
989
- * `importableInternalSettingKeys` in `src/lib/api-settings.ts`.
1025
+ * Appearance settings: `PUT /api/settings` takes them, and `appearanceSettingKeys`
1026
+ * in `src/lib/api-settings.ts` lists the same keys.
990
1027
  */
991
- const IMPORTABLE_INTERNAL_SETTING_KEYS = new Set([
1028
+ const APPEARANCE_SETTING_KEYS = new Set([
992
1029
  "THEME",
993
1030
  "FONT_THEME",
994
1031
  "THEME_MODE",
@@ -996,17 +1033,37 @@ const IMPORTABLE_INTERNAL_SETTING_KEYS = new Set([
996
1033
  "SHOW_HEADER_AVATAR",
997
1034
  ]);
998
1035
 
1036
+ /**
1037
+ * The site's languages, restored through `PUT /api/settings/import`, which
1038
+ * applies the language rules; `languageSettingKeys` lists the same keys.
1039
+ */
1040
+ const LANGUAGE_SETTING_KEYS = new Set([
1041
+ "MULTILINGUAL_ENABLED",
1042
+ "ADDITIONAL_LANGUAGES",
1043
+ ]);
1044
+
1045
+ /**
1046
+ * Sort an export's settings into the requests that restore them.
1047
+ *
1048
+ * Appearance goes in a request of its own so that a theme this Jant no longer
1049
+ * has costs the import its appearance only, not everything else.
1050
+ *
1051
+ * @param {Record<string, string>} updates - Settings read from the export
1052
+ * @returns {{ editable: Record<string, string>, appearance: Record<string, string>, languages: Record<string, string> }}
1053
+ * @example
1054
+ * splitSettingsUpdatesForImport({ SITE_NAME: "Blog", THEME: "paper" });
1055
+ * // { editable: { SITE_NAME: "Blog" }, appearance: { THEME: "paper" }, languages: {} }
1056
+ */
999
1057
  function splitSettingsUpdatesForImport(updates) {
1000
1058
  const editable = {};
1001
- const internal = {};
1059
+ const appearance = {};
1060
+ const languages = {};
1002
1061
  for (const [key, value] of Object.entries(updates)) {
1003
- if (IMPORTABLE_INTERNAL_SETTING_KEYS.has(key)) {
1004
- internal[key] = value;
1005
- } else {
1006
- editable[key] = value;
1007
- }
1062
+ if (APPEARANCE_SETTING_KEYS.has(key)) appearance[key] = value;
1063
+ else if (LANGUAGE_SETTING_KEYS.has(key)) languages[key] = value;
1064
+ else editable[key] = value;
1008
1065
  }
1009
- return { editable, internal };
1066
+ return { editable, appearance, languages };
1010
1067
  }
1011
1068
 
1012
1069
  const NAV_PLACEMENTS = new Set(["header", "more"]);
@@ -1241,9 +1298,8 @@ function buildSmartCollectionCreateRequest(bundle, collectionSlugToId) {
1241
1298
  payload: {
1242
1299
  slug: bundle.slug,
1243
1300
  title,
1244
- ...(typeof frontMatter.summary_text === "string" &&
1245
- frontMatter.summary_text.trim()
1246
- ? { description: frontMatter.summary_text }
1301
+ ...(readCollectionDescription(frontMatter)
1302
+ ? { description: readCollectionDescription(frontMatter) }
1247
1303
  : {}),
1248
1304
  selection,
1249
1305
  // `sortOrder` since 0.10, `sort` before: a site on either version
@@ -1622,7 +1678,7 @@ function createRemoteTarget(apiUrl, token) {
1622
1678
  async updateSettings(updates) {
1623
1679
  return apiCall("PUT", "/api/settings", apiUrl, token, updates);
1624
1680
  },
1625
- async updateImportSettings(updates) {
1681
+ async restoreLanguages(updates) {
1626
1682
  return apiCall("PUT", "/api/settings/import", apiUrl, token, updates);
1627
1683
  },
1628
1684
  async listNavItems() {
@@ -1776,10 +1832,10 @@ function createRemoteTarget(apiUrl, token) {
1776
1832
  { postId: otherPostId },
1777
1833
  );
1778
1834
  },
1779
- async createAlias(path, targetSlug) {
1835
+ async createAlias(path, targetSlug, targetType = "post") {
1780
1836
  return apiCall("POST", "/api/custom-urls", apiUrl, token, {
1781
1837
  path,
1782
- targetType: "post",
1838
+ targetType,
1783
1839
  targetId: targetSlug,
1784
1840
  });
1785
1841
  },
@@ -2312,7 +2368,7 @@ function printImportUsage() {
2312
2368
  console.log("Options:");
2313
2369
  console.log(" --url Jant site URL (required)");
2314
2370
  console.log(
2315
- " --path Path to export directory or ZIP file (default: .)",
2371
+ " --path Path to export directory or ZIP file (default: jant-site-export.zip)",
2316
2372
  );
2317
2373
  console.log(" --dry-run Parse and validate without making API calls");
2318
2374
  console.log(
@@ -2346,7 +2402,8 @@ export async function run(argv) {
2346
2402
  options: {
2347
2403
  url: { type: "string" },
2348
2404
  token: { type: "string" },
2349
- path: { type: "string", default: "." },
2405
+ // What `site export` writes when given no --output.
2406
+ path: { type: "string", default: "jant-site-export.zip" },
2350
2407
  "dry-run": { type: "boolean", default: false },
2351
2408
  "skip-remote-media": { type: "boolean", default: false },
2352
2409
  help: { type: "boolean", short: "h" },
@@ -2479,7 +2536,7 @@ export async function run(argv) {
2479
2536
  }
2480
2537
  }
2481
2538
  } else {
2482
- const { editable, internal } =
2539
+ const { editable, appearance, languages } =
2483
2540
  splitSettingsUpdatesForImport(settingsUpdates);
2484
2541
  try {
2485
2542
  const result = await target.updateSettings(editable);
@@ -2495,17 +2552,22 @@ export async function run(argv) {
2495
2552
  process.exit(1);
2496
2553
  }
2497
2554
 
2498
- if (Object.keys(internal).length > 0) {
2555
+ if (Object.keys(appearance).length > 0) {
2499
2556
  try {
2500
- const result = await target.updateImportSettings(internal);
2501
- if (result?.rejectedKeys?.length) {
2502
- console.warn(
2503
- `Warning: Some internal site settings were rejected: ${result.rejectedKeys.join(", ")}`,
2504
- );
2505
- }
2557
+ await target.updateSettings(appearance);
2558
+ } catch (err) {
2559
+ console.warn(
2560
+ `Warning: kept this site's theme, fonts, and custom CSS: ${err.message}`,
2561
+ );
2562
+ }
2563
+ }
2564
+
2565
+ if (Object.keys(languages).length > 0) {
2566
+ try {
2567
+ await target.restoreLanguages(languages);
2506
2568
  } catch (err) {
2507
2569
  console.error(
2508
- `Error applying exported internal site settings: ${err.message}`,
2570
+ `Error restoring the site's languages: ${err.message}`,
2509
2571
  );
2510
2572
  process.exit(1);
2511
2573
  }
@@ -2531,6 +2593,9 @@ export async function run(argv) {
2531
2593
 
2532
2594
  // 3. Fetch existing collections and create missing ones
2533
2595
  const collectionSlugToId = new Map();
2596
+ // Custom URLs recreated, for collections here and for posts in step 4.
2597
+ let aliasesCreated = 0;
2598
+ let aliasesSkipped = 0;
2534
2599
  // Root posts by slug, for navigation entries that point at a page.
2535
2600
  const postSlugToId = new Map();
2536
2601
 
@@ -2568,10 +2633,7 @@ export async function run(argv) {
2568
2633
  const result = await target.createCollection({
2569
2634
  title: bundle.frontMatter.title || slug,
2570
2635
  slug,
2571
- description:
2572
- typeof bundle.frontMatter.summary_text === "string"
2573
- ? bundle.frontMatter.summary_text
2574
- : undefined,
2636
+ description: readCollectionDescription(bundle.frontMatter),
2575
2637
  sortOrder:
2576
2638
  typeof bundle.frontMatter.sort_order === "string"
2577
2639
  ? bundle.frontMatter.sort_order
@@ -2583,6 +2645,24 @@ export async function run(argv) {
2583
2645
  console.error(`Error creating collection "${slug}": ${err.message}`);
2584
2646
  process.exit(1);
2585
2647
  }
2648
+
2649
+ // Custom URLs that name the collection.
2650
+ const collectionAliases = Array.isArray(bundle.frontMatter.aliases)
2651
+ ? bundle.frontMatter.aliases.filter(
2652
+ (alias) => typeof alias === "string" && alias.trim(),
2653
+ )
2654
+ : [];
2655
+ for (const alias of collectionAliases) {
2656
+ try {
2657
+ await target.createAlias(alias, slug, "collection");
2658
+ aliasesCreated++;
2659
+ } catch (err) {
2660
+ aliasesSkipped++;
2661
+ console.warn(
2662
+ `Warning: couldn't add ${alias} for collection /${slug}: ${err.message}`,
2663
+ );
2664
+ }
2665
+ }
2586
2666
  }
2587
2667
 
2588
2668
  // Smart collections after collections, which their conditions may name.
@@ -2665,7 +2745,6 @@ export async function run(argv) {
2665
2745
  let postsCreated = 0;
2666
2746
  let repliesCreated = 0;
2667
2747
  let mediaUploaded = 0;
2668
- let aliasesCreated = 0;
2669
2748
 
2670
2749
  for (const rootBundle of rootBundles) {
2671
2750
  const { frontMatter: rootFm } = rootBundle;
@@ -2960,15 +3039,18 @@ export async function run(argv) {
2960
3039
  rootTargetSlug,
2961
3040
  replySlugPaths,
2962
3041
  );
3042
+ // An address an earlier release allowed can be one this release
3043
+ // refuses, such as `/~me`. The post is in already; losing one old way
3044
+ // in is better than stopping with the site half imported.
2963
3045
  for (const aliasPath of aliasPaths) {
2964
3046
  try {
2965
3047
  await target.createAlias(aliasPath, rootTargetSlug);
2966
3048
  aliasesCreated++;
2967
3049
  } catch (err) {
2968
- console.error(
2969
- `Error creating alias "${aliasPath}" for "${postLabel}": ${err.message}`,
3050
+ aliasesSkipped++;
3051
+ console.warn(
3052
+ `Warning: couldn't add ${aliasPath} for "${postLabel}": ${err.message}`,
2970
3053
  );
2971
- process.exit(1);
2972
3054
  }
2973
3055
  }
2974
3056
  }
@@ -3066,6 +3148,11 @@ export async function run(argv) {
3066
3148
  if (aliasesCreated > 0) {
3067
3149
  console.log(` Aliases created: ${aliasesCreated}`);
3068
3150
  }
3151
+ if (aliasesSkipped > 0) {
3152
+ console.log(
3153
+ ` Aliases skipped: ${aliasesSkipped} (see the warnings above)`,
3154
+ );
3155
+ }
3069
3156
  if (customUrlsCreated > 0) {
3070
3157
  console.log(` Redirects created: ${customUrlsCreated}`);
3071
3158
  }
@@ -56,8 +56,9 @@ export async function run(argv) {
56
56
  args: argv,
57
57
  options: {
58
58
  help: { type: "boolean", short: "h" },
59
+ // What `site export` writes when given no --output.
59
60
  path: { type: "string", default: "jant-site-export.zip" },
60
- output: { type: "string" },
61
+ output: { type: "string", short: "o" },
61
62
  },
62
63
  });
63
64
 
@@ -71,7 +72,7 @@ export async function run(argv) {
71
72
  " --path Path to an export ZIP or directory (default: jant-site-export.zip)",
72
73
  );
73
74
  console.log(
74
- " --output Output ZIP path when --path points to a ZIP (default: overwrite input)",
75
+ " --output, -o Output ZIP path when --path points to a ZIP (default: overwrite input)",
75
76
  );
76
77
  process.exit(0);
77
78
  }
@@ -16,6 +16,7 @@ import {
16
16
  import {
17
17
  buildSnapshotMeta,
18
18
  buildSnapshotStorageQuery,
19
+ SNAPSHOT_CONFLICT_CLAUSES,
19
20
  collectSnapshotObjects,
20
21
  getSnapshotSelectSql,
21
22
  orderSnapshotPostRows,
@@ -207,7 +208,7 @@ export async function run(argv) {
207
208
  console.log(" on import.");
208
209
  console.log("");
209
210
  console.log(
210
- "`.env.node` next to your project (or in packages/core/) is auto-loaded.",
211
+ "`.env` in the current directory is read, or the file JANT_ENV_FILE names.",
211
212
  );
212
213
  console.log(
213
214
  "If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
@@ -256,6 +257,7 @@ export async function run(argv) {
256
257
  // D1 answers through Wrangler's buffered output; read it in pages.
257
258
  pageSize: runtime === "node" ? undefined : D1_DUMP_PAGE_SIZE,
258
259
  orderRowsByTable: { post: orderSnapshotPostRows },
260
+ conflictClauseByTable: SNAPSHOT_CONFLICT_CLAUSES,
259
261
  tables: SNAPSHOT_TABLES,
260
262
  selectSqlByTable: Object.fromEntries(
261
263
  SNAPSHOT_TABLES.map((tableName) => [
@@ -240,7 +240,7 @@ export async function run(argv) {
240
240
  console.log(" missing key list.");
241
241
  console.log("");
242
242
  console.log(
243
- "`.env.node` next to your project (or in packages/core/) is auto-loaded.",
243
+ "`.env` in the current directory is read, or the file JANT_ENV_FILE names.",
244
244
  );
245
245
  console.log(
246
246
  "If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
@@ -398,7 +398,8 @@ export async function run(argv) {
398
398
 
399
399
  await context.execute(
400
400
  [
401
- ...(context.dialect === "postgres" ? [] : [DEFER_FOREIGN_KEYS_SQL]),
401
+ // The PRAGMA is SQLite's. Node reports Postgres as "pg".
402
+ ...(context.dialect === "pg" ? [] : [DEFER_FOREIGN_KEYS_SQL]),
402
403
  buildReplaceSql(targetSite.id),
403
404
  dbSql,
404
405
  buildMediaProviderSql(targetSite.id, context.storageProvider),