wrangler 0.0.0-fb43821 → 0.0.0-fb53fda
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.
- package/README.md +1 -1
- package/bin/wrangler.js +12 -3
- package/miniflare-dist/index.mjs +79 -0
- package/miniflare-dist/index.mjs.map +7 -0
- package/package.json +46 -17
- package/pages/functions/buildWorker.ts +62 -0
- package/pages/functions/filepath-routing.test.ts +223 -0
- package/pages/functions/filepath-routing.ts +181 -0
- package/pages/functions/identifiers.ts +78 -0
- package/pages/functions/routes.ts +151 -0
- package/pages/functions/template-worker.ts +130 -0
- package/src/__tests__/configuration.test.ts +2790 -0
- package/src/__tests__/dev.test.tsx +532 -0
- package/src/__tests__/guess-worker-format.test.ts +68 -0
- package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
- package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
- package/src/__tests__/helpers/faye-websocket.d.ts +6 -0
- package/src/__tests__/helpers/mock-account-id.ts +48 -0
- package/src/__tests__/helpers/mock-bin.ts +36 -0
- package/src/__tests__/helpers/mock-cfetch.ts +207 -0
- package/src/__tests__/helpers/mock-console.ts +70 -0
- package/src/__tests__/helpers/mock-dialogs.ts +65 -0
- package/src/__tests__/helpers/mock-kv.ts +33 -0
- package/src/__tests__/helpers/mock-stdin.ts +103 -0
- package/src/__tests__/helpers/mock-web-socket.ts +29 -0
- package/src/__tests__/helpers/run-in-tmp.ts +32 -0
- package/src/__tests__/helpers/run-wrangler.ts +16 -0
- package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
- package/src/__tests__/https-options.test.ts +127 -0
- package/src/__tests__/index.test.ts +770 -209
- package/src/__tests__/jest.setup.ts +69 -0
- package/src/__tests__/kv.test.ts +1380 -0
- package/src/__tests__/logout.test.ts +52 -0
- package/src/__tests__/package-manager.test.ts +206 -0
- package/src/__tests__/pages.test.ts +82 -0
- package/src/__tests__/parse.test.ts +322 -0
- package/src/__tests__/publish.test.ts +3431 -0
- package/src/__tests__/r2.test.ts +198 -0
- package/src/__tests__/route.test.ts +45 -0
- package/src/__tests__/secret.test.ts +425 -0
- package/src/__tests__/sentry.test.ts +146 -0
- package/src/__tests__/tail.test.ts +562 -0
- package/src/__tests__/whoami.test.tsx +100 -0
- package/src/bundle.ts +142 -0
- package/src/cfetch/index.ts +104 -0
- package/src/cfetch/internal.ts +139 -0
- package/src/cli.ts +16 -7
- package/src/config/README.md +107 -0
- package/src/config/config.ts +218 -0
- package/src/config/diagnostics.ts +80 -0
- package/src/config/environment.ts +366 -0
- package/src/config/index.ts +62 -0
- package/src/config/validation-helpers.ts +554 -0
- package/src/config/validation.ts +1191 -0
- package/src/{api/preview.ts → create-worker-preview.ts} +63 -25
- package/src/create-worker-upload-form.ts +217 -0
- package/src/dev/dev.tsx +390 -0
- package/src/dev/local.tsx +232 -0
- package/src/dev/remote.tsx +203 -0
- package/src/dev/use-esbuild.ts +100 -0
- package/src/dialogs.tsx +4 -4
- package/src/entry.ts +237 -0
- package/src/environment-variables.ts +33 -0
- package/src/https-options.ts +122 -0
- package/src/index.tsx +1417 -915
- package/src/inspect.ts +617 -0
- package/src/intl-polyfill.d.ts +139 -0
- package/src/kv.ts +319 -0
- package/src/miniflare-cli/README.md +30 -0
- package/src/miniflare-cli/enum-keys.ts +17 -0
- package/src/miniflare-cli/index.ts +37 -0
- package/src/module-collection.ts +229 -35
- package/src/open-in-browser.ts +25 -0
- package/src/package-manager.ts +126 -0
- package/src/pages.tsx +470 -227
- package/src/parse.ts +183 -0
- package/src/paths.ts +26 -0
- package/src/proxy.ts +440 -0
- package/src/publish.ts +292 -290
- package/src/r2.ts +50 -0
- package/src/reporting.ts +131 -0
- package/src/selfsigned.d.ts +29 -0
- package/src/sites.tsx +224 -59
- package/src/tail/filters.ts +279 -0
- package/src/tail/index.ts +299 -0
- package/src/tail/printing.ts +62 -0
- package/src/user.tsx +301 -203
- package/src/whoami.tsx +69 -0
- package/src/worker.ts +163 -0
- package/templates/new-worker.js +15 -0
- package/templates/new-worker.ts +15 -0
- package/{static-asset-facade.js → templates/static-asset-facade.js} +0 -0
- package/templates/tsconfig.json +105 -0
- package/wrangler-dist/cli.js +134241 -116339
- package/wrangler-dist/cli.js.map +3 -3
- package/src/__tests__/mock-cfetch.js +0 -42
- package/src/api/form_data.ts +0 -141
- package/src/api/inspect.ts +0 -430
- package/src/api/worker.ts +0 -161
- package/src/cfetch.ts +0 -72
- package/src/config.ts +0 -122
- package/src/dev.tsx +0 -776
- package/src/kv.tsx +0 -211
- package/src/tail.tsx +0 -71
|
@@ -0,0 +1,532 @@
|
|
|
1
|
+
import * as fs from "node:fs";
|
|
2
|
+
import { readFileSync } from "node:fs";
|
|
3
|
+
import patchConsole from "patch-console";
|
|
4
|
+
import Dev from "../dev/dev";
|
|
5
|
+
import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
|
|
6
|
+
import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
|
|
7
|
+
import { mockConsoleMethods } from "./helpers/mock-console";
|
|
8
|
+
import { runInTempDir } from "./helpers/run-in-tmp";
|
|
9
|
+
import { runWrangler } from "./helpers/run-wrangler";
|
|
10
|
+
import writeWranglerToml from "./helpers/write-wrangler-toml";
|
|
11
|
+
|
|
12
|
+
describe("wrangler dev", () => {
|
|
13
|
+
mockAccountId();
|
|
14
|
+
mockApiToken();
|
|
15
|
+
runInTempDir();
|
|
16
|
+
const std = mockConsoleMethods();
|
|
17
|
+
afterEach(() => {
|
|
18
|
+
(Dev as jest.Mock).mockClear();
|
|
19
|
+
patchConsole(() => {});
|
|
20
|
+
unsetAllMocks();
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
describe("entry-points", () => {
|
|
24
|
+
it("should error if there is no entry-point specified", async () => {
|
|
25
|
+
writeWranglerToml();
|
|
26
|
+
|
|
27
|
+
await expect(
|
|
28
|
+
runWrangler("dev")
|
|
29
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
30
|
+
`"Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler dev path/to/script\`) or the \`main\` config field."`
|
|
31
|
+
);
|
|
32
|
+
|
|
33
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
34
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
35
|
+
"Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler dev path/to/script\`) or the \`main\` config field.
|
|
36
|
+
|
|
37
|
+
[32m%s[0m If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
|
|
38
|
+
`);
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it("should use `main` from the top-level environment", async () => {
|
|
42
|
+
writeWranglerToml({
|
|
43
|
+
main: "index.js",
|
|
44
|
+
});
|
|
45
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
46
|
+
await runWrangler("dev");
|
|
47
|
+
expect((Dev as jest.Mock).mock.calls[0][0].entry.file).toMatch(
|
|
48
|
+
/index\.js$/
|
|
49
|
+
);
|
|
50
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
51
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
52
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it("should use `main` from a named environment", async () => {
|
|
56
|
+
writeWranglerToml({
|
|
57
|
+
env: {
|
|
58
|
+
ENV1: {
|
|
59
|
+
main: "index.js",
|
|
60
|
+
},
|
|
61
|
+
},
|
|
62
|
+
});
|
|
63
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
64
|
+
await runWrangler("dev --env=ENV1");
|
|
65
|
+
expect((Dev as jest.Mock).mock.calls[0][0].entry.file).toMatch(
|
|
66
|
+
/index\.js$/
|
|
67
|
+
);
|
|
68
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
69
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
70
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
it("should use `main` from a named environment, rather than the top-level", async () => {
|
|
74
|
+
writeWranglerToml({
|
|
75
|
+
main: "other.js",
|
|
76
|
+
env: {
|
|
77
|
+
ENV1: {
|
|
78
|
+
main: "index.js",
|
|
79
|
+
},
|
|
80
|
+
},
|
|
81
|
+
});
|
|
82
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
83
|
+
await runWrangler("dev --env=ENV1");
|
|
84
|
+
expect((Dev as jest.Mock).mock.calls[0][0].entry.file).toMatch(
|
|
85
|
+
/index\.js$/
|
|
86
|
+
);
|
|
87
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
88
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
89
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
describe("host", () => {
|
|
94
|
+
it("should resolve a host to its zone", async () => {
|
|
95
|
+
writeWranglerToml({
|
|
96
|
+
main: "index.js",
|
|
97
|
+
});
|
|
98
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
99
|
+
mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
|
|
100
|
+
await runWrangler("dev --host some-host.com");
|
|
101
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
|
|
102
|
+
host: "some-host.com",
|
|
103
|
+
id: "some-zone-id",
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it("should read wrangler.toml's dev.host", async () => {
|
|
108
|
+
writeWranglerToml({
|
|
109
|
+
main: "index.js",
|
|
110
|
+
dev: {
|
|
111
|
+
host: "some-host.com",
|
|
112
|
+
},
|
|
113
|
+
});
|
|
114
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
115
|
+
mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
|
|
116
|
+
await runWrangler("dev");
|
|
117
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
|
|
118
|
+
"some-host.com"
|
|
119
|
+
);
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
it("should read --route", async () => {
|
|
123
|
+
writeWranglerToml({
|
|
124
|
+
main: "index.js",
|
|
125
|
+
});
|
|
126
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
127
|
+
mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
|
|
128
|
+
await runWrangler("dev --route http://some-host.com/some/path/*");
|
|
129
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
|
|
130
|
+
"some-host.com"
|
|
131
|
+
);
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
it("should read wrangler.toml's routes", async () => {
|
|
135
|
+
writeWranglerToml({
|
|
136
|
+
main: "index.js",
|
|
137
|
+
routes: [
|
|
138
|
+
"http://some-host.com/some/path/*",
|
|
139
|
+
"http://some-other-host.com/path/*",
|
|
140
|
+
],
|
|
141
|
+
});
|
|
142
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
143
|
+
mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
|
|
144
|
+
await runWrangler("dev");
|
|
145
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
|
|
146
|
+
"some-host.com"
|
|
147
|
+
);
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
it("should read wrangler.toml's environment specific routes", async () => {
|
|
151
|
+
writeWranglerToml({
|
|
152
|
+
main: "index.js",
|
|
153
|
+
routes: [
|
|
154
|
+
"http://a-host.com/some/path/*",
|
|
155
|
+
"http://another-host.com/path/*",
|
|
156
|
+
],
|
|
157
|
+
env: {
|
|
158
|
+
staging: {
|
|
159
|
+
routes: [
|
|
160
|
+
"http://some-host.com/some/path/*",
|
|
161
|
+
"http://some-other-host.com/path/*",
|
|
162
|
+
],
|
|
163
|
+
},
|
|
164
|
+
},
|
|
165
|
+
});
|
|
166
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
167
|
+
mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
|
|
168
|
+
await runWrangler("dev --env staging");
|
|
169
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
|
|
170
|
+
"some-host.com"
|
|
171
|
+
);
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
it("given a long host, it should use the longest subdomain that resolves to a zone", async () => {
|
|
175
|
+
writeWranglerToml({
|
|
176
|
+
main: "index.js",
|
|
177
|
+
});
|
|
178
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
179
|
+
mockGetZones("111.222.333.some-host.com", []);
|
|
180
|
+
mockGetZones("222.333.some-host.com", []);
|
|
181
|
+
mockGetZones("333.some-host.com", [{ id: "some-zone-id" }]);
|
|
182
|
+
await runWrangler("dev --host 111.222.333.some-host.com");
|
|
183
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
|
|
184
|
+
host: "111.222.333.some-host.com",
|
|
185
|
+
id: "some-zone-id",
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
|
|
189
|
+
it("should, in order, use args.host/config.dev.host/args.routes/(config.route|config.routes)", async () => {
|
|
190
|
+
// This test might seem like it's testing implementation details, but let's be specific and consider it a spec
|
|
191
|
+
|
|
192
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
193
|
+
|
|
194
|
+
// config.routes
|
|
195
|
+
mockGetZones("5.some-host.com", [{ id: "some-zone-id-5" }]);
|
|
196
|
+
writeWranglerToml({
|
|
197
|
+
main: "index.js",
|
|
198
|
+
routes: ["http://5.some-host.com/some/path/*"],
|
|
199
|
+
});
|
|
200
|
+
await runWrangler("dev");
|
|
201
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
|
|
202
|
+
host: "5.some-host.com",
|
|
203
|
+
id: "some-zone-id-5",
|
|
204
|
+
});
|
|
205
|
+
(Dev as jest.Mock).mockClear();
|
|
206
|
+
|
|
207
|
+
// config.route
|
|
208
|
+
mockGetZones("4.some-host.com", [{ id: "some-zone-id-4" }]);
|
|
209
|
+
writeWranglerToml({
|
|
210
|
+
main: "index.js",
|
|
211
|
+
route: "https://4.some-host.com/some/path/*",
|
|
212
|
+
});
|
|
213
|
+
await runWrangler("dev");
|
|
214
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
|
|
215
|
+
host: "4.some-host.com",
|
|
216
|
+
id: "some-zone-id-4",
|
|
217
|
+
});
|
|
218
|
+
(Dev as jest.Mock).mockClear();
|
|
219
|
+
|
|
220
|
+
// --routes
|
|
221
|
+
mockGetZones("3.some-host.com", [{ id: "some-zone-id-3" }]);
|
|
222
|
+
writeWranglerToml({
|
|
223
|
+
main: "index.js",
|
|
224
|
+
route: "https://4.some-host.com/some/path/*",
|
|
225
|
+
});
|
|
226
|
+
await runWrangler("dev --routes http://3.some-host.com/some/path/*");
|
|
227
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
|
|
228
|
+
host: "3.some-host.com",
|
|
229
|
+
id: "some-zone-id-3",
|
|
230
|
+
});
|
|
231
|
+
(Dev as jest.Mock).mockClear();
|
|
232
|
+
|
|
233
|
+
// config.dev.host
|
|
234
|
+
mockGetZones("2.some-host.com", [{ id: "some-zone-id-2" }]);
|
|
235
|
+
writeWranglerToml({
|
|
236
|
+
main: "index.js",
|
|
237
|
+
dev: {
|
|
238
|
+
host: `2.some-host.com`,
|
|
239
|
+
},
|
|
240
|
+
route: "4.some-host.com/some/path/*",
|
|
241
|
+
});
|
|
242
|
+
await runWrangler("dev --routes http://3.some-host.com/some/path/*");
|
|
243
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
|
|
244
|
+
host: "2.some-host.com",
|
|
245
|
+
id: "some-zone-id-2",
|
|
246
|
+
});
|
|
247
|
+
(Dev as jest.Mock).mockClear();
|
|
248
|
+
|
|
249
|
+
// --host
|
|
250
|
+
mockGetZones("1.some-host.com", [{ id: "some-zone-id-1" }]);
|
|
251
|
+
writeWranglerToml({
|
|
252
|
+
main: "index.js",
|
|
253
|
+
dev: {
|
|
254
|
+
host: `2.some-host.com`,
|
|
255
|
+
},
|
|
256
|
+
route: "4.some-host.com/some/path/*",
|
|
257
|
+
});
|
|
258
|
+
await runWrangler(
|
|
259
|
+
"dev --routes http://3.some-host.com/some/path/* --host 1.some-host.com"
|
|
260
|
+
);
|
|
261
|
+
expect((Dev as jest.Mock).mock.calls[0][0].zone).toEqual({
|
|
262
|
+
host: "1.some-host.com",
|
|
263
|
+
id: "some-zone-id-1",
|
|
264
|
+
});
|
|
265
|
+
(Dev as jest.Mock).mockClear();
|
|
266
|
+
});
|
|
267
|
+
|
|
268
|
+
it("should error if a host can't resolve to a zone", async () => {
|
|
269
|
+
writeWranglerToml({
|
|
270
|
+
main: "index.js",
|
|
271
|
+
});
|
|
272
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
273
|
+
mockGetZones("some-host.com", []);
|
|
274
|
+
await expect(
|
|
275
|
+
runWrangler("dev --host some-host.com")
|
|
276
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
277
|
+
`"Could not find zone for some-host.com"`
|
|
278
|
+
);
|
|
279
|
+
});
|
|
280
|
+
});
|
|
281
|
+
|
|
282
|
+
describe("custom builds", () => {
|
|
283
|
+
it("should run a custom build before starting `dev`", async () => {
|
|
284
|
+
writeWranglerToml({
|
|
285
|
+
build: {
|
|
286
|
+
command: `node -e "console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
|
|
287
|
+
},
|
|
288
|
+
});
|
|
289
|
+
|
|
290
|
+
await runWrangler("dev index.js");
|
|
291
|
+
|
|
292
|
+
expect(readFileSync("index.js", "utf-8")).toMatchInlineSnapshot(
|
|
293
|
+
`"export default { fetch(){ return new Response(123) } }"`
|
|
294
|
+
);
|
|
295
|
+
|
|
296
|
+
// and the command would pass through
|
|
297
|
+
expect((Dev as jest.Mock).mock.calls[0][0].build).toEqual({
|
|
298
|
+
command:
|
|
299
|
+
"node -e \"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\"",
|
|
300
|
+
cwd: undefined,
|
|
301
|
+
watch_dir: "src",
|
|
302
|
+
});
|
|
303
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
304
|
+
`"running: node -e \\"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\""`
|
|
305
|
+
);
|
|
306
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
307
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
308
|
+
});
|
|
309
|
+
|
|
310
|
+
if (process.platform !== "win32") {
|
|
311
|
+
it("should run a custom build of multiple steps combined by && before starting `dev`", async () => {
|
|
312
|
+
writeWranglerToml({
|
|
313
|
+
build: {
|
|
314
|
+
command: `echo "custom build" && echo "export default { fetch(){ return new Response(123) } }" > index.js`,
|
|
315
|
+
},
|
|
316
|
+
});
|
|
317
|
+
|
|
318
|
+
await runWrangler("dev index.js");
|
|
319
|
+
|
|
320
|
+
expect(readFileSync("index.js", "utf-8")).toMatchInlineSnapshot(`
|
|
321
|
+
"export default { fetch(){ return new Response(123) } }
|
|
322
|
+
"
|
|
323
|
+
`);
|
|
324
|
+
|
|
325
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
326
|
+
`"running: echo \\"custom build\\" && echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js"`
|
|
327
|
+
);
|
|
328
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
329
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
330
|
+
});
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
it("should throw an error if the entry doesn't exist after the build finishes", async () => {
|
|
334
|
+
writeWranglerToml({
|
|
335
|
+
main: "index.js",
|
|
336
|
+
build: {
|
|
337
|
+
command: `node -e "console.log('custom build');"`,
|
|
338
|
+
},
|
|
339
|
+
});
|
|
340
|
+
|
|
341
|
+
await expect(
|
|
342
|
+
runWrangler("dev")
|
|
343
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
344
|
+
`"Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\""`
|
|
345
|
+
);
|
|
346
|
+
expect(std.out).toMatchInlineSnapshot(
|
|
347
|
+
`"running: node -e \\"console.log('custom build');\\""`
|
|
348
|
+
);
|
|
349
|
+
expect(std.err).toMatchInlineSnapshot(`
|
|
350
|
+
"Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\"
|
|
351
|
+
|
|
352
|
+
[32m%s[0m If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
|
|
353
|
+
`);
|
|
354
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
355
|
+
});
|
|
356
|
+
});
|
|
357
|
+
|
|
358
|
+
describe("upstream-protocol", () => {
|
|
359
|
+
it("should default upstream-protocol to `https`", async () => {
|
|
360
|
+
writeWranglerToml({
|
|
361
|
+
main: "index.js",
|
|
362
|
+
});
|
|
363
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
364
|
+
await runWrangler("dev");
|
|
365
|
+
expect((Dev as jest.Mock).mock.calls[0][0].upstreamProtocol).toEqual(
|
|
366
|
+
"https"
|
|
367
|
+
);
|
|
368
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
369
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
370
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
371
|
+
});
|
|
372
|
+
|
|
373
|
+
it("should warn if `--upstream-protocol=http` is used", async () => {
|
|
374
|
+
writeWranglerToml({
|
|
375
|
+
main: "index.js",
|
|
376
|
+
});
|
|
377
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
378
|
+
await runWrangler("dev --upstream-protocol=http");
|
|
379
|
+
expect((Dev as jest.Mock).mock.calls[0][0].upstreamProtocol).toEqual(
|
|
380
|
+
"http"
|
|
381
|
+
);
|
|
382
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
383
|
+
expect(std.warn).toMatchInlineSnapshot(`
|
|
384
|
+
"Setting upstream-protocol to http is not currently implemented.
|
|
385
|
+
If this is required in your project, please add your use case to the following issue:
|
|
386
|
+
https://github.com/cloudflare/wrangler2/issues/583."
|
|
387
|
+
`);
|
|
388
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
389
|
+
});
|
|
390
|
+
});
|
|
391
|
+
|
|
392
|
+
describe("local-protocol", () => {
|
|
393
|
+
it("should default local-protocol to `http`", async () => {
|
|
394
|
+
writeWranglerToml({
|
|
395
|
+
main: "index.js",
|
|
396
|
+
});
|
|
397
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
398
|
+
await runWrangler("dev");
|
|
399
|
+
expect((Dev as jest.Mock).mock.calls[0][0].localProtocol).toEqual("http");
|
|
400
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
401
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
402
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
403
|
+
});
|
|
404
|
+
|
|
405
|
+
it("should use `local_protocol` from `wrangler.toml`, if available", async () => {
|
|
406
|
+
writeWranglerToml({
|
|
407
|
+
main: "index.js",
|
|
408
|
+
dev: {
|
|
409
|
+
local_protocol: "https",
|
|
410
|
+
},
|
|
411
|
+
});
|
|
412
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
413
|
+
await runWrangler("dev");
|
|
414
|
+
expect((Dev as jest.Mock).mock.calls[0][0].localProtocol).toEqual(
|
|
415
|
+
"https"
|
|
416
|
+
);
|
|
417
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
418
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
419
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
420
|
+
});
|
|
421
|
+
|
|
422
|
+
it("should use --local-protocol command line arg, if provided", async () => {
|
|
423
|
+
// Here we show that the command line overrides the wrangler.toml by
|
|
424
|
+
// setting the config to https, and then setting it back to http on the command line.
|
|
425
|
+
writeWranglerToml({
|
|
426
|
+
main: "index.js",
|
|
427
|
+
dev: {
|
|
428
|
+
local_protocol: "https",
|
|
429
|
+
},
|
|
430
|
+
});
|
|
431
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
432
|
+
await runWrangler("dev --local-protocol=http");
|
|
433
|
+
expect((Dev as jest.Mock).mock.calls[0][0].localProtocol).toEqual("http");
|
|
434
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
435
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
436
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
437
|
+
});
|
|
438
|
+
});
|
|
439
|
+
|
|
440
|
+
describe("ip", () => {
|
|
441
|
+
it("should default ip to localhost", async () => {
|
|
442
|
+
writeWranglerToml({
|
|
443
|
+
main: "index.js",
|
|
444
|
+
});
|
|
445
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
446
|
+
await runWrangler("dev");
|
|
447
|
+
expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("localhost");
|
|
448
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
449
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
450
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
451
|
+
});
|
|
452
|
+
|
|
453
|
+
it("should use to `ip` from `wrangler.toml`, if available", async () => {
|
|
454
|
+
writeWranglerToml({
|
|
455
|
+
main: "index.js",
|
|
456
|
+
dev: {
|
|
457
|
+
ip: "0.0.0.0",
|
|
458
|
+
},
|
|
459
|
+
});
|
|
460
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
461
|
+
await runWrangler("dev");
|
|
462
|
+
expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
|
|
463
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
464
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
465
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
466
|
+
});
|
|
467
|
+
|
|
468
|
+
it("should use --ip command line arg, if provided", async () => {
|
|
469
|
+
writeWranglerToml({
|
|
470
|
+
main: "index.js",
|
|
471
|
+
dev: {
|
|
472
|
+
ip: "1.1.1.1",
|
|
473
|
+
},
|
|
474
|
+
});
|
|
475
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
476
|
+
await runWrangler("dev --ip=0.0.0.0");
|
|
477
|
+
expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
|
|
478
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
479
|
+
expect(std.warn).toMatchInlineSnapshot(`""`);
|
|
480
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
481
|
+
});
|
|
482
|
+
});
|
|
483
|
+
|
|
484
|
+
describe("durable_objects", () => {
|
|
485
|
+
it("should warn if there is one or more remote Durable Object", async () => {
|
|
486
|
+
writeWranglerToml({
|
|
487
|
+
main: "index.js",
|
|
488
|
+
durable_objects: {
|
|
489
|
+
bindings: [
|
|
490
|
+
{ name: "NAME_1", class_name: "CLASS_1" },
|
|
491
|
+
{
|
|
492
|
+
name: "NAME_2",
|
|
493
|
+
class_name: "CLASS_2",
|
|
494
|
+
script_name: "SCRIPT_A",
|
|
495
|
+
},
|
|
496
|
+
{ name: "NAME_3", class_name: "CLASS_3" },
|
|
497
|
+
{
|
|
498
|
+
name: "NAME_4",
|
|
499
|
+
class_name: "CLASS_4",
|
|
500
|
+
script_name: "SCRIPT_B",
|
|
501
|
+
},
|
|
502
|
+
],
|
|
503
|
+
},
|
|
504
|
+
});
|
|
505
|
+
fs.writeFileSync("index.js", `export default {};`);
|
|
506
|
+
await runWrangler("dev");
|
|
507
|
+
expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("localhost");
|
|
508
|
+
expect(std.out).toMatchInlineSnapshot(`""`);
|
|
509
|
+
expect(std.warn).toMatchInlineSnapshot(`
|
|
510
|
+
"WARNING: You have Durable Object bindings, which are not defined locally in the worker being developed.
|
|
511
|
+
Be aware that changes to the data stored in these Durable Objects will be permanent and affect the live instances.
|
|
512
|
+
Remote Durable Objects that are affected:
|
|
513
|
+
- {\\"name\\":\\"NAME_2\\",\\"class_name\\":\\"CLASS_2\\",\\"script_name\\":\\"SCRIPT_A\\"}
|
|
514
|
+
- {\\"name\\":\\"NAME_4\\",\\"class_name\\":\\"CLASS_4\\",\\"script_name\\":\\"SCRIPT_B\\"}"
|
|
515
|
+
`);
|
|
516
|
+
expect(std.err).toMatchInlineSnapshot(`""`);
|
|
517
|
+
});
|
|
518
|
+
});
|
|
519
|
+
});
|
|
520
|
+
|
|
521
|
+
function mockGetZones(domain: string, zones: { id: string }[] = []) {
|
|
522
|
+
const removeMock = setMockResponse(
|
|
523
|
+
"/zones",
|
|
524
|
+
"GET",
|
|
525
|
+
(_urlPieces, _init, queryParams) => {
|
|
526
|
+
expect([...queryParams.entries()]).toEqual([["name", domain]]);
|
|
527
|
+
// Because the API URL `/zones` is the same for each request, we can get into a situation where earlier mocks get triggered for later requests. So, we simply clear the mock on every trigger.
|
|
528
|
+
removeMock();
|
|
529
|
+
return zones;
|
|
530
|
+
}
|
|
531
|
+
);
|
|
532
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { writeFile } from "fs/promises";
|
|
2
|
+
import path from "path";
|
|
3
|
+
import guessWorkerFormat from "../entry";
|
|
4
|
+
import { runInTempDir } from "./helpers/run-in-tmp";
|
|
5
|
+
|
|
6
|
+
describe("guess worker format", () => {
|
|
7
|
+
runInTempDir();
|
|
8
|
+
it('should detect a "modules" worker', async () => {
|
|
9
|
+
await writeFile("./index.ts", "export default {};");
|
|
10
|
+
// Note that this isn't actually a valid worker, because it's missing
|
|
11
|
+
// a fetch handler. Regardless, our heuristic is simply to check for exports.
|
|
12
|
+
const guess = await guessWorkerFormat(
|
|
13
|
+
path.join(process.cwd(), "./index.ts"),
|
|
14
|
+
process.cwd(),
|
|
15
|
+
undefined
|
|
16
|
+
);
|
|
17
|
+
expect(guess).toBe("modules");
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it('should detect a "service-worker" worker', async () => {
|
|
21
|
+
await writeFile("./index.ts", "");
|
|
22
|
+
// Note that this isn't actually a valid worker, because it's missing
|
|
23
|
+
// a fetch listener. Regardless, our heuristic is simply to check for
|
|
24
|
+
// the lack of exports.
|
|
25
|
+
const guess = await guessWorkerFormat(
|
|
26
|
+
path.join(process.cwd(), "./index.ts"),
|
|
27
|
+
process.cwd(),
|
|
28
|
+
undefined
|
|
29
|
+
);
|
|
30
|
+
expect(guess).toBe("service-worker");
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
it("should throw an error when the hint doesn't match the guess (modules - service-worker)", async () => {
|
|
34
|
+
await writeFile("./index.ts", "export default {};");
|
|
35
|
+
await expect(
|
|
36
|
+
guessWorkerFormat(
|
|
37
|
+
path.join(process.cwd(), "./index.ts"),
|
|
38
|
+
process.cwd(),
|
|
39
|
+
"service-worker"
|
|
40
|
+
)
|
|
41
|
+
).rejects.toThrow(
|
|
42
|
+
"You configured this worker to be a 'service-worker', but the file you are trying to build appears to have ES module exports. Please pass `--format modules`, or simply remove the configuration."
|
|
43
|
+
);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
it("should throw an error when the hint doesn't match the guess (service-worker - modules)", async () => {
|
|
47
|
+
await writeFile("./index.ts", "");
|
|
48
|
+
await expect(
|
|
49
|
+
guessWorkerFormat(
|
|
50
|
+
path.join(process.cwd(), "./index.ts"),
|
|
51
|
+
process.cwd(),
|
|
52
|
+
"modules"
|
|
53
|
+
)
|
|
54
|
+
).rejects.toThrow(
|
|
55
|
+
"You configured this worker to be 'modules', but the file you are trying to build doesn't export a handler. Please pass `--format service-worker`, or simply remove the configuration."
|
|
56
|
+
);
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
it("should not error if a .js entry point has jsx", async () => {
|
|
60
|
+
await writeFile("./index.js", "console.log(<div/>)");
|
|
61
|
+
const guess = await guessWorkerFormat(
|
|
62
|
+
path.join(process.cwd(), "./index.js"),
|
|
63
|
+
process.cwd(),
|
|
64
|
+
undefined
|
|
65
|
+
);
|
|
66
|
+
expect(guess).toBe("service-worker");
|
|
67
|
+
});
|
|
68
|
+
});
|
|
File without changes
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The typings file available at `@types/cmd-shim` are out of date.
|
|
3
|
+
*/
|
|
4
|
+
module "cmd-shim" {
|
|
5
|
+
/**
|
|
6
|
+
*
|
|
7
|
+
* Create a cmd shim at `to` for the command line program at `from`.
|
|
8
|
+
*
|
|
9
|
+
*/
|
|
10
|
+
export default function cmdShim(from: string, to: string): Promise<void>;
|
|
11
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { reinitialiseAuthTokens } from "../../user";
|
|
2
|
+
|
|
3
|
+
const ORIGINAL_CLOUDFLARE_API_TOKEN = process.env.CLOUDFLARE_API_TOKEN;
|
|
4
|
+
const ORIGINAL_CLOUDFLARE_ACCOUNT_ID = process.env.CLOUDFLARE_ACCOUNT_ID;
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Mock the API token so that we don't need to read it from user configuration files.
|
|
8
|
+
*
|
|
9
|
+
* Note that you can remove any API token from the environment by setting the value to `null`.
|
|
10
|
+
* This is useful if a higher `describe()` block has already called `mockApiToken()`.
|
|
11
|
+
*/
|
|
12
|
+
export function mockApiToken({
|
|
13
|
+
apiToken = "some-api-token",
|
|
14
|
+
}: { apiToken?: string | null } = {}) {
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
if (apiToken === null) {
|
|
17
|
+
delete process.env.CLOUDFLARE_API_TOKEN;
|
|
18
|
+
} else {
|
|
19
|
+
process.env.CLOUDFLARE_API_TOKEN = apiToken;
|
|
20
|
+
}
|
|
21
|
+
// Now we have updated the environment, we must reinitialize the user auth state.
|
|
22
|
+
reinitialiseAuthTokens();
|
|
23
|
+
});
|
|
24
|
+
afterEach(() => {
|
|
25
|
+
process.env.CLOUDFLARE_API_TOKEN = ORIGINAL_CLOUDFLARE_API_TOKEN;
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Mock the current account ID so that we don't need to read it from configuration files.
|
|
31
|
+
*
|
|
32
|
+
* Note that you can remove any account ID from the environment by setting the value to `null`.
|
|
33
|
+
* This is useful if a higher `describe()` block has already called `mockAccountId()`.
|
|
34
|
+
*/
|
|
35
|
+
export function mockAccountId({
|
|
36
|
+
accountId = "some-account-id",
|
|
37
|
+
}: { accountId?: string | null } = {}) {
|
|
38
|
+
beforeEach(() => {
|
|
39
|
+
if (accountId === null) {
|
|
40
|
+
delete process.env.CLOUDFLARE_ACCOUNT_ID;
|
|
41
|
+
} else {
|
|
42
|
+
process.env.CLOUDFLARE_ACCOUNT_ID = accountId;
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
afterEach(() => {
|
|
46
|
+
process.env.CLOUDFLARE_ACCOUNT_ID = ORIGINAL_CLOUDFLARE_ACCOUNT_ID;
|
|
47
|
+
});
|
|
48
|
+
}
|