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
@@ -1,254 +1,263 @@
1
1
  import { readFileSync } from "node:fs";
2
2
  import { FormData, File } from "undici";
3
3
  import type {
4
- CfWorkerInit,
5
- CfModuleType,
6
- CfDurableObjectMigrations,
4
+ CfWorkerInit,
5
+ CfModuleType,
6
+ CfDurableObjectMigrations,
7
7
  } from "./worker.js";
8
8
 
9
9
  export function toMimeType(type: CfModuleType): string {
10
- switch (type) {
11
- case "esm":
12
- return "application/javascript+module";
13
- case "commonjs":
14
- return "application/javascript";
15
- case "compiled-wasm":
16
- return "application/wasm";
17
- case "buffer":
18
- return "application/octet-stream";
19
- case "text":
20
- return "text/plain";
21
- default:
22
- throw new TypeError("Unsupported module: " + type);
23
- }
10
+ switch (type) {
11
+ case "esm":
12
+ return "application/javascript+module";
13
+ case "commonjs":
14
+ return "application/javascript";
15
+ case "compiled-wasm":
16
+ return "application/wasm";
17
+ case "buffer":
18
+ return "application/octet-stream";
19
+ case "text":
20
+ return "text/plain";
21
+ default:
22
+ throw new TypeError("Unsupported module: " + type);
23
+ }
24
24
  }
25
25
 
26
26
  export interface WorkerMetadata {
27
- /** The name of the entry point module. Only exists when the worker is in the ES module format */
28
- main_module?: string;
29
- /** The name of the entry point module. Only exists when the worker is in the service-worker format */
30
- body_part?: string;
31
- compatibility_date?: string;
32
- compatibility_flags?: string[];
33
- usage_model?: "bundled" | "unbound";
34
- migrations?: CfDurableObjectMigrations;
35
- // If you add any new binding types here, also add it to safeBindings
36
- // under validateUnsafeBinding in config/validation.ts
37
- bindings: (
38
- | { type: "plain_text"; name: string; text: string }
39
- | { type: "json"; name: string; json: unknown }
40
- | { type: "wasm_module"; name: string; part: string }
41
- | { type: "text_blob"; name: string; part: string }
42
- | { type: "data_blob"; name: string; part: string }
43
- | { type: "kv_namespace"; name: string; namespace_id: string }
44
- | {
45
- type: "durable_object_namespace";
46
- name: string;
47
- class_name: string;
48
- script_name?: string;
49
- environment?: string;
50
- }
51
- | { type: "r2_bucket"; name: string; bucket_name: string }
52
- | { type: "service"; name: string; service: string; environment?: string }
53
- )[];
27
+ /** The name of the entry point module. Only exists when the worker is in the ES module format */
28
+ main_module?: string;
29
+ /** The name of the entry point module. Only exists when the worker is in the service-worker format */
30
+ body_part?: string;
31
+ compatibility_date?: string;
32
+ compatibility_flags?: string[];
33
+ usage_model?: "bundled" | "unbound";
34
+ migrations?: CfDurableObjectMigrations;
35
+ // If you add any new binding types here, also add it to safeBindings
36
+ // under validateUnsafeBinding in config/validation.ts
37
+ bindings: (
38
+ | { type: "plain_text"; name: string; text: string }
39
+ | { type: "json"; name: string; json: unknown }
40
+ | { type: "wasm_module"; name: string; part: string }
41
+ | { type: "text_blob"; name: string; part: string }
42
+ | { type: "data_blob"; name: string; part: string }
43
+ | { type: "kv_namespace"; name: string; namespace_id: string }
44
+ | {
45
+ type: "durable_object_namespace";
46
+ name: string;
47
+ class_name: string;
48
+ script_name?: string;
49
+ environment?: string;
50
+ }
51
+ | { type: "r2_bucket"; name: string; bucket_name: string }
52
+ | { type: "service"; name: string; service: string; environment?: string }
53
+ | { type: "namespace"; name: string; namespace: string }
54
+ )[];
54
55
  }
55
56
 
56
57
  /**
57
58
  * Creates a `FormData` upload from a `CfWorkerInit`.
58
59
  */
59
60
  export function createWorkerUploadForm(worker: CfWorkerInit): FormData {
60
- const formData = new FormData();
61
- const {
62
- main,
63
- bindings,
64
- migrations,
65
- usage_model,
66
- compatibility_date,
67
- compatibility_flags,
68
- } = worker;
69
-
70
- let { modules } = worker;
71
-
72
- const metadataBindings: WorkerMetadata["bindings"] = [];
73
-
74
- Object.entries(bindings.vars || {})?.forEach(([key, value]) => {
75
- if (typeof value === "string") {
76
- metadataBindings.push({ name: key, type: "plain_text", text: value });
77
- } else {
78
- metadataBindings.push({ name: key, type: "json", json: value });
79
- }
80
- });
81
-
82
- bindings.kv_namespaces?.forEach(({ id, binding }) => {
83
- metadataBindings.push({
84
- name: binding,
85
- type: "kv_namespace",
86
- namespace_id: id,
87
- });
88
- });
89
-
90
- bindings.durable_objects?.bindings.forEach(
91
- ({ name, class_name, script_name, environment }) => {
92
- metadataBindings.push({
93
- name,
94
- type: "durable_object_namespace",
95
- class_name: class_name,
96
- ...(script_name && { script_name }),
97
- ...(environment && { environment }),
98
- });
99
- }
100
- );
101
-
102
- bindings.r2_buckets?.forEach(({ binding, bucket_name }) => {
103
- metadataBindings.push({
104
- name: binding,
105
- type: "r2_bucket",
106
- bucket_name,
107
- });
108
- });
109
-
110
- bindings.services?.forEach(({ binding, service, environment }) => {
111
- metadataBindings.push({
112
- name: binding,
113
- type: "service",
114
- service,
115
- ...(environment && { environment }),
116
- });
117
- });
118
-
119
- for (const [name, filePath] of Object.entries(bindings.wasm_modules || {})) {
120
- metadataBindings.push({
121
- name,
122
- type: "wasm_module",
123
- part: name,
124
- });
125
-
126
- formData.set(
127
- name,
128
- new File([readFileSync(filePath)], filePath, {
129
- type: "application/wasm",
130
- })
131
- );
132
- }
133
-
134
- for (const [name, filePath] of Object.entries(bindings.text_blobs || {})) {
135
- metadataBindings.push({
136
- name,
137
- type: "text_blob",
138
- part: name,
139
- });
140
-
141
- if (name !== "__STATIC_CONTENT_MANIFEST") {
142
- formData.set(
143
- name,
144
- new File([readFileSync(filePath)], filePath, {
145
- type: "text/plain",
146
- })
147
- );
148
- }
149
- }
150
-
151
- for (const [name, filePath] of Object.entries(bindings.data_blobs || {})) {
152
- metadataBindings.push({
153
- name,
154
- type: "data_blob",
155
- part: name,
156
- });
157
-
158
- formData.set(
159
- name,
160
- new File([readFileSync(filePath)], filePath, {
161
- type: "application/octet-stream",
162
- })
163
- );
164
- }
165
-
166
- if (main.type === "commonjs") {
167
- // This is a service-worker format worker.
168
- for (const module of Object.values([...(modules || [])])) {
169
- if (module.name === "__STATIC_CONTENT_MANIFEST") {
170
- // Add the manifest to the form data.
171
- formData.set(
172
- module.name,
173
- new File([module.content], module.name, {
174
- type: "text/plain",
175
- })
176
- );
177
- // And then remove it from the modules collection
178
- modules = modules?.filter((m) => m !== module);
179
- } else if (
180
- module.type === "compiled-wasm" ||
181
- module.type === "text" ||
182
- module.type === "buffer"
183
- ) {
184
- // Convert all wasm/text/data modules into `wasm_module`/`text_blob`/`data_blob` bindings.
185
- // The "name" of the module is a file path. We use it
186
- // to instead be a "part" of the body, and a reference
187
- // that we can use inside our source. This identifier has to be a valid
188
- // JS identifier, so we replace all non alphanumeric characters
189
- // with an underscore.
190
- const name = module.name.replace(/[^a-zA-Z0-9_$]/g, "_");
191
- metadataBindings.push({
192
- name,
193
- type:
194
- module.type === "compiled-wasm"
195
- ? "wasm_module"
196
- : module.type === "text"
197
- ? "text_blob"
198
- : "data_blob",
199
- part: name,
200
- });
201
-
202
- // Add the module to the form data.
203
- formData.set(
204
- name,
205
- new File([module.content], module.name, {
206
- type:
207
- module.type === "compiled-wasm"
208
- ? "application/wasm"
209
- : module.type === "text"
210
- ? "text/plain"
211
- : "application/octet-stream",
212
- })
213
- );
214
- // And then remove it from the modules collection
215
- modules = modules?.filter((m) => m !== module);
216
- }
217
- }
218
- }
219
-
220
- if (bindings.unsafe) {
221
- // @ts-expect-error unsafe bindings don't need to match a specific type here
222
- metadataBindings.push(...bindings.unsafe);
223
- }
224
-
225
- const metadata: WorkerMetadata = {
226
- ...(main.type !== "commonjs"
227
- ? { main_module: main.name }
228
- : { body_part: main.name }),
229
- bindings: metadataBindings,
230
- ...(compatibility_date && { compatibility_date }),
231
- ...(compatibility_flags && { compatibility_flags }),
232
- ...(usage_model && { usage_model }),
233
- ...(migrations && { migrations }),
234
- };
235
-
236
- formData.set("metadata", JSON.stringify(metadata));
237
-
238
- if (main.type === "commonjs" && modules && modules.length > 0) {
239
- throw new TypeError(
240
- "More than one module can only be specified when type = 'esm'"
241
- );
242
- }
243
-
244
- for (const module of [main].concat(modules || [])) {
245
- formData.set(
246
- module.name,
247
- new File([module.content], module.name, {
248
- type: toMimeType(module.type ?? main.type ?? "esm"),
249
- })
250
- );
251
- }
252
-
253
- return formData;
61
+ const formData = new FormData();
62
+ const {
63
+ main,
64
+ bindings,
65
+ migrations,
66
+ usage_model,
67
+ compatibility_date,
68
+ compatibility_flags,
69
+ } = worker;
70
+
71
+ let { modules } = worker;
72
+
73
+ const metadataBindings: WorkerMetadata["bindings"] = [];
74
+
75
+ Object.entries(bindings.vars || {})?.forEach(([key, value]) => {
76
+ if (typeof value === "string") {
77
+ metadataBindings.push({ name: key, type: "plain_text", text: value });
78
+ } else {
79
+ metadataBindings.push({ name: key, type: "json", json: value });
80
+ }
81
+ });
82
+
83
+ bindings.kv_namespaces?.forEach(({ id, binding }) => {
84
+ metadataBindings.push({
85
+ name: binding,
86
+ type: "kv_namespace",
87
+ namespace_id: id,
88
+ });
89
+ });
90
+
91
+ bindings.durable_objects?.bindings.forEach(
92
+ ({ name, class_name, script_name, environment }) => {
93
+ metadataBindings.push({
94
+ name,
95
+ type: "durable_object_namespace",
96
+ class_name: class_name,
97
+ ...(script_name && { script_name }),
98
+ ...(environment && { environment }),
99
+ });
100
+ }
101
+ );
102
+
103
+ bindings.r2_buckets?.forEach(({ binding, bucket_name }) => {
104
+ metadataBindings.push({
105
+ name: binding,
106
+ type: "r2_bucket",
107
+ bucket_name,
108
+ });
109
+ });
110
+
111
+ bindings.services?.forEach(({ binding, service, environment }) => {
112
+ metadataBindings.push({
113
+ name: binding,
114
+ type: "service",
115
+ service,
116
+ ...(environment && { environment }),
117
+ });
118
+ });
119
+
120
+ bindings.worker_namespaces?.forEach(({ binding, namespace }) => {
121
+ metadataBindings.push({
122
+ name: binding,
123
+ type: "namespace",
124
+ namespace,
125
+ });
126
+ });
127
+
128
+ for (const [name, filePath] of Object.entries(bindings.wasm_modules || {})) {
129
+ metadataBindings.push({
130
+ name,
131
+ type: "wasm_module",
132
+ part: name,
133
+ });
134
+
135
+ formData.set(
136
+ name,
137
+ new File([readFileSync(filePath)], filePath, {
138
+ type: "application/wasm",
139
+ })
140
+ );
141
+ }
142
+
143
+ for (const [name, filePath] of Object.entries(bindings.text_blobs || {})) {
144
+ metadataBindings.push({
145
+ name,
146
+ type: "text_blob",
147
+ part: name,
148
+ });
149
+
150
+ if (name !== "__STATIC_CONTENT_MANIFEST") {
151
+ formData.set(
152
+ name,
153
+ new File([readFileSync(filePath)], filePath, {
154
+ type: "text/plain",
155
+ })
156
+ );
157
+ }
158
+ }
159
+
160
+ for (const [name, filePath] of Object.entries(bindings.data_blobs || {})) {
161
+ metadataBindings.push({
162
+ name,
163
+ type: "data_blob",
164
+ part: name,
165
+ });
166
+
167
+ formData.set(
168
+ name,
169
+ new File([readFileSync(filePath)], filePath, {
170
+ type: "application/octet-stream",
171
+ })
172
+ );
173
+ }
174
+
175
+ if (main.type === "commonjs") {
176
+ // This is a service-worker format worker.
177
+ for (const module of Object.values([...(modules || [])])) {
178
+ if (module.name === "__STATIC_CONTENT_MANIFEST") {
179
+ // Add the manifest to the form data.
180
+ formData.set(
181
+ module.name,
182
+ new File([module.content], module.name, {
183
+ type: "text/plain",
184
+ })
185
+ );
186
+ // And then remove it from the modules collection
187
+ modules = modules?.filter((m) => m !== module);
188
+ } else if (
189
+ module.type === "compiled-wasm" ||
190
+ module.type === "text" ||
191
+ module.type === "buffer"
192
+ ) {
193
+ // Convert all wasm/text/data modules into `wasm_module`/`text_blob`/`data_blob` bindings.
194
+ // The "name" of the module is a file path. We use it
195
+ // to instead be a "part" of the body, and a reference
196
+ // that we can use inside our source. This identifier has to be a valid
197
+ // JS identifier, so we replace all non alphanumeric characters
198
+ // with an underscore.
199
+ const name = module.name.replace(/[^a-zA-Z0-9_$]/g, "_");
200
+ metadataBindings.push({
201
+ name,
202
+ type:
203
+ module.type === "compiled-wasm"
204
+ ? "wasm_module"
205
+ : module.type === "text"
206
+ ? "text_blob"
207
+ : "data_blob",
208
+ part: name,
209
+ });
210
+
211
+ // Add the module to the form data.
212
+ formData.set(
213
+ name,
214
+ new File([module.content], module.name, {
215
+ type:
216
+ module.type === "compiled-wasm"
217
+ ? "application/wasm"
218
+ : module.type === "text"
219
+ ? "text/plain"
220
+ : "application/octet-stream",
221
+ })
222
+ );
223
+ // And then remove it from the modules collection
224
+ modules = modules?.filter((m) => m !== module);
225
+ }
226
+ }
227
+ }
228
+
229
+ if (bindings.unsafe) {
230
+ // @ts-expect-error unsafe bindings don't need to match a specific type here
231
+ metadataBindings.push(...bindings.unsafe);
232
+ }
233
+
234
+ const metadata: WorkerMetadata = {
235
+ ...(main.type !== "commonjs"
236
+ ? { main_module: main.name }
237
+ : { body_part: main.name }),
238
+ bindings: metadataBindings,
239
+ ...(compatibility_date && { compatibility_date }),
240
+ ...(compatibility_flags && { compatibility_flags }),
241
+ ...(usage_model && { usage_model }),
242
+ ...(migrations && { migrations }),
243
+ };
244
+
245
+ formData.set("metadata", JSON.stringify(metadata));
246
+
247
+ if (main.type === "commonjs" && modules && modules.length > 0) {
248
+ throw new TypeError(
249
+ "More than one module can only be specified when type = 'esm'"
250
+ );
251
+ }
252
+
253
+ for (const module of [main].concat(modules || [])) {
254
+ formData.set(
255
+ module.name,
256
+ new File([module.content], module.name, {
257
+ type: toMimeType(module.type ?? main.type ?? "esm"),
258
+ })
259
+ );
260
+ }
261
+
262
+ return formData;
254
263
  }
@@ -20,17 +20,17 @@ import type { Config } from "../config";
20
20
  * bindings provided in the `wrangler.toml`.
21
21
  */
22
22
  export function getVarsForDev(config: Config): Config["vars"] {
23
- const configDir = path.resolve(path.dirname(config.configPath ?? "."));
24
- const devVarsPath = path.resolve(configDir, ".dev.vars");
25
- if (fs.existsSync(devVarsPath)) {
26
- const devVarsRelativePath = path.relative(process.cwd(), devVarsPath);
27
- logger.log(`Using vars defined in ${devVarsRelativePath}`);
28
- const devVars = dotenv.parse(fs.readFileSync(devVarsPath, "utf8"));
29
- return {
30
- ...config.vars,
31
- ...devVars,
32
- };
33
- } else {
34
- return config.vars;
35
- }
23
+ const configDir = path.resolve(path.dirname(config.configPath ?? "."));
24
+ const devVarsPath = path.resolve(configDir, ".dev.vars");
25
+ if (fs.existsSync(devVarsPath)) {
26
+ const devVarsRelativePath = path.relative(process.cwd(), devVarsPath);
27
+ logger.log(`Using vars defined in ${devVarsRelativePath}`);
28
+ const devVars = dotenv.parse(fs.readFileSync(devVarsPath, "utf8"));
29
+ return {
30
+ ...config.vars,
31
+ ...devVars,
32
+ };
33
+ } else {
34
+ return config.vars;
35
+ }
36
36
  }