@jant/core 0.7.0 → 0.8.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/assets/prepare.js +3 -3
- package/bin/commands/db/export.js +115 -2
- package/bin/commands/deploy.js +11 -3
- package/bin/commands/{search-reindex.js → search/reindex.js} +5 -5
- package/bin/commands/setup.js +136 -0
- package/bin/commands/site/export.js +117 -68
- package/bin/commands/site/import.js +3074 -2
- package/bin/commands/site/pull-media.js +2 -6
- package/bin/commands/site/snapshot/export.js +18 -60
- package/bin/commands/site/snapshot/import.js +24 -23
- package/bin/commands/telegram/register-webhooks.js +48 -23
- package/bin/jant.js +16 -11
- package/bin/lib/command-registry.js +120 -0
- package/bin/lib/d1-query.js +87 -2
- package/bin/lib/hugo-markdown.js +4 -0
- package/bin/lib/migration-artifacts.js +19 -0
- package/bin/lib/renamed-arguments.js +56 -0
- package/bin/lib/site-pull-media.js +21 -28
- package/bin/lib/site-selection.js +10 -1
- package/bin/lib/site-snapshot.js +421 -4
- package/bin/lib/sql-export.js +68 -5
- package/bin/lib/wrangler-cli.js +9 -0
- package/bin/lib/zip-archive.js +187 -0
- package/dist/{app-K_Aa1MMn.js → app-CFsmRVJN.js} +8629 -697
- package/dist/client/.vite/manifest.json +20 -20
- package/dist/client/_assets/chunks/{create-editor-CD3FhrOB.js → create-editor-B-m7X7S5.js} +50 -46
- package/dist/client/_assets/chunks/{sortable-list-CgaL2jCs.js → sortable-list-BJyd-LXE.js} +1 -1
- package/dist/client/_assets/chunks/{unsafe-svg-0QCkP0vZ.js → unsafe-svg-BkscJx69.js} +2 -2
- package/dist/client/_assets/{client-GiYENVw8.css → client-BCumu1-D.css} +1 -1
- package/dist/client/_assets/{client-VnFxJN7G.js → client-DTLBOHqD.js} +1 -1
- package/dist/client/_assets/{client-auth-k8gJ6QJj.js → client-auth-D6Ix6SmE.js} +1 -1
- package/dist/client/_assets/{client-compose-B_kDtWkW.js → client-compose-D6rExKVK.js} +1 -1
- package/dist/client/_assets/{client-manage-M90aSTOk.js → client-manage-sVOkqVbH.js} +1 -1
- package/dist/client/_assets/{client-settings-DfYs9n1F.js → client-settings-CGR_nZ78.js} +7 -7
- package/dist/index.js +2 -3
- package/dist/node.js +8 -5
- package/dist/url-CKlGzvdN.js +428 -0
- package/package.json +13 -7
- package/src/__tests__/cli-commands.test.ts +144 -0
- package/src/__tests__/config-docs.test.ts +148 -0
- package/src/__tests__/dev-scripts.test.ts +203 -0
- package/src/__tests__/export-collection-order.test.ts +276 -0
- package/src/__tests__/export-feed-ids.test.ts +184 -0
- package/src/__tests__/export-feed-order.test.ts +294 -0
- package/src/__tests__/export-hugo-build.test.ts +130 -0
- package/src/__tests__/export-import-roundtrip.test.ts +95 -1
- package/src/__tests__/export-service.test.ts +611 -28
- package/src/__tests__/export-smart-collection.test.ts +329 -0
- package/src/__tests__/feed-docs.test.ts +36 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/README.md +89 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/0x4nv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/archive/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/bought-too-many-lemons-again/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/city-walks/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/collections/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/current-tea-rotation/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/desk-but-better/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/e0kcg/_index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/featured/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-basho/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-epictetus/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-marcus-aurelius/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-seneca/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-thoreau/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/2cl6d/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/5oxsv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/home-cooking/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/a83qu/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/c91j0/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/qyucy/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/wsgck/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +43 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/reading-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/cxiu6/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/t77ms/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/telk3/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/telk3/from-thoreau-pawt2/index.md +17 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/tiny-projects/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/useful-links/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/weekend-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +49 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/data/jant.toml +119 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/hugo.toml +43 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/021801c20ab3-med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/0f868ce9ac84-med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/50c2ad911bad-med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/7a91f0960491-med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/8714116d3c8e-med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/8a0b4277443f-med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/a7d1c8a1afd9-med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/e25570b405f5-med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/e89ea4eabf01-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/snapshot/db.sql +218 -0
- package/src/__tests__/fixtures/releases/0.7.0/snapshot/meta.json +9 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/README.md +89 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/0x4nv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/archive/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/bought-too-many-lemons-again/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/city-walks/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/collections/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/current-tea-rotation/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/desk-but-better/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/e0kcg/_index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/featured/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-basho/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-epictetus/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-marcus-aurelius/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-seneca/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-thoreau/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/2cl6d/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/5oxsv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/home-cooking/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/a83qu/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/from-seneca-5hibo/index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/mynoise-for-rainy-afternoons/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/nts-archives-are-good-cleaning-music/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/c91j0/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/qyucy/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/wsgck/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +43 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/reading-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/cxiu6/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/t77ms/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/the-soup-trick-i-always-forget/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/telk3/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/telk3/from-thoreau-pawt2/index.md +17 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/tiny-projects/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/useful-links/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/weekend-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/what-i-actually-use-my-notebook-for/_index.md +49 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/data/jant.toml +119 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/hugo.toml +43 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/021801c20ab3-med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/0f868ce9ac84-med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/50c2ad911bad-med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/7a91f0960491-med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/8714116d3c8e-med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/8a0b4277443f-med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/a7d1c8a1afd9-med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/e25570b405f5-med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/e89ea4eabf01-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.7.1/snapshot/meta.json +9 -0
- package/src/__tests__/helpers/hugo-site.ts +146 -0
- package/src/__tests__/helpers/site-export-import.ts +97 -0
- package/src/__tests__/import-site-command.test.ts +514 -2
- package/src/__tests__/mise-config.test.ts +75 -4
- package/src/__tests__/node-dev-tasks.test.ts +264 -0
- package/src/__tests__/release-fixtures.test.ts +132 -0
- package/src/__tests__/site-export-canonical-import.test.ts +113 -0
- package/src/__tests__/snapshot-canonical-replay.test.ts +179 -0
- package/src/__tests__/snapshot-settings.test.ts +97 -0
- package/src/__tests__/snapshot-tables.test.ts +219 -0
- package/src/__tests__/sql-export.test.ts +173 -0
- package/src/__tests__/theme-docs.test.ts +109 -0
- package/src/__tests__/zip-archive.test.ts +106 -0
- package/src/app.tsx +16 -11
- package/src/client/components/__tests__/jant-settings-avatar.test.ts +1 -1
- package/src/client/components/__tests__/jant-settings-general.test.ts +21 -1
- package/src/client/components/jant-repo-picker-types.ts +6 -1
- package/src/client/components/jant-repo-picker.ts +4 -7
- package/src/client/components/jant-settings-general.ts +17 -12
- package/src/client/tiptap/__tests__/list-editing.test.ts +224 -86
- package/src/client/tiptap/__tests__/mark-exit.test.ts +1 -2
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +26 -0
- package/src/client/tiptap/extensions.ts +0 -3
- package/src/client/tiptap/structural-keymap.ts +158 -47
- package/src/db/__tests__/d1-query.test.ts +56 -1
- package/src/db/rehearsal-fixtures/pg-demo-current.json +55 -0
- package/src/db/rehearsal-fixtures/pg-demo-current.sql +431 -0
- package/src/i18n/locales/public/en.po +0 -2
- package/src/i18n/locales/public/zh-Hans.po +0 -2
- package/src/i18n/locales/public/zh-Hant.po +0 -2
- package/src/i18n/locales/settings/en.po +8 -8
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +8 -8
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +8 -8
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/index.ts +6 -77
- package/src/lib/__tests__/github-sync-repo-name.test.ts +40 -0
- package/src/lib/__tests__/image.test.ts +27 -1
- package/src/lib/__tests__/markdown-to-tiptap.test.ts +105 -0
- package/src/lib/__tests__/markdown.test.ts +10 -0
- package/src/lib/__tests__/resolve-config.test.ts +67 -0
- package/src/lib/__tests__/schemas.test.ts +27 -1
- package/src/lib/__tests__/timeline.test.ts +87 -0
- package/src/lib/__tests__/tiptap-to-markdown.test.ts +172 -4
- package/src/lib/__tests__/view.test.ts +0 -46
- package/src/lib/discover.ts +3 -1
- package/src/lib/feed.ts +0 -6
- package/src/lib/github-sync-repo-name.ts +45 -0
- package/src/lib/hugo-markdown.ts +46 -0
- package/src/lib/image.ts +17 -4
- package/src/lib/markdown-manager.ts +392 -2
- package/src/lib/post-body-html.ts +11 -4
- package/src/lib/resolve-config.ts +58 -1
- package/src/lib/schemas.ts +50 -5
- package/src/lib/thread-fold.ts +3 -3
- package/src/lib/timeline.ts +1 -1
- package/src/lib/tiptap-to-markdown.ts +13 -7
- package/src/lib/url.ts +20 -0
- package/src/lib/view.ts +2 -29
- package/src/node/__tests__/cli-export.test.ts +2 -2
- package/src/node/__tests__/cli-setup.test.ts +163 -0
- package/src/node/__tests__/cli-site-snapshot.test.ts +73 -0
- package/src/node/__tests__/cli-site-token-env.test.ts +4 -1
- package/src/node/__tests__/cli-snapshot-meta.test.ts +84 -0
- package/src/node/__tests__/runtime.test.ts +38 -0
- package/src/node/index.ts +2 -0
- package/src/node/request-handler.ts +3 -1
- package/src/routes/api/__tests__/posts.test.ts +24 -0
- package/src/routes/api/__tests__/upload.test.ts +34 -0
- package/src/routes/api/export.ts +3 -3
- package/src/routes/api/internal/search-reindex.ts +1 -1
- package/src/routes/api/internal/sites.ts +0 -1
- package/src/routes/api/posts.ts +2 -0
- package/src/routes/api/public/posts.ts +21 -1
- package/src/routes/api/upload.ts +10 -3
- package/src/routes/compose.tsx +4 -0
- package/src/routes/dash/__tests__/github-sync-app.test.ts +365 -0
- package/src/routes/dash/settings.tsx +212 -70
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +211 -0
- package/src/routes/pages/__tests__/thread-order.test.ts +179 -0
- package/src/routes/pages/archive.tsx +17 -11
- package/src/routes/pages/featured.tsx +11 -5
- package/src/routes/pages/page.tsx +53 -31
- package/src/routes/pages/search.tsx +4 -2
- package/src/runtime/__tests__/readiness.test.ts +23 -0
- package/src/runtime/node.ts +49 -0
- package/src/runtime/readiness.ts +15 -0
- package/src/services/__tests__/bootstrap-setup-instance.test.ts +230 -0
- package/src/services/__tests__/custom-url.test.ts +34 -0
- package/src/services/__tests__/github-app-installations.test.ts +153 -0
- package/src/services/__tests__/github-sync-push.test.ts +46 -0
- package/src/services/__tests__/media.test.ts +31 -271
- package/src/services/__tests__/path.test.ts +56 -0
- package/src/services/__tests__/post-timeline.test.ts +127 -0
- package/src/services/__tests__/post.test.ts +74 -0
- package/src/services/bootstrap.ts +263 -44
- package/src/services/custom-url.ts +2 -2
- package/src/services/export-theme/layouts/_default/alias.html +27 -1
- package/src/services/export-theme/layouts/_default/list.html +2 -63
- package/src/services/export-theme/layouts/_default/rss.xml +27 -38
- package/src/services/export-theme/layouts/collections/list.html +3 -3
- package/src/services/export-theme/layouts/featured/list.html +1 -4
- package/src/services/export-theme/layouts/index.html +40 -26
- package/src/services/export-theme/layouts/partials/collection-members.html +100 -0
- package/src/services/export-theme/layouts/partials/collection-threads.html +33 -0
- package/src/services/export-theme/layouts/partials/featured-members.html +35 -0
- package/src/services/export-theme/layouts/partials/featured-thread.html +1 -1
- package/src/services/export-theme/layouts/partials/footer.html +1 -1
- package/src/services/export-theme/layouts/partials/head.html +1 -1
- package/src/services/export-theme/layouts/partials/header.html +5 -3
- package/src/services/export-theme/layouts/partials/jant-data.html +23 -0
- package/src/services/export-theme/layouts/partials/latest-members.html +48 -0
- package/src/services/export-theme/layouts/partials/smart-collection-members.html +129 -0
- package/src/services/export-theme/layouts/partials/thread-preview.html +1 -1
- package/src/services/export-theme/layouts/post/list.html +1 -1
- package/src/services/export-theme/layouts/smart_collection/list.html +24 -0
- package/src/services/export-theme/styles/main.css +0 -1
- package/src/services/export-theme/theme.toml +1 -1
- package/src/services/export.ts +630 -73
- package/src/services/github-app-installations.ts +171 -4
- package/src/services/github-sync.ts +69 -15
- package/src/services/mcp.ts +19 -1
- package/src/services/media.ts +9 -220
- package/src/services/path.ts +34 -1
- package/src/services/post.ts +214 -39
- package/src/services/site-admin.ts +3 -7
- package/src/services/site.ts +83 -31
- package/src/styles/ui.css +7 -119
- package/src/types/app-context.ts +16 -0
- package/src/types/bindings.ts +5 -0
- package/src/types/operations.ts +10 -0
- package/src/ui/dash/settings/GeneralContent.tsx +10 -8
- package/bin/commands/export.js +0 -118
- package/bin/commands/import-site.js +0 -2561
- package/bin/commands/migrate-text-attachments.js +0 -181
- package/dist/github-sync-BPAvT999.js +0 -7709
- package/src/client/multipart-upload.ts +0 -206
- package/src/client/tiptap/exitable-marks.ts +0 -73
- package/src/routes/api/__tests__/upload-multipart.test.ts +0 -739
- package/src/routes/api/internal/text-attachments.ts +0 -60
- package/src/routes/api/upload-multipart.ts +0 -366
|
@@ -15,7 +15,7 @@ export async function run(argv) {
|
|
|
15
15
|
config: { type: "string", short: "c", default: DEFAULT_CONFIG_PATH },
|
|
16
16
|
env: { type: "string", short: "e" },
|
|
17
17
|
output: { type: "string", short: "o", default: DEFAULT_PUBLISH_DIR },
|
|
18
|
-
"
|
|
18
|
+
"path-prefix": { type: "string" },
|
|
19
19
|
},
|
|
20
20
|
});
|
|
21
21
|
|
|
@@ -35,7 +35,7 @@ export async function run(argv) {
|
|
|
35
35
|
` -o, --output <path> Output directory (default: ${DEFAULT_PUBLISH_DIR})`,
|
|
36
36
|
);
|
|
37
37
|
console.log(
|
|
38
|
-
" --
|
|
38
|
+
" --path-prefix <path> Override SITE_PATH_PREFIX instead of reading config",
|
|
39
39
|
);
|
|
40
40
|
process.exit(0);
|
|
41
41
|
}
|
|
@@ -43,7 +43,7 @@ export async function run(argv) {
|
|
|
43
43
|
const sitePathPrefix = resolveSitePathPrefix({
|
|
44
44
|
config: values.config,
|
|
45
45
|
env: values.env,
|
|
46
|
-
sitePathPrefix: values["
|
|
46
|
+
sitePathPrefix: values["path-prefix"],
|
|
47
47
|
});
|
|
48
48
|
const prepared = await preparePublicAssets({
|
|
49
49
|
outputDir: values.output,
|
|
@@ -1,5 +1,118 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { writeFileSync } from "node:fs";
|
|
2
|
+
import { resolve } from "node:path";
|
|
3
|
+
import { parseArgs } from "node:util";
|
|
4
|
+
import { D1_DUMP_PAGE_SIZE, queryD1 } from "../../lib/d1-query.js";
|
|
5
|
+
import { openNodeDatabase } from "../../lib/node-database.js";
|
|
6
|
+
import { dumpDatabaseToSql } from "../../lib/sql-export.js";
|
|
7
|
+
import {
|
|
8
|
+
bootstrapCliRuntime,
|
|
9
|
+
getCliRuntimeLabel,
|
|
10
|
+
} from "../../lib/runtime-target.js";
|
|
11
|
+
|
|
12
|
+
function createD1QueryRunner(runtime) {
|
|
13
|
+
return {
|
|
14
|
+
async query(sql, options) {
|
|
15
|
+
return queryD1(sql, runtime, options);
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
}
|
|
2
19
|
|
|
3
20
|
export async function run(argv) {
|
|
4
|
-
|
|
21
|
+
const { values } = parseArgs({
|
|
22
|
+
args: argv,
|
|
23
|
+
options: {
|
|
24
|
+
config: { type: "string" },
|
|
25
|
+
database: { type: "string", default: "DB" },
|
|
26
|
+
env: { type: "string" },
|
|
27
|
+
local: { type: "boolean", default: false },
|
|
28
|
+
node: { type: "boolean", default: false },
|
|
29
|
+
remote: { type: "boolean", default: false },
|
|
30
|
+
output: { type: "string", short: "o", default: "jant-export.sql" },
|
|
31
|
+
help: { type: "boolean", short: "h" },
|
|
32
|
+
"persist-to": { type: "string" },
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
if (values.help) {
|
|
37
|
+
console.log(
|
|
38
|
+
"Usage: jant db export [--local | --remote | --node] [--output <file>] [--config <file>] [--env <name>] [--database <binding>]",
|
|
39
|
+
);
|
|
40
|
+
console.log("");
|
|
41
|
+
console.log("Export the current database to a SQL file.");
|
|
42
|
+
console.log("");
|
|
43
|
+
console.log("Options:");
|
|
44
|
+
console.log(" --local Force local D1 instead of DATABASE_URL");
|
|
45
|
+
console.log(
|
|
46
|
+
" --remote Export from remote D1 database (default: local)",
|
|
47
|
+
);
|
|
48
|
+
console.log(
|
|
49
|
+
" --node Force Node runtime even if DATABASE_URL is unset",
|
|
50
|
+
);
|
|
51
|
+
console.log(
|
|
52
|
+
" --output, -o Output file path (default: jant-export.sql)",
|
|
53
|
+
);
|
|
54
|
+
console.log(
|
|
55
|
+
" --config Wrangler config file (default: wrangler.toml)",
|
|
56
|
+
);
|
|
57
|
+
console.log(" --env Wrangler environment name");
|
|
58
|
+
console.log(" --database D1 binding name (default: DB)");
|
|
59
|
+
console.log(" --persist-to Local D1 state directory override");
|
|
60
|
+
console.log("");
|
|
61
|
+
console.log(
|
|
62
|
+
"`.env.node` next to your project (or in packages/core/) is auto-loaded.",
|
|
63
|
+
);
|
|
64
|
+
console.log(
|
|
65
|
+
"If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
|
|
66
|
+
);
|
|
67
|
+
console.log("this command uses the Node database runtime.");
|
|
68
|
+
process.exit(0);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
const { runtime } = bootstrapCliRuntime(values);
|
|
72
|
+
const output = values.output;
|
|
73
|
+
let sql;
|
|
74
|
+
|
|
75
|
+
if (runtime === "node") {
|
|
76
|
+
const nodeDatabase = await openNodeDatabase(process.env);
|
|
77
|
+
try {
|
|
78
|
+
sql = await dumpDatabaseToSql(
|
|
79
|
+
{
|
|
80
|
+
async query(statement) {
|
|
81
|
+
return nodeDatabase.query(statement);
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
source: "node",
|
|
86
|
+
dialect: nodeDatabase.database.dialect,
|
|
87
|
+
},
|
|
88
|
+
);
|
|
89
|
+
} finally {
|
|
90
|
+
await nodeDatabase.close();
|
|
91
|
+
}
|
|
92
|
+
} else {
|
|
93
|
+
const d1Options = {
|
|
94
|
+
configPath: values.config,
|
|
95
|
+
database: values.database,
|
|
96
|
+
env: values.env,
|
|
97
|
+
persistTo: values["persist-to"],
|
|
98
|
+
};
|
|
99
|
+
const queryRunner = createD1QueryRunner(runtime);
|
|
100
|
+
sql = await dumpDatabaseToSql(
|
|
101
|
+
{
|
|
102
|
+
async query(statement) {
|
|
103
|
+
return queryRunner.query(statement, d1Options);
|
|
104
|
+
},
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
source: runtime === "d1-remote" ? "remote" : "local",
|
|
108
|
+
dialect: "sqlite",
|
|
109
|
+
// D1 answers through Wrangler's buffered output; read it in pages.
|
|
110
|
+
pageSize: D1_DUMP_PAGE_SIZE,
|
|
111
|
+
},
|
|
112
|
+
);
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
const outPath = resolve(process.cwd(), output);
|
|
116
|
+
writeFileSync(outPath, sql);
|
|
117
|
+
console.log(`Exported ${getCliRuntimeLabel(runtime)} to ${output}`);
|
|
5
118
|
}
|
package/bin/commands/deploy.js
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
preparePublicAssets,
|
|
8
8
|
resolvePackageClientRoot,
|
|
9
9
|
} from "../lib/public-assets.js";
|
|
10
|
+
import { findRenamedOption } from "../lib/renamed-arguments.js";
|
|
10
11
|
import { resolveSitePathPrefix } from "../lib/site-url.js";
|
|
11
12
|
import { resolveWranglerAssetsDirectory } from "../lib/wrangler-config.js";
|
|
12
13
|
|
|
@@ -53,6 +54,13 @@ function resolveDeployPlan(options) {
|
|
|
53
54
|
|
|
54
55
|
export async function run(argv) {
|
|
55
56
|
const { commandArgs, wranglerArgs } = splitArgs(argv);
|
|
57
|
+
const renamed = findRenamedOption("deploy", commandArgs, {
|
|
58
|
+
"--site-path-prefix": "--path-prefix",
|
|
59
|
+
});
|
|
60
|
+
if (renamed) {
|
|
61
|
+
console.error(`Error: ${renamed}`);
|
|
62
|
+
process.exit(1);
|
|
63
|
+
}
|
|
56
64
|
const { values } = parseArgs({
|
|
57
65
|
args: commandArgs,
|
|
58
66
|
allowPositionals: true,
|
|
@@ -61,7 +69,7 @@ export async function run(argv) {
|
|
|
61
69
|
config: { type: "string", short: "c", default: "wrangler.toml" },
|
|
62
70
|
env: { type: "string", short: "e" },
|
|
63
71
|
output: { type: "string", short: "o", default: DEFAULT_PUBLISH_DIR },
|
|
64
|
-
"
|
|
72
|
+
"path-prefix": { type: "string" },
|
|
65
73
|
database: { type: "string", default: "DB" },
|
|
66
74
|
"skip-migrate": { type: "boolean", default: false },
|
|
67
75
|
},
|
|
@@ -83,7 +91,7 @@ export async function run(argv) {
|
|
|
83
91
|
` -o, --output <path> Publish directory for prefixed asset deploys (default: ${DEFAULT_PUBLISH_DIR})`,
|
|
84
92
|
);
|
|
85
93
|
console.log(
|
|
86
|
-
" --
|
|
94
|
+
" --path-prefix <path> Override SITE_PATH_PREFIX instead of reading config",
|
|
87
95
|
);
|
|
88
96
|
console.log(
|
|
89
97
|
" --database <name> D1 binding name for migrations (default: DB)",
|
|
@@ -103,7 +111,7 @@ export async function run(argv) {
|
|
|
103
111
|
config: values.config,
|
|
104
112
|
env: values.env,
|
|
105
113
|
output: values.output,
|
|
106
|
-
sitePathPrefix: values["
|
|
114
|
+
sitePathPrefix: values["path-prefix"],
|
|
107
115
|
});
|
|
108
116
|
|
|
109
117
|
if (!values["skip-migrate"]) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { parseArgs } from "node:util";
|
|
2
|
-
import { resolveSiteUrl } from "
|
|
2
|
+
import { resolveSiteUrl } from "../../lib/site-url.js";
|
|
3
3
|
|
|
4
4
|
const INTERNAL_ADMIN_TOKEN_ENV_VAR = "INTERNAL_ADMIN_TOKEN";
|
|
5
5
|
const DEFAULT_BATCH_SIZE = 50;
|
|
@@ -70,7 +70,7 @@ export async function run(argv) {
|
|
|
70
70
|
});
|
|
71
71
|
|
|
72
72
|
if (values.help) {
|
|
73
|
-
console.log("Usage: jant search
|
|
73
|
+
console.log("Usage: jant search reindex [--url <url>] [options]");
|
|
74
74
|
console.log("");
|
|
75
75
|
console.log("Rebuild the search index for every non-deleted post by");
|
|
76
76
|
console.log("recomputing `post.body_text` from the stored TipTap body.");
|
|
@@ -99,7 +99,7 @@ export async function run(argv) {
|
|
|
99
99
|
console.log(
|
|
100
100
|
` export ${INTERNAL_ADMIN_TOKEN_ENV_VAR}=your-internal-admin-token`,
|
|
101
101
|
);
|
|
102
|
-
console.log(" jant search
|
|
102
|
+
console.log(" jant search reindex --url https://your-site.example");
|
|
103
103
|
console.log("");
|
|
104
104
|
console.log(
|
|
105
105
|
"If --url is omitted, uses SITE_ORIGIN + SITE_PATH_PREFIX from env or wrangler.toml.",
|
|
@@ -114,7 +114,7 @@ export async function run(argv) {
|
|
|
114
114
|
});
|
|
115
115
|
if (!siteUrl) {
|
|
116
116
|
console.error(
|
|
117
|
-
"Error: search
|
|
117
|
+
"Error: search reindex requires --url or SITE_ORIGIN in the environment or wrangler.toml.",
|
|
118
118
|
);
|
|
119
119
|
process.exit(1);
|
|
120
120
|
}
|
|
@@ -123,7 +123,7 @@ export async function run(argv) {
|
|
|
123
123
|
values.token?.trim() || process.env[INTERNAL_ADMIN_TOKEN_ENV_VAR]?.trim();
|
|
124
124
|
if (!token) {
|
|
125
125
|
console.error(
|
|
126
|
-
`Error: search
|
|
126
|
+
`Error: search reindex requires --token or ${INTERNAL_ADMIN_TOKEN_ENV_VAR}.`,
|
|
127
127
|
);
|
|
128
128
|
process.exit(1);
|
|
129
129
|
}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { parseArgs } from "node:util";
|
|
2
|
+
import { loadNodeRuntime } from "../lib/load-node-runtime.js";
|
|
3
|
+
import { openNodeDatabase } from "../lib/node-database.js";
|
|
4
|
+
import { bootstrapCliRuntime } from "../lib/runtime-target.js";
|
|
5
|
+
|
|
6
|
+
function printHelp() {
|
|
7
|
+
console.log(
|
|
8
|
+
"Usage: jant setup --email <address> --password-stdin [--site-name <name>] [--language <tag>] [--time-zone <zone>] [--site-id <id>]",
|
|
9
|
+
);
|
|
10
|
+
console.log("");
|
|
11
|
+
console.log(
|
|
12
|
+
"Set up a self-hosted install without the browser: the owner account, the site, and onboarding.",
|
|
13
|
+
);
|
|
14
|
+
console.log("Does the same as the two /setup screens.");
|
|
15
|
+
console.log("");
|
|
16
|
+
console.log("Options:");
|
|
17
|
+
console.log(" --email The owner's sign-in address");
|
|
18
|
+
console.log(
|
|
19
|
+
" --password-stdin Read the owner's password from standard input",
|
|
20
|
+
);
|
|
21
|
+
console.log(
|
|
22
|
+
" --site-name The site's name (default: the built-in fallback name)",
|
|
23
|
+
);
|
|
24
|
+
console.log(
|
|
25
|
+
" --language Language the site publishes in, as a BCP 47 tag (default: en)",
|
|
26
|
+
);
|
|
27
|
+
console.log(" --time-zone The site's IANA time zone (default: UTC)");
|
|
28
|
+
console.log(
|
|
29
|
+
" --site-id Create the site with this id instead of a random one",
|
|
30
|
+
);
|
|
31
|
+
console.log(
|
|
32
|
+
" --node Force Node runtime even if DATABASE_URL is unset",
|
|
33
|
+
);
|
|
34
|
+
console.log("");
|
|
35
|
+
console.log("Safe to run on every start. An install that has finished setup");
|
|
36
|
+
console.log(
|
|
37
|
+
"is left unchanged, so a password changed since then is not reset.",
|
|
38
|
+
);
|
|
39
|
+
console.log("");
|
|
40
|
+
console.log("Example:");
|
|
41
|
+
console.log(
|
|
42
|
+
` printf '%s' "$OWNER_PASSWORD" | jant setup --email owner@example.com --password-stdin`,
|
|
43
|
+
);
|
|
44
|
+
console.log("");
|
|
45
|
+
console.log(
|
|
46
|
+
"Node runtime and SITE_RESOLUTION_MODE=single-site only. `.env.node` next to",
|
|
47
|
+
);
|
|
48
|
+
console.log("your project (or in packages/core/) is auto-loaded.");
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Read a secret piped to the command, the way `docker login --password-stdin`
|
|
53
|
+
* does: everything on the stream, minus the one line break `echo` adds.
|
|
54
|
+
*
|
|
55
|
+
* @param stream - Where the secret arrives
|
|
56
|
+
* @returns The secret
|
|
57
|
+
*/
|
|
58
|
+
async function readPasswordFromStdin(stream) {
|
|
59
|
+
if (stream.isTTY) {
|
|
60
|
+
throw new Error(
|
|
61
|
+
"--password-stdin reads the password from a pipe. Example: printf '%s' \"$OWNER_PASSWORD\" | jant setup --email <address> --password-stdin",
|
|
62
|
+
);
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
const chunks = [];
|
|
66
|
+
for await (const chunk of stream) {
|
|
67
|
+
chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
|
|
68
|
+
}
|
|
69
|
+
return Buffer.concat(chunks)
|
|
70
|
+
.toString("utf8")
|
|
71
|
+
.replace(/\r?\n$/, "");
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const OUTCOME_MESSAGES = {
|
|
75
|
+
created: (siteId) => `Set up site ${siteId}.`,
|
|
76
|
+
resumed: (siteId) =>
|
|
77
|
+
`Finished setting up site ${siteId}, which an earlier run had started.`,
|
|
78
|
+
"already-set-up": (siteId) =>
|
|
79
|
+
`Site ${siteId} was already set up. Nothing changed.`,
|
|
80
|
+
};
|
|
81
|
+
|
|
82
|
+
export async function run(argv, io = { stdin: process.stdin }) {
|
|
83
|
+
const { values } = parseArgs({
|
|
84
|
+
args: argv,
|
|
85
|
+
options: {
|
|
86
|
+
email: { type: "string" },
|
|
87
|
+
help: { type: "boolean", short: "h" },
|
|
88
|
+
language: { type: "string" },
|
|
89
|
+
node: { type: "boolean", default: false },
|
|
90
|
+
"password-stdin": { type: "boolean", default: false },
|
|
91
|
+
"site-id": { type: "string" },
|
|
92
|
+
"site-name": { type: "string" },
|
|
93
|
+
"time-zone": { type: "string" },
|
|
94
|
+
},
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
if (values.help) {
|
|
98
|
+
printHelp();
|
|
99
|
+
process.exit(0);
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
if (!values.email) {
|
|
103
|
+
throw new Error("Pass the owner's sign-in address with --email.");
|
|
104
|
+
}
|
|
105
|
+
if (!values["password-stdin"]) {
|
|
106
|
+
throw new Error(
|
|
107
|
+
"Pass --password-stdin and pipe the owner's password in. The password is never read from an argument, where it would show up in the process list.",
|
|
108
|
+
);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
const { runtime } = bootstrapCliRuntime(values);
|
|
112
|
+
if (runtime !== "node") {
|
|
113
|
+
throw new Error(
|
|
114
|
+
"jant setup runs against a Node database. Set DATABASE_URL or DATA_DIR, or pass --node.",
|
|
115
|
+
);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
const password = await readPasswordFromStdin(io.stdin);
|
|
119
|
+
const { setUpNodeInstance } = await loadNodeRuntime();
|
|
120
|
+
const nodeDatabase = await openNodeDatabase(process.env);
|
|
121
|
+
|
|
122
|
+
try {
|
|
123
|
+
const result = await setUpNodeInstance(nodeDatabase.bindings, {
|
|
124
|
+
email: values.email,
|
|
125
|
+
password,
|
|
126
|
+
siteId: values["site-id"],
|
|
127
|
+
siteName: values["site-name"],
|
|
128
|
+
siteLanguage: values.language,
|
|
129
|
+
timeZone: values["time-zone"],
|
|
130
|
+
});
|
|
131
|
+
console.log(OUTCOME_MESSAGES[result.outcome](result.siteId));
|
|
132
|
+
return result;
|
|
133
|
+
} finally {
|
|
134
|
+
await nodeDatabase.close();
|
|
135
|
+
}
|
|
136
|
+
}
|
|
@@ -1,14 +1,30 @@
|
|
|
1
|
-
import { mkdirSync, readdirSync
|
|
2
|
-
import {
|
|
1
|
+
import { createWriteStream, mkdirSync, readdirSync } from "node:fs";
|
|
2
|
+
import { mkdir, mkdtemp, rename, rm } from "node:fs/promises";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { dirname, join, resolve } from "node:path";
|
|
5
|
+
import { Readable } from "node:stream";
|
|
6
|
+
import { pipeline } from "node:stream/promises";
|
|
3
7
|
import { parseArgs } from "node:util";
|
|
4
|
-
import { unzipSync } from "fflate";
|
|
5
8
|
import {
|
|
6
9
|
CLI_API_TOKEN_ENV_VAR,
|
|
7
10
|
getCliApiToken,
|
|
8
11
|
} from "../../lib/cli-api-token.js";
|
|
9
|
-
import {
|
|
12
|
+
import { pullSiteExportDirectory } from "../../lib/site-pull-media.js";
|
|
13
|
+
import {
|
|
14
|
+
findPositionalUrl,
|
|
15
|
+
findRenamedOption,
|
|
16
|
+
} from "../../lib/renamed-arguments.js";
|
|
17
|
+
import { extractZipFile, writeDirectoryToZip } from "../../lib/zip-archive.js";
|
|
10
18
|
|
|
11
|
-
|
|
19
|
+
/**
|
|
20
|
+
* Stream the site's export archive to a file. The site streams it too, and a
|
|
21
|
+
* site that bundles its media answers with gigabytes.
|
|
22
|
+
*
|
|
23
|
+
* @param {string} url - Site URL
|
|
24
|
+
* @param {string} token - API token
|
|
25
|
+
* @param {string} destination - File to write
|
|
26
|
+
*/
|
|
27
|
+
async function downloadSiteArchive(url, token, destination) {
|
|
12
28
|
const response = await fetch(`${url.replace(/\/$/, "")}/api/export/hugo`, {
|
|
13
29
|
method: "POST",
|
|
14
30
|
headers: {
|
|
@@ -16,12 +32,16 @@ async function exportRemoteSite(url, token) {
|
|
|
16
32
|
},
|
|
17
33
|
});
|
|
18
34
|
|
|
19
|
-
if (!response.ok) {
|
|
35
|
+
if (!response.ok || !response.body) {
|
|
20
36
|
const text = await response.text();
|
|
21
37
|
throw new Error(`HTTP ${response.status}: ${text}`);
|
|
22
38
|
}
|
|
23
39
|
|
|
24
|
-
|
|
40
|
+
await mkdir(dirname(destination), { recursive: true });
|
|
41
|
+
await pipeline(
|
|
42
|
+
Readable.fromWeb(response.body),
|
|
43
|
+
createWriteStream(destination),
|
|
44
|
+
);
|
|
25
45
|
}
|
|
26
46
|
|
|
27
47
|
function describeProgressUrl(value) {
|
|
@@ -70,19 +90,16 @@ function logPullProgress(event) {
|
|
|
70
90
|
}
|
|
71
91
|
|
|
72
92
|
function printUsage() {
|
|
73
|
-
console.log("Usage: jant site export <url> [options]");
|
|
74
|
-
console.log("");
|
|
75
|
-
console.log("Export a Jant site as a Hugo ZIP archive or directory.");
|
|
76
|
-
console.log("");
|
|
77
|
-
console.log("Arguments:");
|
|
78
|
-
console.log(" <url> Jant site URL (required)");
|
|
93
|
+
console.log("Usage: jant site export --url <url> [options]");
|
|
79
94
|
console.log("");
|
|
80
|
-
console.log("Options:");
|
|
81
95
|
console.log(
|
|
82
|
-
"
|
|
96
|
+
"Export a Jant site as a Hugo site, to a ZIP archive or a directory.",
|
|
83
97
|
);
|
|
98
|
+
console.log("");
|
|
99
|
+
console.log("Options:");
|
|
100
|
+
console.log(" --url Jant site URL (required)");
|
|
84
101
|
console.log(
|
|
85
|
-
" --
|
|
102
|
+
" --output, -o A .zip path, or an empty directory to export into (default: jant-site-export.zip)",
|
|
86
103
|
);
|
|
87
104
|
console.log(
|
|
88
105
|
" --pull-media Download referenced media into static/media/ (default: on)",
|
|
@@ -92,26 +109,43 @@ function printUsage() {
|
|
|
92
109
|
console.log("");
|
|
93
110
|
console.log("Authentication:");
|
|
94
111
|
console.log(` export ${CLI_API_TOKEN_ENV_VAR}=jnt_your_token`);
|
|
95
|
-
console.log(" jant site export https://your-site.example");
|
|
112
|
+
console.log(" jant site export --url https://your-site.example");
|
|
96
113
|
console.log("");
|
|
97
114
|
console.log("Examples:");
|
|
98
|
-
console.log(" jant site export https://your-site.example -o ./export.zip");
|
|
99
115
|
console.log(
|
|
100
|
-
" jant site export https://your-site.example -
|
|
116
|
+
" jant site export --url https://your-site.example -o ./export.zip",
|
|
101
117
|
);
|
|
118
|
+
console.log(
|
|
119
|
+
" jant site export --url https://your-site.example -o ./jant-site && cd ./jant-site && hugo serve",
|
|
120
|
+
);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/**
|
|
124
|
+
* Whether an `--output` path names a ZIP archive rather than a directory.
|
|
125
|
+
*
|
|
126
|
+
* @param {string} output - The `--output` value
|
|
127
|
+
* @returns {boolean} True for a `.zip` path
|
|
128
|
+
*/
|
|
129
|
+
function isZipOutput(output) {
|
|
130
|
+
return output.toLowerCase().endsWith(".zip");
|
|
102
131
|
}
|
|
103
132
|
|
|
104
133
|
export async function run(argv) {
|
|
134
|
+
const renamed = findRenamedOption("site export", argv, {
|
|
135
|
+
"--directory": "--output <directory>",
|
|
136
|
+
"-d": "--output <directory>",
|
|
137
|
+
});
|
|
138
|
+
if (renamed) {
|
|
139
|
+
console.error(`Error: ${renamed}`);
|
|
140
|
+
process.exit(1);
|
|
141
|
+
}
|
|
142
|
+
|
|
105
143
|
const noPullMedia = argv.includes("--no-pull-media");
|
|
106
144
|
const filteredArgv = argv.filter((arg) => arg !== "--no-pull-media");
|
|
107
145
|
const { values, positionals } = parseArgs({
|
|
108
146
|
args: filteredArgv,
|
|
109
147
|
allowPositionals: true,
|
|
110
148
|
options: {
|
|
111
|
-
directory: {
|
|
112
|
-
type: "string",
|
|
113
|
-
short: "d",
|
|
114
|
-
},
|
|
115
149
|
help: { type: "boolean", short: "h" },
|
|
116
150
|
"pull-media": { type: "boolean" },
|
|
117
151
|
output: {
|
|
@@ -120,6 +154,7 @@ export async function run(argv) {
|
|
|
120
154
|
default: "jant-site-export.zip",
|
|
121
155
|
},
|
|
122
156
|
token: { type: "string" },
|
|
157
|
+
url: { type: "string" },
|
|
123
158
|
},
|
|
124
159
|
});
|
|
125
160
|
|
|
@@ -128,29 +163,22 @@ export async function run(argv) {
|
|
|
128
163
|
process.exit(0);
|
|
129
164
|
}
|
|
130
165
|
|
|
131
|
-
const
|
|
132
|
-
if (
|
|
133
|
-
console.error(
|
|
134
|
-
console.error("");
|
|
135
|
-
printUsage();
|
|
136
|
-
process.exit(1);
|
|
137
|
-
}
|
|
138
|
-
if (positionals.length > 1) {
|
|
139
|
-
console.error(
|
|
140
|
-
`Error: unexpected extra arguments: ${positionals.slice(1).join(" ")}`,
|
|
141
|
-
);
|
|
166
|
+
const positionalError = findPositionalUrl("site export", positionals);
|
|
167
|
+
if (positionalError) {
|
|
168
|
+
console.error(`Error: ${positionalError}`);
|
|
142
169
|
process.exit(1);
|
|
143
170
|
}
|
|
144
171
|
|
|
145
|
-
|
|
146
|
-
|
|
172
|
+
const url = values.url?.trim();
|
|
173
|
+
if (!url) {
|
|
174
|
+
console.error("Error: --url is required");
|
|
175
|
+
console.error("");
|
|
176
|
+
printUsage();
|
|
147
177
|
process.exit(1);
|
|
148
178
|
}
|
|
149
179
|
|
|
150
180
|
const output = resolve(process.cwd(), values.output);
|
|
151
|
-
const outputDirectory = values.
|
|
152
|
-
? resolve(process.cwd(), values.directory)
|
|
153
|
-
: null;
|
|
181
|
+
const outputDirectory = isZipOutput(values.output) ? null : output;
|
|
154
182
|
const token = getCliApiToken(process.env, values.token);
|
|
155
183
|
const pullMedia = values["pull-media"] ?? !noPullMedia;
|
|
156
184
|
|
|
@@ -161,22 +189,8 @@ export async function run(argv) {
|
|
|
161
189
|
process.exit(1);
|
|
162
190
|
}
|
|
163
191
|
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
const zipBytes = await exportRemoteSite(url, token);
|
|
167
|
-
let zip = zipBytes;
|
|
168
|
-
let pullStats = null;
|
|
169
|
-
|
|
170
|
-
if (pullMedia) {
|
|
171
|
-
console.log("Preparing pull-media export ZIP...");
|
|
172
|
-
const pulled = await pullSiteExportZipBytes(zip, {
|
|
173
|
-
assetLoader: null,
|
|
174
|
-
logger: logPullProgress,
|
|
175
|
-
});
|
|
176
|
-
zip = pulled.zipBytes;
|
|
177
|
-
pullStats = pulled.stats;
|
|
178
|
-
}
|
|
179
|
-
|
|
192
|
+
// Fail before the download, not after it: pulling a real site's media
|
|
193
|
+
// takes minutes.
|
|
180
194
|
if (outputDirectory) {
|
|
181
195
|
let existingEntries = [];
|
|
182
196
|
try {
|
|
@@ -185,29 +199,64 @@ export async function run(argv) {
|
|
|
185
199
|
withFileTypes: true,
|
|
186
200
|
}).filter((entry) => !entry.name.startsWith("."));
|
|
187
201
|
} catch {
|
|
188
|
-
console.error(`Error: couldn't prepare directory ${values.
|
|
202
|
+
console.error(`Error: couldn't prepare directory ${values.output}`);
|
|
189
203
|
process.exit(1);
|
|
190
204
|
}
|
|
191
205
|
if (existingEntries.length > 0) {
|
|
192
206
|
console.error(
|
|
193
|
-
`Error: directory is not empty: ${values.
|
|
207
|
+
`Error: directory is not empty: ${values.output}. Choose an empty directory path.`,
|
|
194
208
|
);
|
|
195
209
|
process.exit(1);
|
|
196
210
|
}
|
|
211
|
+
}
|
|
197
212
|
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
mkdirSync(dirname(fullPath), { recursive: true });
|
|
203
|
-
writeFileSync(fullPath, Buffer.from(bytes));
|
|
204
|
-
}
|
|
205
|
-
console.log(`Exported site from ${url} to ${values.directory}`);
|
|
206
|
-
console.log(`Preview with: cd ${values.directory} && hugo serve`);
|
|
207
|
-
} else {
|
|
213
|
+
console.log(`Exporting site from ${url}...`);
|
|
214
|
+
|
|
215
|
+
// Nothing to add: the site's archive is the export.
|
|
216
|
+
if (!pullMedia && !outputDirectory) {
|
|
208
217
|
console.log(`Writing ${values.output}...`);
|
|
209
|
-
|
|
218
|
+
const partial = `${output}.partial`;
|
|
219
|
+
try {
|
|
220
|
+
await downloadSiteArchive(url, token, partial);
|
|
221
|
+
await rename(partial, output);
|
|
222
|
+
} catch (error) {
|
|
223
|
+
await rm(partial, { force: true });
|
|
224
|
+
throw error;
|
|
225
|
+
}
|
|
210
226
|
console.log(`Exported site from ${url} to ${values.output}`);
|
|
227
|
+
return;
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
// Unpacked to disk and media downloaded next to it, so the export never
|
|
231
|
+
// holds more than one media file in memory.
|
|
232
|
+
const tempDir = await mkdtemp(join(tmpdir(), "jant-site-export-"));
|
|
233
|
+
const workDir = outputDirectory ?? join(tempDir, "site");
|
|
234
|
+
let pullStats = null;
|
|
235
|
+
|
|
236
|
+
try {
|
|
237
|
+
const archivePath = join(tempDir, "site.zip");
|
|
238
|
+
await downloadSiteArchive(url, token, archivePath);
|
|
239
|
+
await extractZipFile(archivePath, workDir);
|
|
240
|
+
await rm(archivePath, { force: true });
|
|
241
|
+
|
|
242
|
+
if (pullMedia) {
|
|
243
|
+
console.log("Pulling media...");
|
|
244
|
+
pullStats = await pullSiteExportDirectory(workDir, {
|
|
245
|
+
assetLoader: null,
|
|
246
|
+
logger: logPullProgress,
|
|
247
|
+
});
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
if (outputDirectory) {
|
|
251
|
+
console.log(`Exported site from ${url} to ${values.output}`);
|
|
252
|
+
console.log(`Preview with: cd ${values.output} && hugo serve`);
|
|
253
|
+
} else {
|
|
254
|
+
console.log(`Writing ${values.output}...`);
|
|
255
|
+
await writeDirectoryToZip(workDir, output);
|
|
256
|
+
console.log(`Exported site from ${url} to ${values.output}`);
|
|
257
|
+
}
|
|
258
|
+
} finally {
|
|
259
|
+
await rm(tempDir, { recursive: true, force: true });
|
|
211
260
|
}
|
|
212
261
|
|
|
213
262
|
if (pullStats) {
|