wrangler 2.8.0 → 2.9.0

package/src/__tests__/publish.test.ts

@@ -5771,6 +5771,77 @@ addEventListener('fetch', event => {});`
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
 
+			it("should support durable objects and D1", async () => {
+				writeWranglerToml({
+					main: "index.js",
+					durable_objects: {
+						bindings: [
+							{
+								name: "EXAMPLE_DO_BINDING",
+								class_name: "ExampleDurableObject",
+							},
+						],
+					},
+					migrations: [{ tag: "v1", new_classes: ["ExampleDurableObject"] }],
+					d1_databases: [
+						{
+							binding: "DB",
+							database_name: "test-d1-db",
+							database_id: "UUID-1-2-3-4",
+							preview_database_id: "UUID-1-2-3-4",
+						},
+					],
+				});
+				const scriptContent = `export class ExampleDurableObject {}; export default{};`;
+				fs.writeFileSync("index.js", scriptContent);
+				mockSubDomainRequest();
+				mockLegacyScriptData({
+					scripts: [{ id: "test-name", migration_tag: "v1" }],
+				});
+				mockUploadWorkerRequest({
+					expectedType: "esm",
+					expectedBindings: [
+						{
+							name: "EXAMPLE_DO_BINDING",
+							class_name: "ExampleDurableObject",
+							type: "durable_object_namespace",
+						},
+						{ name: "DB", type: "d1_database" },
+					],
+				});
+
+				await runWrangler("publish index.js --outdir tmp --dry-run");
+				expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - EXAMPLE_DO_BINDING: ExampleDurableObject
+			- D1 Databases:
+			  - DB: test-d1-db (UUID-1-2-3-4), Preview: (UUID-1-2-3-4)
+			--dry-run: exiting now."
+		`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] Processing wrangler.toml configuration:
+
+			    - D1 Bindings are currently in alpha to allow the API to evolve before general availability.
+			      Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+			      Note: Run this command with the environment variable NO_D1_WARNING=true to hide this message
+
+			      For example: \`export NO_D1_WARNING=true && wrangler <YOUR COMMAND HERE>\`
+
+			"
+		`);
+				const output = fs.readFileSync("tmp/d1-beta-facade.entry.js", "utf-8");
+				expect(output).toContain(
+					`var ExampleDurableObject2 = maskDurableObjectDefinition(ExampleDurableObject);`
+				);
+				expect(output).toContain(
+					`ExampleDurableObject2 as ExampleDurableObject,`
+				);
+				expect(output).toContain(`shim_default as default`);
+			});
+
 			it("should error when detecting a service-worker worker implementing durable objects", async () => {
 				writeWranglerToml({
 					durable_objects: {
@@ -6472,6 +6543,61 @@ addEventListener('fetch', event => {});`
 			}
 		`);
 		});
+
+		it("should copy any module imports related assets at --outdir if specified", async () => {
+			writeWranglerToml();
+			fs.writeFileSync(
+				"./index.js",
+				`
+import txt from './textfile.txt';
+import hello from './hello.wasm';
+export default{
+  async fetch(){
+		const module = await WebAssembly.instantiate(hello);
+    return new Response(txt + module.exports.hello);
+  }
+}
+`
+			);
+			fs.writeFileSync("./textfile.txt", "Hello, World!");
+			fs.writeFileSync("./hello.wasm", "Hello wasm World!");
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({
+				expectedModules: {
+					"./0a0a9f2a6772942557ab5355d76af442f8f65e01-textfile.txt":
+						"Hello, World!",
+					"./d025a03cd31e98e96fb5bd5bce87f9bca4e8ce2c-hello.wasm":
+						"Hello wasm World!",
+				},
+			});
+			await runWrangler("publish index.js --outdir some-dir");
+
+			expect(fs.existsSync("some-dir/index.js")).toBe(true);
+			expect(fs.existsSync("some-dir/index.js.map")).toBe(true);
+			expect(fs.existsSync("some-dir/README.md")).toBe(true);
+			expect(
+				fs.existsSync(
+					"some-dir/0a0a9f2a6772942557ab5355d76af442f8f65e01-textfile.txt"
+				)
+			).toBe(true);
+			expect(
+				fs.existsSync(
+					"some-dir/d025a03cd31e98e96fb5bd5bce87f9bca4e8ce2c-hello.wasm"
+				)
+			).toBe(true);
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class",
+			  "warn": "",
+			}
+		`);
+		});
 	});
 
 	describe("--dry-run", () => {

package/src/__tests__/pubsub.test.ts

@@ -34,10 +34,11 @@ describe("wrangler", () => {
 			  wrangler pubsub broker     Interact with your Pub/Sub Brokers
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]
 
 			👷🏽 'wrangler pubsub ...' commands are currently in private beta. If your account isn't authorized, commands will fail. Visit the Pub/Sub docs for more info: https://developers.cloudflare.com/pub-sub/",
 			  "warn": "",
@@ -65,10 +66,11 @@ describe("wrangler", () => {
 				  wrangler pubsub namespace describe <name>  Describe a Pub/Sub Namespace
 
 				Flags:
-				  -c, --config   Path to .toml configuration file  [string]
-				  -e, --env      Environment to use for operations and .env files  [string]
-				  -h, --help     Show help  [boolean]
-				  -v, --version  Show version number  [boolean]
+				  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+				  -c, --config                    Path to .toml configuration file  [string]
+				  -e, --env                       Environment to use for operations and .env files  [string]
+				  -h, --help                      Show help  [boolean]
+				  -v, --version                   Show version number  [boolean]
 
 				👷🏽 'wrangler pubsub ...' commands are currently in private beta. If your account isn't authorized, commands will fail. Visit the Pub/Sub docs for more info: https://developers.cloudflare.com/pub-sub/",
 				  "warn": "",
@@ -186,10 +188,11 @@ describe("wrangler", () => {
 				  wrangler pubsub broker public-keys <name>       Show the public keys used for verifying on-publish hooks and credentials for a Broker.
 
 				Flags:
-				  -c, --config   Path to .toml configuration file  [string]
-				  -e, --env      Environment to use for operations and .env files  [string]
-				  -h, --help     Show help  [boolean]
-				  -v, --version  Show version number  [boolean]
+				  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+				  -c, --config                    Path to .toml configuration file  [string]
+				  -e, --env                       Environment to use for operations and .env files  [string]
+				  -h, --help                      Show help  [boolean]
+				  -v, --version                   Show version number  [boolean]
 
 				👷🏽 'wrangler pubsub ...' commands are currently in private beta. If your account isn't authorized, commands will fail. Visit the Pub/Sub docs for more info: https://developers.cloudflare.com/pub-sub/",
 				  "warn": "",

package/src/__tests__/queues.test.ts

@@ -28,10 +28,11 @@ describe("wrangler", () => {
 			  wrangler queues consumer       Configure Queue Consumers
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -69,10 +70,11 @@ describe("wrangler", () => {
 			List Queues
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]
 
 			Options:
 			      --page  Page number for pagination  [number]"
@@ -162,10 +164,11 @@ describe("wrangler", () => {
 			  name  The name of the queue  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 			});
 
@@ -255,10 +258,11 @@ describe("wrangler", () => {
 			  name  The name of the queue  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 			});
 
@@ -288,10 +292,11 @@ describe("wrangler", () => {
 			  wrangler queues consumer remove <queue-name> <script-name>  Remove a Queue Consumer
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 			});
 
@@ -336,10 +341,11 @@ describe("wrangler", () => {
 				  script-name  Name of the consumer script  [string] [required]
 
 				Flags:
-				  -c, --config   Path to .toml configuration file  [string]
-				  -e, --env      Environment to use for operations and .env files  [string]
-				  -h, --help     Show help  [boolean]
-				  -v, --version  Show version number  [boolean]
+				  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+				  -c, --config                    Path to .toml configuration file  [string]
+				  -e, --env                       Environment to use for operations and .env files  [string]
+				  -h, --help                      Show help  [boolean]
+				  -v, --version                   Show version number  [boolean]
 
 				Options:
 				      --batch-size         Maximum number of messages per batch  [number]
@@ -482,10 +488,11 @@ describe("wrangler", () => {
 				  script-name  Name of the consumer script  [string] [required]
 
 				Flags:
-				  -c, --config   Path to .toml configuration file  [string]
-				  -e, --env      Environment to use for operations and .env files  [string]
-				  -h, --help     Show help  [boolean]
-				  -v, --version  Show version number  [boolean]"
+				  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+				  -c, --config                    Path to .toml configuration file  [string]
+				  -e, --env                       Environment to use for operations and .env files  [string]
+				  -h, --help                      Show help  [boolean]
+				  -v, --version                   Show version number  [boolean]"
 			`);
 				});
 

package/src/__tests__/r2.test.ts

@@ -4,7 +4,7 @@ import prettyBytes from "pretty-bytes";
 import { MAX_UPLOAD_SIZE } from "../r2/constants";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { msw, mswSuccessR2handlers } from "./helpers/msw";
+import { createFetchResult, msw, mswSuccessR2handlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import type { R2BucketInfo } from "../r2/helpers";
@@ -39,10 +39,11 @@ describe("r2", () => {
 			  wrangler r2 bucket delete <name>  Delete an R2 bucket
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -60,12 +61,8 @@ describe("r2", () => {
 							expect(accountId).toEqual("some-account-id");
 							expect(await request.text()).toEqual("");
 							return response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: {
+								context.json(
+									createFetchResult({
 										buckets: [
 											{
 												name: "bucket-1-local-once",
@@ -76,8 +73,8 @@ describe("r2", () => {
 												creation_date: "01-01-2001",
 											},
 										],
-									},
-								})
+									})
+								)
 							);
 						}
 					)
@@ -107,10 +104,11 @@ describe("r2", () => {
 			  name  The name of the new bucket  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`
 				            "X [ERROR] Not enough non-option arguments: got 0, need at least 1
@@ -135,10 +133,11 @@ describe("r2", () => {
 			  name  The name of the new bucket  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`
 				            "X [ERROR] Unknown arguments: def, ghi
@@ -155,15 +154,7 @@ describe("r2", () => {
 							const { accountId } = request.params;
 							expect(accountId).toEqual("some-account-id");
 							expect(await request.json()).toEqual({ name: "testBucket" });
-							return response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: {},
-								})
-							);
+							return response.once(context.json(createFetchResult({})));
 						}
 					)
 				);
@@ -192,10 +183,11 @@ describe("r2", () => {
 			  name  The name of the bucket to delete  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`
 				            "X [ERROR] Not enough non-option arguments: got 0, need at least 1
@@ -220,10 +212,11 @@ describe("r2", () => {
 			  name  The name of the bucket to delete  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`
 				            "X [ERROR] Unknown arguments: def, ghi
@@ -245,15 +238,7 @@ describe("r2", () => {
 								"Bearer some-api-token"
 							);
 
-							return response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: null,
-								})
-							);
+							return response.once(context.json(createFetchResult(null)));
 						}
 					)
 				);
@@ -333,17 +318,13 @@ describe("r2", () => {
 					}
 				`);
 						return response.once(
-							context.status(200),
-							context.json({
-								success: true,
-								errors: [],
-								messages: [],
-								result: {
+							context.json(
+								createFetchResult({
 									accountId: "some-account-id",
 									bucketName: "bucketName-object-test",
 									objectName: "wormhole-img.png",
-								},
-							})
+								})
+							)
 						);
 					}
 				)

package/src/__tests__/tail.test.ts

@@ -5,7 +5,7 @@ import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm, clearDialogs } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
-import { msw, mswSucessScriptHandlers } from "./helpers/msw";
+import { createFetchResult, msw, mswSucessScriptHandlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import type {
@@ -743,17 +743,13 @@ function mockCreateTailRequest(
 					expect(req.params.envName).toEqual(env);
 				}
 				return res.once(
-					ctx.status(200),
-					ctx.json({
-						success: true,
-						errors: [],
-						messages: [],
-						result: {
+					ctx.json(
+						createFetchResult({
 							url: websocketURL,
 							id: "tail-id",
 							expires_at: mockTailExpiration,
-						},
-					})
+						})
+					)
 				);
 			}
 		)
@@ -818,15 +814,7 @@ function mockDeleteTailRequest(
 					}
 				}
 				expect(req.params.tailId).toEqual("tail-id");
-				return res(
-					ctx.status(200),
-					ctx.json({
-						success: true,
-						errors: [],
-						messages: [],
-						result: null,
-					})
-				);
+				return res(ctx.json(createFetchResult(null)));
 			}
 		)
 	);