wrangler 0.0.0-e978986 → 0.0.0-e9e9872

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 (186) 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 +159 -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 -3363
  9. package/src/__tests__/dev.test.tsx +1128 -949
  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/mock-account-id.ts +24 -24
  13. package/src/__tests__/helpers/mock-bin.ts +20 -20
  14. package/src/__tests__/helpers/mock-cfetch.ts +92 -92
  15. package/src/__tests__/helpers/mock-console.ts +49 -39
  16. package/src/__tests__/helpers/mock-dialogs.ts +94 -71
  17. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  18. package/src/__tests__/helpers/mock-istty.ts +65 -18
  19. package/src/__tests__/helpers/mock-kv.ts +26 -26
  20. package/src/__tests__/helpers/mock-oauth-flow.ts +223 -228
  21. package/src/__tests__/helpers/mock-process.ts +39 -0
  22. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  23. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  24. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  25. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  26. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  27. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  28. package/src/__tests__/https-options.test.ts +142 -109
  29. package/src/__tests__/index.test.ts +239 -233
  30. package/src/__tests__/init.test.ts +1605 -1180
  31. package/src/__tests__/jest.setup.ts +76 -33
  32. package/src/__tests__/kv.test.ts +1160 -991
  33. package/src/__tests__/logger.test.ts +100 -74
  34. package/src/__tests__/package-manager.test.ts +303 -303
  35. package/src/__tests__/pages.test.ts +1160 -563
  36. package/src/__tests__/parse.test.ts +252 -252
  37. package/src/__tests__/publish.test.ts +6426 -5299
  38. package/src/__tests__/pubsub.test.ts +367 -0
  39. package/src/__tests__/r2.test.ts +133 -133
  40. package/src/__tests__/route.test.ts +18 -18
  41. package/src/__tests__/secret.test.ts +470 -459
  42. package/src/__tests__/tail.test.ts +538 -530
  43. package/src/__tests__/user.test.ts +124 -112
  44. package/src/__tests__/whoami.test.tsx +208 -83
  45. package/src/__tests__/worker-namespace.test.ts +327 -0
  46. package/src/abort.d.ts +1 -1
  47. package/src/api/dev.ts +52 -0
  48. package/src/api/index.ts +1 -0
  49. package/src/bundle-reporter.tsx +29 -0
  50. package/src/bundle.ts +158 -146
  51. package/src/cfetch/index.ts +80 -80
  52. package/src/cfetch/internal.ts +92 -88
  53. package/src/cli.ts +21 -7
  54. package/src/config/config.ts +204 -195
  55. package/src/config/diagnostics.ts +61 -61
  56. package/src/config/environment.ts +390 -357
  57. package/src/config/index.ts +206 -193
  58. package/src/config/validation-helpers.ts +366 -357
  59. package/src/config/validation.ts +1573 -1367
  60. package/src/config-cache.ts +79 -41
  61. package/src/create-worker-preview.ts +206 -136
  62. package/src/create-worker-upload-form.ts +247 -238
  63. package/src/dev/dev-vars.ts +13 -13
  64. package/src/dev/dev.tsx +334 -336
  65. package/src/dev/local.tsx +310 -274
  66. package/src/dev/remote.tsx +366 -211
  67. package/src/dev/use-esbuild.ts +126 -94
  68. package/src/dev.tsx +538 -0
  69. package/src/dialogs.tsx +97 -97
  70. package/src/durable.ts +87 -87
  71. package/src/entry.ts +234 -228
  72. package/src/environment-variables.ts +23 -23
  73. package/src/errors.ts +6 -6
  74. package/src/faye-websocket.d.ts +6 -0
  75. package/src/generate.ts +33 -0
  76. package/src/git-client.ts +42 -0
  77. package/src/global-wrangler-config-path.ts +26 -0
  78. package/src/https-options.ts +84 -80
  79. package/src/index.tsx +1800 -2752
  80. package/src/init.ts +549 -0
  81. package/src/inspect.ts +593 -593
  82. package/src/intl-polyfill.d.ts +123 -123
  83. package/src/is-interactive.ts +12 -0
  84. package/src/kv.ts +299 -277
  85. package/src/logger.ts +46 -39
  86. package/src/miniflare-cli/enum-keys.ts +8 -8
  87. package/src/miniflare-cli/index.ts +43 -31
  88. package/src/miniflare-cli/request-context.ts +18 -18
  89. package/src/module-collection.ts +212 -212
  90. package/src/open-in-browser.ts +4 -6
  91. package/src/package-manager.ts +173 -128
  92. package/src/pages/build.tsx +202 -0
  93. package/src/pages/constants.ts +7 -0
  94. package/src/pages/deployments.tsx +101 -0
  95. package/src/pages/dev.tsx +964 -0
  96. package/src/pages/functions/buildPlugin.ts +105 -0
  97. package/src/pages/functions/buildWorker.ts +151 -0
  98. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  99. package/src/pages/functions/filepath-routing.ts +189 -0
  100. package/src/pages/functions/identifiers.ts +78 -0
  101. package/src/pages/functions/routes.ts +151 -0
  102. package/src/pages/index.tsx +84 -0
  103. package/src/pages/projects.tsx +157 -0
  104. package/src/pages/publish.tsx +335 -0
  105. package/src/pages/types.ts +40 -0
  106. package/src/pages/upload.tsx +396 -0
  107. package/src/pages/utils.ts +12 -0
  108. package/src/parse.ts +209 -125
  109. package/src/paths.ts +6 -6
  110. package/src/preview.ts +31 -0
  111. package/src/proxy.ts +400 -389
  112. package/src/publish.ts +702 -505
  113. package/src/pubsub/index.ts +286 -0
  114. package/src/pubsub/pubsub-commands.tsx +577 -0
  115. package/src/r2.ts +19 -19
  116. package/src/selfsigned.d.ts +23 -23
  117. package/src/sites.tsx +278 -201
  118. package/src/tail/filters.ts +108 -108
  119. package/src/tail/index.ts +217 -217
  120. package/src/tail/printing.ts +45 -45
  121. package/src/update-check.ts +11 -11
  122. package/src/user/choose-account.tsx +60 -0
  123. package/src/user/env-vars.ts +46 -0
  124. package/src/user/generate-auth-url.ts +33 -0
  125. package/src/user/generate-random-state.ts +16 -0
  126. package/src/user/index.ts +3 -0
  127. package/src/user/user.tsx +1170 -0
  128. package/src/whoami.tsx +61 -41
  129. package/src/worker-namespace.ts +190 -0
  130. package/src/worker.ts +110 -99
  131. package/src/zones.ts +76 -0
  132. package/templates/checked-fetch.js +17 -0
  133. package/templates/new-worker-scheduled.js +4 -4
  134. package/templates/new-worker-scheduled.ts +16 -16
  135. package/templates/new-worker.js +3 -3
  136. package/templates/new-worker.ts +15 -15
  137. package/templates/no-op-worker.js +10 -0
  138. package/templates/pages-template-plugin.ts +155 -0
  139. package/templates/pages-template-worker.ts +161 -0
  140. package/templates/static-asset-facade.js +38 -36
  141. package/templates/tsconfig.json +95 -95
  142. package/wrangler-dist/cli.d.ts +298 -0
  143. package/wrangler-dist/cli.js +33496 -31370
  144. package/pages/functions/buildPlugin.ts +0 -105
  145. package/pages/functions/buildWorker.ts +0 -151
  146. package/pages/functions/filepath-routing.ts +0 -189
  147. package/pages/functions/identifiers.ts +0 -78
  148. package/pages/functions/routes.ts +0 -156
  149. package/pages/functions/template-plugin.ts +0 -147
  150. package/pages/functions/template-worker.ts +0 -143
  151. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  152. package/src/pages.tsx +0 -2027
  153. package/src/user.tsx +0 -1203
  154. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  155. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  156. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  157. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  158. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  159. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  160. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  161. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  162. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  163. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  164. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  165. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  166. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  167. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  168. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  169. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  170. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  171. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  172. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  173. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  174. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  175. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  176. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  177. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  178. package/vendor/wrangler-mime/LICENSE +0 -21
  179. package/vendor/wrangler-mime/Mime.js +0 -97
  180. package/vendor/wrangler-mime/README.md +0 -187
  181. package/vendor/wrangler-mime/cli.js +0 -46
  182. package/vendor/wrangler-mime/index.js +0 -4
  183. package/vendor/wrangler-mime/lite.js +0 -4
  184. package/vendor/wrangler-mime/package.json +0 -52
  185. package/vendor/wrangler-mime/types/other.js +0 -1
  186. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -0,0 +1,335 @@
1
+ import { execSync } from "node:child_process";
2
+ import { existsSync, readFileSync } from "node:fs";
3
+ import { tmpdir } from "node:os";
4
+ import { dirname, join } from "node:path";
5
+ import { cwd } from "node:process";
6
+ import { render, Text } from "ink";
7
+ import SelectInput from "ink-select-input";
8
+ import React from "react";
9
+ import { File, FormData } from "undici";
10
+ import { fetchResult } from "../cfetch";
11
+ import { getConfigCache, saveToConfigCache } from "../config-cache";
12
+ import { prompt } from "../dialogs";
13
+ import { FatalError } from "../errors";
14
+ import { logger } from "../logger";
15
+ import { requireAuth } from "../user";
16
+ import { buildFunctions } from "./build";
17
+ import { PAGES_CONFIG_CACHE_FILENAME } from "./constants";
18
+ import { listProjects } from "./projects";
19
+ import { upload } from "./upload";
20
+ import { pagesBetaWarning } from "./utils";
21
+ import type { Deployment, PagesConfigCache, Project } from "./types";
22
+ import type { ArgumentsCamelCase, Argv } from "yargs";
23
+
24
+ type PublishArgs = {
25
+ directory: string;
26
+ "project-name"?: string;
27
+ branch?: string;
28
+ "commit-hash"?: string;
29
+ "commit-message"?: string;
30
+ "commit-dirty"?: boolean;
31
+ };
32
+
33
+ export function Options(yargs: Argv): Argv<PublishArgs> {
34
+ return yargs
35
+ .positional("directory", {
36
+ type: "string",
37
+ demandOption: true,
38
+ description: "The directory of static files to upload",
39
+ })
40
+ .options({
41
+ "project-name": {
42
+ type: "string",
43
+ description: "The name of the project you want to deploy to",
44
+ },
45
+ branch: {
46
+ type: "string",
47
+ description: "The name of the branch you want to deploy to",
48
+ },
49
+ "commit-hash": {
50
+ type: "string",
51
+ description: "The SHA to attach to this deployment",
52
+ },
53
+ "commit-message": {
54
+ type: "string",
55
+ description: "The commit message to attach to this deployment",
56
+ },
57
+ "commit-dirty": {
58
+ type: "boolean",
59
+ description:
60
+ "Whether or not the workspace should be considered dirty for this deployment",
61
+ },
62
+ config: {
63
+ describe: "Pages does not support wrangler.toml",
64
+ type: "string",
65
+ hidden: true,
66
+ },
67
+ })
68
+ .epilogue(pagesBetaWarning);
69
+ }
70
+
71
+ export const Handler = async ({
72
+ directory,
73
+ projectName,
74
+ branch,
75
+ commitHash,
76
+ commitMessage,
77
+ commitDirty,
78
+ config: wranglerConfig,
79
+ }: ArgumentsCamelCase<PublishArgs>) => {
80
+ if (wranglerConfig) {
81
+ throw new FatalError("Pages does not support wrangler.toml", 1);
82
+ }
83
+
84
+ if (!directory) {
85
+ throw new FatalError("Must specify a directory.", 1);
86
+ }
87
+
88
+ const config = getConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME);
89
+ const accountId = await requireAuth(config);
90
+
91
+ projectName ??= config.project_name;
92
+
93
+ const isInteractive = process.stdin.isTTY;
94
+ if (!projectName && isInteractive) {
95
+ const projects = (await listProjects({ accountId })).filter(
96
+ (project) => !project.source
97
+ );
98
+
99
+ let existingOrNew: "existing" | "new" = "new";
100
+
101
+ if (projects.length > 0) {
102
+ existingOrNew = await new Promise<"new" | "existing">((resolve) => {
103
+ const { unmount } = render(
104
+ <>
105
+ <Text>
106
+ No project selected. Would you like to create one or use an
107
+ existing project?
108
+ </Text>
109
+ <SelectInput
110
+ items={[
111
+ {
112
+ key: "new",
113
+ label: "Create a new project",
114
+ value: "new",
115
+ },
116
+ {
117
+ key: "existing",
118
+ label: "Use an existing project",
119
+ value: "existing",
120
+ },
121
+ ]}
122
+ onSelect={async (selected) => {
123
+ resolve(selected.value as "new" | "existing");
124
+ unmount();
125
+ }}
126
+ />
127
+ </>
128
+ );
129
+ });
130
+ }
131
+
132
+ switch (existingOrNew) {
133
+ case "existing": {
134
+ projectName = await new Promise((resolve) => {
135
+ const { unmount } = render(
136
+ <>
137
+ <Text>Select a project:</Text>
138
+ <SelectInput
139
+ items={projects.map((project) => ({
140
+ key: project.name,
141
+ label: project.name,
142
+ value: project,
143
+ }))}
144
+ onSelect={async (selected) => {
145
+ resolve(selected.value.name);
146
+ unmount();
147
+ }}
148
+ />
149
+ </>
150
+ );
151
+ });
152
+ break;
153
+ }
154
+ case "new": {
155
+ projectName = await prompt("Enter the name of your new project:");
156
+
157
+ if (!projectName) {
158
+ throw new FatalError("Must specify a project name.", 1);
159
+ }
160
+
161
+ let isGitDir = true;
162
+ try {
163
+ execSync(`git rev-parse --is-inside-work-tree`, {
164
+ stdio: "ignore",
165
+ });
166
+ } catch (err) {
167
+ isGitDir = false;
168
+ }
169
+
170
+ const productionBranch = await prompt(
171
+ "Enter the production branch name:",
172
+ "text",
173
+ isGitDir
174
+ ? execSync(`git rev-parse --abbrev-ref HEAD`).toString().trim()
175
+ : "production"
176
+ );
177
+
178
+ if (!productionBranch) {
179
+ throw new FatalError("Must specify a production branch.", 1);
180
+ }
181
+
182
+ await fetchResult<Project>(`/accounts/${accountId}/pages/projects`, {
183
+ method: "POST",
184
+ body: JSON.stringify({
185
+ name: projectName,
186
+ production_branch: productionBranch,
187
+ }),
188
+ });
189
+
190
+ saveToConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME, {
191
+ account_id: accountId,
192
+ project_name: projectName,
193
+ });
194
+
195
+ logger.log(`✨ Successfully created the '${projectName}' project.`);
196
+ break;
197
+ }
198
+ }
199
+ }
200
+
201
+ if (!projectName) {
202
+ throw new FatalError("Must specify a project name.", 1);
203
+ }
204
+
205
+ // We infer git info by default is not passed in
206
+
207
+ let isGitDir = true;
208
+ try {
209
+ execSync(`git rev-parse --is-inside-work-tree`, {
210
+ stdio: "ignore",
211
+ });
212
+ } catch (err) {
213
+ isGitDir = false;
214
+ }
215
+
216
+ let isGitDirty = false;
217
+
218
+ if (isGitDir) {
219
+ try {
220
+ isGitDirty = Boolean(
221
+ execSync(`git status --porcelain`).toString().length
222
+ );
223
+
224
+ if (!branch) {
225
+ branch = execSync(`git rev-parse --abbrev-ref HEAD`).toString().trim();
226
+ }
227
+
228
+ if (!commitHash) {
229
+ commitHash = execSync(`git rev-parse HEAD`).toString().trim();
230
+ }
231
+
232
+ if (!commitMessage) {
233
+ commitMessage = execSync(`git show -s --format=%B ${commitHash}`)
234
+ .toString()
235
+ .trim();
236
+ }
237
+ } catch (err) {}
238
+
239
+ if (isGitDirty && !commitDirty) {
240
+ logger.warn(
241
+ `Warning: Your working directory is a git repo and has uncommitted changes\nTo silence this warning, pass in --commit-dirty=true`
242
+ );
243
+ }
244
+
245
+ if (commitDirty === undefined) {
246
+ commitDirty = isGitDirty;
247
+ }
248
+ }
249
+
250
+ let builtFunctions: string | undefined = undefined;
251
+ const functionsDirectory = join(cwd(), "functions");
252
+ if (existsSync(functionsDirectory)) {
253
+ const outfile = join(tmpdir(), `./functionsWorker-${Math.random()}.js`);
254
+
255
+ await new Promise((resolve) =>
256
+ buildFunctions({
257
+ outfile,
258
+ functionsDirectory,
259
+ onEnd: () => resolve(null),
260
+ buildOutputDirectory: dirname(outfile),
261
+ })
262
+ );
263
+
264
+ builtFunctions = readFileSync(outfile, "utf-8");
265
+ }
266
+
267
+ const manifest = await upload({ directory, accountId, projectName });
268
+
269
+ const formData = new FormData();
270
+
271
+ formData.append("manifest", JSON.stringify(manifest));
272
+
273
+ if (branch) {
274
+ formData.append("branch", branch);
275
+ }
276
+
277
+ if (commitMessage) {
278
+ formData.append("commit_message", commitMessage);
279
+ }
280
+
281
+ if (commitHash) {
282
+ formData.append("commit_hash", commitHash);
283
+ }
284
+
285
+ if (commitDirty !== undefined) {
286
+ formData.append("commit_dirty", commitDirty);
287
+ }
288
+
289
+ let _headers: string | undefined,
290
+ _redirects: string | undefined,
291
+ _workerJS: string | undefined;
292
+
293
+ try {
294
+ _headers = readFileSync(join(directory, "_headers"), "utf-8");
295
+ } catch {}
296
+
297
+ try {
298
+ _redirects = readFileSync(join(directory, "_redirects"), "utf-8");
299
+ } catch {}
300
+
301
+ try {
302
+ _workerJS = readFileSync(join(directory, "_worker.js"), "utf-8");
303
+ } catch {}
304
+
305
+ if (_headers) {
306
+ formData.append("_headers", new File([_headers], "_headers"));
307
+ }
308
+
309
+ if (_redirects) {
310
+ formData.append("_redirects", new File([_redirects], "_redirects"));
311
+ }
312
+
313
+ if (builtFunctions) {
314
+ formData.append("_worker.js", new File([builtFunctions], "_worker.js"));
315
+ } else if (_workerJS) {
316
+ formData.append("_worker.js", new File([_workerJS], "_worker.js"));
317
+ }
318
+
319
+ const deploymentResponse = await fetchResult<Deployment>(
320
+ `/accounts/${accountId}/pages/projects/${projectName}/deployments`,
321
+ {
322
+ method: "POST",
323
+ body: formData,
324
+ }
325
+ );
326
+
327
+ saveToConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME, {
328
+ account_id: accountId,
329
+ project_name: projectName,
330
+ });
331
+
332
+ logger.log(
333
+ `✨ Deployment complete! Take a peek over at ${deploymentResponse.url}`
334
+ );
335
+ };
@@ -0,0 +1,40 @@
1
+ export type Project = {
2
+ name: string;
3
+ subdomain: string;
4
+ domains: Array<string>;
5
+ source?: {
6
+ type: string;
7
+ };
8
+ latest_deployment?: {
9
+ modified_on: string;
10
+ };
11
+ created_on: string;
12
+ production_branch: string;
13
+ };
14
+ export type Deployment = {
15
+ id: string;
16
+ environment: string;
17
+ deployment_trigger: {
18
+ metadata: {
19
+ commit_hash: string;
20
+ branch: string;
21
+ };
22
+ };
23
+ url: string;
24
+ latest_stage: {
25
+ status: string;
26
+ ended_on: string;
27
+ };
28
+ project_name: string;
29
+ };
30
+ export type UploadPayloadFile = {
31
+ key: string;
32
+ value: string;
33
+ metadata: { contentType: string };
34
+ base64: boolean;
35
+ };
36
+
37
+ export interface PagesConfigCache {
38
+ account_id?: string;
39
+ project_name?: string;
40
+ }