wrangler 0.0.0-e492c10 → 0.0.0-e4ca780f

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 (360) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +25 -5
  3. package/bin/wrangler.js +174 -34
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +1590 -81
  6. package/package.json +198 -149
  7. package/src/__tests__/access.test.ts +25 -0
  8. package/src/__tests__/api-dev.test.ts +238 -0
  9. package/src/__tests__/api-devregistry.test.ts +121 -0
  10. package/src/__tests__/api.test.ts +102 -0
  11. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  12. package/src/__tests__/config-cache.test.ts +30 -24
  13. package/src/__tests__/configuration.test.ts +4498 -3114
  14. package/src/__tests__/d1/d1.test.ts +82 -0
  15. package/src/__tests__/d1/execute.test.ts +66 -0
  16. package/src/__tests__/d1/migrate.test.ts +157 -0
  17. package/src/__tests__/d1/splitter.test.ts +255 -0
  18. package/src/__tests__/delete.test.ts +272 -0
  19. package/src/__tests__/deployments.test.ts +369 -0
  20. package/src/__tests__/dev.test.tsx +1592 -802
  21. package/src/__tests__/generate.test.ts +237 -0
  22. package/src/__tests__/get-host-from-url.test.ts +16 -0
  23. package/src/__tests__/guess-worker-format.test.ts +103 -68
  24. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  25. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  26. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  27. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  28. package/src/__tests__/helpers/mock-bin.ts +20 -20
  29. package/src/__tests__/helpers/mock-console.ts +64 -39
  30. package/src/__tests__/helpers/mock-dialogs.ts +104 -55
  31. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  32. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  33. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  34. package/src/__tests__/helpers/mock-istty.ts +65 -18
  35. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  36. package/src/__tests__/helpers/mock-kv.ts +41 -28
  37. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  38. package/src/__tests__/helpers/mock-process.ts +34 -0
  39. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  40. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  41. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  42. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  43. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  44. package/src/__tests__/helpers/msw/handlers/deployments.ts +160 -0
  45. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  46. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  47. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  48. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  49. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  50. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  51. package/src/__tests__/helpers/msw/index.ts +52 -0
  52. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  53. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  54. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  55. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  56. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  57. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  58. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  59. package/src/__tests__/helpers/worker-scripts/parent-worker.js +11 -0
  60. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  61. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  62. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  63. package/src/__tests__/https-options.test.ts +142 -109
  64. package/src/__tests__/index.test.ts +262 -224
  65. package/src/__tests__/init.test.ts +3168 -1488
  66. package/src/__tests__/jest.setup.ts +152 -50
  67. package/src/__tests__/kv.test.ts +1789 -1432
  68. package/src/__tests__/logger.test.ts +167 -75
  69. package/src/__tests__/logout.test.ts +47 -0
  70. package/src/__tests__/metrics.test.ts +493 -0
  71. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  72. package/src/__tests__/middleware.test.ts +816 -0
  73. package/src/__tests__/mtls-certificates.test.ts +588 -0
  74. package/src/__tests__/package-manager.test.ts +312 -165
  75. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  76. package/src/__tests__/pages/functions-build.test.ts +452 -0
  77. package/src/__tests__/pages/pages.test.ts +81 -0
  78. package/src/__tests__/pages/project-create.test.ts +63 -0
  79. package/src/__tests__/pages/project-list.test.ts +110 -0
  80. package/src/__tests__/pages/project-upload.test.ts +500 -0
  81. package/src/__tests__/pages/publish.test.ts +2864 -0
  82. package/src/__tests__/pages-deployment-tail.test.ts +955 -0
  83. package/src/__tests__/parse.test.ts +358 -248
  84. package/src/__tests__/paths.test.ts +39 -0
  85. package/src/__tests__/publish.test.ts +8322 -4847
  86. package/src/__tests__/pubsub.test.ts +496 -0
  87. package/src/__tests__/queues.test.ts +532 -0
  88. package/src/__tests__/r2.test.ts +369 -205
  89. package/src/__tests__/route.test.ts +18 -18
  90. package/src/__tests__/secret.test.ts +683 -436
  91. package/src/__tests__/tail.test.ts +835 -567
  92. package/src/__tests__/test-old-node-version.js +31 -0
  93. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  94. package/src/__tests__/tsconfig-sanity.ts +12 -0
  95. package/src/__tests__/tsconfig.json +8 -0
  96. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  97. package/src/__tests__/type-generation.test.ts +234 -0
  98. package/src/__tests__/user.test.ts +107 -120
  99. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  100. package/src/__tests__/validate-dev-props.test.ts +56 -0
  101. package/src/__tests__/version.test.ts +35 -0
  102. package/src/__tests__/whoami.test.tsx +165 -98
  103. package/src/__tests__/worker-namespace.test.ts +340 -0
  104. package/src/abort.d.ts +3 -0
  105. package/src/api/dev.ts +316 -0
  106. package/src/api/index.ts +11 -0
  107. package/src/api/mtls-certificate.ts +148 -0
  108. package/src/api/pages/create-worker-bundle-contents.ts +76 -0
  109. package/src/api/pages/index.ts +5 -0
  110. package/src/api/pages/publish.tsx +355 -0
  111. package/src/bundle-reporter.ts +68 -0
  112. package/src/bundle.ts +874 -135
  113. package/src/cfetch/index.ts +123 -69
  114. package/src/cfetch/internal.ts +217 -96
  115. package/src/cli.ts +23 -8
  116. package/src/config/config.ts +244 -196
  117. package/src/config/diagnostics.ts +61 -61
  118. package/src/config/environment.ts +563 -339
  119. package/src/config/index.ts +381 -41
  120. package/src/config/validation-helpers.ts +379 -357
  121. package/src/config/validation.ts +2181 -1263
  122. package/src/config-cache.ts +81 -41
  123. package/src/create-worker-preview.ts +250 -132
  124. package/src/create-worker-upload-form.ts +343 -224
  125. package/src/d1/backups.tsx +219 -0
  126. package/src/d1/constants.ts +2 -0
  127. package/src/d1/create.tsx +68 -0
  128. package/src/d1/delete.ts +53 -0
  129. package/src/d1/execute.tsx +357 -0
  130. package/src/d1/formatTimeAgo.ts +14 -0
  131. package/src/d1/index.ts +100 -0
  132. package/src/d1/list.tsx +60 -0
  133. package/src/d1/migrations/apply.tsx +212 -0
  134. package/src/d1/migrations/create.tsx +79 -0
  135. package/src/d1/migrations/helpers.ts +172 -0
  136. package/src/d1/migrations/index.ts +3 -0
  137. package/src/d1/migrations/list.tsx +95 -0
  138. package/src/d1/migrations/options.ts +23 -0
  139. package/src/d1/options.ts +22 -0
  140. package/src/d1/splitter.ts +161 -0
  141. package/src/d1/types.ts +25 -0
  142. package/src/d1/utils.ts +49 -0
  143. package/src/delete.ts +100 -0
  144. package/src/deployments.ts +368 -0
  145. package/src/deprecated/index.ts +144 -0
  146. package/src/dev/dev-vars.ts +20 -17
  147. package/src/dev/dev.tsx +535 -353
  148. package/src/dev/get-local-persistence-path.ts +31 -0
  149. package/src/dev/local.tsx +900 -292
  150. package/src/dev/remote.tsx +620 -201
  151. package/src/dev/start-server.ts +534 -0
  152. package/src/dev/use-esbuild.ts +182 -97
  153. package/src/dev/validate-dev-props.ts +40 -0
  154. package/src/dev-registry.ts +202 -0
  155. package/src/dev.tsx +929 -0
  156. package/src/dialogs.ts +136 -0
  157. package/src/dispatch-namespace.ts +211 -0
  158. package/src/docs/index.ts +97 -0
  159. package/src/durable.ts +102 -0
  160. package/src/entry.ts +259 -189
  161. package/src/environment-variables/factory.ts +88 -0
  162. package/src/environment-variables/misc-variables.ts +30 -0
  163. package/src/errors.ts +6 -6
  164. package/src/generate/index.ts +298 -0
  165. package/src/git-client.ts +135 -0
  166. package/src/global-wrangler-config-path.ts +26 -0
  167. package/src/https-options.ts +84 -80
  168. package/src/index.ts +758 -0
  169. package/src/init.ts +1032 -0
  170. package/src/inspect.ts +721 -562
  171. package/src/intl-polyfill.d.ts +123 -123
  172. package/src/is-ci.ts +14 -0
  173. package/src/is-interactive.ts +16 -0
  174. package/src/jest.d.ts +4 -0
  175. package/src/kv/helpers.ts +430 -0
  176. package/src/kv/index.ts +594 -0
  177. package/src/logger.ts +96 -43
  178. package/src/metrics/index.ts +5 -0
  179. package/src/metrics/metrics-config.ts +239 -0
  180. package/src/metrics/metrics-dispatcher.ts +96 -0
  181. package/src/metrics/metrics-usage-headers.ts +24 -0
  182. package/src/metrics/send-event.ts +99 -0
  183. package/src/miniflare-cli/assets.ts +251 -0
  184. package/src/miniflare-cli/index.ts +202 -33
  185. package/src/miniflare-cli/request-context.ts +18 -18
  186. package/src/miniflare-cli/tsconfig.json +9 -0
  187. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  188. package/src/miniflare-cli/types.ts +11 -0
  189. package/src/module-collection.ts +290 -215
  190. package/src/mtls-certificate/cli.ts +155 -0
  191. package/src/open-in-browser.ts +5 -14
  192. package/src/package-manager.ts +182 -90
  193. package/src/pages/build.ts +410 -0
  194. package/src/pages/buildFunctions.ts +140 -0
  195. package/src/pages/constants.ts +18 -0
  196. package/src/pages/deployment-tails.ts +281 -0
  197. package/src/pages/deployments.tsx +84 -0
  198. package/src/pages/dev.ts +716 -0
  199. package/src/pages/errors.ts +67 -0
  200. package/src/pages/functions/buildPlugin.ts +113 -0
  201. package/src/pages/functions/buildWorker.ts +291 -0
  202. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  203. package/src/pages/functions/filepath-routing.ts +189 -0
  204. package/src/pages/functions/identifiers.ts +78 -0
  205. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  206. package/src/pages/functions/routes-consolidation.ts +73 -0
  207. package/src/pages/functions/routes-transformation.test.ts +282 -0
  208. package/src/pages/functions/routes-transformation.ts +115 -0
  209. package/src/pages/functions/routes-validation.test.ts +403 -0
  210. package/src/pages/functions/routes-validation.ts +202 -0
  211. package/src/pages/functions/routes.ts +151 -0
  212. package/src/pages/functions/tsconfig.json +8 -0
  213. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  214. package/src/pages/functions.ts +86 -0
  215. package/src/pages/hash.ts +13 -0
  216. package/src/pages/index.ts +102 -0
  217. package/src/pages/projects.tsx +159 -0
  218. package/src/pages/prompt-select-project.tsx +31 -0
  219. package/src/pages/publish.tsx +267 -0
  220. package/src/pages/types.ts +46 -0
  221. package/src/pages/upload.tsx +469 -0
  222. package/src/pages/utils.ts +23 -0
  223. package/src/parse.ts +246 -123
  224. package/src/paths.ts +53 -8
  225. package/src/proxy.ts +628 -383
  226. package/src/publish/index.ts +274 -0
  227. package/src/publish/publish.ts +1060 -0
  228. package/src/pubsub/index.ts +286 -0
  229. package/src/pubsub/pubsub-commands.ts +623 -0
  230. package/src/queues/cli/commands/consumer/add.ts +71 -0
  231. package/src/queues/cli/commands/consumer/index.ts +19 -0
  232. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  233. package/src/queues/cli/commands/create.ts +25 -0
  234. package/src/queues/cli/commands/delete.ts +26 -0
  235. package/src/queues/cli/commands/index.ts +35 -0
  236. package/src/queues/cli/commands/list.ts +25 -0
  237. package/src/queues/client.ts +136 -0
  238. package/src/queues/utils.ts +18 -0
  239. package/src/r2/constants.ts +4 -0
  240. package/src/r2/helpers.ts +132 -0
  241. package/src/r2/index.ts +289 -0
  242. package/src/routes.ts +140 -0
  243. package/src/secret/index.ts +376 -0
  244. package/src/selfsigned.d.ts +23 -23
  245. package/src/sites.ts +372 -0
  246. package/src/tail/createTail.ts +406 -0
  247. package/src/tail/filters.ts +109 -111
  248. package/src/tail/index.ts +208 -296
  249. package/src/tail/printing.ts +101 -46
  250. package/src/traverse-module-graph.ts +53 -0
  251. package/src/tsconfig-sanity.ts +16 -0
  252. package/src/type-generation.ts +181 -0
  253. package/src/update-check.ts +11 -11
  254. package/src/user/access.ts +68 -0
  255. package/src/user/auth-variables.ts +113 -0
  256. package/src/user/choose-account.tsx +39 -0
  257. package/src/user/generate-auth-url.ts +33 -0
  258. package/src/user/generate-random-state.ts +16 -0
  259. package/src/user/index.ts +2 -0
  260. package/src/user/user.ts +1233 -0
  261. package/src/utils/collectKeyValues.ts +14 -0
  262. package/src/utils/render.ts +93 -0
  263. package/src/whoami.ts +135 -0
  264. package/src/worker.ts +203 -101
  265. package/src/yargs-types.ts +37 -0
  266. package/src/zones.ts +191 -0
  267. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  268. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  269. package/templates/__tests__/tsconfig.json +8 -0
  270. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  271. package/templates/checked-fetch.js +23 -0
  272. package/templates/d1-beta-facade.js +244 -0
  273. package/templates/facade.d.ts +14 -0
  274. package/templates/first-party-worker-module-facade.ts +19 -0
  275. package/templates/format-dev-errors.ts +34 -0
  276. package/templates/gitignore +1 -0
  277. package/templates/init-tests/test-jest-new-worker.js +23 -0
  278. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  279. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  280. package/templates/middleware/common.ts +62 -0
  281. package/templates/middleware/loader-modules.ts +84 -0
  282. package/templates/middleware/loader-sw.ts +233 -0
  283. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  284. package/templates/middleware/middleware-pretty-error.ts +40 -0
  285. package/templates/middleware/middleware-scheduled.ts +15 -0
  286. package/templates/new-worker-scheduled.js +17 -0
  287. package/templates/new-worker-scheduled.ts +32 -0
  288. package/templates/new-worker.js +3 -3
  289. package/templates/new-worker.ts +21 -3
  290. package/templates/no-op-worker.js +10 -0
  291. package/templates/pages-dev-pipeline.ts +31 -0
  292. package/templates/pages-dev-util.ts +52 -0
  293. package/templates/pages-shim.ts +12 -0
  294. package/templates/pages-template-plugin.ts +180 -0
  295. package/templates/pages-template-worker.ts +189 -0
  296. package/templates/serve-static-assets.ts +66 -0
  297. package/templates/service-bindings-module-facade.js +55 -0
  298. package/templates/service-bindings-sw-facade.js +42 -0
  299. package/templates/tsconfig-sanity.ts +11 -0
  300. package/templates/tsconfig.init.json +105 -0
  301. package/templates/tsconfig.json +6 -103
  302. package/templates/tsconfig.tsbuildinfo +1 -0
  303. package/wrangler-dist/cli.d.ts +1641 -0
  304. package/wrangler-dist/cli.js +129145 -89350
  305. package/wrangler-dist/wasm-sync.wasm +0 -0
  306. package/pages/functions/buildPlugin.ts +0 -92
  307. package/pages/functions/buildWorker.ts +0 -138
  308. package/pages/functions/filepath-routing.ts +0 -189
  309. package/pages/functions/identifiers.ts +0 -78
  310. package/pages/functions/routes.ts +0 -156
  311. package/pages/functions/template-plugin.ts +0 -146
  312. package/pages/functions/template-worker.ts +0 -143
  313. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  314. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  315. package/src/__tests__/pages.test.ts +0 -327
  316. package/src/dialogs.tsx +0 -87
  317. package/src/environment-variables.ts +0 -35
  318. package/src/index.tsx +0 -2698
  319. package/src/kv.ts +0 -319
  320. package/src/miniflare-cli/enum-keys.ts +0 -17
  321. package/src/pages.tsx +0 -1875
  322. package/src/publish.ts +0 -469
  323. package/src/r2.ts +0 -50
  324. package/src/sites.tsx +0 -293
  325. package/src/user.tsx +0 -1203
  326. package/src/whoami.tsx +0 -70
  327. package/templates/static-asset-facade.js +0 -47
  328. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  329. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  330. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  331. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  332. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  333. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  334. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  335. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  336. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  337. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  338. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  339. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  340. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  341. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  342. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  343. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  344. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  345. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  346. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  347. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  348. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  349. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  350. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  351. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  352. package/vendor/wrangler-mime/LICENSE +0 -21
  353. package/vendor/wrangler-mime/Mime.js +0 -97
  354. package/vendor/wrangler-mime/README.md +0 -187
  355. package/vendor/wrangler-mime/cli.js +0 -46
  356. package/vendor/wrangler-mime/index.js +0 -4
  357. package/vendor/wrangler-mime/lite.js +0 -4
  358. package/vendor/wrangler-mime/package.json +0 -52
  359. package/vendor/wrangler-mime/types/other.js +0 -1
  360. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -1,118 +1,203 @@
1
1
  import assert from "node:assert";
2
+ import { watch } from "chokidar";
2
3
  import { useApp } from "ink";
3
4
  import { useState, useEffect } from "react";
4
- import { bundleWorker } from "../bundle";
5
- import { logger } from "../logger";
5
+ import { bundleWorker, rewriteNodeCompatBuildFailure } from "../bundle";
6
+ import { logBuildFailure, logger } from "../logger";
7
+ import traverseModuleGraph from "../traverse-module-graph";
6
8
  import type { Config } from "../config";
9
+ import type { WorkerRegistry } from "../dev-registry";
7
10
  import type { Entry } from "../entry";
8
11
  import type { CfModule } from "../worker";
9
- import type { WatchMode } from "esbuild";
12
+ import type { WatchMode, Metafile } from "esbuild";
10
13
 
11
14
  export type EsbuildBundle = {
12
- id: number;
13
- path: string;
14
- entry: Entry;
15
- type: "esm" | "commonjs";
16
- modules: CfModule[];
17
- serveAssetsFromWorker: boolean;
15
+ id: number;
16
+ path: string;
17
+ entry: Entry;
18
+ type: "esm" | "commonjs";
19
+ modules: CfModule[];
20
+ dependencies: Metafile["outputs"][string]["inputs"];
21
+ sourceMapPath: string | undefined;
18
22
  };
19
23
 
20
24
  export function useEsbuild({
21
- entry,
22
- destination,
23
- staticRoot,
24
- jsxFactory,
25
- jsxFragment,
26
- rules,
27
- serveAssetsFromWorker,
28
- tsconfig,
29
- minify,
30
- nodeCompat,
25
+ entry,
26
+ destination,
27
+ jsxFactory,
28
+ jsxFragment,
29
+ rules,
30
+ assets,
31
+ serveAssetsFromWorker,
32
+ tsconfig,
33
+ minify,
34
+ legacyNodeCompat,
35
+ nodejsCompat,
36
+ betaD1Shims,
37
+ define,
38
+ noBundle,
39
+ workerDefinitions,
40
+ services,
41
+ durableObjects,
42
+ firstPartyWorkerDevFacade,
43
+ local,
44
+ targetConsumer,
45
+ testScheduled,
46
+ experimentalLocal,
31
47
  }: {
32
- entry: Entry;
33
- destination: string | undefined;
34
- staticRoot: string | undefined;
35
- jsxFactory: string | undefined;
36
- jsxFragment: string | undefined;
37
- rules: Config["rules"];
38
- serveAssetsFromWorker: boolean;
39
- tsconfig: string | undefined;
40
- minify: boolean | undefined;
41
- nodeCompat: boolean | undefined;
48
+ entry: Entry;
49
+ destination: string | undefined;
50
+ jsxFactory: string | undefined;
51
+ jsxFragment: string | undefined;
52
+ rules: Config["rules"];
53
+ assets: Config["assets"];
54
+ define: Config["define"];
55
+ services: Config["services"];
56
+ serveAssetsFromWorker: boolean;
57
+ tsconfig: string | undefined;
58
+ minify: boolean | undefined;
59
+ legacyNodeCompat: boolean | undefined;
60
+ nodejsCompat: boolean | undefined;
61
+ betaD1Shims?: string[];
62
+ noBundle: boolean;
63
+ workerDefinitions: WorkerRegistry;
64
+ durableObjects: Config["durable_objects"];
65
+ firstPartyWorkerDevFacade: boolean | undefined;
66
+ local: boolean;
67
+ targetConsumer: "dev" | "publish";
68
+ testScheduled: boolean;
69
+ experimentalLocal: boolean | undefined;
42
70
  }): EsbuildBundle | undefined {
43
- const [bundle, setBundle] = useState<EsbuildBundle>();
44
- const { exit } = useApp();
45
- useEffect(() => {
46
- let stopWatching: (() => void) | undefined = undefined;
71
+ const [bundle, setBundle] = useState<EsbuildBundle>();
72
+ const { exit } = useApp();
73
+ useEffect(() => {
74
+ let stopWatching: (() => void) | undefined = undefined;
47
75
 
48
- const watchMode: WatchMode = {
49
- async onRebuild(error) {
50
- if (error) logger.error("Watch build failed:", error);
51
- else {
52
- // nothing really changes here, so let's increment the id
53
- // to change the return object's identity
54
- setBundle((previousBundle) => {
55
- assert(
56
- previousBundle,
57
- "Rebuild triggered with no previous build available"
58
- );
59
- return { ...previousBundle, id: previousBundle.id + 1 };
60
- });
61
- }
62
- },
63
- };
76
+ function updateBundle() {
77
+ // nothing really changes here, so let's increment the id
78
+ // to change the return object's identity
79
+ setBundle((previousBundle) => {
80
+ assert(
81
+ previousBundle,
82
+ "Rebuild triggered with no previous build available"
83
+ );
84
+ return { ...previousBundle, id: previousBundle.id + 1 };
85
+ });
86
+ }
64
87
 
65
- async function build() {
66
- if (!destination) return;
88
+ const watchMode: WatchMode = {
89
+ async onRebuild(error) {
90
+ if (error !== null) {
91
+ if (!legacyNodeCompat) rewriteNodeCompatBuildFailure(error);
92
+ logBuildFailure(error);
93
+ logger.error("Watch build failed:", error.message);
94
+ } else {
95
+ updateBundle();
96
+ }
97
+ },
98
+ };
67
99
 
68
- const { resolvedEntryPointPath, bundleType, modules, stop } =
69
- await bundleWorker(entry, destination, {
70
- // In dev, we serve assets from the local proxy before we send the request to the worker.
71
- serveAssetsFromWorker: false,
72
- jsxFactory,
73
- jsxFragment,
74
- rules,
75
- watch: watchMode,
76
- tsconfig,
77
- minify,
78
- nodeCompat,
79
- });
100
+ async function build() {
101
+ if (!destination) return;
80
102
 
81
- // Capture the `stop()` method to use as the `useEffect()` destructor.
82
- stopWatching = stop;
103
+ const {
104
+ resolvedEntryPointPath,
105
+ bundleType,
106
+ modules,
107
+ dependencies,
108
+ stop,
109
+ sourceMapPath,
110
+ }: Awaited<ReturnType<typeof bundleWorker>> = noBundle
111
+ ? await traverseModuleGraph(entry, rules)
112
+ : await bundleWorker(entry, destination, {
113
+ serveAssetsFromWorker,
114
+ jsxFactory,
115
+ jsxFragment,
116
+ rules,
117
+ watch: watchMode,
118
+ tsconfig,
119
+ minify,
120
+ legacyNodeCompat,
121
+ nodejsCompat,
122
+ betaD1Shims,
123
+ doBindings: durableObjects.bindings,
124
+ define,
125
+ checkFetch: true,
126
+ assets: assets && {
127
+ ...assets,
128
+ // disable the cache in dev
129
+ bypassCache: true,
130
+ },
131
+ workerDefinitions,
132
+ services,
133
+ firstPartyWorkerDevFacade,
134
+ local,
135
+ targetConsumer,
136
+ testScheduled,
137
+ experimentalLocal,
138
+ });
83
139
 
84
- setBundle({
85
- id: 0,
86
- entry,
87
- path: resolvedEntryPointPath,
88
- type: bundleType,
89
- modules,
90
- serveAssetsFromWorker,
91
- });
92
- }
140
+ // Capture the `stop()` method to use as the `useEffect()` destructor.
141
+ stopWatching = stop;
93
142
 
94
- build().catch((err) => {
95
- // If esbuild fails on first run, we want to quit the process
96
- // since we can't recover from here
97
- // related: https://github.com/evanw/esbuild/issues/1037
98
- exit(err);
99
- });
143
+ // if "noBundle" is true, then we need to manually watch the entry point and
144
+ // trigger "builds" when it changes
145
+ if (noBundle) {
146
+ const watcher = watch(entry.file, {
147
+ persistent: true,
148
+ }).on("change", async (_event) => {
149
+ updateBundle();
150
+ });
100
151
 
101
- return () => {
102
- stopWatching?.();
103
- };
104
- }, [
105
- entry,
106
- destination,
107
- staticRoot,
108
- jsxFactory,
109
- jsxFragment,
110
- serveAssetsFromWorker,
111
- rules,
112
- tsconfig,
113
- exit,
114
- minify,
115
- nodeCompat,
116
- ]);
117
- return bundle;
152
+ stopWatching = () => {
153
+ void watcher.close();
154
+ };
155
+ }
156
+ setBundle({
157
+ id: 0,
158
+ entry,
159
+ path: resolvedEntryPointPath,
160
+ type: bundleType,
161
+ modules,
162
+ dependencies,
163
+ sourceMapPath,
164
+ });
165
+ }
166
+
167
+ build().catch((err) => {
168
+ // If esbuild fails on first run, we want to quit the process
169
+ // since we can't recover from here
170
+ // related: https://github.com/evanw/esbuild/issues/1037
171
+ exit(err);
172
+ });
173
+
174
+ return () => {
175
+ stopWatching?.();
176
+ };
177
+ }, [
178
+ entry,
179
+ destination,
180
+ jsxFactory,
181
+ jsxFragment,
182
+ serveAssetsFromWorker,
183
+ rules,
184
+ tsconfig,
185
+ exit,
186
+ noBundle,
187
+ minify,
188
+ legacyNodeCompat,
189
+ nodejsCompat,
190
+ define,
191
+ assets,
192
+ services,
193
+ durableObjects,
194
+ workerDefinitions,
195
+ firstPartyWorkerDevFacade,
196
+ betaD1Shims,
197
+ local,
198
+ targetConsumer,
199
+ testScheduled,
200
+ experimentalLocal,
201
+ ]);
202
+ return bundle;
118
203
  }
@@ -0,0 +1,40 @@
1
+ import type { DevProps } from "./dev";
2
+
3
+ export function validateDevProps(props: DevProps) {
4
+ if (
5
+ !props.isWorkersSite &&
6
+ props.assetPaths &&
7
+ props.entry.format === "service-worker"
8
+ ) {
9
+ throw new Error(
10
+ "You cannot use the service-worker format with an `assets` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
11
+ );
12
+ }
13
+
14
+ if (props.bindings.wasm_modules && props.entry.format === "modules") {
15
+ throw new Error(
16
+ "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
17
+ );
18
+ }
19
+
20
+ if (props.bindings.text_blobs && props.entry.format === "modules") {
21
+ throw new Error(
22
+ "You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
23
+ );
24
+ }
25
+
26
+ if (props.bindings.data_blobs && props.entry.format === "modules") {
27
+ throw new Error(
28
+ "You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
29
+ );
30
+ }
31
+
32
+ if (
33
+ props.compatibilityFlags?.includes("nodejs_compat") &&
34
+ props.legacyNodeCompat
35
+ ) {
36
+ throw new Error(
37
+ "You cannot use the `nodejs_compat` compatibility flag in conjunction with the legacy `--node-compat` flag. If you want to use the new runtime Node.js compatibility features, please remove the `--node-compat` argument from your CLI command or your config file."
38
+ );
39
+ }
40
+ }
@@ -0,0 +1,202 @@
1
+ import http from "http";
2
+ import net from "net";
3
+ import bodyParser from "body-parser";
4
+ import express from "express";
5
+ import { createHttpTerminator } from "http-terminator";
6
+ import { fetch } from "undici";
7
+ import { logger } from "./logger";
8
+
9
+ import type { Config } from "./config";
10
+ import type { Server } from "http";
11
+ import type { HttpTerminator } from "http-terminator";
12
+
13
+ const DEV_REGISTRY_PORT = "6284";
14
+ const DEV_REGISTRY_HOST = `http://localhost:${DEV_REGISTRY_PORT}`;
15
+
16
+ let server: Server | null;
17
+ let terminator: HttpTerminator;
18
+
19
+ export type WorkerRegistry = Record<string, WorkerDefinition>;
20
+
21
+ type WorkerDefinition = {
22
+ port: number | undefined;
23
+ protocol: "http" | "https" | undefined;
24
+ host: string | undefined;
25
+ mode: "local" | "remote";
26
+ headers?: Record<string, string>;
27
+ durableObjects: { name: string; className: string }[];
28
+ durableObjectsHost?: string;
29
+ durableObjectsPort?: number;
30
+ };
31
+
32
+ /**
33
+ * A helper function to check whether our service registry is already running
34
+ */
35
+ async function isPortAvailable() {
36
+ return new Promise((resolve, reject) => {
37
+ const netServer = net
38
+ .createServer()
39
+ .once("error", (err) => {
40
+ netServer.close();
41
+ if ((err as unknown as { code: string }).code === "EADDRINUSE") {
42
+ resolve(false);
43
+ } else {
44
+ reject(err);
45
+ }
46
+ })
47
+ .once("listening", () => {
48
+ netServer.close();
49
+ resolve(true);
50
+ });
51
+ netServer.listen(DEV_REGISTRY_PORT);
52
+ });
53
+ }
54
+
55
+ const jsonBodyParser = bodyParser.json();
56
+
57
+ /**
58
+ * Start the service registry. It's a simple server
59
+ * that exposes endpoints for registering and unregistering
60
+ * services, as well as getting the state of the registry.
61
+ */
62
+ export async function startWorkerRegistry() {
63
+ if ((await isPortAvailable()) && !server) {
64
+ const app = express();
65
+
66
+ let workers: WorkerRegistry = {};
67
+ app
68
+ .get("/workers", async (req, res) => {
69
+ res.json(workers);
70
+ })
71
+ .post("/workers/:workerId", jsonBodyParser, async (req, res) => {
72
+ workers[req.params.workerId] = req.body;
73
+ res.json(null);
74
+ })
75
+ .delete(`/workers/:workerId`, async (req, res) => {
76
+ delete workers[req.params.workerId];
77
+ res.json(null);
78
+ })
79
+ .delete("/workers", async (req, res) => {
80
+ workers = {};
81
+ res.json(null);
82
+ });
83
+ server = http.createServer(app);
84
+ terminator = createHttpTerminator({ server });
85
+ server.listen(DEV_REGISTRY_PORT);
86
+
87
+ /**
88
+ * The registry server may have already been started by another wrangler process.
89
+ * If wrangler processes are run in parallel, isPortAvailable() can return true
90
+ * while another process spins up the server
91
+ */
92
+ server.once("error", (err) => {
93
+ if ((err as unknown as { code: string }).code !== "EADDRINUSE") {
94
+ throw err;
95
+ }
96
+ });
97
+ }
98
+ }
99
+
100
+ /**
101
+ * Stop the service registry.
102
+ */
103
+ export async function stopWorkerRegistry() {
104
+ await terminator?.terminate();
105
+ server = null;
106
+ }
107
+
108
+ /**
109
+ * Register a worker in the registry.
110
+ */
111
+ export async function registerWorker(
112
+ name: string,
113
+ definition: WorkerDefinition
114
+ ) {
115
+ try {
116
+ return await fetch(`${DEV_REGISTRY_HOST}/workers/${name}`, {
117
+ method: "POST",
118
+ headers: {
119
+ "Content-Type": "application/json",
120
+ },
121
+ body: JSON.stringify(definition),
122
+ });
123
+ } catch (e) {
124
+ if (
125
+ !["ECONNRESET", "ECONNREFUSED"].includes(
126
+ (e as unknown as { cause?: { code?: string } }).cause?.code || "___"
127
+ )
128
+ ) {
129
+ logger.error("Failed to register worker in local service registry", e);
130
+ } else {
131
+ logger.debug("Failed to register worker in local service registry", e);
132
+ }
133
+ }
134
+ }
135
+
136
+ /**
137
+ * Unregister a worker from the registry.
138
+ */
139
+ export async function unregisterWorker(name: string) {
140
+ try {
141
+ await fetch(`${DEV_REGISTRY_HOST}/workers/${name}`, {
142
+ method: "DELETE",
143
+ });
144
+ } catch (e) {
145
+ if (
146
+ !["ECONNRESET", "ECONNREFUSED"].includes(
147
+ (e as unknown as { cause?: { code?: string } }).cause?.code || "___"
148
+ )
149
+ ) {
150
+ throw e;
151
+ // logger.error("failed to unregister worker", e);
152
+ }
153
+ }
154
+ }
155
+
156
+ /**
157
+ * Get the state of the service registry.
158
+ */
159
+ export async function getRegisteredWorkers(): Promise<
160
+ WorkerRegistry | undefined
161
+ > {
162
+ try {
163
+ const response = await fetch(`${DEV_REGISTRY_HOST}/workers`);
164
+ return (await response.json()) as WorkerRegistry;
165
+ } catch (e) {
166
+ if (
167
+ !["ECONNRESET", "ECONNREFUSED"].includes(
168
+ (e as unknown as { cause?: { code?: string } }).cause?.code || "___"
169
+ )
170
+ ) {
171
+ throw e;
172
+ }
173
+ }
174
+ }
175
+
176
+ /**
177
+ * a function that takes your serviceNames and durableObjectNames and returns a
178
+ * list of the running workers that we're bound to
179
+ */
180
+ export async function getBoundRegisteredWorkers({
181
+ services,
182
+ durableObjects,
183
+ }: {
184
+ services: Config["services"] | undefined;
185
+ durableObjects: Config["durable_objects"] | undefined;
186
+ }) {
187
+ const serviceNames = (services || []).map(
188
+ (serviceBinding) => serviceBinding.service
189
+ );
190
+ const durableObjectServices = (
191
+ durableObjects || { bindings: [] }
192
+ ).bindings.map((durableObjectBinding) => durableObjectBinding.script_name);
193
+
194
+ const workerDefinitions = await getRegisteredWorkers();
195
+ const filteredWorkers = Object.fromEntries(
196
+ Object.entries(workerDefinitions || {}).filter(
197
+ ([key, _value]) =>
198
+ serviceNames.includes(key) || durableObjectServices.includes(key)
199
+ )
200
+ );
201
+ return filteredWorkers;
202
+ }