wrangler 2.20.0 → 3.0.0

package/src/__tests__/access.test.ts

@@ -1,25 +0,0 @@
-import { domainUsesAccess, getAccessToken } from "../user/access";
-import { msw, mswAccessHandlers } from "./helpers/msw";
-
-describe("access", () => {
-	beforeEach(() => {
-		msw.use(...mswAccessHandlers);
-	});
-
-	describe("basic", () => {
-		it("should correctly detect an access protected domain", async () => {
-			expect(await domainUsesAccess("access-protected.com")).toBeTruthy();
-			expect(await domainUsesAccess("not-access-protected.com")).toBeFalsy();
-		});
-		it("should not fail without cloudflared installed", async () => {
-			expect(await getAccessToken("not-access-protected.com")).toBeFalsy();
-		});
-		it("should error without cloudflared installed on an access protected domain", async () => {
-			await expect(getAccessToken("access-protected.com")).rejects.toEqual(
-				new Error(
-					"To use Wrangler with Cloudflare Access, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
-				)
-			);
-		});
-	});
-});

package/src/__tests__/api-dev.test.ts

@@ -1,238 +0,0 @@
-import * as fs from "node:fs";
-import { Request } from "undici";
-import { unstable_dev } from "../api";
-import { runInTempDir } from "./helpers/run-in-tmp";
-
-jest.unmock("undici");
-
-describe("unstable_dev", () => {
-	it("should return Hello World", async () => {
-		const worker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{
-				experimental: {
-					disableExperimentalWarning: true,
-					disableDevRegistry: true,
-				},
-			}
-		);
-		const resp = await worker.fetch();
-		if (resp) {
-			const text = await resp.text();
-			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
-		}
-		await worker.stop();
-	});
-
-	it("should return the port that the server started on (1)", async () => {
-		const worker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{
-				experimental: {
-					disableExperimentalWarning: true,
-					disableDevRegistry: true,
-				},
-			}
-		);
-		expect(worker.port).toBeGreaterThan(0);
-		await worker.stop();
-	});
-
-	it("should return the port that the server started on (2)", async () => {
-		const worker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{
-				port: 9191,
-				experimental: {
-					disableExperimentalWarning: true,
-					disableDevRegistry: true,
-				},
-			}
-		);
-		expect(worker.port).toBe(9191);
-		await worker.stop();
-	});
-});
-
-describe("unstable dev fetch input protocol", () => {
-	it("should use http localProtocol", async () => {
-		const worker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{
-				localProtocol: "http",
-				experimental: {
-					disableExperimentalWarning: true,
-					disableDevRegistry: true,
-				},
-			}
-		);
-		const res = await worker.fetch();
-		if (res) {
-			const text = await res.text();
-			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
-		}
-		await worker.stop();
-	});
-
-	it("should use undefined localProtocol", async () => {
-		const worker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{
-				localProtocol: undefined,
-				experimental: {
-					disableExperimentalWarning: true,
-					disableDevRegistry: true,
-				},
-			}
-		);
-		const res = await worker.fetch();
-		if (res) {
-			const text = await res.text();
-			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
-		}
-		await worker.stop();
-	});
-});
-
-describe("unstable dev fetch input parsing", () => {
-	runInTempDir();
-
-	it("should pass in a request object unchanged", async () => {
-		const scriptContent = `
-	export default {
-		fetch(request, env, ctx) {
-			const url = new URL(request.url);
-			if (url.pathname === "/test") {
-				if (request.method === "POST") {
-					return new Response("requestPOST");
-				}
-				return new Response("requestGET");
-			}
-			return new Response('Hello world');
-		}
-	};
-	`;
-		fs.writeFileSync("index.js", scriptContent);
-		const port = 21213;
-		const worker = await unstable_dev("index.js", {
-			port,
-			experimental: {
-				disableExperimentalWarning: true,
-				disableDevRegistry: true,
-			},
-		});
-		const req = new Request("http://0.0.0.0:21213/test", {
-			method: "POST",
-		});
-		const resp = await worker.fetch(req);
-		let text;
-		if (resp) text = await resp.text();
-		expect(text).toMatchInlineSnapshot(`"requestPOST"`);
-		await worker.stop();
-	});
-
-	it("should strip back to pathname for URL objects", async () => {
-		const scriptContent = `
-	export default {
-		fetch(request, env, ctx) {
-			const url = new URL(request.url);
-			if (url.pathname === "/test") {
-				return new Response("request");
-			}
-			return new Response('Hello world');
-		}
-	};
-	`;
-		fs.writeFileSync("index.js", scriptContent);
-		const worker = await unstable_dev("index.js", {
-			experimental: {
-				disableExperimentalWarning: true,
-				disableDevRegistry: true,
-			},
-		});
-		const url = new URL("http://localhost:80/test");
-		const resp = await worker.fetch(url);
-		let text;
-		if (resp) text = await resp.text();
-		expect(text).toMatchInlineSnapshot(`"request"`);
-		await worker.stop();
-	});
-
-	it("should allow full url passed in string, and stripped back to pathname", async () => {
-		const scriptContent = `
-	export default {
-		fetch(request, env, ctx) {
-			const url = new URL(request.url);
-			if (url.pathname === "/test") {
-				return new Response("request");
-			}
-			return new Response('Hello world');
-		}
-	};
-	`;
-		fs.writeFileSync("index.js", scriptContent);
-		const worker = await unstable_dev("index.js", {
-			experimental: {
-				disableExperimentalWarning: true,
-				disableDevRegistry: true,
-			},
-		});
-		const resp = await worker.fetch("http://example.com/test");
-		let text;
-		if (resp) text = await resp.text();
-		expect(text).toMatchInlineSnapshot(`"request"`);
-		await worker.stop();
-	});
-
-	it("should allow pathname to be passed in", async () => {
-		const scriptContent = `
-	export default {
-		fetch(request, env, ctx) {
-			const url = new URL(request.url);
-			if (url.pathname === "/test") {
-				return new Response("request");
-			}
-			return new Response('Hello world');
-		}
-	};
-	`;
-		fs.writeFileSync("index.js", scriptContent);
-		const worker = await unstable_dev("index.js", {
-			experimental: {
-				disableExperimentalWarning: true,
-				disableDevRegistry: true,
-			},
-		});
-		const resp = await worker.fetch("/test");
-		let text;
-		if (resp) text = await resp.text();
-		expect(text).toMatchInlineSnapshot(`"request"`);
-		await worker.stop();
-	});
-
-	it("should allow no input be passed in", async () => {
-		const scriptContent = `
-	export default {
-		fetch(request, env, ctx) {
-			const url = new URL(request.url);
-			if (url.pathname === "/test") {
-				return new Response("request");
-			}
-			return new Response('Hello world');
-		}
-	};
-	`;
-		fs.writeFileSync("index.js", scriptContent);
-		const worker = await unstable_dev("index.js", {
-			experimental: {
-				disableExperimentalWarning: true,
-				disableDevRegistry: true,
-			},
-		});
-		const resp = await worker.fetch("");
-		let text;
-		if (resp) text = await resp.text();
-		expect(text).toMatchInlineSnapshot(`"Hello world"`);
-		await worker.stop();
-	});
-});

package/src/__tests__/api-devregistry.test.ts

@@ -1,121 +0,0 @@
-import { fetch } from "undici";
-import { unstable_dev } from "../api";
-
-jest.unmock("undici");
-
-/**
- * a huge caveat to how testing multi-worker scripts works:
- * you can't shutdown the first worker you spun up, or it'll kill the devRegistry
- */
-describe("multi-worker testing", () => {
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	let childWorker: any;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	let parentWorker: any;
-
-	beforeAll(async () => {
-		childWorker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{
-				config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml",
-				experimental: {
-					disableExperimentalWarning: true,
-				},
-			}
-		);
-		parentWorker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/parent-worker.js",
-			{
-				config: "src/__tests__/helpers/worker-scripts/parent-wrangler.toml",
-				experimental: {
-					disableExperimentalWarning: true,
-				},
-			}
-		);
-	});
-
-	afterAll(async () => {
-		await childWorker.stop();
-		await parentWorker.stop();
-	});
-
-	it("parentWorker and childWorker should be added devRegistry", async () => {
-		const resp = await fetch("http://localhost:6284/workers");
-		if (resp) {
-			const parsedResp = (await resp.json()) as {
-				parent: unknown;
-				child: unknown;
-			};
-			expect(parsedResp.parent).toBeTruthy();
-			expect(parsedResp.child).toBeTruthy();
-		}
-	});
-
-	it("childWorker should return Hello World itself", async () => {
-		const resp = await childWorker.fetch();
-		if (resp) {
-			const text = await resp.text();
-			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
-		}
-	});
-
-	it("parentWorker should return Hello World by invoking the child worker", async () => {
-		const resp = await parentWorker.fetch();
-		if (resp) {
-			const parsedResp = await resp.text();
-			expect(parsedResp).toEqual("Parent worker sees: Hello World!");
-		}
-	});
-
-	it("should be able to stop and start the server with no warning logs", async () => {
-		// Spy on all the console methods
-		let logs = "";
-		(["debug", "info", "log", "warn", "error"] as const).forEach((method) =>
-			jest
-				.spyOn(console, method)
-				.mockImplementation((...args: unknown[]) => (logs += `\n${args}`))
-		);
-
-		// Spy on the std out that is written to by Miniflare 2
-		jest
-			.spyOn(process.stdout, "write")
-			.mockImplementation((chunk: unknown) => ((logs += `\n${chunk}`), true));
-
-		async function startWorker() {
-			return await unstable_dev(
-				"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-				{
-					// We need the wrangler.toml config to specify a Worker name
-					// otherwise unstable_dev will not register the worker with the DevRegistry
-					config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml",
-					// We need debug logs because this is where the message is written if registering the worker fails.
-					logLevel: "debug",
-					experimental: {
-						disableExperimentalWarning: true,
-					},
-				}
-			);
-		}
-
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		let worker: any;
-		try {
-			worker = await startWorker();
-
-			// Stop the worker and start it again
-			await worker.stop();
-			await new Promise((r) => setTimeout(r, 2000));
-
-			worker = await startWorker();
-
-			const resp = await worker.fetch();
-			expect(resp).not.toBe(undefined);
-
-			expect(logs).not.toMatch(
-				/Failed to register worker in local service registry/
-			);
-		} finally {
-			await worker?.stop();
-		}
-	}, 10000);
-});

package/src/__tests__/api.test.ts

@@ -1,102 +0,0 @@
-import { Request } from "undici";
-import { parseRequestInput } from "../api/dev";
-
-describe("parseRequestInput for fetch on unstable dev", () => {
-	it("should allow no input to be passed in", () => {
-		const [input, _] = parseRequestInput("0.0.0.0", 8080);
-
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/"`);
-	});
-
-	it("should allow string of pathname to be passed in", () => {
-		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test");
-
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
-	});
-
-	it("should allow string of pathname and querystring to be passed in", () => {
-		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test?q=testparam");
-
-		expect(input).toMatchInlineSnapshot(
-			`"http://0.0.0.0:8080/test?q=testparam"`
-		);
-	});
-
-	it("should allow full url to be passed in as string and stripped", () => {
-		const [input, _] = parseRequestInput(
-			"0.0.0.0",
-			8080,
-			"http://cloudflare.com/test?q=testparam"
-		);
-
-		expect(input).toMatchInlineSnapshot(
-			`"http://0.0.0.0:8080/test?q=testparam"`
-		);
-	});
-
-	it("should allow URL object without pathname to be passed in and stripped", () => {
-		const [input, _] = parseRequestInput(
-			"0.0.0.0",
-			8080,
-			new URL("http://cloudflare.com")
-		);
-
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/"`);
-	});
-
-	it("should allow URL object with pathname to be passed in and stripped", () => {
-		const [input, _] = parseRequestInput(
-			"0.0.0.0",
-			8080,
-			new URL("http://cloudflare.com/test")
-		);
-
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
-	});
-
-	it("should allow URL object with pathname and querystring to be passed in and stripped", () => {
-		const [input, _] = parseRequestInput(
-			"0.0.0.0",
-			8080,
-			new URL("http://cloudflare.com/test?q=testparam")
-		);
-
-		expect(input).toMatchInlineSnapshot(
-			`"http://0.0.0.0:8080/test?q=testparam"`
-		);
-	});
-
-	it("should allow request object to be passed in", () => {
-		const [input, init] = parseRequestInput(
-			"0.0.0.0",
-			8080,
-			new Request("http://cloudflare.com/test?q=testparam", { method: "POST" })
-		);
-
-		expect(init).toBeUndefined();
-		expect(input).toBeInstanceOf(Request);
-		// We don't expect the request to be modified
-		expect((input as Request).url).toMatchInlineSnapshot(
-			`"http://cloudflare.com/test?q=testparam"`
-		);
-		expect((input as Request).method).toMatchInlineSnapshot(`"POST"`);
-	});
-
-	it("should parse to give https url with localProtocol = https", () => {
-		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test", {}, "https");
-
-		expect(input).toMatchInlineSnapshot(`"https://0.0.0.0:8080/test"`);
-	});
-
-	it("should parse to give http url with localProtocol = http", () => {
-		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test", {}, "http");
-
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
-	});
-
-	it("should parse to give http url with localProtocol not set", () => {
-		const [input, _] = parseRequestInput("0.0.0.0", 8080, "/test", {});
-
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
-	});
-});

package/src/__tests__/config-cache-without-cache-dir.test.ts

@@ -1,38 +0,0 @@
-import { getConfigCache, saveToConfigCache } from "../config-cache";
-import { mockConsoleMethods } from "./helpers/mock-console";
-import { runInTempDir } from "./helpers/run-in-tmp";
-
-interface PagesConfigCache {
-	account_id: string;
-	pages_project_name: string;
-}
-
-describe("config cache", () => {
-	runInTempDir();
-	mockConsoleMethods();
-	// In this set of tests, we don't create a node_modules folder
-	const pagesConfigCacheFilename = "pages-config-cache.json";
-
-	it("should return an empty config if no file exists", () => {
-		expect(
-			getConfigCache<PagesConfigCache>(pagesConfigCacheFilename)
-		).toMatchInlineSnapshot(`Object {}`);
-	});
-
-	it("should ignore attempts to cache values ", () => {
-		saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
-			account_id: "some-account-id",
-			pages_project_name: "foo",
-		});
-		expect(getConfigCache<PagesConfigCache>(pagesConfigCacheFilename)).toEqual(
-			{}
-		);
-
-		saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
-			pages_project_name: "bar",
-		});
-		expect(getConfigCache<PagesConfigCache>(pagesConfigCacheFilename)).toEqual(
-			{}
-		);
-	});
-});

package/src/__tests__/config-cache.test.ts

@@ -1,42 +0,0 @@
-import { mkdirSync } from "node:fs";
-import { getConfigCache, saveToConfigCache } from "../config-cache";
-import { mockConsoleMethods } from "./helpers/mock-console";
-import { runInTempDir } from "./helpers/run-in-tmp";
-
-interface PagesConfigCache {
-	account_id: string;
-	pages_project_name: string;
-}
-
-describe("config cache", () => {
-	runInTempDir();
-	mockConsoleMethods();
-	beforeEach(() => {
-		mkdirSync("node_modules");
-	});
-
-	const pagesConfigCacheFilename = "pages-config-cache.json";
-
-	it("should return an empty config if no file exists", () => {
-		expect(
-			getConfigCache<PagesConfigCache>(pagesConfigCacheFilename)
-		).toMatchInlineSnapshot(`Object {}`);
-	});
-
-	it("should read and write values without overriding old ones", () => {
-		saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
-			account_id: "some-account-id",
-			pages_project_name: "foo",
-		});
-		expect(
-			getConfigCache<PagesConfigCache>(pagesConfigCacheFilename).account_id
-		).toEqual("some-account-id");
-
-		saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
-			pages_project_name: "bar",
-		});
-		expect(
-			getConfigCache<PagesConfigCache>(pagesConfigCacheFilename).account_id
-		).toEqual("some-account-id");
-	});
-});