wrangler 0.0.0-e33bea9b → 0.0.0-e351afcf

package/src/__tests__/dev.test.tsx

@@ -635,7 +635,7 @@ describe("wrangler dev", () => {
 		it("should run a custom build before starting `dev`", async () => {
 			writeWranglerToml({
 				build: {
-					command: `node -e "console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
+					command: `node -e "4+4; require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
 				},
 			});
 
@@ -648,12 +648,12 @@ describe("wrangler dev", () => {
 			// and the command would pass through
 			expect((Dev as jest.Mock).mock.calls[0][0].build).toEqual({
 				command:
-					"node -e \"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\"",
+					"node -e \"4+4; require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\"",
 				cwd: undefined,
 				watch_dir: "src",
 			});
 			expect(std.out).toMatchInlineSnapshot(
-				`"Running custom build: node -e \\"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\""`
+				`"Running custom build: node -e \\"4+4; require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\""`
 			);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -663,7 +663,7 @@ describe("wrangler dev", () => {
 			it("should run a custom build of multiple steps combined by && before starting `dev`", async () => {
 				writeWranglerToml({
 					build: {
-						command: `echo "custom build" && echo "export default { fetch(){ return new Response(123) } }" > index.js`,
+						command: `echo "export default { fetch(){ return new Response(123) } }" > index.js`,
 					},
 				});
 
@@ -675,7 +675,7 @@ describe("wrangler dev", () => {
 		        `);
 
 				expect(std.out).toMatchInlineSnapshot(
-					`"Running custom build: echo \\"custom build\\" && echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js"`
+					`"Running custom build: echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js"`
 				);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -686,27 +686,27 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				build: {
-					command: `node -e "console.log('custom build');"`,
+					command: `node -e "4+4;"`,
 				},
 			});
 
 			await expect(runWrangler("dev")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-						              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
-						              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
-					            `);
+			"The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"4+4;\\".
+			The \`main\` property in wrangler.toml should point to the file generated by the custom build."
+		`);
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Running custom build: node -e \\"console.log('custom build');\\"
+			"Running custom build: node -e \\"4+4;\\"
 
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
-		      `);
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`
-			        "X [ERROR] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			"X [ERROR] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"4+4;\\".
 
-			          The \`main\` property in wrangler.toml should point to the file generated by the custom build.
+			  The \`main\` property in wrangler.toml should point to the file generated by the custom build.
 
-			        "
-		      `);
+			"
+		`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
 
@@ -894,6 +894,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -911,6 +912,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -928,6 +930,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -948,6 +951,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -1209,6 +1213,7 @@ describe("wrangler dev", () => {
 			  "err": "X [ERROR] Not enough arguments following: site
 
 			",
+			  "info": "",
 			  "out": "
 			wrangler dev [script]
 
@@ -1343,15 +1348,16 @@ describe("wrangler dev", () => {
 
 			await runWrangler('dev --assets "./assets"');
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "",
-			          "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
-
-			        ",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+
+			",
+			}
+		`);
 		});
 
 		it("should warn if config.assets is used", async () => {
@@ -1364,17 +1370,18 @@ describe("wrangler dev", () => {
 
 			await runWrangler("dev");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "",
+			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - \\"assets\\" fields are experimental and may change or break at any time.
+			    - \\"assets\\" fields are experimental and may change or break at any time.
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 	});
 
@@ -1383,15 +1390,16 @@ describe("wrangler dev", () => {
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev index.js --inspect");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "",
-			          "warn": "▲ [WARNING] Passing --inspect is unnecessary, now you can always connect to devtools.
-
-			        ",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "",
+			  "warn": "▲ [WARNING] Passing --inspect is unnecessary, now you can always connect to devtools.
+
+			",
+			}
+		`);
 		});
 
 		it("should default to true, without a warning", async () => {
@@ -1402,6 +1410,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -1416,6 +1425,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "▲ [WARNING] Passing --inspect is unnecessary, now you can always connect to devtools.
 
@@ -1432,6 +1442,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -1447,6 +1458,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -1460,6 +1472,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "▲ [WARNING] Passing --inspect is unnecessary, now you can always connect to devtools.
 
@@ -1516,23 +1529,24 @@ describe("wrangler dev", () => {
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev index.js");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Your worker has access to the following bindings:
-			        - Services:
-			          - WorkerA: A
-			          - WorkerB: B - staging",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "Your worker has access to the following bindings:
+			- Services:
+			  - WorkerA: A
+			  - WorkerB: B - staging",
+			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - \\"services\\" fields are experimental and may change or break at any time.
+			    - \\"services\\" fields are experimental and may change or break at any time.
 
 
-			        ▲ [WARNING] This worker is bound to live services: WorkerA (A), WorkerB (B@staging)
+			▲ [WARNING] This worker is bound to live services: WorkerA (A), WorkerB (B@staging)
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should mask vars that were overriden in .dev.vars", async () => {
@@ -1555,6 +1569,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Using vars defined in .dev.vars
 			Your worker has access to the following bindings:
 			- Vars:

package/src/__tests__/generate.test.ts

@@ -107,7 +107,7 @@ describe("generate", () => {
 	});
 
 	describe("cloning", () => {
-		it.skip("clones a cloudflare template with sparse checkouts", async () => {
+		it("clones a cloudflare template with sparse checkouts", async () => {
 			await expect(
 				runWrangler("generate my-worker worker-typescript")
 			).resolves.toBeUndefined();
@@ -116,10 +116,9 @@ describe("generate", () => {
 				".git": expect.any(Object),
 				".gitignore": expect.any(String),
 				"README.md": expect.stringContaining("Template: worker-typescript"),
-				"jest.config.json": expect.any(String),
 				"package.json": expect.stringContaining("@cloudflare/workers-types"),
-				src: expect.objectContaining({ "index.ts": expect.any(String) }),
-				test: expect.objectContaining({
+				src: expect.objectContaining({
+					"index.ts": expect.any(String),
 					"index.test.ts": expect.any(String),
 				}),
 				"tsconfig.json": expect.any(String),

package/src/__tests__/helpers/mock-console.ts

@@ -8,6 +8,7 @@ import { logger } from "../../logger";
 
 let debugSpy: jest.SpyInstance,
 	logSpy: jest.SpyInstance,
+	infoSpy: jest.SpyInstance,
 	errorSpy: jest.SpyInstance,
 	warnSpy: jest.SpyInstance;
 
@@ -18,6 +19,9 @@ const std = {
 	get out() {
 		return normalizeOutput(logSpy);
 	},
+	get info() {
+		return normalizeOutput(infoSpy);
+	},
 	get err() {
 		return normalizeOutput(errorSpy);
 	},
@@ -47,12 +51,14 @@ export function mockConsoleMethods() {
 		logger.columns = 100;
 		debugSpy = jest.spyOn(console, "debug").mockImplementation();
 		logSpy = jest.spyOn(console, "log").mockImplementation();
+		infoSpy = jest.spyOn(console, "info").mockImplementation();
 		errorSpy = jest.spyOn(console, "error").mockImplementation();
 		warnSpy = jest.spyOn(console, "warn").mockImplementation();
 	});
 	afterEach(() => {
 		debugSpy.mockRestore();
 		logSpy.mockRestore();
+		infoSpy.mockRestore();
 		errorSpy.mockRestore();
 		warnSpy.mockRestore();
 	});

package/src/__tests__/helpers/msw/handlers/deployments.ts

@@ -49,6 +49,7 @@ export const mswSuccessDeployments = [
 								annotations: {
 									"workers/triggered_by": "rollback",
 									"workers/rollback_from": "MOCK-DEPLOYMENT-ID-1111",
+									"workers/message": "Rolled back for this version",
 								},
 								metadata: {
 									author_id: "Kathryn-Jane-Gamma-6-0-7-3",
@@ -59,7 +60,7 @@ export const mswSuccessDeployments = [
 								},
 							},
 							{
-								id: "Intrepid-Class",
+								id: "3mEgaU1T-Intrepid-someThing",
 								number: "NCC-74656",
 								metadata: {
 									author_id: "Kathryn-Jane-Gamma-6-0-7-3",
@@ -77,17 +78,83 @@ export const mswSuccessDeployments = [
 	),
 ];
 
-export const mswSuccessLastDeployment = [
+export const mswSuccessDeploymentScriptMetadata = [
 	rest.get(
 		"*/accounts/:accountId/workers/services/:scriptName",
 		(_, res, ctx) => {
 			return res.once(
 				ctx.json(
 					createFetchResult({
-						default_environment: { script: { last_deployed_from: "wrangler" } },
+						default_environment: {
+							script: { last_deployed_from: "wrangler", tag: "MOCK-TAG" },
+						},
+					})
+				)
+			);
+		}
+	),
+];
+
+export const mswSuccessDeploymentDetails = [
+	rest.get(
+		"*/accounts/:accountId/workers/deployments/by-script/:scriptTag/detail/:deploymentId",
+		(req, res, ctx) => {
+			let bindings: object[] = [];
+			if (req.url.toString().includes("bindings-tag")) {
+				bindings = [
+					{
+						bucket_name: "testr2",
+						name: "MY_BUCKET",
+						type: "r2_bucket",
+					},
+				];
+			}
+
+			expect(req.url.toString().includes("1701-E"));
+			return res.once(
+				ctx.json(
+					createFetchResult({
+						id: "1701-E",
+						Number: 0,
+						metadata: {
+							author_id: "Picard-Gamma-6-0-7-3",
+							author_email: "Jean-Luc-Picard@federation.org",
+							source: "wrangler",
+							created_on: "2021-01-01T00:00:00.000000Z",
+							modified_on: "2021-01-01T00:00:00.000000Z",
+						},
+						resources: {
+							script: {
+								etag: "mock-e-tag",
+								handlers: ["fetch"],
+								last_deployed_from: "wrangler",
+							},
+							script_runtime: {
+								usage_model: "bundled",
+							},
+							bindings: bindings,
+						},
 					})
 				)
 			);
 		}
 	),
+	// ?deployment=<deploymentid> param used to get deployment <script content> as text
+	rest.get(
+		"*/accounts/:accountId/workers/scripts/:scriptName",
+		(req, res, ctx) => {
+			let scriptContent = "";
+			if (req.url.searchParams.get("deployment") === "1701-E") {
+				scriptContent = `
+			export default {
+				async fetch(request) {
+					return new Response('Hello World from Deployment 1701-E');
+				},
+			};`;
+			} else {
+				return res(ctx.status(400));
+			}
+			return res.once(ctx.text(scriptContent));
+		}
+	),
 ];

package/src/__tests__/helpers/msw/index.ts

@@ -2,7 +2,8 @@ import { setupServer } from "msw/node";
 import { default as mswAccessHandlers } from "./handlers/access";
 import {
 	mswSuccessDeployments,
-	mswSuccessLastDeployment,
+	mswSuccessDeploymentScriptMetadata,
+	mswSuccessDeploymentDetails,
 } from "./handlers/deployments";
 import { mswSuccessNamespacesHandlers } from "./handlers/namespaces";
 import { mswSuccessOauthHandlers } from "./handlers/oauth";
@@ -45,6 +46,7 @@ export {
 	mswSucessScriptHandlers,
 	mswZoneHandlers,
 	mswSuccessDeployments,
+	mswSuccessDeploymentDetails,
 	mswAccessHandlers,
-	mswSuccessLastDeployment,
+	mswSuccessDeploymentScriptMetadata,
 };

package/src/__tests__/helpers/worker-scripts/parent-worker.js

@@ -2,7 +2,10 @@ export default {
 	async fetch(req, env) {
 		const resp = await env.CHILD.fetch(req);
 		const text = await resp.text();
-		console.log("text: ", text);
+		// TODO: we should capture console logs when running `dev` programmatically
+		// (and locally) and expose it on the DevWorker object instead of allowing
+		// the log to appear in the output of the test runner.
+		// console.log("text: ", text);
 		return new Response(`Parent worker sees: ${text}`);
 	},
 };

package/src/__tests__/index.test.ts

@@ -32,7 +32,7 @@ describe("wrangler", () => {
 			"wrangler
 
 			Commands:
-			  wrangler docs [command]              📚 Open wrangler's docs in your browser
+			  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 			  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 			  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 			  wrangler dev [script]                👂 Start a local server for developing your worker
@@ -49,20 +49,24 @@ describe("wrangler", () => {
 			  wrangler r2                          📦 Interact with an R2 store
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
+			  wrangler constellation               🤖 Interact with Constellation AI models
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare
 			  wrangler logout                      🚪 Logout from Cloudflare
 			  wrangler whoami                      🕵️  Retrieve your user info and test your auth config
 			  wrangler types                       📝 Generate types from bindings & module rules in config
-			  wrangler deployments                 🚢 Displays the 10 most recent deployments for a worker
+			  wrangler deployments                 🚢 List and view details for deployments
+			  wrangler rollback [deployment-id]    🔙 Rollback a deployment
 
 			Flags:
 			  -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]"
+			  -v, --version                   Show version number  [boolean]
+
+			🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		`);
 
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -82,7 +86,7 @@ describe("wrangler", () => {
 			wrangler
 
 			Commands:
-			  wrangler docs [command]              📚 Open wrangler's docs in your browser
+			  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 			  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 			  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 			  wrangler dev [script]                👂 Start a local server for developing your worker
@@ -99,20 +103,24 @@ describe("wrangler", () => {
 			  wrangler r2                          📦 Interact with an R2 store
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
+			  wrangler constellation               🤖 Interact with Constellation AI models
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
 			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare
 			  wrangler logout                      🚪 Logout from Cloudflare
 			  wrangler whoami                      🕵️  Retrieve your user info and test your auth config
 			  wrangler types                       📝 Generate types from bindings & module rules in config
-			  wrangler deployments                 🚢 Displays the 10 most recent deployments for a worker
+			  wrangler deployments                 🚢 List and view details for deployments
+			  wrangler rollback [deployment-id]    🔙 Rollback a deployment
 
 			Flags:
 			  -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]"
+			  -v, --version                   Show version number  [boolean]
+
+			🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`
 			        "X [ERROR] Unknown argument: invalid-command