wrangler 0.0.0-e98613f8 → 0.0.0-e9a45766c

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "0.0.0-e98613f8",
+	"version": "0.0.0-e9a45766c",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -24,13 +24,13 @@
 		"http",
 		"cli"
 	],
-	"homepage": "https://github.com/cloudflare/wrangler2#readme",
+	"homepage": "https://github.com/cloudflare/workers-sdk#readme",
 	"bugs": {
-		"url": "https://github.com/cloudflare/wrangler2/issues"
+		"url": "https://github.com/cloudflare/workers-sdk/issues"
 	},
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/cloudflare/wrangler2.git",
+		"url": "https://github.com/cloudflare/workers-sdk.git",
 		"directory": "packages/wrangler"
 	},
 	"license": "MIT OR Apache-2.0",
@@ -57,15 +57,17 @@
 		"assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
 		"build": "npm run clean && npm run bundle && npm run emit-types",
 		"bundle": "node -r esbuild-register scripts/bundle.ts",
-		"check:type": "tsc",
+		"check:type": "node -r esbuild-register scripts/tsc-all.ts",
 		"clean": "rimraf wrangler-dist miniflare-dist emitted-types",
 		"dev": "npm run clean && concurrently -c black,blue --kill-others-on-fail false 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "npm run assert-git-version && jest --silent=false --verbose=true",
+		"test": "npm run assert-git-version && jest",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
-		"test:ci": "npm run test -- --verbose=true --coverage"
+		"test:ci": "npm run test -- --coverage",
+		"test:debug": "npm run test -- --silent=false --verbose=true",
+		"test:e2e": "vitest --no-threads ./e2e"
 	},
 	"jest": {
 		"coverageReporters": [
@@ -82,7 +84,7 @@
 		"setupFilesAfterEnv": [
 			"<rootDir>/src/__tests__/jest.setup.ts"
 		],
-		"testRegex": ".*.(test|spec)\\.[jt]sx?$",
+		"testRegex": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
 		"testTimeout": 30000,
 		"transform": {
 			"^.+\\.c?(t|j)sx?$": [
@@ -100,13 +102,13 @@
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-		"@miniflare/core": "2.10.0",
-		"@miniflare/d1": "2.10.0",
-		"@miniflare/durable-objects": "2.10.0",
+		"@miniflare/core": "2.14.4",
+		"@miniflare/d1": "2.14.4",
+		"@miniflare/durable-objects": "2.14.4",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
-		"esbuild": "0.14.51",
-		"miniflare": "2.10.0",
+		"esbuild": "0.16.3",
+		"miniflare": "2.14.4",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -115,11 +117,10 @@
 	},
 	"devDependencies": {
 		"@cloudflare/types": "^6.18.4",
-		"@databases/split-sql-query": "^1.0.3",
-		"@databases/sql": "^3.2.0",
+		"@cloudflare/workers-types": "^4.20221111.1",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "^3.0.0-next.7",
+		"@miniflare/tre": "3.0.0-next.14",
 		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
@@ -136,6 +137,8 @@
 		"@types/yargs": "^17.0.10",
 		"@webcontainer/env": "^1.0.1",
 		"body-parser": "^1.20.0",
+		"chalk": "^2.4.2",
+		"cli-table3": "^0.6.3",
 		"clipboardy": "^3.0.0",
 		"cmd-shim": "^4.1.0",
 		"command-exists": "^1.2.9",
@@ -162,7 +165,7 @@
 		"jest-websocket-mock": "^2.3.0",
 		"mime": "^3.0.0",
 		"minimatch": "^5.1.0",
-		"msw": "^0.47.1",
+		"msw": "^0.49.1",
 		"npx-import": "^1.1.3",
 		"open": "^8.4.0",
 		"p-queue": "^7.2.0",
@@ -173,16 +176,20 @@
 		"remove-accents-esm": "^0.0.1",
 		"semiver": "^1.1.0",
 		"serve-static": "^1.15.0",
+		"shellac": "^0.7.3",
 		"signal-exit": "^3.0.7",
+		"strip-ansi": "^7.0.1",
 		"supports-color": "^9.2.2",
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
-		"undici": "^5.11.0",
+		"undici": "5.28.2",
 		"update-check": "^1.5.4",
+		"vitest": "^0.29.2",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",
-		"yargs": "^17.4.1"
+		"yargs": "^17.4.1",
+		"yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz"
 	},
 	"optionalDependencies": {
 		"fsevents": "~2.3.2"

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

@@ -5,12 +5,16 @@ import { runInTempDir } from "./helpers/run-in-tmp";
 
 jest.unmock("undici");
 
-describe.skip("unstable_dev", () => {
+describe("unstable_dev", () => {
 	it("should return Hello World", async () => {
 		const worker = await unstable_dev(
 			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{},
-			{ disableExperimentalWarning: true }
+			{
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
 		);
 		const resp = await worker.fetch();
 		if (resp) {
@@ -23,8 +27,12 @@ describe.skip("unstable_dev", () => {
 	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",
-			{},
-			{ disableExperimentalWarning: true }
+			{
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
 		);
 		expect(worker.port).toBeGreaterThan(0);
 		await worker.stop();
@@ -33,8 +41,13 @@ describe.skip("unstable_dev", () => {
 	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 },
-			{ disableExperimentalWarning: true }
+			{
+				port: 9191,
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
 		);
 		expect(worker.port).toBe(9191);
 		await worker.stop();
@@ -45,8 +58,13 @@ 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" },
-			{ disableExperimentalWarning: true }
+			{
+				localProtocol: "http",
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
 		);
 		const res = await worker.fetch();
 		if (res) {
@@ -59,8 +77,13 @@ describe("unstable dev fetch input protocol", () => {
 	it("should use undefined localProtocol", async () => {
 		const worker = await unstable_dev(
 			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{ localProtocol: undefined },
-			{ disableExperimentalWarning: true }
+			{
+				localProtocol: undefined,
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			}
 		);
 		const res = await worker.fetch();
 		if (res) {
@@ -91,11 +114,13 @@ describe("unstable dev fetch input parsing", () => {
 	`;
 		fs.writeFileSync("index.js", scriptContent);
 		const port = 21213;
-		const worker = await unstable_dev(
-			"index.js",
-			{ port },
-			{ disableExperimentalWarning: true }
-		);
+		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",
 		});
@@ -119,11 +144,12 @@ describe("unstable dev fetch input parsing", () => {
 	};
 	`;
 		fs.writeFileSync("index.js", scriptContent);
-		const worker = await unstable_dev(
-			"index.js",
-			{},
-			{ disableExperimentalWarning: true }
-		);
+		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;
@@ -145,11 +171,12 @@ describe("unstable dev fetch input parsing", () => {
 	};
 	`;
 		fs.writeFileSync("index.js", scriptContent);
-		const worker = await unstable_dev(
-			"index.js",
-			{},
-			{ disableExperimentalWarning: true }
-		);
+		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();
@@ -170,11 +197,12 @@ describe("unstable dev fetch input parsing", () => {
 	};
 	`;
 		fs.writeFileSync("index.js", scriptContent);
-		const worker = await unstable_dev(
-			"index.js",
-			{},
-			{ disableExperimentalWarning: true }
-		);
+		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();
@@ -195,11 +223,12 @@ describe("unstable dev fetch input parsing", () => {
 	};
 	`;
 		fs.writeFileSync("index.js", scriptContent);
-		const worker = await unstable_dev(
-			"index.js",
-			{},
-			{ disableExperimentalWarning: true }
-		);
+		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();

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

@@ -0,0 +1,121 @@
+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://127.0.0.1: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

@@ -5,7 +5,7 @@ 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"`);
+		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/"`);
 	});
 
 	it("should allow string of pathname to be passed in", () => {
@@ -14,14 +14,24 @@ describe("parseRequestInput for fetch on unstable dev", () => {
 		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"
+			"http://cloudflare.com/test?q=testparam"
 		);
 
-		expect(input).toMatchInlineSnapshot(`"http://0.0.0.0:8080/test"`);
+		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", () => {
@@ -44,18 +54,30 @@ describe("parseRequestInput for fetch on unstable dev", () => {
 		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", { method: "POST" })
+			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"`
+			`"http://cloudflare.com/test?q=testparam"`
 		);
 		expect((input as Request).method).toMatchInlineSnapshot(`"POST"`);
 	});