wrangler 0.0.0-ecc8b172 → 0.0.0-ecdfabed0

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 (248) hide show
  1. package/README.md +17 -19
  2. package/bin/wrangler.js +24 -93
  3. package/config-schema.json +3088 -0
  4. package/package.json +197 -190
  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 +3 -5
  12. package/templates/init-tests/test-vitest-new-worker.js +4 -6
  13. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  14. package/templates/middleware/common.ts +9 -4
  15. package/templates/middleware/loader-modules.ts +94 -44
  16. package/templates/middleware/loader-sw.ts +48 -32
  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-scheduled.ts +15 -1
  20. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  21. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  22. package/templates/modules-watch-stub.js +4 -0
  23. package/templates/new-worker-scheduled.ts +1 -1
  24. package/templates/new-worker.ts +4 -1
  25. package/templates/pages-dev-pipeline.ts +10 -13
  26. package/templates/pages-dev-util.ts +55 -0
  27. package/templates/pages-shim.ts +1 -1
  28. package/templates/pages-template-plugin.ts +37 -14
  29. package/templates/pages-template-worker.ts +33 -7
  30. package/templates/startDevWorker/InspectorProxyWorker.ts +664 -0
  31. package/templates/startDevWorker/ProxyWorker.ts +336 -0
  32. package/templates/tsconfig-sanity.ts +11 -0
  33. package/templates/tsconfig.init.json +22 -0
  34. package/templates/tsconfig.json +5 -102
  35. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  36. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  37. package/wrangler-dist/ProxyWorker.js +241 -0
  38. package/wrangler-dist/ProxyWorker.js.map +6 -0
  39. package/wrangler-dist/cli.d.ts +26031 -472
  40. package/wrangler-dist/cli.js +172877 -121674
  41. package/wrangler-dist/wasm-sync.wasm +0 -0
  42. package/Cloudflare_CA.pem +0 -18
  43. package/import_meta_url.js +0 -3
  44. package/miniflare-config-stubs/.env.empty +0 -0
  45. package/miniflare-config-stubs/package.empty.json +0 -1
  46. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  47. package/miniflare-dist/index.mjs +0 -6310
  48. package/src/__tests__/api-dev.test.ts +0 -209
  49. package/src/__tests__/api-devregistry.test.js +0 -56
  50. package/src/__tests__/api.test.ts +0 -80
  51. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  52. package/src/__tests__/config-cache.test.ts +0 -42
  53. package/src/__tests__/configuration.test.ts +0 -3864
  54. package/src/__tests__/d1.test.ts +0 -70
  55. package/src/__tests__/delete.test.ts +0 -116
  56. package/src/__tests__/dev.test.tsx +0 -1357
  57. package/src/__tests__/dialogs.test.tsx +0 -40
  58. package/src/__tests__/generate.test.ts +0 -235
  59. package/src/__tests__/get-host-from-url.test.ts +0 -16
  60. package/src/__tests__/guess-worker-format.test.ts +0 -85
  61. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  62. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  63. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  64. package/src/__tests__/helpers/mock-bin.ts +0 -36
  65. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  66. package/src/__tests__/helpers/mock-console.ts +0 -106
  67. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  68. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  69. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  70. package/src/__tests__/helpers/mock-istty.ts +0 -74
  71. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  72. package/src/__tests__/helpers/mock-kv.ts +0 -33
  73. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -252
  74. package/src/__tests__/helpers/mock-process.ts +0 -39
  75. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  76. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  77. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -104
  78. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -36
  79. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -80
  80. package/src/__tests__/helpers/msw/handlers/script.ts +0 -75
  81. package/src/__tests__/helpers/msw/handlers/user.ts +0 -63
  82. package/src/__tests__/helpers/msw/index.ts +0 -15
  83. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  84. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  85. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  86. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  87. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  88. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  89. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  90. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  91. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  92. package/src/__tests__/https-options.test.ts +0 -163
  93. package/src/__tests__/index.test.ts +0 -251
  94. package/src/__tests__/init.test.ts +0 -2816
  95. package/src/__tests__/jest.setup.ts +0 -191
  96. package/src/__tests__/kv.test.ts +0 -1675
  97. package/src/__tests__/logger.test.ts +0 -141
  98. package/src/__tests__/metrics.test.ts +0 -450
  99. package/src/__tests__/middleware.scheduled.test.ts +0 -135
  100. package/src/__tests__/middleware.test.ts +0 -726
  101. package/src/__tests__/package-manager.test.ts +0 -353
  102. package/src/__tests__/pages.test.ts +0 -2111
  103. package/src/__tests__/parse.test.ts +0 -330
  104. package/src/__tests__/paths.test.ts +0 -39
  105. package/src/__tests__/publish.test.ts +0 -7119
  106. package/src/__tests__/pubsub.test.ts +0 -367
  107. package/src/__tests__/r2.test.ts +0 -371
  108. package/src/__tests__/route.test.ts +0 -45
  109. package/src/__tests__/secret.test.ts +0 -644
  110. package/src/__tests__/tail.test.ts +0 -800
  111. package/src/__tests__/test-old-node-version.js +0 -31
  112. package/src/__tests__/user.test.ts +0 -155
  113. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  114. package/src/__tests__/validate-dev-props.test.ts +0 -56
  115. package/src/__tests__/version.test.ts +0 -35
  116. package/src/__tests__/whoami.test.tsx +0 -278
  117. package/src/__tests__/worker-namespace.test.ts +0 -321
  118. package/src/abort.d.ts +0 -3
  119. package/src/api/dev.ts +0 -208
  120. package/src/api/index.ts +0 -2
  121. package/src/bundle-reporter.tsx +0 -29
  122. package/src/bundle.ts +0 -756
  123. package/src/cfetch/index.ts +0 -160
  124. package/src/cfetch/internal.ts +0 -263
  125. package/src/cli.ts +0 -29
  126. package/src/config/README.md +0 -107
  127. package/src/config/config.ts +0 -275
  128. package/src/config/diagnostics.ts +0 -80
  129. package/src/config/environment.ts +0 -505
  130. package/src/config/index.ts +0 -293
  131. package/src/config/validation-helpers.ts +0 -597
  132. package/src/config/validation.ts +0 -1930
  133. package/src/config-cache.ts +0 -85
  134. package/src/create-worker-preview.ts +0 -275
  135. package/src/create-worker-upload-form.ts +0 -301
  136. package/src/d1/backups.tsx +0 -212
  137. package/src/d1/create.tsx +0 -54
  138. package/src/d1/delete.tsx +0 -56
  139. package/src/d1/execute.tsx +0 -294
  140. package/src/d1/formatTimeAgo.ts +0 -14
  141. package/src/d1/index.ts +0 -75
  142. package/src/d1/list.tsx +0 -48
  143. package/src/d1/options.ts +0 -12
  144. package/src/d1/types.tsx +0 -14
  145. package/src/d1/utils.ts +0 -39
  146. package/src/delete.ts +0 -86
  147. package/src/deprecated/index.ts +0 -453
  148. package/src/dev/dev-vars.ts +0 -36
  149. package/src/dev/dev.tsx +0 -575
  150. package/src/dev/get-local-persistence-path.tsx +0 -31
  151. package/src/dev/local.tsx +0 -686
  152. package/src/dev/remote.tsx +0 -601
  153. package/src/dev/start-server.ts +0 -506
  154. package/src/dev/use-esbuild.ts +0 -197
  155. package/src/dev/validate-dev-props.ts +0 -31
  156. package/src/dev-registry.tsx +0 -201
  157. package/src/dev.tsx +0 -865
  158. package/src/dialogs.tsx +0 -163
  159. package/src/dispatch-namespace.ts +0 -206
  160. package/src/durable.ts +0 -102
  161. package/src/entry.ts +0 -329
  162. package/src/environment-variables.ts +0 -50
  163. package/src/errors.ts +0 -11
  164. package/src/git-client.ts +0 -124
  165. package/src/global-wrangler-config-path.ts +0 -26
  166. package/src/https-options.ts +0 -127
  167. package/src/index.tsx +0 -582
  168. package/src/init.ts +0 -970
  169. package/src/inspect.ts +0 -747
  170. package/src/intl-polyfill.d.ts +0 -139
  171. package/src/is-ci.ts +0 -14
  172. package/src/is-interactive.ts +0 -12
  173. package/src/kv/helpers.ts +0 -430
  174. package/src/kv/index.ts +0 -645
  175. package/src/logger.ts +0 -80
  176. package/src/metrics/index.ts +0 -5
  177. package/src/metrics/metrics-config.ts +0 -239
  178. package/src/metrics/metrics-dispatcher.ts +0 -96
  179. package/src/metrics/metrics-usage-headers.ts +0 -24
  180. package/src/metrics/send-event.ts +0 -94
  181. package/src/miniflare-cli/README.md +0 -30
  182. package/src/miniflare-cli/assets.ts +0 -215
  183. package/src/miniflare-cli/index.ts +0 -208
  184. package/src/miniflare-cli/request-context.ts +0 -40
  185. package/src/module-collection.ts +0 -267
  186. package/src/open-in-browser.ts +0 -17
  187. package/src/package-manager.ts +0 -219
  188. package/src/pages/build.tsx +0 -238
  189. package/src/pages/constants.ts +0 -16
  190. package/src/pages/deployments.tsx +0 -106
  191. package/src/pages/dev.tsx +0 -689
  192. package/src/pages/errors.ts +0 -66
  193. package/src/pages/functions/buildPlugin.ts +0 -110
  194. package/src/pages/functions/buildWorker.ts +0 -156
  195. package/src/pages/functions/filepath-routing.test.ts +0 -234
  196. package/src/pages/functions/filepath-routing.ts +0 -189
  197. package/src/pages/functions/identifiers.ts +0 -78
  198. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  199. package/src/pages/functions/routes-consolidation.ts +0 -73
  200. package/src/pages/functions/routes-transformation.test.ts +0 -282
  201. package/src/pages/functions/routes-transformation.ts +0 -115
  202. package/src/pages/functions/routes-validation.test.ts +0 -403
  203. package/src/pages/functions/routes-validation.ts +0 -202
  204. package/src/pages/functions/routes.ts +0 -151
  205. package/src/pages/functions.tsx +0 -82
  206. package/src/pages/hash.tsx +0 -13
  207. package/src/pages/index.tsx +0 -94
  208. package/src/pages/projects.tsx +0 -169
  209. package/src/pages/publish.tsx +0 -436
  210. package/src/pages/types.ts +0 -49
  211. package/src/pages/upload.tsx +0 -398
  212. package/src/pages/utils.ts +0 -12
  213. package/src/parse.ts +0 -286
  214. package/src/paths.ts +0 -71
  215. package/src/proxy.ts +0 -657
  216. package/src/publish/index.ts +0 -267
  217. package/src/publish/publish.ts +0 -913
  218. package/src/pubsub/index.ts +0 -286
  219. package/src/pubsub/pubsub-commands.tsx +0 -623
  220. package/src/r2/helpers.ts +0 -131
  221. package/src/r2/index.ts +0 -277
  222. package/src/routes.ts +0 -140
  223. package/src/secret/index.ts +0 -403
  224. package/src/selfsigned.d.ts +0 -29
  225. package/src/sites.tsx +0 -372
  226. package/src/tail/createTail.ts +0 -315
  227. package/src/tail/filters.ts +0 -277
  228. package/src/tail/index.ts +0 -217
  229. package/src/tail/printing.ts +0 -107
  230. package/src/update-check.ts +0 -19
  231. package/src/user/choose-account.tsx +0 -69
  232. package/src/user/env-vars.ts +0 -46
  233. package/src/user/generate-auth-url.ts +0 -33
  234. package/src/user/generate-random-state.ts +0 -16
  235. package/src/user/index.ts +0 -3
  236. package/src/user/user.tsx +0 -1192
  237. package/src/utils/collectKeyValues.ts +0 -14
  238. package/src/whoami.tsx +0 -169
  239. package/src/worker.ts +0 -234
  240. package/src/yargs-types.ts +0 -7
  241. package/src/zones.ts +0 -165
  242. package/templates/d1-beta-facade.js +0 -174
  243. package/templates/experimental-local-cache-stubs.js +0 -27
  244. package/templates/first-party-worker-module-facade.ts +0 -18
  245. package/templates/format-dev-errors.ts +0 -32
  246. package/templates/serve-static-assets.ts +0 -63
  247. package/templates/service-bindings-module-facade.js +0 -54
  248. package/templates/service-bindings-sw-facade.js +0 -42
@@ -1,398 +0,0 @@
1
- import { mkdir, readdir, readFile, stat, writeFile } from "node:fs/promises";
2
- import { dirname, join, relative, resolve, sep } from "node:path";
3
- import { render, Text } from "ink";
4
- import Spinner from "ink-spinner";
5
- import { getType } from "mime";
6
- import PQueue from "p-queue";
7
- import prettyBytes from "pretty-bytes";
8
- import React from "react";
9
- import { fetchResult } from "../cfetch";
10
- import { FatalError } from "../errors";
11
- import { logger } from "../logger";
12
- import {
13
- BULK_UPLOAD_CONCURRENCY,
14
- MAX_BUCKET_FILE_COUNT,
15
- MAX_BUCKET_SIZE,
16
- MAX_CHECK_MISSING_ATTEMPTS,
17
- MAX_UPLOAD_ATTEMPTS,
18
- } from "./constants";
19
- import { hashFile } from "./hash";
20
- import { pagesBetaWarning } from "./utils";
21
- import type { UploadPayloadFile, YargsOptionsToInterface } from "./types";
22
- import type { Argv } from "yargs";
23
-
24
- type UploadArgs = YargsOptionsToInterface<typeof Options>;
25
-
26
- export function Options(yargs: Argv) {
27
- return yargs
28
- .positional("directory", {
29
- type: "string",
30
- demandOption: true,
31
- description: "The directory of static files to upload",
32
- })
33
- .options({
34
- "output-manifest-path": {
35
- type: "string",
36
- description: "The name of the project you want to deploy to",
37
- },
38
- })
39
- .epilogue(pagesBetaWarning);
40
- }
41
-
42
- export const Handler = async ({
43
- directory,
44
- outputManifestPath,
45
- }: UploadArgs) => {
46
- if (!directory) {
47
- throw new FatalError("Must specify a directory.", 1);
48
- }
49
-
50
- if (!process.env.CF_PAGES_UPLOAD_JWT) {
51
- throw new FatalError("No JWT given.", 1);
52
- }
53
-
54
- const manifest = await upload({
55
- directory,
56
- jwt: process.env.CF_PAGES_UPLOAD_JWT,
57
- });
58
-
59
- if (outputManifestPath) {
60
- await mkdir(dirname(outputManifestPath), { recursive: true });
61
- await writeFile(outputManifestPath, JSON.stringify(manifest));
62
- }
63
-
64
- logger.log(`✨ Upload complete!`);
65
- };
66
-
67
- export const upload = async (
68
- args:
69
- | {
70
- directory: string;
71
- jwt: string;
72
- }
73
- | { directory: string; accountId: string; projectName: string }
74
- ) => {
75
- async function fetchJwt(): Promise<string> {
76
- if ("jwt" in args) {
77
- return args.jwt;
78
- } else {
79
- return (
80
- await fetchResult<{ jwt: string }>(
81
- `/accounts/${args.accountId}/pages/projects/${args.projectName}/upload-token`
82
- )
83
- ).jwt;
84
- }
85
- }
86
-
87
- type FileContainer = {
88
- path: string;
89
- contentType: string;
90
- sizeInBytes: number;
91
- hash: string;
92
- };
93
-
94
- const IGNORE_LIST = [
95
- "_worker.js",
96
- "_redirects",
97
- "_headers",
98
- "_routes.json",
99
- ".DS_Store",
100
- "node_modules",
101
- ".git",
102
- ];
103
-
104
- const directory = resolve(args.directory);
105
-
106
- // TODO(future): Use this to more efficiently load files in and speed up uploading
107
- // Limit memory to 1 GB unless more is specified
108
- // let maxMemory = 1_000_000_000;
109
- // if (process.env.NODE_OPTIONS && (process.env.NODE_OPTIONS.includes('--max-old-space-size=') || process.env.NODE_OPTIONS.includes('--max_old_space_size='))) {
110
- // const parsed = parser(process.env.NODE_OPTIONS);
111
- // maxMemory = (parsed['max-old-space-size'] ? parsed['max-old-space-size'] : parsed['max_old_space_size']) * 1000 * 1000; // Turn MB into bytes
112
- // }
113
-
114
- const walk = async (
115
- dir: string,
116
- fileMap: Map<string, FileContainer> = new Map(),
117
- startingDir: string = dir
118
- ) => {
119
- const files = await readdir(dir);
120
-
121
- await Promise.all(
122
- files.map(async (file) => {
123
- const filepath = join(dir, file);
124
- const filestat = await stat(filepath);
125
-
126
- if (IGNORE_LIST.includes(file)) {
127
- return;
128
- }
129
-
130
- if (filestat.isSymbolicLink()) {
131
- return;
132
- }
133
-
134
- if (filestat.isDirectory()) {
135
- fileMap = await walk(filepath, fileMap, startingDir);
136
- } else {
137
- const name = relative(startingDir, filepath).split(sep).join("/");
138
-
139
- if (filestat.size > 25 * 1024 * 1024) {
140
- throw new FatalError(
141
- `Error: Pages only supports files up to ${prettyBytes(
142
- 25 * 1024 * 1024
143
- )} in size\n${name} is ${prettyBytes(filestat.size)} in size`,
144
- 1
145
- );
146
- }
147
-
148
- // We don't want to hold the content in memory. We instead only want to read it when it's needed
149
- fileMap.set(name, {
150
- path: filepath,
151
- contentType: getType(name) || "application/octet-stream",
152
- sizeInBytes: filestat.size,
153
- hash: hashFile(filepath),
154
- });
155
- }
156
- })
157
- );
158
-
159
- return fileMap;
160
- };
161
-
162
- const fileMap = await walk(directory);
163
-
164
- if (fileMap.size > 20000) {
165
- throw new FatalError(
166
- `Error: Pages only supports up to 20,000 files in a deployment. Ensure you have specified your build output directory correctly.`,
167
- 1
168
- );
169
- }
170
-
171
- const files = [...fileMap.values()];
172
-
173
- let jwt = await fetchJwt();
174
-
175
- const start = Date.now();
176
-
177
- let attempts = 0;
178
- const getMissingHashes = async (): Promise<string[]> => {
179
- try {
180
- return await fetchResult<string[]>(`/pages/assets/check-missing`, {
181
- method: "POST",
182
- headers: {
183
- "Content-Type": "application/json",
184
- Authorization: `Bearer ${jwt}`,
185
- },
186
- body: JSON.stringify({
187
- hashes: files.map(({ hash }) => hash),
188
- }),
189
- });
190
- } catch (e) {
191
- if (attempts < MAX_CHECK_MISSING_ATTEMPTS) {
192
- // Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
193
- await new Promise((resolvePromise) =>
194
- setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
195
- );
196
-
197
- if ((e as { code: number }).code === 8000013) {
198
- // Looks like the JWT expired, fetch another one
199
- jwt = await fetchJwt();
200
- }
201
- return getMissingHashes();
202
- } else {
203
- throw e;
204
- }
205
- }
206
- };
207
- const missingHashes = await getMissingHashes();
208
-
209
- const sortedFiles = files
210
- .filter((file) => missingHashes.includes(file.hash))
211
- .sort((a, b) => b.sizeInBytes - a.sizeInBytes);
212
-
213
- // Start with a few buckets so small projects still get
214
- // the benefit of multiple upload streams
215
- const buckets: {
216
- files: FileContainer[];
217
- remainingSize: number;
218
- }[] = new Array(BULK_UPLOAD_CONCURRENCY).fill(null).map(() => ({
219
- files: [],
220
- remainingSize: MAX_BUCKET_SIZE,
221
- }));
222
-
223
- let bucketOffset = 0;
224
- for (const file of sortedFiles) {
225
- let inserted = false;
226
-
227
- for (let i = 0; i < buckets.length; i++) {
228
- // Start at a different bucket for each new file
229
- const bucket = buckets[(i + bucketOffset) % buckets.length];
230
- if (
231
- bucket.remainingSize >= file.sizeInBytes &&
232
- bucket.files.length < MAX_BUCKET_FILE_COUNT
233
- ) {
234
- bucket.files.push(file);
235
- bucket.remainingSize -= file.sizeInBytes;
236
- inserted = true;
237
- break;
238
- }
239
- }
240
-
241
- if (!inserted) {
242
- buckets.push({
243
- files: [file],
244
- remainingSize: MAX_BUCKET_SIZE - file.sizeInBytes,
245
- });
246
- }
247
- bucketOffset++;
248
- }
249
-
250
- let counter = fileMap.size - sortedFiles.length;
251
- const { rerender, unmount } = render(
252
- <Progress done={counter} total={fileMap.size} />
253
- );
254
-
255
- const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY });
256
-
257
- for (const bucket of buckets) {
258
- // Don't upload empty buckets (can happen for tiny projects)
259
- if (bucket.files.length === 0) continue;
260
-
261
- attempts = 0;
262
- const doUpload = async (): Promise<void> => {
263
- // 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)
264
- // This is so we don't run out of memory trying to upload the files.
265
- const payload: UploadPayloadFile[] = await Promise.all(
266
- bucket.files.map(async (file) => ({
267
- key: file.hash,
268
- value: (await readFile(file.path)).toString("base64"),
269
- metadata: {
270
- contentType: file.contentType,
271
- },
272
- base64: true,
273
- }))
274
- );
275
-
276
- try {
277
- return await fetchResult(`/pages/assets/upload`, {
278
- method: "POST",
279
- headers: {
280
- "Content-Type": "application/json",
281
- Authorization: `Bearer ${jwt}`,
282
- },
283
- body: JSON.stringify(payload),
284
- });
285
- } catch (e) {
286
- if (attempts < MAX_UPLOAD_ATTEMPTS) {
287
- // Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
288
- await new Promise((resolvePromise) =>
289
- setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
290
- );
291
-
292
- if ((e as { code: number }).code === 8000013) {
293
- // Looks like the JWT expired, fetch another one
294
- jwt = await fetchJwt();
295
- }
296
- return doUpload();
297
- } else {
298
- throw e;
299
- }
300
- }
301
- };
302
-
303
- queue.add(() =>
304
- doUpload().then(
305
- () => {
306
- counter += bucket.files.length;
307
- rerender(<Progress done={counter} total={fileMap.size} />);
308
- },
309
- (error) => {
310
- return Promise.reject(
311
- new FatalError(
312
- "Failed to upload files. Please try again.",
313
- error.code || 1
314
- )
315
- );
316
- }
317
- )
318
- );
319
- }
320
-
321
- await queue.onIdle();
322
-
323
- unmount();
324
-
325
- const uploadMs = Date.now() - start;
326
-
327
- const skipped = fileMap.size - missingHashes.length;
328
- const skippedMessage = skipped > 0 ? `(${skipped} already uploaded) ` : "";
329
-
330
- logger.log(
331
- `✨ Success! Uploaded ${
332
- sortedFiles.length
333
- } files ${skippedMessage}${formatTime(uploadMs)}\n`
334
- );
335
-
336
- const doUpsertHashes = async (): Promise<void> => {
337
- try {
338
- return await fetchResult(`/pages/assets/upsert-hashes`, {
339
- method: "POST",
340
- headers: {
341
- "Content-Type": "application/json",
342
- Authorization: `Bearer ${jwt}`,
343
- },
344
- body: JSON.stringify({
345
- hashes: files.map(({ hash }) => hash),
346
- }),
347
- });
348
- } catch (e) {
349
- await new Promise((resolvePromise) => setTimeout(resolvePromise, 1000));
350
-
351
- if ((e as { code: number }).code === 8000013) {
352
- // Looks like the JWT expired, fetch another one
353
- jwt = await fetchJwt();
354
- }
355
-
356
- return await fetchResult(`/pages/assets/upsert-hashes`, {
357
- method: "POST",
358
- headers: {
359
- "Content-Type": "application/json",
360
- Authorization: `Bearer ${jwt}`,
361
- },
362
- body: JSON.stringify({
363
- hashes: files.map(({ hash }) => hash),
364
- }),
365
- });
366
- }
367
- };
368
-
369
- try {
370
- await doUpsertHashes();
371
- } catch {
372
- logger.warn(
373
- "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."
374
- );
375
- }
376
-
377
- return Object.fromEntries(
378
- [...fileMap.entries()].map(([fileName, file]) => [
379
- `/${fileName}`,
380
- file.hash,
381
- ])
382
- );
383
- };
384
-
385
- function formatTime(duration: number) {
386
- return `(${(duration / 1000).toFixed(2)} sec)`;
387
- }
388
-
389
- function Progress({ done, total }: { done: number; total: number }) {
390
- return (
391
- <>
392
- <Text>
393
- <Spinner type="earth" />
394
- {` Uploading... (${done}/${total})\n`}
395
- </Text>
396
- </>
397
- );
398
- }
@@ -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
- }