@jant/core 0.7.1 → 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/site/export.js +48 -36
- package/bin/commands/site/import.js +3074 -2
- package/bin/commands/site/snapshot/import.js +2 -0
- 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/migration-artifacts.js +19 -0
- package/bin/lib/renamed-arguments.js +56 -0
- package/bin/lib/site-snapshot.js +83 -1
- package/dist/{app-ZcaI1kPN.js → app-CFsmRVJN.js} +7916 -499
- package/dist/client/.vite/manifest.json +3 -3
- package/dist/client/_assets/{client-DAhoqPdr.css → client-BCumu1-D.css} +1 -1
- package/dist/client/_assets/{client-knSEyUJO.js → client-DTLBOHqD.js} +1 -1
- package/dist/client/_assets/{client-auth-CAMfTrKW.js → client-auth-D6Ix6SmE.js} +1 -1
- package/dist/index.js +2 -3
- package/dist/node.js +2 -3
- package/dist/url-CKlGzvdN.js +428 -0
- package/package.json +1 -5
- package/src/__tests__/cli-commands.test.ts +144 -0
- package/src/__tests__/config-docs.test.ts +148 -0
- package/src/__tests__/export-import-roundtrip.test.ts +1 -1
- 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/site-export-import.ts +97 -0
- package/src/__tests__/import-site-command.test.ts +27 -1
- package/src/__tests__/release-fixtures.test.ts +132 -0
- package/src/__tests__/site-export-canonical-import.test.ts +11 -47
- package/src/__tests__/theme-docs.test.ts +109 -0
- package/src/app.tsx +1 -5
- 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/index.ts +6 -77
- package/src/lib/__tests__/view.test.ts +0 -46
- package/src/lib/feed.ts +0 -6
- package/src/lib/view.ts +0 -27
- package/src/node/__tests__/cli-export.test.ts +2 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +6 -0
- package/src/node/__tests__/cli-site-token-env.test.ts +4 -1
- package/src/node/__tests__/cli-snapshot-meta.test.ts +64 -0
- package/src/routes/api/internal/search-reindex.ts +1 -1
- package/src/services/__tests__/media.test.ts +0 -271
- package/src/services/export.ts +13 -5
- package/src/services/media.ts +1 -219
- package/src/styles/ui.css +0 -118
- package/bin/commands/export.js +0 -120
- package/bin/commands/import-site.js +0 -3034
- package/bin/commands/migrate-text-attachments.js +0 -181
- package/dist/github-sync-Gw4orAHk.js +0 -8398
- package/src/client/multipart-upload.ts +0 -206
- 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
|
}
|
|
@@ -10,6 +10,10 @@ import {
|
|
|
10
10
|
getCliApiToken,
|
|
11
11
|
} from "../../lib/cli-api-token.js";
|
|
12
12
|
import { pullSiteExportDirectory } from "../../lib/site-pull-media.js";
|
|
13
|
+
import {
|
|
14
|
+
findPositionalUrl,
|
|
15
|
+
findRenamedOption,
|
|
16
|
+
} from "../../lib/renamed-arguments.js";
|
|
13
17
|
import { extractZipFile, writeDirectoryToZip } from "../../lib/zip-archive.js";
|
|
14
18
|
|
|
15
19
|
/**
|
|
@@ -86,19 +90,16 @@ function logPullProgress(event) {
|
|
|
86
90
|
}
|
|
87
91
|
|
|
88
92
|
function printUsage() {
|
|
89
|
-
console.log("Usage: jant site export <url> [options]");
|
|
90
|
-
console.log("");
|
|
91
|
-
console.log("Export a Jant site as a Hugo ZIP archive or directory.");
|
|
93
|
+
console.log("Usage: jant site export --url <url> [options]");
|
|
92
94
|
console.log("");
|
|
93
|
-
console.log("Arguments:");
|
|
94
|
-
console.log(" <url> Jant site URL (required)");
|
|
95
|
-
console.log("");
|
|
96
|
-
console.log("Options:");
|
|
97
95
|
console.log(
|
|
98
|
-
"
|
|
96
|
+
"Export a Jant site as a Hugo site, to a ZIP archive or a directory.",
|
|
99
97
|
);
|
|
98
|
+
console.log("");
|
|
99
|
+
console.log("Options:");
|
|
100
|
+
console.log(" --url Jant site URL (required)");
|
|
100
101
|
console.log(
|
|
101
|
-
" --
|
|
102
|
+
" --output, -o A .zip path, or an empty directory to export into (default: jant-site-export.zip)",
|
|
102
103
|
);
|
|
103
104
|
console.log(
|
|
104
105
|
" --pull-media Download referenced media into static/media/ (default: on)",
|
|
@@ -108,26 +109,43 @@ function printUsage() {
|
|
|
108
109
|
console.log("");
|
|
109
110
|
console.log("Authentication:");
|
|
110
111
|
console.log(` export ${CLI_API_TOKEN_ENV_VAR}=jnt_your_token`);
|
|
111
|
-
console.log(" jant site export https://your-site.example");
|
|
112
|
+
console.log(" jant site export --url https://your-site.example");
|
|
112
113
|
console.log("");
|
|
113
114
|
console.log("Examples:");
|
|
114
|
-
console.log(" jant site export https://your-site.example -o ./export.zip");
|
|
115
115
|
console.log(
|
|
116
|
-
" jant site export https://your-site.example -
|
|
116
|
+
" jant site export --url https://your-site.example -o ./export.zip",
|
|
117
|
+
);
|
|
118
|
+
console.log(
|
|
119
|
+
" jant site export --url https://your-site.example -o ./jant-site && cd ./jant-site && hugo serve",
|
|
117
120
|
);
|
|
118
121
|
}
|
|
119
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");
|
|
131
|
+
}
|
|
132
|
+
|
|
120
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
|
+
|
|
121
143
|
const noPullMedia = argv.includes("--no-pull-media");
|
|
122
144
|
const filteredArgv = argv.filter((arg) => arg !== "--no-pull-media");
|
|
123
145
|
const { values, positionals } = parseArgs({
|
|
124
146
|
args: filteredArgv,
|
|
125
147
|
allowPositionals: true,
|
|
126
148
|
options: {
|
|
127
|
-
directory: {
|
|
128
|
-
type: "string",
|
|
129
|
-
short: "d",
|
|
130
|
-
},
|
|
131
149
|
help: { type: "boolean", short: "h" },
|
|
132
150
|
"pull-media": { type: "boolean" },
|
|
133
151
|
output: {
|
|
@@ -136,6 +154,7 @@ export async function run(argv) {
|
|
|
136
154
|
default: "jant-site-export.zip",
|
|
137
155
|
},
|
|
138
156
|
token: { type: "string" },
|
|
157
|
+
url: { type: "string" },
|
|
139
158
|
},
|
|
140
159
|
});
|
|
141
160
|
|
|
@@ -144,29 +163,22 @@ export async function run(argv) {
|
|
|
144
163
|
process.exit(0);
|
|
145
164
|
}
|
|
146
165
|
|
|
147
|
-
const
|
|
148
|
-
if (
|
|
149
|
-
console.error(
|
|
150
|
-
console.error("");
|
|
151
|
-
printUsage();
|
|
152
|
-
process.exit(1);
|
|
153
|
-
}
|
|
154
|
-
if (positionals.length > 1) {
|
|
155
|
-
console.error(
|
|
156
|
-
`Error: unexpected extra arguments: ${positionals.slice(1).join(" ")}`,
|
|
157
|
-
);
|
|
166
|
+
const positionalError = findPositionalUrl("site export", positionals);
|
|
167
|
+
if (positionalError) {
|
|
168
|
+
console.error(`Error: ${positionalError}`);
|
|
158
169
|
process.exit(1);
|
|
159
170
|
}
|
|
160
171
|
|
|
161
|
-
|
|
162
|
-
|
|
172
|
+
const url = values.url?.trim();
|
|
173
|
+
if (!url) {
|
|
174
|
+
console.error("Error: --url is required");
|
|
175
|
+
console.error("");
|
|
176
|
+
printUsage();
|
|
163
177
|
process.exit(1);
|
|
164
178
|
}
|
|
165
179
|
|
|
166
180
|
const output = resolve(process.cwd(), values.output);
|
|
167
|
-
const outputDirectory = values.
|
|
168
|
-
? resolve(process.cwd(), values.directory)
|
|
169
|
-
: null;
|
|
181
|
+
const outputDirectory = isZipOutput(values.output) ? null : output;
|
|
170
182
|
const token = getCliApiToken(process.env, values.token);
|
|
171
183
|
const pullMedia = values["pull-media"] ?? !noPullMedia;
|
|
172
184
|
|
|
@@ -187,12 +199,12 @@ export async function run(argv) {
|
|
|
187
199
|
withFileTypes: true,
|
|
188
200
|
}).filter((entry) => !entry.name.startsWith("."));
|
|
189
201
|
} catch {
|
|
190
|
-
console.error(`Error: couldn't prepare directory ${values.
|
|
202
|
+
console.error(`Error: couldn't prepare directory ${values.output}`);
|
|
191
203
|
process.exit(1);
|
|
192
204
|
}
|
|
193
205
|
if (existingEntries.length > 0) {
|
|
194
206
|
console.error(
|
|
195
|
-
`Error: directory is not empty: ${values.
|
|
207
|
+
`Error: directory is not empty: ${values.output}. Choose an empty directory path.`,
|
|
196
208
|
);
|
|
197
209
|
process.exit(1);
|
|
198
210
|
}
|
|
@@ -236,8 +248,8 @@ export async function run(argv) {
|
|
|
236
248
|
}
|
|
237
249
|
|
|
238
250
|
if (outputDirectory) {
|
|
239
|
-
console.log(`Exported site from ${url} to ${values.
|
|
240
|
-
console.log(`Preview with: cd ${values.
|
|
251
|
+
console.log(`Exported site from ${url} to ${values.output}`);
|
|
252
|
+
console.log(`Preview with: cd ${values.output} && hugo serve`);
|
|
241
253
|
} else {
|
|
242
254
|
console.log(`Writing ${values.output}...`);
|
|
243
255
|
await writeDirectoryToZip(workDir, output);
|