wrangler 2.0.12 → 2.0.16

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 (149) hide show
  1. package/README.md +7 -1
  2. package/bin/wrangler.js +111 -57
  3. package/miniflare-dist/index.mjs +9 -2
  4. package/package.json +156 -154
  5. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  6. package/src/__tests__/config-cache.test.ts +30 -24
  7. package/src/__tests__/configuration.test.ts +3935 -3476
  8. package/src/__tests__/dev.test.tsx +1128 -979
  9. package/src/__tests__/guess-worker-format.test.ts +68 -68
  10. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  11. package/src/__tests__/helpers/faye-websocket.d.ts +4 -4
  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 -27
  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 +104 -104
  29. package/src/__tests__/index.test.ts +239 -234
  30. package/src/__tests__/init.test.ts +1605 -1250
  31. package/src/__tests__/jest.setup.ts +63 -33
  32. package/src/__tests__/kv.test.ts +1128 -1011
  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 +1152 -652
  36. package/src/__tests__/parse.test.ts +252 -252
  37. package/src/__tests__/publish.test.ts +6371 -5622
  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 +382 -377
  42. package/src/__tests__/tail.test.ts +530 -530
  43. package/src/__tests__/user.test.ts +123 -111
  44. package/src/__tests__/whoami.test.tsx +198 -117
  45. package/src/__tests__/worker-namespace.test.ts +327 -0
  46. package/src/abort.d.ts +1 -1
  47. package/src/api/dev.ts +49 -0
  48. package/src/api/index.ts +1 -0
  49. package/src/bundle-reporter.tsx +29 -0
  50. package/src/bundle.ts +157 -149
  51. package/src/cfetch/index.ts +80 -80
  52. package/src/cfetch/internal.ts +90 -83
  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 -366
  59. package/src/config/validation.ts +1573 -1376
  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 +329 -307
  65. package/src/dev/local.tsx +304 -275
  66. package/src/dev/remote.tsx +366 -224
  67. package/src/dev/use-esbuild.ts +126 -91
  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/generate.ts +33 -0
  75. package/src/git-client.ts +42 -0
  76. package/src/https-options.ts +79 -79
  77. package/src/index.tsx +1775 -2763
  78. package/src/init.ts +549 -0
  79. package/src/inspect.ts +593 -593
  80. package/src/intl-polyfill.d.ts +123 -123
  81. package/src/is-interactive.ts +12 -0
  82. package/src/kv.ts +277 -277
  83. package/src/logger.ts +46 -39
  84. package/src/miniflare-cli/enum-keys.ts +8 -8
  85. package/src/miniflare-cli/index.ts +42 -31
  86. package/src/miniflare-cli/request-context.ts +18 -18
  87. package/src/module-collection.ts +212 -212
  88. package/src/open-in-browser.ts +4 -6
  89. package/src/package-manager.ts +123 -123
  90. package/src/pages/build.tsx +202 -0
  91. package/src/pages/constants.ts +7 -0
  92. package/src/pages/deployments.tsx +101 -0
  93. package/src/pages/dev.tsx +964 -0
  94. package/src/pages/functions/buildPlugin.ts +105 -0
  95. package/src/pages/functions/buildWorker.ts +151 -0
  96. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  97. package/src/pages/functions/filepath-routing.ts +189 -0
  98. package/src/pages/functions/identifiers.ts +78 -0
  99. package/src/pages/functions/routes.ts +151 -0
  100. package/src/pages/index.tsx +84 -0
  101. package/src/pages/projects.tsx +157 -0
  102. package/src/pages/publish.tsx +335 -0
  103. package/src/pages/types.ts +40 -0
  104. package/src/pages/upload.tsx +384 -0
  105. package/src/pages/utils.ts +12 -0
  106. package/src/parse.ts +202 -138
  107. package/src/paths.ts +6 -6
  108. package/src/preview.ts +31 -0
  109. package/src/proxy.ts +400 -402
  110. package/src/publish.ts +667 -621
  111. package/src/pubsub/index.ts +286 -0
  112. package/src/pubsub/pubsub-commands.tsx +577 -0
  113. package/src/r2.ts +19 -19
  114. package/src/selfsigned.d.ts +23 -23
  115. package/src/sites.tsx +271 -225
  116. package/src/tail/filters.ts +108 -108
  117. package/src/tail/index.ts +217 -217
  118. package/src/tail/printing.ts +45 -45
  119. package/src/update-check.ts +11 -11
  120. package/src/user/choose-account.tsx +60 -0
  121. package/src/user/env-vars.ts +46 -0
  122. package/src/user/generate-auth-url.ts +33 -0
  123. package/src/user/generate-random-state.ts +16 -0
  124. package/src/user/index.ts +3 -0
  125. package/src/user/user.tsx +1161 -0
  126. package/src/whoami.tsx +61 -42
  127. package/src/worker-namespace.ts +190 -0
  128. package/src/worker.ts +110 -100
  129. package/src/zones.ts +39 -36
  130. package/templates/checked-fetch.js +17 -0
  131. package/templates/new-worker-scheduled.js +3 -3
  132. package/templates/new-worker-scheduled.ts +15 -15
  133. package/templates/new-worker.js +3 -3
  134. package/templates/new-worker.ts +15 -15
  135. package/templates/no-op-worker.js +10 -0
  136. package/templates/pages-template-plugin.ts +155 -0
  137. package/templates/pages-template-worker.ts +161 -0
  138. package/templates/static-asset-facade.js +31 -31
  139. package/templates/tsconfig.json +95 -95
  140. package/wrangler-dist/cli.js +55383 -54138
  141. package/pages/functions/buildPlugin.ts +0 -105
  142. package/pages/functions/buildWorker.ts +0 -151
  143. package/pages/functions/filepath-routing.ts +0 -189
  144. package/pages/functions/identifiers.ts +0 -78
  145. package/pages/functions/routes.ts +0 -156
  146. package/pages/functions/template-plugin.ts +0 -147
  147. package/pages/functions/template-worker.ts +0 -143
  148. package/src/pages.tsx +0 -2093
  149. package/src/user.tsx +0 -1214
@@ -0,0 +1,327 @@
1
+ import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
2
+ import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
3
+ import { mockConsoleMethods } from "./helpers/mock-console";
4
+ import { runInTempDir } from "./helpers/run-in-tmp";
5
+ import { runWrangler } from "./helpers/run-wrangler";
6
+
7
+ describe("worker-namespace", () => {
8
+ runInTempDir();
9
+ const std = mockConsoleMethods();
10
+ mockAccountId();
11
+ mockApiToken();
12
+
13
+ afterEach(() => {
14
+ unsetAllMocks();
15
+ });
16
+
17
+ it("should should display a list of available subcommands, for worker-namespace with no subcommand", async () => {
18
+ await runWrangler("worker-namespace");
19
+
20
+ // wait a tick for the help menu to be printed
21
+ await new Promise((resolve) => setImmediate(resolve));
22
+
23
+ expect(std).toMatchInlineSnapshot(`
24
+ Object {
25
+ "debug": "",
26
+ "err": "",
27
+ "out": "wrangler worker-namespace
28
+
29
+ 📦 Interact with a worker namespace
30
+
31
+ Commands:
32
+ wrangler worker-namespace list List all Worker namespaces
33
+ wrangler worker-namespace get <name> Get information about a Worker namespace
34
+ wrangler worker-namespace create <name> Create a Worker namespace
35
+ wrangler worker-namespace delete <name> Delete a Worker namespace
36
+ wrangler worker-namespace rename <old-name> <new-name> Rename a Worker namespace
37
+
38
+ Flags:
39
+ -c, --config Path to .toml configuration file [string]
40
+ -h, --help Show help [boolean]
41
+ -v, --version Show version number [boolean]",
42
+ "warn": "",
43
+ }
44
+ `);
45
+ });
46
+
47
+ describe("create namespace", () => {
48
+ function mockCreateRequest(expectedName: string) {
49
+ const requests = { count: 0 };
50
+ setMockResponse(
51
+ "/accounts/:accountId/workers/dispatch/namespaces",
52
+ ([_url], init) => {
53
+ requests.count += 1;
54
+
55
+ const incomingText = init.body?.toString() || "";
56
+ const { name: namespace_name } = JSON.parse(incomingText);
57
+
58
+ expect(init.method).toBe("POST");
59
+ expect(namespace_name).toEqual(expectedName);
60
+
61
+ return {
62
+ namespace_id: "some-namespace-id",
63
+ namespace_name: "namespace-name",
64
+ created_on: "2022-06-29T14:30:08.16152Z",
65
+ created_by: "1fc1df98cc4420fe00367c3ab68c1639",
66
+ modified_on: "2022-06-29T14:30:08.16152Z",
67
+ modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
68
+ };
69
+ }
70
+ );
71
+ return requests;
72
+ }
73
+
74
+ it("should display help for create", async () => {
75
+ await expect(
76
+ runWrangler("worker-namespace create")
77
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
78
+ `"Not enough non-option arguments: got 0, need at least 1"`
79
+ );
80
+
81
+ expect(std.out).toMatchInlineSnapshot(`
82
+ "
83
+ wrangler worker-namespace create <name>
84
+
85
+ Create a Worker namespace
86
+
87
+ Positionals:
88
+ name Name of the Worker namespace [string] [required]
89
+
90
+ Flags:
91
+ -c, --config Path to .toml configuration file [string]
92
+ -h, --help Show help [boolean]
93
+ -v, --version Show version number [boolean]"
94
+ `);
95
+ });
96
+
97
+ it("should attempt to create the given namespace", async () => {
98
+ const namespaceName = "my-namespace";
99
+ const requests = mockCreateRequest(namespaceName);
100
+ await runWrangler(`worker-namespace create ${namespaceName}`);
101
+ expect(requests.count).toEqual(1);
102
+
103
+ expect(std.out).toMatchInlineSnapshot(
104
+ `"Created Worker namespace \\"my-namespace\\" with ID \\"some-namespace-id\\""`
105
+ );
106
+ });
107
+ });
108
+
109
+ describe("delete namespace", () => {
110
+ function mockDeleteRequest(expectedName: string) {
111
+ const requests = { count: 0 };
112
+ setMockResponse(
113
+ "/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
114
+ ([_url, _, namespaceName], init) => {
115
+ requests.count += 1;
116
+
117
+ expect(init.method).toBe("DELETE");
118
+ expect(namespaceName).toEqual(expectedName);
119
+
120
+ return null;
121
+ }
122
+ );
123
+ return requests;
124
+ }
125
+
126
+ it("should display help for delete", async () => {
127
+ await expect(
128
+ runWrangler("worker-namespace create")
129
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
130
+ `"Not enough non-option arguments: got 0, need at least 1"`
131
+ );
132
+
133
+ expect(std.out).toMatchInlineSnapshot(`
134
+ "
135
+ wrangler worker-namespace create <name>
136
+
137
+ Create a Worker namespace
138
+
139
+ Positionals:
140
+ name Name of the Worker namespace [string] [required]
141
+
142
+ Flags:
143
+ -c, --config Path to .toml configuration file [string]
144
+ -h, --help Show help [boolean]
145
+ -v, --version Show version number [boolean]"
146
+ `);
147
+ });
148
+
149
+ it("should try to delete the given namespace", async () => {
150
+ const namespaceName = "my-namespace";
151
+ const requests = mockDeleteRequest(namespaceName);
152
+ await runWrangler(`worker-namespace delete ${namespaceName}`);
153
+ expect(requests.count).toBe(1);
154
+
155
+ expect(std.out).toMatchInlineSnapshot(
156
+ `"Deleted Worker namespace \\"my-namespace\\""`
157
+ );
158
+ });
159
+ });
160
+
161
+ describe("get namespace", () => {
162
+ function mockInfoRequest(expectedName: string) {
163
+ const requests = { count: 0 };
164
+ setMockResponse(
165
+ "/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
166
+ ([_url, _, namespaceName], _init) => {
167
+ requests.count += 1;
168
+
169
+ expect(namespaceName).toEqual(expectedName);
170
+
171
+ return {
172
+ namespace_id: "some-namespace-id",
173
+ namespace_name: "namespace-name",
174
+ created_on: "2022-06-29T14:30:08.16152Z",
175
+ created_by: "1fc1df98cc4420fe00367c3ab68c1639",
176
+ modified_on: "2022-06-29T14:30:08.16152Z",
177
+ modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
178
+ };
179
+ }
180
+ );
181
+ return requests;
182
+ }
183
+
184
+ it("should display help for get", async () => {
185
+ await expect(
186
+ runWrangler("worker-namespace get")
187
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
188
+ `"Not enough non-option arguments: got 0, need at least 1"`
189
+ );
190
+
191
+ expect(std.out).toMatchInlineSnapshot(`
192
+ "
193
+ wrangler worker-namespace get <name>
194
+
195
+ Get information about a Worker namespace
196
+
197
+ Positionals:
198
+ name Name of the Worker namespace [string] [required]
199
+
200
+ Flags:
201
+ -c, --config Path to .toml configuration file [string]
202
+ -h, --help Show help [boolean]
203
+ -v, --version Show version number [boolean]"
204
+ `);
205
+ });
206
+
207
+ it("should attempt to get info for the given namespace", async () => {
208
+ const namespaceName = "my-namespace";
209
+ const requests = mockInfoRequest(namespaceName);
210
+ await runWrangler(`worker-namespace get ${namespaceName}`);
211
+ expect(requests.count).toBe(1);
212
+
213
+ expect(std.out).toMatchInlineSnapshot(`
214
+ "{
215
+ namespace_id: 'some-namespace-id',
216
+ namespace_name: 'namespace-name',
217
+ created_on: '2022-06-29T14:30:08.16152Z',
218
+ created_by: '1fc1df98cc4420fe00367c3ab68c1639',
219
+ modified_on: '2022-06-29T14:30:08.16152Z',
220
+ modified_by: '1fc1df98cc4420fe00367c3ab68c1639'
221
+ }"
222
+ `);
223
+ });
224
+ });
225
+
226
+ describe("list namespaces", () => {
227
+ function mockListRequest() {
228
+ const requests = { count: 0 };
229
+ setMockResponse(
230
+ "/accounts/:accountId/workers/dispatch/namespaces",
231
+ ([_url, _, _page, _perPage], _init) => {
232
+ requests.count += 1;
233
+
234
+ return [
235
+ {
236
+ namespace_id: "some-namespace-id",
237
+ namespace_name: "namespace-name",
238
+ created_on: "2022-06-29T14:30:08.16152Z",
239
+ created_by: "1fc1df98cc4420fe00367c3ab68c1639",
240
+ modified_on: "2022-06-29T14:30:08.16152Z",
241
+ modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
242
+ },
243
+ ];
244
+ }
245
+ );
246
+ return requests;
247
+ }
248
+
249
+ it("should list all namespaces", async () => {
250
+ const requests = mockListRequest();
251
+ await runWrangler("worker-namespace list");
252
+ expect(requests.count).toBe(1);
253
+ expect(std.out).toMatchInlineSnapshot(`
254
+ "[
255
+ {
256
+ namespace_id: 'some-namespace-id',
257
+ namespace_name: 'namespace-name',
258
+ created_on: '2022-06-29T14:30:08.16152Z',
259
+ created_by: '1fc1df98cc4420fe00367c3ab68c1639',
260
+ modified_on: '2022-06-29T14:30:08.16152Z',
261
+ modified_by: '1fc1df98cc4420fe00367c3ab68c1639'
262
+ }
263
+ ]"
264
+ `);
265
+ });
266
+ });
267
+
268
+ describe("rename namespace", () => {
269
+ function mockRenameRequest(expectedName: string) {
270
+ const requests = { count: 0 };
271
+ setMockResponse(
272
+ "/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
273
+ ([_url, _, namespaceName], init) => {
274
+ requests.count += 1;
275
+
276
+ expect(init.method).toEqual("PUT");
277
+ expect(namespaceName).toEqual(expectedName);
278
+
279
+ return {
280
+ namespace_id: "some-namespace-id",
281
+ namespace_name: "namespace-name",
282
+ created_on: "2022-06-29T14:30:08.16152Z",
283
+ created_by: "1fc1df98cc4420fe00367c3ab68c1639",
284
+ modified_on: "2022-06-29T14:30:08.16152Z",
285
+ modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
286
+ };
287
+ }
288
+ );
289
+ return requests;
290
+ }
291
+
292
+ it("should display help for rename", async () => {
293
+ await expect(
294
+ runWrangler("worker-namespace rename")
295
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
296
+ `"Not enough non-option arguments: got 0, need at least 2"`
297
+ );
298
+
299
+ expect(std.out).toMatchInlineSnapshot(`
300
+ "
301
+ wrangler worker-namespace rename <old-name> <new-name>
302
+
303
+ Rename a Worker namespace
304
+
305
+ Positionals:
306
+ old-name Name of the Worker namespace [string] [required]
307
+ new-name New name of the Worker namespace [string] [required]
308
+
309
+ Flags:
310
+ -c, --config Path to .toml configuration file [string]
311
+ -h, --help Show help [boolean]
312
+ -v, --version Show version number [boolean]"
313
+ `);
314
+ });
315
+
316
+ it("should attempt to rename the given namespace", async () => {
317
+ const namespaceName = "my-namespace";
318
+ const newName = "new-namespace";
319
+ const requests = mockRenameRequest(namespaceName);
320
+ await runWrangler(`worker-namespace rename ${namespaceName} ${newName}`);
321
+ expect(requests.count).toBe(1);
322
+ expect(std.out).toMatchInlineSnapshot(
323
+ `"Renamed Worker namespace \\"my-namespace\\" to \\"new-namespace\\""`
324
+ );
325
+ });
326
+ });
327
+ });
package/src/abort.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  declare interface AbortSignal {
2
- addEventListener(event: "abort", handler: () => void);
2
+ addEventListener(event: "abort", handler: () => void);
3
3
  }
package/src/api/dev.ts ADDED
@@ -0,0 +1,49 @@
1
+ import { startDev } from "../dev";
2
+ import { logger } from "../logger";
3
+
4
+ import type { RequestInit, Response } from "undici";
5
+
6
+ interface DevOptions {
7
+ env?: string;
8
+ ip?: string;
9
+ port?: number;
10
+ localProtocol?: "http" | "https";
11
+ assets?: string;
12
+ site?: string;
13
+ siteInclude?: string[];
14
+ siteExclude?: string[];
15
+ nodeCompat?: boolean;
16
+ experimentalEnableLocalPersistence?: boolean;
17
+ _: (string | number)[]; //yargs wants this
18
+ $0: string; //yargs wants this
19
+ }
20
+ /**
21
+ * unstable_dev starts a wrangler dev server, and returns a promise that resolves with utility functions to interact with it.
22
+ * @param {string} script
23
+ * @param {DevOptions} options
24
+ */
25
+ export async function unstable_dev(script: string, options: DevOptions) {
26
+ logger.warn(
27
+ `unstable_dev() is experimental\nunstable_dev()'s behaviour will likely change in future releases`
28
+ );
29
+
30
+ return new Promise<{
31
+ stop: () => void;
32
+ fetch: (init?: RequestInit) => Promise<Response | undefined>;
33
+ }>((resolve) => {
34
+ //lmao
35
+ return new Promise<Awaited<ReturnType<typeof startDev>>>((ready) => {
36
+ const devServer = startDev({
37
+ script: script,
38
+ ...options,
39
+ local: true,
40
+ onReady: () => ready(devServer),
41
+ inspect: false,
42
+ logLevel: "none",
43
+ showInteractiveDevSession: false,
44
+ });
45
+ }).then((devServer) => {
46
+ resolve({ stop: devServer.stop, fetch: devServer.fetch });
47
+ });
48
+ });
49
+ }
@@ -0,0 +1 @@
1
+ export { unstable_dev } from "./dev";
@@ -0,0 +1,29 @@
1
+ import { Blob } from "node:buffer";
2
+ import { gzipSync } from "node:zlib";
3
+ import { logger } from "./logger";
4
+ import type { CfModule } from "./worker";
5
+
6
+ async function getSize(modules: CfModule[]) {
7
+ const gzipSize = gzipSync(
8
+ await new Blob(modules.map((file) => file.content)).arrayBuffer()
9
+ ).byteLength;
10
+ const aggregateSize = new Blob(modules.map((file) => file.content)).size;
11
+
12
+ return { size: aggregateSize, gzipSize };
13
+ }
14
+
15
+ export async function printBundleSize(
16
+ main: {
17
+ name: string;
18
+ content: string;
19
+ },
20
+ modules: CfModule[]
21
+ ) {
22
+ const { size, gzipSize } = await getSize([...modules, main]);
23
+
24
+ const bundleReport = `${(size / 1024).toFixed(2)} KiB / gzip: ${(
25
+ gzipSize / 1024
26
+ ).toFixed(2)} KiB`;
27
+
28
+ logger.log(`Total Upload: ${bundleReport}`);
29
+ }