@jant/core 0.11.0 → 0.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (183) hide show
  1. package/bin/commands/deploy.js +179 -0
  2. package/bin/lib/cloudflare-setup.js +499 -0
  3. package/bin/lib/d1-query.js +26 -1
  4. package/bin/lib/r2-query.js +2 -2
  5. package/dist/{app-jQI4OPRe.js → app-DSwsDBD0.js} +28623 -635
  6. package/dist/client/.vite/manifest.json +2 -2
  7. package/dist/client/_assets/{client-52vQhZAv.js → client-DPByjWoU.js} +1 -1
  8. package/dist/client/_assets/{client-auth-BDcCR6u1.js → client-auth-CPqPTX1B.js} +1 -1
  9. package/dist/index.js +1 -1
  10. package/dist/node.js +2 -2
  11. package/package.json +31 -31
  12. package/src/__tests__/bin/deploy.test.ts +163 -0
  13. package/src/__tests__/export-hugo-build.test.ts +5 -5
  14. package/src/__tests__/export-import-roundtrip.test.ts +1 -1
  15. package/src/__tests__/export-service.test.ts +2 -2
  16. package/src/__tests__/fixtures/releases/0.11.0/site-export/README.md +130 -0
  17. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/297kg/_index.md +14 -0
  18. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2thjq/_index.md +25 -0
  19. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2u5e5/_index.md +33 -0
  20. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/0x4nv/index.md +18 -0
  21. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/_index.md +42 -0
  22. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/faqyt/index.md +28 -0
  23. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
  24. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5kayp/_index.md +23 -0
  25. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/_index.md +31 -0
  26. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/hu597/index.md +21 -0
  27. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/_index.md +5 -0
  28. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
  29. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
  30. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/archive/_index.md +8 -0
  31. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
  32. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/bought-too-many-lemons-again/_index.md +35 -0
  33. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/city-walks/_index.md +14 -0
  34. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
  35. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
  36. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/co344/_index.md +25 -0
  37. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/collections/_index.md +5 -0
  38. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/current-tea-rotation/_index.md +34 -0
  39. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
  40. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/desk-but-better/_index.md +25 -0
  41. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/e0kcg/_index.md +22 -0
  42. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/egi3c/_index.md +24 -0
  43. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/evf9j/_index.md +129 -0
  44. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/featured/_index.md +8 -0
  45. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-draft/_index.md +17 -0
  46. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-quotes/_index.md +13 -0
  47. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-text-attachment/_index.md +29 -0
  48. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-basho/_index.md +25 -0
  49. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-epictetus/_index.md +25 -0
  50. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
  51. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-seneca/_index.md +26 -0
  52. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-thoreau/_index.md +25 -0
  53. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
  54. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/3zqv7/index.md +28 -0
  55. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
  56. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/_index.md +37 -0
  57. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gwob9/_index.md +25 -0
  58. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/home-cooking/_index.md +12 -0
  59. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/hz729/_index.md +24 -0
  60. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +42 -0
  61. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/j4v0q/_index.md +33 -0
  62. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k278t/_index.md +25 -0
  63. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k4eee/_index.md +22 -0
  64. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/_index.md +32 -0
  65. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
  66. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a83qu/index.md +18 -0
  67. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
  68. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
  69. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/l2m7y/_index.md +29 -0
  70. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +52 -0
  71. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
  72. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/n09le/_index.md +23 -0
  73. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +40 -0
  74. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
  75. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/_index.md +32 -0
  76. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/c91j0/index.md +18 -0
  77. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/qyucy/index.md +18 -0
  78. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/wsgck/index.md +18 -0
  79. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +44 -0
  80. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/reading-notes/_index.md +12 -0
  81. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/s4r3e/_index.md +25 -0
  82. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
  83. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/_index.md +42 -0
  84. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/cxiu6/index.md +18 -0
  85. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/t77ms/index.md +18 -0
  86. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
  87. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/_index.md +30 -0
  88. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
  89. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
  90. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
  91. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
  92. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tiny-projects/_index.md +12 -0
  93. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
  94. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
  95. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/useful-links/_index.md +12 -0
  96. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/weekend-notes/_index.md +12 -0
  97. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +50 -0
  98. package/src/__tests__/fixtures/releases/0.11.0/site-export/data/jant.toml +155 -0
  99. package/src/__tests__/fixtures/releases/0.11.0/site-export/hugo.toml +45 -0
  100. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/_redirects +30 -0
  101. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/3c46a9ea6fe0-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
  102. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
  103. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
  104. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
  105. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
  106. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
  107. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
  108. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
  109. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
  110. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
  111. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
  112. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
  113. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
  114. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
  115. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
  116. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
  117. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
  118. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
  119. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
  120. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
  121. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
  122. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
  123. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
  124. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
  125. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
  126. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
  127. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
  128. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
  129. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
  130. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m50607a6e8h8gfpa8byqtt7h.md +3 -0
  131. package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
  132. package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/custom.css +0 -0
  133. package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/favicon.ico +0 -0
  134. package/src/__tests__/fixtures/releases/0.11.0/site-export/wrangler.jsonc +24 -0
  135. package/src/__tests__/fixtures/releases/0.11.0/snapshot/db.sql +339 -0
  136. package/src/__tests__/fixtures/releases/0.11.0/snapshot/meta.json +11 -0
  137. package/src/__tests__/helpers/d1-round-trips.ts +213 -0
  138. package/src/__tests__/package-dependencies.test.ts +123 -0
  139. package/src/__tests__/public-page-round-trips.test.ts +203 -0
  140. package/src/__tests__/template-deploy-workflow.test.ts +33 -77
  141. package/src/__tests__/vite-config.test.ts +32 -0
  142. package/src/app.tsx +7 -1
  143. package/src/client/icons.ts +5 -6
  144. package/src/db/__tests__/d1-query.test.ts +29 -0
  145. package/src/db/__tests__/migration-rehearsal.test.ts +2 -2
  146. package/src/lib/__tests__/icons.test.ts +21 -10
  147. package/src/lib/api-posts.ts +4 -2
  148. package/src/lib/api-public-posts.ts +4 -2
  149. package/src/lib/constants.ts +20 -0
  150. package/src/lib/icons.ts +96 -34
  151. package/src/lib/post-display.ts +13 -9
  152. package/src/lib/timeline.ts +23 -21
  153. package/src/lib/view.ts +3 -2
  154. package/src/middleware/__tests__/onboarding.test.ts +5 -3
  155. package/src/middleware/__tests__/secure-headers.test.ts +40 -42
  156. package/src/middleware/config.ts +44 -2
  157. package/src/middleware/onboarding.ts +12 -3
  158. package/src/middleware/secure-headers.ts +25 -36
  159. package/src/node/__tests__/cli-deploy-setup.test.ts +373 -0
  160. package/src/node/__tests__/cli-deploy.test.ts +55 -0
  161. package/src/routes/feed/feed.ts +4 -2
  162. package/src/routes/pages/__tests__/post-page-round-trips.test.ts +10 -10
  163. package/src/routes/pages/archive.tsx +36 -17
  164. package/src/routes/pages/collection.tsx +72 -35
  165. package/src/routes/pages/page.tsx +46 -25
  166. package/src/routes/pages/search.tsx +3 -1
  167. package/src/services/__tests__/collection.test.ts +2 -4
  168. package/src/services/collection.ts +95 -71
  169. package/src/services/export.ts +2 -1
  170. package/src/services/post.ts +150 -205
  171. package/src/services/settings.ts +4 -8
  172. package/src/types/app-context.ts +5 -0
  173. package/src/ui/pages/ArchivePage.tsx +34 -34
  174. package/src/ui/pages/CollectionPage.tsx +1 -1
  175. package/src/ui/pages/SmartCollectionPage.tsx +2 -2
  176. package/src/ui/pages/SubscribePage.tsx +2 -4
  177. package/src/ui/shared/CollectionDirectory.tsx +2 -2
  178. package/src/ui/shared/CollectionsManager.tsx +1 -1
  179. package/src/ui/shared/CopyField.tsx +1 -1
  180. package/src/ui/shared/Icon.tsx +5 -5
  181. package/src/ui/shared/IconSprite.tsx +10 -11
  182. package/src/ui/shared/custom-icons.ts +38 -7
  183. package/src/ui/shared/icon-collector.ts +7 -5
@@ -1,7 +1,13 @@
1
1
  import { spawnSync } from "node:child_process";
2
+ import { appendFileSync } from "node:fs";
2
3
  import { resolve } from "node:path";
3
4
  import { parseArgs } from "node:util";
4
5
  import { run as runMigrate } from "./migrate.js";
6
+ import {
7
+ BEFORE_GOING_LIVE_URL,
8
+ needsFirstDeploySetup,
9
+ runFirstDeploySetup,
10
+ } from "../lib/cloudflare-setup.js";
5
11
  import {
6
12
  DEFAULT_PUBLISH_DIR,
7
13
  preparePublicAssets,
@@ -23,6 +29,85 @@ function splitArgs(argv) {
23
29
  };
24
30
  }
25
31
 
32
+ /**
33
+ * Decide what a `--ci` run does before it deploys.
34
+ *
35
+ * The deploy workflow create-jant projects ship runs on every push, also in
36
+ * repos that deploy another way: one-click deploys build with Cloudflare's
37
+ * Workers Builds and have no Cloudflare secrets in GitHub. With neither
38
+ * credential set there is nothing to deploy with, so the run is skipped
39
+ * without failing. Half the credentials means a deploy was meant, so that
40
+ * fails. A `database_id` that is still the placeholder fails too: the first
41
+ * deploy writes the real ID into `wrangler.toml`, and a CI checkout can't
42
+ * commit it, so the first deploy belongs on the author's computer.
43
+ *
44
+ * @param {{ env: Record<string, string | undefined>, needsSetup: boolean }} input
45
+ * - `env`: the environment the deploy runs in
46
+ * - `needsSetup`: whether `database_id` is still the placeholder
47
+ * @returns {{ action: "deploy" } | { action: "skip" | "fail", message: string }}
48
+ * @example
49
+ * ciPreflight({ env: {}, needsSetup: false });
50
+ * // { action: "skip", message: "Deploy skipped: ..." }
51
+ */
52
+ export function ciPreflight({ env, needsSetup }) {
53
+ const token = env.CLOUDFLARE_API_TOKEN?.trim();
54
+ const accountId = env.CLOUDFLARE_ACCOUNT_ID?.trim();
55
+
56
+ if (!token && !accountId) {
57
+ return {
58
+ action: "skip",
59
+ message:
60
+ "Deploy skipped: neither CLOUDFLARE_API_TOKEN nor CLOUDFLARE_ACCOUNT_ID is set. A repo Cloudflare already deploys, such as one made by one-click deploy, needs neither. To deploy from GitHub Actions, add the CF_API_TOKEN and CF_ACCOUNT_ID repository secrets.",
61
+ };
62
+ }
63
+ if (!token) {
64
+ return {
65
+ action: "fail",
66
+ message:
67
+ "CLOUDFLARE_ACCOUNT_ID is set but CLOUDFLARE_API_TOKEN isn't. Add the API token (the CF_API_TOKEN repository secret in the GitHub workflow), or remove both to skip deploys from here.",
68
+ };
69
+ }
70
+ if (needsSetup) {
71
+ return {
72
+ action: "fail",
73
+ message:
74
+ 'wrangler.toml still has database_id = "local". Run the first deploy on your computer with `jant deploy` (`npm run deploy` in a create-jant project): it creates the D1 database and writes its ID into wrangler.toml. Then commit wrangler.toml.',
75
+ };
76
+ }
77
+ return { action: "deploy" };
78
+ }
79
+
80
+ /**
81
+ * Add a line to the GitHub Actions run summary, when there is one.
82
+ *
83
+ * @param {string} message - What to show
84
+ * @param {Record<string, string | undefined>} env - The environment to read
85
+ * `GITHUB_STEP_SUMMARY` from
86
+ * @returns {void}
87
+ * @example
88
+ * writeStepSummary("Deploy skipped: ...", process.env);
89
+ */
90
+ function writeStepSummary(message, env) {
91
+ if (!env.GITHUB_STEP_SUMMARY) return;
92
+ appendFileSync(env.GITHUB_STEP_SUMMARY, `### jant deploy\n\n${message}\n`);
93
+ }
94
+
95
+ /**
96
+ * Whether the arguments passed on to `wrangler deploy` ask for a dry run.
97
+ * Only Wrangler sees the flag: the remote migrations and the first-deploy
98
+ * setup run before it, so a dry run has to skip both.
99
+ *
100
+ * @param {string[]} wranglerArgs - The arguments after `--`
101
+ * @returns {boolean} True when one of them is `--dry-run`
102
+ * @example
103
+ * asksForDryRun(["--dry-run"]); // true
104
+ */
105
+ export function asksForDryRun(wranglerArgs) {
106
+ return wranglerArgs.some(
107
+ (arg) => arg === "--dry-run" || arg.startsWith("--dry-run="),
108
+ );
109
+ }
110
+
26
111
  function resolveDeployPlan(options) {
27
112
  const sitePathPrefix = resolveSitePathPrefix({
28
113
  config: options.config,
@@ -72,6 +157,7 @@ export async function run(argv) {
72
157
  "path-prefix": { type: "string" },
73
158
  database: { type: "string", default: "DB" },
74
159
  "skip-migrate": { type: "boolean", default: false },
160
+ ci: { type: "boolean", default: false },
75
161
  },
76
162
  });
77
163
 
@@ -97,6 +183,27 @@ export async function run(argv) {
97
183
  " --database <name> D1 binding name for migrations (default: DB)",
98
184
  );
99
185
  console.log(" --skip-migrate Skip remote migrations");
186
+ console.log(
187
+ " --ci Deploy from an automated run, such as GitHub Actions",
188
+ );
189
+ console.log("");
190
+ console.log(
191
+ 'The first deploy of a new project, whose D1 database_id is still "local",',
192
+ );
193
+ console.log(
194
+ "creates the D1 database, the R2 buckets, and AUTH_SECRET on Cloudflare,",
195
+ );
196
+ console.log(
197
+ "reusing any that already exist, and writes the database ID to wrangler.toml.",
198
+ );
199
+ console.log("");
200
+ console.log(
201
+ "With --ci, a run with neither CLOUDFLARE_API_TOKEN nor CLOUDFLARE_ACCOUNT_ID",
202
+ );
203
+ console.log(
204
+ 'set is skipped without failing, and a database_id that is still "local" fails',
205
+ );
206
+ console.log("instead of running the first deploy.");
100
207
  console.log("");
101
208
  console.log(
102
209
  "Root-path deploys reuse the configured assets directory directly.",
@@ -107,6 +214,75 @@ export async function run(argv) {
107
214
  process.exit(0);
108
215
  }
109
216
 
217
+ const needsSetup = needsFirstDeploySetup({
218
+ configPath: values.config,
219
+ env: values.env,
220
+ database: values.database,
221
+ });
222
+
223
+ if (asksForDryRun(wranglerArgs)) {
224
+ if (!values["skip-migrate"]) {
225
+ console.error(
226
+ "Error: `-- --dry-run` reaches Wrangler only after the remote migrations have run. Add --skip-migrate to dry-run the Worker upload alone.",
227
+ );
228
+ process.exit(1);
229
+ }
230
+ if (needsSetup) {
231
+ console.error(
232
+ "Error: A dry run can't make the first deploy, which creates the Cloudflare resources and writes database_id into wrangler.toml. Deploy once without --dry-run first.",
233
+ );
234
+ process.exit(1);
235
+ }
236
+ }
237
+
238
+ if (values.ci) {
239
+ const preflight = ciPreflight({ env: process.env, needsSetup });
240
+ if (preflight.action !== "deploy") {
241
+ writeStepSummary(preflight.message, process.env);
242
+ if (preflight.action === "fail") {
243
+ console.error(`Error: ${preflight.message}`);
244
+ process.exit(1);
245
+ }
246
+ console.log(preflight.message);
247
+ return;
248
+ }
249
+ }
250
+
251
+ const setup = needsSetup
252
+ ? await runFirstDeploySetup({
253
+ configPath: values.config,
254
+ env: values.env,
255
+ database: values.database,
256
+ })
257
+ : null;
258
+
259
+ try {
260
+ await deploy(values, wranglerArgs, setup?.secretsFile ?? null);
261
+ } catch (error) {
262
+ if (setup) {
263
+ setup.restore();
264
+ console.error(
265
+ 'wrangler.toml is back to database_id = "local". Deploying again reuses what this run created.',
266
+ );
267
+ }
268
+ throw error;
269
+ } finally {
270
+ setup?.cleanup();
271
+ }
272
+
273
+ if (setup) {
274
+ console.log("");
275
+ console.log(
276
+ "First deploy done. Commit wrangler.toml: it now holds the D1 database ID.",
277
+ );
278
+ console.log(
279
+ "Open the URL above to create the admin account. To use your own domain, bind it first:",
280
+ );
281
+ console.log(BEFORE_GOING_LIVE_URL);
282
+ }
283
+ }
284
+
285
+ async function deploy(values, wranglerArgs, secretsFile) {
110
286
  const plan = resolveDeployPlan({
111
287
  config: values.config,
112
288
  env: values.env,
@@ -147,6 +323,9 @@ export async function run(argv) {
147
323
  if (values.env) {
148
324
  deployArgs.push("--env", values.env);
149
325
  }
326
+ if (secretsFile) {
327
+ deployArgs.push("--secrets-file", secretsFile);
328
+ }
150
329
  deployArgs.push(...wranglerArgs);
151
330
 
152
331
  const result = spawnSync(wranglerBin, deployArgs, {