wrangler 0.0.0-ea8f8d7 → 0.0.0-eab9542

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/README.md +7 -1
  2. package/bin/wrangler.js +114 -57
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +10 -2
  5. package/package.json +156 -152
  6. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  7. package/src/__tests__/config-cache.test.ts +30 -24
  8. package/src/__tests__/configuration.test.ts +3935 -3321
  9. package/src/__tests__/dev.test.tsx +1131 -871
  10. package/src/__tests__/guess-worker-format.test.ts +68 -68
  11. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  12. package/src/__tests__/helpers/faye-websocket.d.ts +4 -4
  13. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  14. package/src/__tests__/helpers/mock-bin.ts +20 -20
  15. package/src/__tests__/helpers/mock-cfetch.ts +92 -92
  16. package/src/__tests__/helpers/mock-console.ts +49 -39
  17. package/src/__tests__/helpers/mock-dialogs.ts +114 -51
  18. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  19. package/src/__tests__/helpers/mock-istty.ts +65 -18
  20. package/src/__tests__/helpers/mock-kv.ts +26 -26
  21. package/src/__tests__/helpers/mock-oauth-flow.ts +223 -228
  22. package/src/__tests__/helpers/mock-process.ts +39 -0
  23. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  24. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  25. package/src/__tests__/helpers/run-in-tmp.ts +27 -27
  26. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  27. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  28. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  29. package/src/__tests__/https-options.test.ts +104 -104
  30. package/src/__tests__/index.test.ts +239 -233
  31. package/src/__tests__/init.test.ts +1607 -1172
  32. package/src/__tests__/jest.setup.ts +63 -33
  33. package/src/__tests__/kv.test.ts +1136 -998
  34. package/src/__tests__/logger.test.ts +100 -74
  35. package/src/__tests__/package-manager.test.ts +312 -165
  36. package/src/__tests__/pages.test.ts +1177 -580
  37. package/src/__tests__/parse.test.ts +252 -252
  38. package/src/__tests__/publish.test.ts +6400 -5299
  39. package/src/__tests__/pubsub.test.ts +367 -0
  40. package/src/__tests__/r2.test.ts +133 -133
  41. package/src/__tests__/route.test.ts +18 -18
  42. package/src/__tests__/secret.test.ts +386 -381
  43. package/src/__tests__/tail.test.ts +530 -530
  44. package/src/__tests__/user.test.ts +123 -111
  45. package/src/__tests__/whoami.test.tsx +198 -83
  46. package/src/__tests__/worker-namespace.test.ts +327 -0
  47. package/src/abort.d.ts +1 -1
  48. package/src/api/dev.ts +52 -0
  49. package/src/api/index.ts +1 -0
  50. package/src/bundle-reporter.tsx +29 -0
  51. package/src/bundle.ts +158 -146
  52. package/src/cfetch/index.ts +80 -80
  53. package/src/cfetch/internal.ts +96 -86
  54. package/src/cli.ts +21 -7
  55. package/src/config/config.ts +204 -195
  56. package/src/config/diagnostics.ts +61 -61
  57. package/src/config/environment.ts +390 -357
  58. package/src/config/index.ts +206 -193
  59. package/src/config/validation-helpers.ts +366 -357
  60. package/src/config/validation.ts +1573 -1358
  61. package/src/config-cache.ts +79 -41
  62. package/src/create-worker-preview.ts +206 -136
  63. package/src/create-worker-upload-form.ts +247 -238
  64. package/src/dev/dev-vars.ts +13 -13
  65. package/src/dev/dev.tsx +333 -338
  66. package/src/dev/local.tsx +308 -274
  67. package/src/dev/remote.tsx +366 -211
  68. package/src/dev/use-esbuild.ts +126 -94
  69. package/src/dev.tsx +538 -0
  70. package/src/dialogs.tsx +111 -63
  71. package/src/durable.ts +87 -87
  72. package/src/entry.ts +234 -228
  73. package/src/environment-variables.ts +23 -23
  74. package/src/errors.ts +6 -6
  75. package/src/generate.ts +33 -0
  76. package/src/git-client.ts +42 -0
  77. package/src/https-options.ts +79 -79
  78. package/src/index.tsx +1773 -2691
  79. package/src/init.ts +549 -0
  80. package/src/inspect.ts +593 -593
  81. package/src/intl-polyfill.d.ts +123 -123
  82. package/src/is-interactive.ts +12 -0
  83. package/src/kv.ts +277 -277
  84. package/src/logger.ts +46 -39
  85. package/src/miniflare-cli/enum-keys.ts +8 -8
  86. package/src/miniflare-cli/index.ts +43 -31
  87. package/src/miniflare-cli/request-context.ts +18 -18
  88. package/src/module-collection.ts +212 -212
  89. package/src/open-in-browser.ts +4 -6
  90. package/src/package-manager.ts +133 -86
  91. package/src/pages/build.tsx +202 -0
  92. package/src/pages/constants.ts +7 -0
  93. package/src/pages/deployments.tsx +101 -0
  94. package/src/pages/dev.tsx +964 -0
  95. package/src/pages/functions/buildPlugin.ts +105 -0
  96. package/src/pages/functions/buildWorker.ts +151 -0
  97. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  98. package/src/pages/functions/filepath-routing.ts +189 -0
  99. package/src/pages/functions/identifiers.ts +78 -0
  100. package/src/pages/functions/routes.ts +151 -0
  101. package/src/pages/index.tsx +84 -0
  102. package/src/pages/projects.tsx +157 -0
  103. package/src/pages/publish.tsx +335 -0
  104. package/src/pages/types.ts +40 -0
  105. package/src/pages/upload.tsx +384 -0
  106. package/src/pages/utils.ts +12 -0
  107. package/src/parse.ts +209 -125
  108. package/src/paths.ts +6 -6
  109. package/src/preview.ts +31 -0
  110. package/src/proxy.ts +400 -389
  111. package/src/publish.ts +689 -505
  112. package/src/pubsub/index.ts +286 -0
  113. package/src/pubsub/pubsub-commands.tsx +577 -0
  114. package/src/r2.ts +19 -19
  115. package/src/selfsigned.d.ts +23 -23
  116. package/src/sites.tsx +278 -201
  117. package/src/tail/filters.ts +108 -108
  118. package/src/tail/index.ts +217 -217
  119. package/src/tail/printing.ts +45 -45
  120. package/src/update-check.ts +11 -11
  121. package/src/user/choose-account.tsx +60 -0
  122. package/src/user/env-vars.ts +46 -0
  123. package/src/user/generate-auth-url.ts +33 -0
  124. package/src/user/generate-random-state.ts +16 -0
  125. package/src/user/index.ts +3 -0
  126. package/src/user/user.tsx +1161 -0
  127. package/src/whoami.tsx +61 -41
  128. package/src/worker-namespace.ts +190 -0
  129. package/src/worker.ts +110 -99
  130. package/src/zones.ts +76 -0
  131. package/templates/checked-fetch.js +17 -0
  132. package/templates/new-worker-scheduled.js +17 -0
  133. package/templates/new-worker-scheduled.ts +32 -0
  134. package/templates/new-worker.js +3 -3
  135. package/templates/new-worker.ts +15 -15
  136. package/templates/no-op-worker.js +10 -0
  137. package/templates/pages-template-plugin.ts +155 -0
  138. package/templates/pages-template-worker.ts +161 -0
  139. package/templates/static-asset-facade.js +32 -36
  140. package/templates/tsconfig.json +95 -95
  141. package/wrangler-dist/cli.js +39087 -37488
  142. package/pages/functions/buildPlugin.ts +0 -105
  143. package/pages/functions/buildWorker.ts +0 -151
  144. package/pages/functions/filepath-routing.ts +0 -189
  145. package/pages/functions/identifiers.ts +0 -78
  146. package/pages/functions/routes.ts +0 -156
  147. package/pages/functions/template-plugin.ts +0 -147
  148. package/pages/functions/template-worker.ts +0 -143
  149. package/src/pages.tsx +0 -2024
  150. package/src/user.tsx +0 -1203
  151. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  152. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  153. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  154. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  155. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  156. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  157. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  158. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  159. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  160. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  161. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  162. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  163. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  164. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  165. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  166. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  167. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  168. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  169. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  170. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  171. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  172. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  173. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  174. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  175. package/vendor/wrangler-mime/LICENSE +0 -21
  176. package/vendor/wrangler-mime/Mime.js +0 -97
  177. package/vendor/wrangler-mime/README.md +0 -187
  178. package/vendor/wrangler-mime/cli.js +0 -46
  179. package/vendor/wrangler-mime/index.js +0 -4
  180. package/vendor/wrangler-mime/lite.js +0 -4
  181. package/vendor/wrangler-mime/package.json +0 -52
  182. package/vendor/wrangler-mime/types/other.js +0 -1
  183. package/vendor/wrangler-mime/types/standard.js +0 -1
package/src/dev/dev.tsx CHANGED
@@ -9,279 +9,274 @@ import { withErrorBoundary, useErrorHandler } from "react-error-boundary";
9
9
  import onExit from "signal-exit";
10
10
  import tmp from "tmp-promise";
11
11
  import { fetch } from "undici";
12
- import { printBindings } from "../config";
13
12
  import { runCustomBuild } from "../entry";
14
13
  import { openInspector } from "../inspect";
15
14
  import { logger } from "../logger";
16
15
  import openInBrowser from "../open-in-browser";
17
- import { getAPIToken } from "../user";
18
16
  import { Local } from "./local";
19
17
  import { Remote } from "./remote";
20
18
  import { useEsbuild } from "./use-esbuild";
21
19
  import type { Config } from "../config";
20
+ import type { Route } from "../config/environment";
22
21
  import type { Entry } from "../entry";
23
22
  import type { AssetPaths } from "../sites";
24
23
  import type { CfWorkerInit } from "../worker";
25
- import type { EsbuildBundle } from "./use-esbuild";
26
24
 
27
25
  export type DevProps = {
28
- name?: string;
29
- entry: Entry;
30
- port: number;
31
- ip: string;
32
- inspectorPort: number;
33
- rules: Config["rules"];
34
- accountId: string | undefined;
35
- initialMode: "local" | "remote";
36
- jsxFactory: string | undefined;
37
- jsxFragment: string | undefined;
38
- tsconfig: string | undefined;
39
- upstreamProtocol: "https" | "http";
40
- localProtocol: "https" | "http";
41
- enableLocalPersistence: boolean;
42
- bindings: CfWorkerInit["bindings"];
43
- crons: Config["triggers"]["crons"];
44
- public: string | undefined;
45
- assetPaths: AssetPaths | undefined;
46
- compatibilityDate: string;
47
- compatibilityFlags: string[] | undefined;
48
- usageModel: "bundled" | "unbound" | undefined;
49
- minify: boolean | undefined;
50
- nodeCompat: boolean | undefined;
51
- build: {
52
- command?: string | undefined;
53
- cwd?: string | undefined;
54
- watch_dir?: string | undefined;
55
- };
56
- env: string | undefined;
57
- legacyEnv: boolean;
58
- zone:
59
- | {
60
- id: string;
61
- host: string;
62
- }
63
- | undefined;
26
+ name: string | undefined;
27
+ noBundle: boolean;
28
+ entry: Entry;
29
+ port: number;
30
+ ip: string;
31
+ inspectorPort: number;
32
+ rules: Config["rules"];
33
+ accountId: string | undefined;
34
+ initialMode: "local" | "remote";
35
+ jsxFactory: string | undefined;
36
+ jsxFragment: string | undefined;
37
+ tsconfig: string | undefined;
38
+ upstreamProtocol: "https" | "http";
39
+ localProtocol: "https" | "http";
40
+ localUpstream: string | undefined;
41
+ enableLocalPersistence: boolean;
42
+ bindings: CfWorkerInit["bindings"];
43
+ define: Config["define"];
44
+ crons: Config["triggers"]["crons"];
45
+ isWorkersSite: boolean;
46
+ assetPaths: AssetPaths | undefined;
47
+ compatibilityDate: string;
48
+ compatibilityFlags: string[] | undefined;
49
+ usageModel: "bundled" | "unbound" | undefined;
50
+ minify: boolean | undefined;
51
+ nodeCompat: boolean | undefined;
52
+ build: Config["build"];
53
+ env: string | undefined;
54
+ legacyEnv: boolean;
55
+ zone: string | undefined;
56
+ host: string | undefined;
57
+ routes: Route[] | undefined;
58
+ inspect: boolean | undefined;
59
+ logLevel: "none" | "error" | "log" | "warn" | "debug" | undefined;
60
+ onReady: (() => void) | undefined;
61
+ showInteractiveDevSession: boolean | undefined;
64
62
  };
65
63
 
66
64
  export function DevImplementation(props: DevProps): JSX.Element {
67
- const apiToken = props.initialMode === "remote" ? getAPIToken() : undefined;
68
- const directory = useTmpDir();
65
+ if (
66
+ !props.isWorkersSite &&
67
+ props.assetPaths &&
68
+ props.entry.format === "service-worker"
69
+ ) {
70
+ throw new Error(
71
+ "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/"
72
+ );
73
+ }
69
74
 
70
- useCustomBuild(props.entry, props.build);
75
+ if (props.bindings.wasm_modules && props.entry.format === "modules") {
76
+ throw new Error(
77
+ "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
78
+ );
79
+ }
71
80
 
72
- if (props.public && props.entry.format === "service-worker") {
73
- throw new Error(
74
- "You cannot use the service-worker format with a `public` directory."
75
- );
76
- }
81
+ if (props.bindings.text_blobs && props.entry.format === "modules") {
82
+ throw new Error(
83
+ "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"
84
+ );
85
+ }
77
86
 
78
- if (props.bindings.wasm_modules && props.entry.format === "modules") {
79
- throw new Error(
80
- "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
81
- );
82
- }
87
+ if (props.bindings.data_blobs && props.entry.format === "modules") {
88
+ throw new Error(
89
+ "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"
90
+ );
91
+ }
83
92
 
84
- if (props.bindings.text_blobs && props.entry.format === "modules") {
85
- throw new Error(
86
- "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"
87
- );
88
- }
93
+ // only load the UI if we're running in a supported environment
94
+ const { isRawModeSupported } = useStdin();
89
95
 
90
- if (props.bindings.data_blobs && props.entry.format === "modules") {
91
- throw new Error(
92
- "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"
93
- );
94
- }
96
+ return props.showInteractiveDevSession ?? isRawModeSupported ? (
97
+ <InteractiveDevSession {...props} />
98
+ ) : (
99
+ <DevSession {...props} local={props.initialMode === "local"} />
100
+ );
101
+ }
95
102
 
96
- const bundle = useEsbuild({
97
- entry: props.entry,
98
- destination: directory,
99
- staticRoot: props.public,
100
- jsxFactory: props.jsxFactory,
101
- rules: props.rules,
102
- jsxFragment: props.jsxFragment,
103
- serveAssetsFromWorker: !!props.public,
104
- tsconfig: props.tsconfig,
105
- minify: props.minify,
106
- nodeCompat: props.nodeCompat,
107
- });
103
+ function InteractiveDevSession(props: DevProps) {
104
+ const toggles = useHotkeys(
105
+ {
106
+ local: props.initialMode === "local",
107
+ tunnel: false,
108
+ },
109
+ props.port,
110
+ props.ip,
111
+ props.inspectorPort,
112
+ props.localProtocol
113
+ );
108
114
 
109
- printBindings(props.bindings);
115
+ useTunnel(toggles.tunnel);
110
116
 
111
- // only load the UI if we're running in a supported environment
112
- const { isRawModeSupported } = useStdin();
113
- return isRawModeSupported ? (
114
- <InteractiveDevSession {...props} bundle={bundle} apiToken={apiToken} />
115
- ) : (
116
- <DevSession
117
- {...props}
118
- bundle={bundle}
119
- apiToken={apiToken}
120
- local={props.initialMode === "local"}
121
- />
122
- );
117
+ return (
118
+ <>
119
+ <DevSession {...props} local={toggles.local} />
120
+ <Box borderStyle="round" paddingLeft={1} paddingRight={1}>
121
+ <Text bold={true}>[b]</Text>
122
+ <Text> open a browser, </Text>
123
+ <Text bold={true}>[d]</Text>
124
+ <Text> open Devtools, </Text>
125
+ <Text bold={true}>[l]</Text>
126
+ <Text> {toggles.local ? "turn off" : "turn on"} local mode, </Text>
127
+ <Text bold={true}>[c]</Text>
128
+ <Text> clear console, </Text>
129
+ <Text bold={true}>[x]</Text>
130
+ <Text> to exit</Text>
131
+ </Box>
132
+ </>
133
+ );
123
134
  }
124
135
 
125
- type InteractiveDevSessionProps = DevProps & {
126
- apiToken: string | undefined;
127
- bundle: EsbuildBundle | undefined;
136
+ type DevSessionProps = DevProps & {
137
+ local: boolean;
128
138
  };
129
139
 
130
- function InteractiveDevSession(props: InteractiveDevSessionProps) {
131
- const toggles = useHotkeys(
132
- {
133
- local: props.initialMode === "local",
134
- tunnel: false,
135
- },
136
- props.port,
137
- props.ip,
138
- props.inspectorPort,
139
- props.localProtocol
140
- );
140
+ function DevSession(props: DevSessionProps) {
141
+ useCustomBuild(props.entry, props.build);
141
142
 
142
- useTunnel(toggles.tunnel);
143
+ const directory = useTmpDir();
143
144
 
144
- return (
145
- <>
146
- <DevSession {...props} local={toggles.local} />
147
- <Box borderStyle="round" paddingLeft={1} paddingRight={1}>
148
- <Text bold={true}>[b]</Text>
149
- <Text> open a browser, </Text>
150
- <Text bold={true}>[d]</Text>
151
- <Text> open Devtools, </Text>
152
- <Text bold={true}>[l]</Text>
153
- <Text> {toggles.local ? "turn off" : "turn on"} local mode, </Text>
154
- <Text bold={true}>[c]</Text>
155
- <Text> clear console, </Text>
156
- <Text bold={true}>[x]</Text>
157
- <Text> to exit</Text>
158
- </Box>
159
- </>
160
- );
161
- }
145
+ const bundle = useEsbuild({
146
+ entry: props.entry,
147
+ destination: directory,
148
+ jsxFactory: props.jsxFactory,
149
+ rules: props.rules,
150
+ jsxFragment: props.jsxFragment,
151
+ serveAssetsFromWorker: Boolean(
152
+ props.assetPaths && !props.isWorkersSite && props.local
153
+ ),
154
+ tsconfig: props.tsconfig,
155
+ minify: props.minify,
156
+ nodeCompat: props.nodeCompat,
157
+ define: props.define,
158
+ noBundle: props.noBundle,
159
+ });
162
160
 
163
- type DevSessionProps = InteractiveDevSessionProps & { local: boolean };
164
-
165
- function DevSession(props: DevSessionProps) {
166
- return props.local ? (
167
- <Local
168
- name={props.name}
169
- bundle={props.bundle}
170
- format={props.entry.format}
171
- compatibilityDate={props.compatibilityDate}
172
- compatibilityFlags={props.compatibilityFlags}
173
- bindings={props.bindings}
174
- assetPaths={props.assetPaths}
175
- public={props.public}
176
- port={props.port}
177
- ip={props.ip}
178
- rules={props.rules}
179
- inspectorPort={props.inspectorPort}
180
- enableLocalPersistence={props.enableLocalPersistence}
181
- crons={props.crons}
182
- />
183
- ) : (
184
- <Remote
185
- name={props.name}
186
- bundle={props.bundle}
187
- format={props.entry.format}
188
- accountId={props.accountId}
189
- apiToken={props.apiToken}
190
- bindings={props.bindings}
191
- assetPaths={props.assetPaths}
192
- public={props.public}
193
- port={props.port}
194
- ip={props.ip}
195
- localProtocol={props.localProtocol}
196
- inspectorPort={props.inspectorPort}
197
- compatibilityDate={props.compatibilityDate}
198
- compatibilityFlags={props.compatibilityFlags}
199
- usageModel={props.usageModel}
200
- env={props.env}
201
- legacyEnv={props.legacyEnv}
202
- zone={props.zone}
203
- />
204
- );
161
+ return props.local ? (
162
+ <Local
163
+ name={props.name}
164
+ bundle={bundle}
165
+ format={props.entry.format}
166
+ compatibilityDate={props.compatibilityDate}
167
+ compatibilityFlags={props.compatibilityFlags}
168
+ bindings={props.bindings}
169
+ assetPaths={props.assetPaths}
170
+ isWorkersSite={props.isWorkersSite}
171
+ port={props.port}
172
+ ip={props.ip}
173
+ rules={props.rules}
174
+ inspectorPort={props.inspectorPort}
175
+ enableLocalPersistence={props.enableLocalPersistence}
176
+ crons={props.crons}
177
+ localProtocol={props.localProtocol}
178
+ localUpstream={props.localUpstream}
179
+ logLevel={props.logLevel}
180
+ inspect={props.inspect}
181
+ onReady={props.onReady}
182
+ />
183
+ ) : (
184
+ <Remote
185
+ name={props.name}
186
+ bundle={bundle}
187
+ format={props.entry.format}
188
+ accountId={props.accountId}
189
+ bindings={props.bindings}
190
+ assetPaths={props.assetPaths}
191
+ isWorkersSite={props.isWorkersSite}
192
+ port={props.port}
193
+ ip={props.ip}
194
+ localProtocol={props.localProtocol}
195
+ inspectorPort={props.inspectorPort}
196
+ compatibilityDate={props.compatibilityDate}
197
+ compatibilityFlags={props.compatibilityFlags}
198
+ usageModel={props.usageModel}
199
+ env={props.env}
200
+ legacyEnv={props.legacyEnv}
201
+ zone={props.zone}
202
+ host={props.host}
203
+ routes={props.routes}
204
+ onReady={props.onReady}
205
+ />
206
+ );
205
207
  }
206
208
 
207
209
  export interface DirectorySyncResult {
208
- name: string;
209
- removeCallback: () => void;
210
+ name: string;
211
+ removeCallback: () => void;
210
212
  }
211
213
 
212
214
  function useTmpDir(): string | undefined {
213
- const [directory, setDirectory] = useState<DirectorySyncResult>();
214
- const handleError = useErrorHandler();
215
- useEffect(() => {
216
- let dir: DirectorySyncResult | undefined;
217
- try {
218
- dir = tmp.dirSync({ unsafeCleanup: true });
219
- setDirectory(dir);
220
- return;
221
- } catch (err) {
222
- logger.error(
223
- "Failed to create temporary directory to store built files."
224
- );
225
- handleError(err);
226
- }
227
- return () => {
228
- dir?.removeCallback();
229
- };
230
- }, [handleError]);
231
- return directory?.name;
215
+ const [directory, setDirectory] = useState<DirectorySyncResult>();
216
+ const handleError = useErrorHandler();
217
+ useEffect(() => {
218
+ let dir: DirectorySyncResult | undefined;
219
+ try {
220
+ dir = tmp.dirSync({ unsafeCleanup: true });
221
+ setDirectory(dir);
222
+ return;
223
+ } catch (err) {
224
+ logger.error(
225
+ "Failed to create temporary directory to store built files."
226
+ );
227
+ handleError(err);
228
+ }
229
+ return () => {
230
+ dir?.removeCallback();
231
+ };
232
+ }, [handleError]);
233
+ return directory?.name;
232
234
  }
233
235
 
234
- function useCustomBuild(
235
- expectedEntry: Entry,
236
- build: {
237
- command?: string | undefined;
238
- cwd?: string | undefined;
239
- watch_dir?: string | undefined;
240
- }
241
- ): void {
242
- useEffect(() => {
243
- if (!build.command) return;
244
- let watcher: ReturnType<typeof watch> | undefined;
245
- if (build.watch_dir) {
246
- watcher = watch(build.watch_dir, {
247
- persistent: true,
248
- ignoreInitial: true,
249
- }).on("all", (_event, filePath) => {
250
- const relativeFile =
251
- path.relative(expectedEntry.directory, expectedEntry.file) || ".";
252
- //TODO: we should buffer requests to the proxy until this completes
253
- logger.log(`The file ${filePath} changed, restarting build...`);
254
- runCustomBuild(expectedEntry.file, relativeFile, build).catch((err) => {
255
- logger.error("Custom build failed:", err);
256
- });
257
- });
258
- }
236
+ function useCustomBuild(expectedEntry: Entry, build: Config["build"]): void {
237
+ useEffect(() => {
238
+ if (!build.command) return;
239
+ let watcher: ReturnType<typeof watch> | undefined;
240
+ if (build.watch_dir) {
241
+ watcher = watch(build.watch_dir, {
242
+ persistent: true,
243
+ ignoreInitial: true,
244
+ }).on("all", (_event, filePath) => {
245
+ const relativeFile =
246
+ path.relative(expectedEntry.directory, expectedEntry.file) || ".";
247
+ //TODO: we should buffer requests to the proxy until this completes
248
+ logger.log(`The file ${filePath} changed, restarting build...`);
249
+ runCustomBuild(expectedEntry.file, relativeFile, build).catch((err) => {
250
+ logger.error("Custom build failed:", err);
251
+ });
252
+ });
253
+ }
259
254
 
260
- return () => {
261
- watcher?.close();
262
- };
263
- }, [build, expectedEntry]);
255
+ return () => {
256
+ watcher?.close();
257
+ };
258
+ }, [build, expectedEntry]);
264
259
  }
265
260
 
266
261
  function sleep(period: number) {
267
- return new Promise((resolve) => setTimeout(resolve, period));
262
+ return new Promise((resolve) => setTimeout(resolve, period));
268
263
  }
269
264
  const SLEEP_DURATION = 2000;
270
265
  // really need a first class api for this
271
266
  const hostNameRegex = /userHostname="(.*)"/g;
272
267
  async function findTunnelHostname() {
273
- let hostName: string | undefined;
274
- while (!hostName) {
275
- try {
276
- const resp = await fetch("http://localhost:8789/metrics");
277
- const data = await resp.text();
278
- const matches = Array.from(data.matchAll(hostNameRegex));
279
- hostName = matches[0][1];
280
- } catch (err) {
281
- await sleep(SLEEP_DURATION);
282
- }
283
- }
284
- return hostName;
268
+ let hostName: string | undefined;
269
+ while (!hostName) {
270
+ try {
271
+ const resp = await fetch("http://localhost:8789/metrics");
272
+ const data = await resp.text();
273
+ const matches = Array.from(data.matchAll(hostNameRegex));
274
+ hostName = matches[0][1];
275
+ } catch (err) {
276
+ await sleep(SLEEP_DURATION);
277
+ }
278
+ }
279
+ return hostName;
285
280
  }
286
281
 
287
282
  /**
@@ -289,134 +284,134 @@ async function findTunnelHostname() {
289
284
  * We've disabled this for now until we figure out a better user experience.
290
285
  */
291
286
  function useTunnel(toggle: boolean) {
292
- const tunnel = useRef<ReturnType<typeof spawn>>();
293
- const removeSignalExitListener = useRef<() => void>();
294
- // TODO: test if cloudflared is available, if not
295
- // point them to a url where they can get docs to install it
296
- useEffect(() => {
297
- async function startTunnel() {
298
- if (toggle) {
299
- try {
300
- await commandExists("cloudflared");
301
- } catch (e) {
302
- logger.warn(
303
- "To share your worker on the Internet, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
304
- );
305
- return;
306
- }
307
- logger.log("⎔ Starting a tunnel...");
308
- tunnel.current = spawn("cloudflared", [
309
- "tunnel",
310
- "--url",
311
- "http://localhost:8787",
312
- "--metrics",
313
- "localhost:8789",
314
- ]);
287
+ const tunnel = useRef<ReturnType<typeof spawn>>();
288
+ const removeSignalExitListener = useRef<() => void>();
289
+ // TODO: test if cloudflared is available, if not
290
+ // point them to a url where they can get docs to install it
291
+ useEffect(() => {
292
+ async function startTunnel() {
293
+ if (toggle) {
294
+ try {
295
+ await commandExists("cloudflared");
296
+ } catch (e) {
297
+ logger.warn(
298
+ "To share your worker on the Internet, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
299
+ );
300
+ return;
301
+ }
302
+ logger.log("⎔ Starting a tunnel...");
303
+ tunnel.current = spawn("cloudflared", [
304
+ "tunnel",
305
+ "--url",
306
+ "http://localhost:8787",
307
+ "--metrics",
308
+ "localhost:8789",
309
+ ]);
315
310
 
316
- tunnel.current.on("close", (code) => {
317
- if (code) {
318
- logger.log(`Tunnel process exited with code ${code}`);
319
- }
320
- });
311
+ tunnel.current.on("close", (code) => {
312
+ if (code) {
313
+ logger.log(`Tunnel process exited with code ${code}`);
314
+ }
315
+ });
321
316
 
322
- removeSignalExitListener.current = onExit((_code, _signal) => {
323
- logger.log("⎔ Shutting down local tunnel.");
324
- tunnel.current?.kill();
325
- tunnel.current = undefined;
326
- });
317
+ removeSignalExitListener.current = onExit((_code, _signal) => {
318
+ logger.log("⎔ Shutting down local tunnel.");
319
+ tunnel.current?.kill();
320
+ tunnel.current = undefined;
321
+ });
327
322
 
328
- const hostName = await findTunnelHostname();
329
- await clipboardy.write(hostName);
330
- logger.log(`⬣ Sharing at ${hostName}, copied to clipboard.`);
331
- }
332
- }
323
+ const hostName = await findTunnelHostname();
324
+ await clipboardy.write(hostName);
325
+ logger.log(`⬣ Sharing at ${hostName}, copied to clipboard.`);
326
+ }
327
+ }
333
328
 
334
- startTunnel().catch(async (err) => {
335
- logger.error("tunnel:", err);
336
- });
329
+ startTunnel().catch(async (err) => {
330
+ logger.error("tunnel:", err);
331
+ });
337
332
 
338
- return () => {
339
- if (tunnel.current) {
340
- logger.log("⎔ Shutting down tunnel.");
341
- tunnel.current?.kill();
342
- tunnel.current = undefined;
343
- removeSignalExitListener.current && removeSignalExitListener.current();
344
- removeSignalExitListener.current = undefined;
345
- }
346
- };
347
- }, [toggle]);
333
+ return () => {
334
+ if (tunnel.current) {
335
+ logger.log("⎔ Shutting down tunnel.");
336
+ tunnel.current?.kill();
337
+ tunnel.current = undefined;
338
+ removeSignalExitListener.current && removeSignalExitListener.current();
339
+ removeSignalExitListener.current = undefined;
340
+ }
341
+ };
342
+ }, [toggle]);
348
343
  }
349
344
 
350
345
  type useHotkeysInitialState = {
351
- local: boolean;
352
- tunnel: boolean;
346
+ local: boolean;
347
+ tunnel: boolean;
353
348
  };
354
349
  function useHotkeys(
355
- initial: useHotkeysInitialState,
356
- port: number,
357
- ip: string,
358
- inspectorPort: number,
359
- localProtocol: "http" | "https"
350
+ initial: useHotkeysInitialState,
351
+ port: number,
352
+ ip: string,
353
+ inspectorPort: number,
354
+ localProtocol: "http" | "https"
360
355
  ) {
361
- // UGH, we should put port in context instead
362
- const [toggles, setToggles] = useState(initial);
363
- const { exit } = useApp();
364
- useInput(
365
- async (
366
- input,
367
- // eslint-disable-next-line unused-imports/no-unused-vars
368
- key
369
- ) => {
370
- switch (input.toLowerCase()) {
371
- // clear console
372
- case "c":
373
- console.clear();
374
- // This console.log causes Ink to re-render the `DevSession` component.
375
- // Couldn't find a better way to tell it to do so...
376
- console.log();
377
- break;
378
- // open browser
379
- case "b": {
380
- await openInBrowser(`${localProtocol}://${ip}:${port}`);
381
- break;
382
- }
383
- // toggle inspector
384
- case "d": {
385
- await openInspector(inspectorPort);
386
- break;
387
- }
388
- // toggle local
389
- case "l":
390
- setToggles((previousToggles) => ({
391
- ...previousToggles,
392
- local: !previousToggles.local,
393
- }));
394
- break;
395
- // shut down
396
- case "q":
397
- case "x":
398
- exit();
399
- break;
400
- default:
401
- // nothing?
402
- break;
403
- }
404
- }
405
- );
406
- return toggles;
356
+ // UGH, we should put port in context instead
357
+ const [toggles, setToggles] = useState(initial);
358
+ const { exit } = useApp();
359
+ useInput(
360
+ async (
361
+ input,
362
+ // eslint-disable-next-line unused-imports/no-unused-vars
363
+ key
364
+ ) => {
365
+ switch (input.toLowerCase()) {
366
+ // clear console
367
+ case "c":
368
+ console.clear();
369
+ // This console.log causes Ink to re-render the `DevSession` component.
370
+ // Couldn't find a better way to tell it to do so...
371
+ console.log();
372
+ break;
373
+ // open browser
374
+ case "b": {
375
+ await openInBrowser(`${localProtocol}://${ip}:${port}`);
376
+ break;
377
+ }
378
+ // toggle inspector
379
+ case "d": {
380
+ await openInspector(inspectorPort);
381
+ break;
382
+ }
383
+ // toggle local
384
+ case "l":
385
+ setToggles((previousToggles) => ({
386
+ ...previousToggles,
387
+ local: !previousToggles.local,
388
+ }));
389
+ break;
390
+ // shut down
391
+ case "q":
392
+ case "x":
393
+ exit();
394
+ break;
395
+ default:
396
+ // nothing?
397
+ break;
398
+ }
399
+ }
400
+ );
401
+ return toggles;
407
402
  }
408
403
 
409
404
  function ErrorFallback(props: { error: Error }) {
410
- const { exit } = useApp();
411
- useEffect(() => exit(props.error));
412
- return (
413
- <>
414
- <Text>Something went wrong:</Text>
415
- <Text>{props.error.stack}</Text>
416
- </>
417
- );
405
+ const { exit } = useApp();
406
+ useEffect(() => exit(props.error));
407
+ return (
408
+ <>
409
+ <Text>Something went wrong:</Text>
410
+ <Text>{props.error.stack}</Text>
411
+ </>
412
+ );
418
413
  }
419
414
 
420
415
  export default withErrorBoundary(DevImplementation, {
421
- FallbackComponent: ErrorFallback,
416
+ FallbackComponent: ErrorFallback,
422
417
  });