wrangler 0.0.0-e6c9c5c0 → 0.0.0-e6e1daba

package/src/__tests__/dev.test.tsx

@@ -136,7 +136,7 @@ describe("wrangler dev", () => {
 
 			expect(std.out).toMatchInlineSnapshot(`
 			        "
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/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] 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.
@@ -698,7 +698,7 @@ describe("wrangler dev", () => {
 			expect(std.out).toMatchInlineSnapshot(`
 			        "Running custom build: node -e \\"console.log('custom build');\\"
 
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/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');\\".
@@ -774,7 +774,7 @@ describe("wrangler dev", () => {
 			        "▲ [WARNING] Setting upstream-protocol to http is not currently implemented.
 
 			          If this is required in your project, please add your use case to the following issue:
-			          https://github.com/cloudflare/wrangler2/issues/583.
+			          https://github.com/cloudflare/workers-sdk/issues/583.
 
 			        "
 		      `);
@@ -1218,10 +1218,11 @@ describe("wrangler dev", () => {
 			  script  The path to an entry point for your worker  [string]
 
 			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:
 			      --name                                       Name of the worker  [string]

package/src/__tests__/generate.test.ts

@@ -131,7 +131,7 @@ describe("generate", () => {
 		// was harder than i thought, leaving this for now.
 		it.todo("clones a cloudflare template with full checkouts");
 
-		it("clones a user/repo template", async () => {
+		it.skip("clones a user/repo template", async () => {
 			await expect(
 				runWrangler("generate my-worker caass/wrangler-generate-test-template")
 			).resolves.toBeUndefined();

package/src/__tests__/guess-worker-format.test.ts

@@ -32,6 +32,41 @@ describe("guess worker format", () => {
 		expect(guess).toBe("service-worker");
 	});
 
+	it('should detect a "service-worker" worker using `typeof module`', async () => {
+		await writeFile("./index.ts", "typeof module");
+		const guess = await guessWorkerFormat(
+			path.join(process.cwd(), "./index.ts"),
+			process.cwd(),
+			undefined
+		);
+		expect(guess).toBe("service-worker");
+	});
+
+	it('should detect a "service-worker" worker using imports', async () => {
+		await writeFile(
+			"./dep.ts",
+			`
+			const value = 'thing';
+			export default value;
+			`
+		);
+		await writeFile(
+			"./index.ts",
+			`
+			import value from './dep.ts';
+			addEventListener('fetch', (event) => {
+				event.respondWith(new Response(value));
+			});
+			`
+		);
+		const guess = await guessWorkerFormat(
+			path.join(process.cwd(), "./index.ts"),
+			process.cwd(),
+			undefined
+		);
+		expect(guess).toBe("service-worker");
+	});
+
 	it("should throw an error when the hint doesn't match the guess (modules - service-worker)", async () => {
 		await writeFile("./index.ts", "export default {};");
 		await expect(

package/src/__tests__/helpers/end-event-loop.ts

@@ -0,0 +1,6 @@
+/**
+ * Forces a tick and ensures that all pending promises resolve
+ */
+export function endEventLoop() {
+	return new Promise((resolve) => setImmediate(resolve));
+}

package/src/__tests__/helpers/mock-get-pages-upload-token.ts

@@ -0,0 +1,25 @@
+import { rest } from "msw";
+import { msw } from "./msw";
+
+/**
+ * Mocks the `/accounts/:accountId/pages/projects/:projectName/upload-token` GET request
+ */
+export function mockGetUploadTokenRequest(
+	jwt: string,
+	accountId: string,
+	projectName: string
+) {
+	msw.use(
+		rest.get(
+			`*/accounts/:accountId/pages/projects/${projectName}/upload-token`,
+			(req, res, ctx) => {
+				expect(req.params.accountId).toEqual(accountId);
+
+				return res(
+					ctx.status(200),
+					ctx.json({ success: true, errors: [], messages: [], result: { jwt } })
+				);
+			}
+		)
+	);
+}

package/src/__tests__/helpers/mock-set-timeout.ts

@@ -0,0 +1,16 @@
+let setTimeoutSpy: jest.SpyInstance;
+
+export function mockSetTimeout() {
+	beforeEach(() => {
+		setTimeoutSpy = jest
+			.spyOn(global, "setTimeout")
+			// @ts-expect-error we're using a very simple setTimeout mock here
+			.mockImplementation((fn, _period) => {
+				setImmediate(fn);
+			});
+	});
+
+	afterEach(() => {
+		setTimeoutSpy.mockRestore();
+	});
+}

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

@@ -1,6 +1,25 @@
 import { rest } from "msw";
 import { createFetchResult } from "../index";
 
+const latestDeployment = {
+	id: "Galaxy-Class",
+	number: "1701-E",
+	annotations: {
+		"workers/triggered_by": "rollback",
+		"workers/rollback_from": "MOCK-DEPLOYMENT-ID-2222",
+	},
+	metadata: {
+		author_id: "Picard-Gamma-6-0-7-3",
+		author_email: "Jean-Luc-Picard@federation.org",
+		source: "wrangler",
+		created_on: "2021-01-04T00:00:00.000000Z",
+		modified_on: "2021-01-04T00:00:00.000000Z",
+	},
+	resources: {
+		script: "MOCK-TAG",
+		bindings: [],
+	},
+};
 export const mswSuccessDeployments = [
 	rest.get(
 		"*/accounts/:accountId/workers/deployments/by-script/:scriptTag",
@@ -8,25 +27,14 @@ export const mswSuccessDeployments = [
 			response.once(
 				context.json(
 					createFetchResult({
-						latest: {
-							id: "Galaxy-Class",
-							number: "1701-E",
-							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: "MOCK-TAG",
-								bindings: [],
-							},
-						},
+						latest: latestDeployment,
 						items: [
 							{
-								id: "Galaxy-Class",
+								id: "Constitution-Class",
 								number: "1701-E",
+								annotations: {
+									"workers/triggered_by": "upload",
+								},
 								metadata: {
 									author_id: "Picard-Gamma-6-0-7-3",
 									author_email: "Jean-Luc-Picard@federation.org",
@@ -38,6 +46,10 @@ export const mswSuccessDeployments = [
 							{
 								id: "Intrepid-Class",
 								number: "NCC-74656",
+								annotations: {
+									"workers/triggered_by": "rollback",
+									"workers/rollback_from": "MOCK-DEPLOYMENT-ID-1111",
+								},
 								metadata: {
 									author_id: "Kathryn-Jane-Gamma-6-0-7-3",
 									author_email: "Kathryn-Janeway@federation.org",
@@ -46,6 +58,18 @@ export const mswSuccessDeployments = [
 									modified_on: "2021-02-02T00:00:00.000000Z",
 								},
 							},
+							{
+								id: "Intrepid-Class",
+								number: "NCC-74656",
+								metadata: {
+									author_id: "Kathryn-Jane-Gamma-6-0-7-3",
+									author_email: "Kathryn-Janeway@federation.org",
+									source: "wrangler",
+									created_on: "2021-02-03T00:00:00.000000Z",
+									modified_on: "2021-02-03T00:00:00.000000Z",
+								},
+							},
+							latestDeployment,
 						],
 					})
 				)

package/src/__tests__/helpers/string-dynamic-values-matcher.ts

@@ -0,0 +1,28 @@
+export type PatternReplacementPair = [string | RegExp, string];
+
+/**
+ * Sometimes, we might need to test strings that contain dynamic |
+ * random | generated data (such as file hashes, IDs, etc.).
+ *
+ * This helper function replaces the dynamic parts of such strings with
+ * static values, thus enabling us to properly test the contents of the
+ * string.
+ *
+ * see https://jestjs.io/docs/snapshot-testing#property-matchers
+ */
+export function replaceRandomWithConstantData(
+	stringWithRandomData: string,
+	patternReplacementPairs: Array<PatternReplacementPair>
+) {
+	let stringWithConstantData = stringWithRandomData;
+
+	patternReplacementPairs.forEach(
+		(pair) =>
+			(stringWithConstantData = stringWithConstantData.replace(
+				pair[0], // pattern
+				pair[1] // replacement
+			))
+	);
+
+	return stringWithConstantData;
+}

package/src/__tests__/index.test.ts

@@ -1,4 +1,5 @@
 import { getPackageManager } from "../package-manager";
+import { endEventLoop } from "./helpers/end-event-loop";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
@@ -49,6 +50,7 @@ describe("wrangler", () => {
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
 			  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
@@ -56,10 +58,11 @@ describe("wrangler", () => {
 			  wrangler deployments                 🚢 Displays the 10 most recent deployments for a worker
 
 			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(`""`);
@@ -97,6 +100,7 @@ describe("wrangler", () => {
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
 			  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
@@ -104,10 +108,11 @@ describe("wrangler", () => {
 			  wrangler deployments                 🚢 Displays the 10 most recent deployments for a worker
 
 			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 argument: invalid-command
@@ -151,10 +156,11 @@ describe("wrangler", () => {
 			  wrangler secret list          List all secrets for a Worker
 
 			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]"
 		`);
 		});
 
@@ -172,10 +178,11 @@ describe("wrangler", () => {
 			  wrangler kv:namespace delete              Deletes a given 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]"
 		`);
 		});
 
@@ -194,10 +201,11 @@ describe("wrangler", () => {
 			  wrangler kv:key delete <key>       Removes a single key value pair from the given 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]"
 		`);
 		});
 
@@ -214,10 +222,11 @@ describe("wrangler", () => {
 			  wrangler kv:bulk delete <filename>  Delete multiple key-value pairs from a 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]"
 		`);
 		});
 
@@ -234,10 +243,11 @@ describe("wrangler", () => {
 			  wrangler r2 bucket  Manage R2 buckets
 
 			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]"
 		`);
 		});
 	});
@@ -262,7 +272,3 @@ describe("wrangler", () => {
 	`);
 	});
 });
-
-function endEventLoop() {
-	return new Promise((resolve) => setImmediate(resolve));
-}

package/src/__tests__/init.test.ts

@@ -1392,7 +1392,7 @@ describe("init", () => {
 						contents: {
 							config: {
 								compilerOptions: expect.objectContaining({
-									types: ["@cloudflare/workers-types", "jest"],
+									types: ["@cloudflare/workers-types", "vitest"],
 								}),
 							},
 							error: undefined,