wrangler 0.0.0-e8e684c7 → 0.0.0-e9106dfa5

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 (207) hide show
  1. package/README.md +35 -49
  2. package/bin/wrangler.js +25 -100
  3. package/config-schema.json +2277 -0
  4. package/package.json +182 -174
  5. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  6. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  7. package/templates/__tests__/tsconfig.json +8 -0
  8. package/templates/checked-fetch.js +19 -6
  9. package/templates/facade.d.ts +19 -0
  10. package/templates/gitignore +2 -3
  11. package/templates/init-tests/test-jest-new-worker.js +23 -0
  12. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  13. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  14. package/templates/middleware/common.ts +67 -0
  15. package/templates/middleware/loader-modules.ts +134 -0
  16. package/templates/middleware/loader-sw.ts +229 -0
  17. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  18. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  19. package/templates/middleware/middleware-mock-analytics-engine.d.ts +3 -0
  20. package/templates/middleware/middleware-mock-analytics-engine.ts +30 -0
  21. package/templates/middleware/middleware-patch-console-prefix.d.ts +3 -0
  22. package/templates/middleware/middleware-patch-console-prefix.ts +21 -0
  23. package/templates/middleware/middleware-pretty-error.ts +40 -0
  24. package/templates/middleware/middleware-scheduled.ts +29 -0
  25. package/templates/modules-watch-stub.js +4 -0
  26. package/templates/new-worker-scheduled.ts +1 -1
  27. package/templates/new-worker.js +1 -1
  28. package/templates/new-worker.ts +4 -1
  29. package/templates/pages-dev-pipeline.ts +33 -0
  30. package/templates/pages-dev-util.ts +55 -0
  31. package/templates/pages-shim.ts +1 -1
  32. package/templates/pages-template-plugin.ts +37 -14
  33. package/templates/pages-template-worker.ts +33 -7
  34. package/templates/startDevWorker/InspectorProxyWorker.ts +679 -0
  35. package/templates/startDevWorker/ProxyWorker.ts +336 -0
  36. package/templates/tsconfig-sanity.ts +11 -0
  37. package/templates/tsconfig.init.json +22 -0
  38. package/templates/tsconfig.json +12 -102
  39. package/templates/tsconfig.tsbuildinfo +1 -0
  40. package/wrangler-dist/InspectorProxyWorker.js +471 -0
  41. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  42. package/wrangler-dist/ProxyWorker.js +238 -0
  43. package/wrangler-dist/ProxyWorker.js.map +6 -0
  44. package/wrangler-dist/cli.d.ts +26527 -172
  45. package/wrangler-dist/cli.js +148646 -148093
  46. package/Cloudflare_CA.pem +0 -18
  47. package/import_meta_url.js +0 -3
  48. package/miniflare-config-stubs/.env.empty +0 -0
  49. package/miniflare-config-stubs/package.empty.json +0 -1
  50. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  51. package/miniflare-dist/index.mjs +0 -5542
  52. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  53. package/src/__tests__/config-cache.test.ts +0 -42
  54. package/src/__tests__/configuration.test.ts +0 -4026
  55. package/src/__tests__/dev.test.tsx +0 -1318
  56. package/src/__tests__/generate.test.ts +0 -91
  57. package/src/__tests__/guess-worker-format.test.ts +0 -85
  58. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  59. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  60. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  61. package/src/__tests__/helpers/mock-bin.ts +0 -36
  62. package/src/__tests__/helpers/mock-cfetch.ts +0 -296
  63. package/src/__tests__/helpers/mock-console.ts +0 -97
  64. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  65. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  66. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  67. package/src/__tests__/helpers/mock-istty.ts +0 -74
  68. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  69. package/src/__tests__/helpers/mock-kv.ts +0 -33
  70. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -250
  71. package/src/__tests__/helpers/mock-process.ts +0 -39
  72. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  73. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  74. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  75. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  76. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  77. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  78. package/src/__tests__/https-options.test.ts +0 -163
  79. package/src/__tests__/index.test.ts +0 -245
  80. package/src/__tests__/init.test.ts +0 -2170
  81. package/src/__tests__/jest.setup.ts +0 -157
  82. package/src/__tests__/kv.test.ts +0 -1671
  83. package/src/__tests__/logger.test.ts +0 -141
  84. package/src/__tests__/metrics.test.ts +0 -450
  85. package/src/__tests__/package-manager.test.ts +0 -353
  86. package/src/__tests__/pages.test.ts +0 -1275
  87. package/src/__tests__/parse.test.ts +0 -330
  88. package/src/__tests__/publish.test.ts +0 -6955
  89. package/src/__tests__/pubsub.test.ts +0 -367
  90. package/src/__tests__/r2.test.ts +0 -336
  91. package/src/__tests__/route.test.ts +0 -45
  92. package/src/__tests__/secret.test.ts +0 -492
  93. package/src/__tests__/tail.test.ts +0 -802
  94. package/src/__tests__/test-old-node-version.js +0 -31
  95. package/src/__tests__/user.test.ts +0 -155
  96. package/src/__tests__/validate-dev-props.test.ts +0 -56
  97. package/src/__tests__/version.test.ts +0 -35
  98. package/src/__tests__/whoami.test.tsx +0 -289
  99. package/src/__tests__/worker-namespace.test.ts +0 -329
  100. package/src/abort.d.ts +0 -3
  101. package/src/api/dev.ts +0 -93
  102. package/src/api/index.ts +0 -1
  103. package/src/bundle-reporter.tsx +0 -29
  104. package/src/bundle.ts +0 -473
  105. package/src/cfetch/index.ts +0 -121
  106. package/src/cfetch/internal.ts +0 -298
  107. package/src/cli.ts +0 -27
  108. package/src/config/README.md +0 -107
  109. package/src/config/config.ts +0 -263
  110. package/src/config/diagnostics.ts +0 -80
  111. package/src/config/environment.ts +0 -485
  112. package/src/config/index.ts +0 -251
  113. package/src/config/validation-helpers.ts +0 -597
  114. package/src/config/validation.ts +0 -1862
  115. package/src/config-cache.ts +0 -85
  116. package/src/create-worker-preview.ts +0 -257
  117. package/src/create-worker-upload-form.ts +0 -291
  118. package/src/dev/dev-vars.ts +0 -36
  119. package/src/dev/dev.tsx +0 -545
  120. package/src/dev/local.tsx +0 -449
  121. package/src/dev/remote.tsx +0 -422
  122. package/src/dev/use-esbuild.ts +0 -178
  123. package/src/dev/validate-dev-props.ts +0 -31
  124. package/src/dev-registry.tsx +0 -160
  125. package/src/dev.tsx +0 -696
  126. package/src/dialogs.tsx +0 -135
  127. package/src/dispatch-namespace.ts +0 -206
  128. package/src/durable.ts +0 -102
  129. package/src/entry.ts +0 -328
  130. package/src/environment-variables.ts +0 -35
  131. package/src/errors.ts +0 -11
  132. package/src/faye-websocket.d.ts +0 -6
  133. package/src/generate.ts +0 -131
  134. package/src/git-client.ts +0 -42
  135. package/src/global-wrangler-config-path.ts +0 -26
  136. package/src/https-options.ts +0 -127
  137. package/src/index.tsx +0 -2260
  138. package/src/init.ts +0 -622
  139. package/src/inspect.ts +0 -747
  140. package/src/intl-polyfill.d.ts +0 -139
  141. package/src/is-ci.ts +0 -14
  142. package/src/is-interactive.ts +0 -12
  143. package/src/kv.ts +0 -430
  144. package/src/logger.ts +0 -73
  145. package/src/metrics/index.ts +0 -5
  146. package/src/metrics/metrics-config.ts +0 -239
  147. package/src/metrics/metrics-dispatcher.ts +0 -96
  148. package/src/metrics/metrics-usage-headers.ts +0 -24
  149. package/src/metrics/send-event.ts +0 -92
  150. package/src/miniflare-cli/README.md +0 -30
  151. package/src/miniflare-cli/assets.ts +0 -554
  152. package/src/miniflare-cli/enum-keys.ts +0 -17
  153. package/src/miniflare-cli/index.ts +0 -207
  154. package/src/miniflare-cli/request-context.ts +0 -40
  155. package/src/module-collection.ts +0 -258
  156. package/src/open-in-browser.ts +0 -17
  157. package/src/package-manager.ts +0 -219
  158. package/src/pages/build.tsx +0 -238
  159. package/src/pages/constants.ts +0 -12
  160. package/src/pages/deployments.tsx +0 -106
  161. package/src/pages/dev.tsx +0 -528
  162. package/src/pages/errors.ts +0 -22
  163. package/src/pages/functions/buildPlugin.ts +0 -109
  164. package/src/pages/functions/buildWorker.ts +0 -155
  165. package/src/pages/functions/filepath-routing.test.ts +0 -234
  166. package/src/pages/functions/filepath-routing.ts +0 -189
  167. package/src/pages/functions/identifiers.ts +0 -78
  168. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  169. package/src/pages/functions/routes-consolidation.ts +0 -73
  170. package/src/pages/functions/routes-transformation.test.ts +0 -271
  171. package/src/pages/functions/routes-transformation.ts +0 -122
  172. package/src/pages/functions/routes.ts +0 -151
  173. package/src/pages/functions.tsx +0 -96
  174. package/src/pages/index.tsx +0 -94
  175. package/src/pages/projects.tsx +0 -169
  176. package/src/pages/publish.tsx +0 -391
  177. package/src/pages/types.ts +0 -49
  178. package/src/pages/upload.tsx +0 -413
  179. package/src/pages/utils.ts +0 -12
  180. package/src/parse.ts +0 -286
  181. package/src/paths.ts +0 -26
  182. package/src/preview.ts +0 -31
  183. package/src/proxy.ts +0 -486
  184. package/src/publish.ts +0 -822
  185. package/src/pubsub/index.ts +0 -286
  186. package/src/pubsub/pubsub-commands.tsx +0 -623
  187. package/src/r2.ts +0 -131
  188. package/src/selfsigned.d.ts +0 -29
  189. package/src/sites.tsx +0 -372
  190. package/src/tail/filters.ts +0 -281
  191. package/src/tail/index.ts +0 -312
  192. package/src/tail/printing.ts +0 -107
  193. package/src/update-check.ts +0 -19
  194. package/src/user/choose-account.tsx +0 -69
  195. package/src/user/env-vars.ts +0 -46
  196. package/src/user/generate-auth-url.ts +0 -33
  197. package/src/user/generate-random-state.ts +0 -16
  198. package/src/user/index.ts +0 -3
  199. package/src/user/user.tsx +0 -1191
  200. package/src/whoami.tsx +0 -169
  201. package/src/worker.ts +0 -204
  202. package/src/zones.ts +0 -167
  203. package/templates/first-party-worker-module-facade.ts +0 -18
  204. package/templates/format-dev-errors.ts +0 -32
  205. package/templates/serve-static-assets.ts +0 -63
  206. package/templates/service-bindings-module-facade.js +0 -54
  207. package/templates/service-bindings-sw-facade.js +0 -42
@@ -1,413 +0,0 @@
1
- import { mkdir, readdir, readFile, stat, writeFile } from "node:fs/promises";
2
- import {
3
- basename,
4
- dirname,
5
- extname,
6
- join,
7
- relative,
8
- resolve,
9
- sep,
10
- } from "node:path";
11
- import { hash as blake3hash } from "blake3-wasm";
12
- import { render, Text } from "ink";
13
- import Spinner from "ink-spinner";
14
- import { getType } from "mime";
15
- import PQueue from "p-queue";
16
- import prettyBytes from "pretty-bytes";
17
- import React from "react";
18
- import { fetchResult } from "../cfetch";
19
- import { FatalError } from "../errors";
20
- import { logger } from "../logger";
21
- import {
22
- BULK_UPLOAD_CONCURRENCY,
23
- MAX_BUCKET_FILE_COUNT,
24
- MAX_BUCKET_SIZE,
25
- MAX_CHECK_MISSING_ATTEMPTS,
26
- MAX_UPLOAD_ATTEMPTS,
27
- } from "./constants";
28
- import { pagesBetaWarning } from "./utils";
29
- import type { UploadPayloadFile, YargsOptionsToInterface } from "./types";
30
- import type { Argv } from "yargs";
31
-
32
- type UploadArgs = YargsOptionsToInterface<typeof Options>;
33
-
34
- export function Options(yargs: Argv) {
35
- return yargs
36
- .positional("directory", {
37
- type: "string",
38
- demandOption: true,
39
- description: "The directory of static files to upload",
40
- })
41
- .options({
42
- "output-manifest-path": {
43
- type: "string",
44
- description: "The name of the project you want to deploy to",
45
- },
46
- })
47
- .epilogue(pagesBetaWarning);
48
- }
49
-
50
- export const Handler = async ({
51
- directory,
52
- outputManifestPath,
53
- }: UploadArgs) => {
54
- if (!directory) {
55
- throw new FatalError("Must specify a directory.", 1);
56
- }
57
-
58
- if (!process.env.CF_PAGES_UPLOAD_JWT) {
59
- throw new FatalError("No JWT given.", 1);
60
- }
61
-
62
- const manifest = await upload({
63
- directory,
64
- jwt: process.env.CF_PAGES_UPLOAD_JWT,
65
- });
66
-
67
- if (outputManifestPath) {
68
- await mkdir(dirname(outputManifestPath), { recursive: true });
69
- await writeFile(outputManifestPath, JSON.stringify(manifest));
70
- }
71
-
72
- logger.log(`✨ Upload complete!`);
73
- };
74
-
75
- export const upload = async (
76
- args:
77
- | {
78
- directory: string;
79
- jwt: string;
80
- }
81
- | { directory: string; accountId: string; projectName: string }
82
- ) => {
83
- async function fetchJwt(): Promise<string> {
84
- if ("jwt" in args) {
85
- return args.jwt;
86
- } else {
87
- return (
88
- await fetchResult<{ jwt: string }>(
89
- `/accounts/${args.accountId}/pages/projects/${args.projectName}/upload-token`
90
- )
91
- ).jwt;
92
- }
93
- }
94
-
95
- type FileContainer = {
96
- path: string;
97
- contentType: string;
98
- sizeInBytes: number;
99
- hash: string;
100
- };
101
-
102
- const IGNORE_LIST = [
103
- "_worker.js",
104
- "_redirects",
105
- "_headers",
106
- "_routes.json",
107
- ".DS_Store",
108
- "node_modules",
109
- ".git",
110
- ];
111
-
112
- const directory = resolve(args.directory);
113
-
114
- // TODO(future): Use this to more efficiently load files in and speed up uploading
115
- // Limit memory to 1 GB unless more is specified
116
- // let maxMemory = 1_000_000_000;
117
- // if (process.env.NODE_OPTIONS && (process.env.NODE_OPTIONS.includes('--max-old-space-size=') || process.env.NODE_OPTIONS.includes('--max_old_space_size='))) {
118
- // const parsed = parser(process.env.NODE_OPTIONS);
119
- // maxMemory = (parsed['max-old-space-size'] ? parsed['max-old-space-size'] : parsed['max_old_space_size']) * 1000 * 1000; // Turn MB into bytes
120
- // }
121
-
122
- const walk = async (
123
- dir: string,
124
- fileMap: Map<string, FileContainer> = new Map(),
125
- startingDir: string = dir
126
- ) => {
127
- const files = await readdir(dir);
128
-
129
- await Promise.all(
130
- files.map(async (file) => {
131
- const filepath = join(dir, file);
132
- const filestat = await stat(filepath);
133
-
134
- if (IGNORE_LIST.includes(file)) {
135
- return;
136
- }
137
-
138
- if (filestat.isSymbolicLink()) {
139
- return;
140
- }
141
-
142
- if (filestat.isDirectory()) {
143
- fileMap = await walk(filepath, fileMap, startingDir);
144
- } else {
145
- const name = relative(startingDir, filepath).split(sep).join("/");
146
-
147
- const fileContent = await readFile(filepath);
148
-
149
- const base64Content = fileContent.toString("base64");
150
- const extension = extname(basename(name)).substring(1);
151
-
152
- if (filestat.size > 25 * 1024 * 1024) {
153
- throw new FatalError(
154
- `Error: Pages only supports files up to ${prettyBytes(
155
- 25 * 1024 * 1024
156
- )} in size\n${name} is ${prettyBytes(filestat.size)} in size`,
157
- 1
158
- );
159
- }
160
-
161
- // We don't want to hold the content in memory. We instead only want to read it when it's needed
162
- fileMap.set(name, {
163
- path: filepath,
164
- contentType: getType(name) || "application/octet-stream",
165
- sizeInBytes: filestat.size,
166
- hash: blake3hash(base64Content + extension)
167
- .toString("hex")
168
- .slice(0, 32),
169
- });
170
- }
171
- })
172
- );
173
-
174
- return fileMap;
175
- };
176
-
177
- const fileMap = await walk(directory);
178
-
179
- if (fileMap.size > 20000) {
180
- throw new FatalError(
181
- `Error: Pages only supports up to 20,000 files in a deployment. Ensure you have specified your build output directory correctly.`,
182
- 1
183
- );
184
- }
185
-
186
- const files = [...fileMap.values()];
187
-
188
- let jwt = await fetchJwt();
189
-
190
- const start = Date.now();
191
-
192
- let attempts = 0;
193
- const getMissingHashes = async (): Promise<string[]> => {
194
- try {
195
- return await fetchResult<string[]>(`/pages/assets/check-missing`, {
196
- method: "POST",
197
- headers: {
198
- "Content-Type": "application/json",
199
- Authorization: `Bearer ${jwt}`,
200
- },
201
- body: JSON.stringify({
202
- hashes: files.map(({ hash }) => hash),
203
- }),
204
- });
205
- } catch (e) {
206
- if (attempts < MAX_CHECK_MISSING_ATTEMPTS) {
207
- // Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
208
- await new Promise((resolvePromise) =>
209
- setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
210
- );
211
-
212
- if ((e as { code: number }).code === 8000013) {
213
- // Looks like the JWT expired, fetch another one
214
- jwt = await fetchJwt();
215
- }
216
- return getMissingHashes();
217
- } else {
218
- throw e;
219
- }
220
- }
221
- };
222
- const missingHashes = await getMissingHashes();
223
-
224
- const sortedFiles = files
225
- .filter((file) => missingHashes.includes(file.hash))
226
- .sort((a, b) => b.sizeInBytes - a.sizeInBytes);
227
-
228
- // Start with a few buckets so small projects still get
229
- // the benefit of multiple upload streams
230
- const buckets: {
231
- files: FileContainer[];
232
- remainingSize: number;
233
- }[] = new Array(BULK_UPLOAD_CONCURRENCY).fill(null).map(() => ({
234
- files: [],
235
- remainingSize: MAX_BUCKET_SIZE,
236
- }));
237
-
238
- let bucketOffset = 0;
239
- for (const file of sortedFiles) {
240
- let inserted = false;
241
-
242
- for (let i = 0; i < buckets.length; i++) {
243
- // Start at a different bucket for each new file
244
- const bucket = buckets[(i + bucketOffset) % buckets.length];
245
- if (
246
- bucket.remainingSize >= file.sizeInBytes &&
247
- bucket.files.length < MAX_BUCKET_FILE_COUNT
248
- ) {
249
- bucket.files.push(file);
250
- bucket.remainingSize -= file.sizeInBytes;
251
- inserted = true;
252
- break;
253
- }
254
- }
255
-
256
- if (!inserted) {
257
- buckets.push({
258
- files: [file],
259
- remainingSize: MAX_BUCKET_SIZE - file.sizeInBytes,
260
- });
261
- }
262
- bucketOffset++;
263
- }
264
-
265
- let counter = fileMap.size - sortedFiles.length;
266
- const { rerender, unmount } = render(
267
- <Progress done={counter} total={fileMap.size} />
268
- );
269
-
270
- const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY });
271
-
272
- for (const bucket of buckets) {
273
- // Don't upload empty buckets (can happen for tiny projects)
274
- if (bucket.files.length === 0) continue;
275
-
276
- attempts = 0;
277
- const doUpload = async (): Promise<void> => {
278
- // Populate the payload only when actually uploading (this is limited to 3 concurrent uploads at 50 MiB per bucket meaning we'd only load in a max of ~150 MiB)
279
- // This is so we don't run out of memory trying to upload the files.
280
- const payload: UploadPayloadFile[] = await Promise.all(
281
- bucket.files.map(async (file) => ({
282
- key: file.hash,
283
- value: (await readFile(file.path)).toString("base64"),
284
- metadata: {
285
- contentType: file.contentType,
286
- },
287
- base64: true,
288
- }))
289
- );
290
-
291
- try {
292
- return await fetchResult(`/pages/assets/upload`, {
293
- method: "POST",
294
- headers: {
295
- "Content-Type": "application/json",
296
- Authorization: `Bearer ${jwt}`,
297
- },
298
- body: JSON.stringify(payload),
299
- });
300
- } catch (e) {
301
- if (attempts < MAX_UPLOAD_ATTEMPTS) {
302
- // Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
303
- await new Promise((resolvePromise) =>
304
- setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
305
- );
306
-
307
- if ((e as { code: number }).code === 8000013) {
308
- // Looks like the JWT expired, fetch another one
309
- jwt = await fetchJwt();
310
- }
311
- return doUpload();
312
- } else {
313
- throw e;
314
- }
315
- }
316
- };
317
-
318
- queue.add(() =>
319
- doUpload().then(
320
- () => {
321
- counter += bucket.files.length;
322
- rerender(<Progress done={counter} total={fileMap.size} />);
323
- },
324
- (error) => {
325
- return Promise.reject(
326
- new FatalError(
327
- "Failed to upload files. Please try again.",
328
- error.code || 1
329
- )
330
- );
331
- }
332
- )
333
- );
334
- }
335
-
336
- await queue.onIdle();
337
-
338
- unmount();
339
-
340
- const uploadMs = Date.now() - start;
341
-
342
- const skipped = fileMap.size - missingHashes.length;
343
- const skippedMessage = skipped > 0 ? `(${skipped} already uploaded) ` : "";
344
-
345
- logger.log(
346
- `✨ Success! Uploaded ${
347
- sortedFiles.length
348
- } files ${skippedMessage}${formatTime(uploadMs)}\n`
349
- );
350
-
351
- const doUpsertHashes = async (): Promise<void> => {
352
- try {
353
- return await fetchResult(`/pages/assets/upsert-hashes`, {
354
- method: "POST",
355
- headers: {
356
- "Content-Type": "application/json",
357
- Authorization: `Bearer ${jwt}`,
358
- },
359
- body: JSON.stringify({
360
- hashes: files.map(({ hash }) => hash),
361
- }),
362
- });
363
- } catch (e) {
364
- await new Promise((resolvePromise) => setTimeout(resolvePromise, 1000));
365
-
366
- if ((e as { code: number }).code === 8000013) {
367
- // Looks like the JWT expired, fetch another one
368
- jwt = await fetchJwt();
369
- }
370
-
371
- return await fetchResult(`/pages/assets/upsert-hashes`, {
372
- method: "POST",
373
- headers: {
374
- "Content-Type": "application/json",
375
- Authorization: `Bearer ${jwt}`,
376
- },
377
- body: JSON.stringify({
378
- hashes: files.map(({ hash }) => hash),
379
- }),
380
- });
381
- }
382
- };
383
-
384
- try {
385
- await doUpsertHashes();
386
- } catch {
387
- logger.warn(
388
- "Failed to update file hashes. Every upload appeared to succeed for this deployment, but you might need to re-upload for future deployments. This shouldn't have any impact other than slowing the upload speed of your next deployment."
389
- );
390
- }
391
-
392
- return Object.fromEntries(
393
- [...fileMap.entries()].map(([fileName, file]) => [
394
- `/${fileName}`,
395
- file.hash,
396
- ])
397
- );
398
- };
399
-
400
- function formatTime(duration: number) {
401
- return `(${(duration / 1000).toFixed(2)} sec)`;
402
- }
403
-
404
- function Progress({ done, total }: { done: number; total: number }) {
405
- return (
406
- <>
407
- <Text>
408
- <Spinner type="earth" />
409
- {` Uploading... (${done}/${total})\n`}
410
- </Text>
411
- </>
412
- );
413
- }
@@ -1,12 +0,0 @@
1
- import type { BuildResult } from "esbuild";
2
-
3
- export const RUNNING_BUILDERS: BuildResult[] = [];
4
-
5
- export const CLEANUP_CALLBACKS: (() => void)[] = [];
6
- export const CLEANUP = () => {
7
- CLEANUP_CALLBACKS.forEach((callback) => callback());
8
- RUNNING_BUILDERS.forEach((builder) => builder.stop?.());
9
- };
10
-
11
- export const pagesBetaWarning =
12
- "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose";
package/src/parse.ts DELETED
@@ -1,286 +0,0 @@
1
- import * as fs from "node:fs";
2
- import { resolve } from "node:path";
3
- import TOML from "@iarna/toml";
4
- import { formatMessagesSync } from "esbuild";
5
- import { logger } from "./logger";
6
-
7
- export type Message = {
8
- text: string;
9
- location?: Location;
10
- notes?: Message[];
11
- kind?: "warning" | "error";
12
- };
13
-
14
- export type Location = File & {
15
- line: number;
16
- column: number;
17
- length?: number;
18
- lineText?: string;
19
- suggestion?: string;
20
- };
21
-
22
- export type File = {
23
- file?: string;
24
- fileText?: string;
25
- };
26
-
27
- /**
28
- * Formats a `Message` using esbuild's pretty-printing algorithm.
29
- */
30
- export function formatMessage(
31
- { text, notes, location, kind = "error" }: Message,
32
- color = true
33
- ): string {
34
- const input = { text, notes, location };
35
- delete input.location?.fileText;
36
- for (const note of notes ?? []) {
37
- delete note.location?.fileText;
38
- }
39
- const lines = formatMessagesSync([input], {
40
- color,
41
- kind: kind,
42
- terminalWidth: logger.columns,
43
- });
44
- return lines.join("\n");
45
- }
46
-
47
- /**
48
- * An error that's thrown when something fails to parse.
49
- */
50
- export class ParseError extends Error implements Message {
51
- readonly text: string;
52
- readonly notes: Message[];
53
- readonly location?: Location;
54
- readonly kind: "warning" | "error";
55
-
56
- constructor({ text, notes, location, kind }: Message) {
57
- super(text);
58
- this.name = this.constructor.name;
59
- this.text = text;
60
- this.notes = notes ?? [];
61
- this.location = location;
62
- this.kind = kind ?? "error";
63
- }
64
- }
65
-
66
- const TOML_ERROR_NAME = "TomlError";
67
- const TOML_ERROR_SUFFIX = " at row ";
68
-
69
- type TomlError = Error & {
70
- line: number;
71
- col: number;
72
- };
73
-
74
- /**
75
- * A wrapper around `TOML.parse` that throws a `ParseError`.
76
- */
77
- export function parseTOML(input: string, file?: string): TOML.JsonMap | never {
78
- try {
79
- // Normalize CRLF to LF to avoid hitting https://github.com/iarna/iarna-toml/issues/33.
80
- const normalizedInput = input.replace(/\r\n/g, "\n");
81
- return TOML.parse(normalizedInput);
82
- } catch (err) {
83
- const { name, message, line, col } = err as TomlError;
84
- if (name !== TOML_ERROR_NAME) {
85
- throw err;
86
- }
87
- const text = message.substring(0, message.lastIndexOf(TOML_ERROR_SUFFIX));
88
- const lineText = input.split("\n")[line];
89
- const location = {
90
- lineText,
91
- line: line + 1,
92
- column: col - 1,
93
- file,
94
- fileText: input,
95
- };
96
- throw new ParseError({ text, location });
97
- }
98
- }
99
-
100
- const JSON_ERROR_SUFFIX = " in JSON at position ";
101
-
102
- /**
103
- * A minimal type describing a package.json file.
104
- */
105
- export type PackageJSON = {
106
- devDependencies?: Record<string, unknown>;
107
- dependencies?: Record<string, unknown>;
108
- scripts?: Record<string, unknown>;
109
- };
110
-
111
- /**
112
- * A typed version of `parseJSON()`.
113
- */
114
- export function parsePackageJSON<T extends PackageJSON = PackageJSON>(
115
- input: string,
116
- file?: string
117
- ): T {
118
- return parseJSON<T>(input, file);
119
- }
120
-
121
- /**
122
- * A wrapper around `JSON.parse` that throws a `ParseError`.
123
- */
124
- export function parseJSON<T>(input: string, file?: string): T {
125
- try {
126
- return JSON.parse(input);
127
- } catch (err) {
128
- const { message } = err as Error;
129
- const index = message.lastIndexOf(JSON_ERROR_SUFFIX);
130
- if (index < 0) {
131
- throw err;
132
- }
133
- const text = message.substring(0, index);
134
- const position = parseInt(
135
- message.substring(index + JSON_ERROR_SUFFIX.length)
136
- );
137
- const location = indexLocation({ file, fileText: input }, position);
138
- throw new ParseError({ text, location });
139
- }
140
- }
141
-
142
- /**
143
- * Reads a file into a node Buffer.
144
- */
145
- export function readFileSyncToBuffer(file: string): Buffer {
146
- try {
147
- return fs.readFileSync(file);
148
- } catch (err) {
149
- const { message } = err as Error;
150
- throw new ParseError({
151
- text: `Could not read file: ${file}`,
152
- notes: [
153
- {
154
- text: message.replace(file, resolve(file)),
155
- },
156
- ],
157
- });
158
- }
159
- }
160
-
161
- /**
162
- * Reads a file and parses it based on its type.
163
- */
164
- export function readFileSync(file: string): string {
165
- try {
166
- return fs.readFileSync(file, { encoding: "utf-8" });
167
- } catch (err) {
168
- const { message } = err as Error;
169
- throw new ParseError({
170
- text: `Could not read file: ${file}`,
171
- notes: [
172
- {
173
- text: message.replace(file, resolve(file)),
174
- },
175
- ],
176
- });
177
- }
178
- }
179
-
180
- /**
181
- * Calculates the line and column location from an index.
182
- */
183
- export function indexLocation(file: File, index: number): Location {
184
- let lineText,
185
- line = 0,
186
- column = 0,
187
- cursor = 0;
188
- const { fileText = "" } = file;
189
- for (const row of fileText.split("\n")) {
190
- line++;
191
- cursor += row.length + 1;
192
- if (cursor >= index) {
193
- lineText = row;
194
- column = row.length - (cursor - index);
195
- break;
196
- }
197
- }
198
- return { lineText, line, column, ...file };
199
- }
200
-
201
- /**
202
- * Guesses the line and column location of a search query.
203
- */
204
- export function searchLocation(file: File, query: unknown): Location {
205
- let lineText,
206
- length,
207
- line = 0,
208
- column = 0;
209
- const queryText = String(query);
210
- const { fileText = "" } = file;
211
- for (const content of fileText.split("\n")) {
212
- line++;
213
- const index = content.indexOf(queryText);
214
- if (index >= 0) {
215
- lineText = content;
216
- column = index;
217
- length = queryText.length;
218
- break;
219
- }
220
- }
221
- return { lineText, line, column, length, ...file };
222
- }
223
-
224
- const units = {
225
- nanoseconds: 0.000000001,
226
- nanosecond: 0.000000001,
227
- microseconds: 0.000001,
228
- microsecond: 0.000001,
229
- milliseconds: 0.001,
230
- millisecond: 0.001,
231
- seconds: 1,
232
- second: 1,
233
- minutes: 60,
234
- minute: 60,
235
- hours: 3600,
236
- hour: 3600,
237
- days: 86400,
238
- day: 86400,
239
- weeks: 604800,
240
- week: 604800,
241
- month: 18144000,
242
- year: 220752000,
243
-
244
- nsecs: 0.000000001,
245
- nsec: 0.000000001,
246
- usecs: 0.000001,
247
- usec: 0.000001,
248
- msecs: 0.001,
249
- msec: 0.001,
250
- secs: 1,
251
- sec: 1,
252
- mins: 60,
253
- min: 60,
254
-
255
- ns: 0.000000001,
256
- us: 0.000001,
257
- ms: 0.001,
258
- mo: 18144000,
259
- yr: 220752000,
260
-
261
- s: 1,
262
- m: 60,
263
- h: 3600,
264
- d: 86400,
265
- w: 604800,
266
- y: 220752000,
267
- };
268
-
269
- /**
270
- * Parse a human-readable time duration in seconds (including fractional)
271
- *
272
- * Invalid values will return NaN
273
- */
274
- export function parseHumanDuration(s: string): number {
275
- const unitsMap = new Map(Object.entries(units));
276
- s = s.trim().toLowerCase();
277
- let base = 1;
278
- for (const [name, _] of unitsMap) {
279
- if (s.endsWith(name)) {
280
- s = s.substring(0, s.length - name.length);
281
- base = unitsMap.get(name) || 1;
282
- break;
283
- }
284
- }
285
- return Number(s) * base;
286
- }