wrangler 2.0.27 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.0.27",
+	"version": "2.1.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -97,7 +97,7 @@
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.14.51",
-		"miniflare": "^2.6.0",
+		"miniflare": "^2.8.1",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -107,6 +107,7 @@
 	"devDependencies": {
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
+		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
 		"@types/express": "^4.17.13",
 		"@types/glob-to-regexp": "0.4.1",
@@ -120,6 +121,7 @@
 		"@types/yargs": "^17.0.10",
 		"@webcontainer/env": "^1.0.1",
 		"body-parser": "^1.20.0",
+		"busboy": "^1.6.0",
 		"clipboardy": "^3.0.0",
 		"cmd-shim": "^4.1.0",
 		"command-exists": "^1.2.9",
@@ -158,7 +160,7 @@
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
-		"undici": "^5.5.1",
+		"undici": "^5.9.1",
 		"update-check": "^1.5.4",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",
@@ -168,6 +170,6 @@
 		"fsevents": "~2.3.2"
 	},
 	"engines": {
-		"node": ">=16.7.0"
+		"node": ">=16.13.0"
 	}
 }

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

@@ -0,0 +1,19 @@
+import { unstable_dev } from "../api";
+
+jest.unmock("undici");
+
+describe("unstable_dev", () => {
+	it("should return Hello World", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/hello-world-worker.js",
+			{},
+			{ disableExperimentalWarning: true }
+		);
+		const resp = await worker.fetch();
+		if (resp) {
+			const text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+		await worker.stop();
+	});
+});

package/src/__tests__/configuration.test.ts

@@ -61,7 +61,7 @@ describe("normalizeAndValidateConfig()", () => {
 			unsafe: {
 				bindings: [],
 			},
-			worker_namespaces: [],
+			dispatch_namespaces: [],
 			usage_model: undefined,
 			vars: {},
 			define: {},
@@ -1913,11 +1913,11 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
-		describe("[worker_namespaces]", () => {
-			it("should log an experimental warning when worker_namespaces is used", () => {
+		describe("[dispatch_namespaces]", () => {
+			it("should log an experimental warning when dispatch_namespaces is used", () => {
 				const { config, diagnostics } = normalizeAndValidateConfig(
 					{
-						worker_namespaces: [
+						dispatch_namespaces: [
 							{
 								binding: "BINDING_1",
 								namespace: "NAMESPACE_1",
@@ -1928,44 +1928,44 @@ describe("normalizeAndValidateConfig()", () => {
 					{ env: undefined }
 				);
 				expect(config).toEqual(
-					expect.not.objectContaining({ worker_namespaces: expect.anything })
+					expect.not.objectContaining({ dispatch_namespaces: expect.anything })
 				);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.hasErrors()).toBe(false);
 				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
-			  - \\"worker_namespaces\\" fields are experimental and may change or break at any time."
+			  - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
 		`);
 			});
 
-			it("should error if worker_namespaces is not an array", () => {
+			it("should error if dispatch_namespaces is not an array", () => {
 				const { config, diagnostics } = normalizeAndValidateConfig(
 					{
-						worker_namespaces: "just a string",
+						dispatch_namespaces: "just a string",
 					} as unknown as RawConfig,
 					undefined,
 					{ env: undefined }
 				);
 
 				expect(config).toEqual(
-					expect.not.objectContaining({ worker_namespaces: expect.anything })
+					expect.not.objectContaining({ dispatch_namespaces: expect.anything })
 				);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.hasErrors()).toBe(true);
 				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			          "Processing wrangler configuration:
-			            - \\"worker_namespaces\\" fields are experimental and may change or break at any time."
+			            - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
 		        `);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
-			  - The field \\"worker_namespaces\\" should be an array but got \\"just a string\\"."
+			  - The field \\"dispatch_namespaces\\" should be an array but got \\"just a string\\"."
 		`);
 			});
 
-			it("should error on non valid worker_namespaces", () => {
+			it("should error on non valid dispatch_namespaces", () => {
 				const { config, diagnostics } = normalizeAndValidateConfig(
 					{
-						worker_namespaces: [
+						dispatch_namespaces: [
 							"a string",
 							123,
 							{
@@ -1973,17 +1973,17 @@ describe("normalizeAndValidateConfig()", () => {
 								namespace: 456,
 							},
 							{
-								binding: "WORKER_NAMESPACE_BINDING_1",
+								binding: "DISPATCH_NAMESPACE_BINDING_1",
 								namespace: 456,
 							},
 							// this one is valid
 							{
-								binding: "WORKER_NAMESPACE_BINDING_1",
-								namespace: "WORKER_NAMESPACE_BINDING_NAMESPACE_1",
+								binding: "DISPATCH_NAMESPACE_BINDING_1",
+								namespace: "DISPATCH_NAMESPACE_BINDING_NAMESPACE_1",
 							},
 							{
 								binding: 123,
-								namespace: "WORKER_NAMESPACE_BINDING_SERVICE_1",
+								namespace: "DISPATCH_NAMESPACE_BINDING_SERVICE_1",
 							},
 							{
 								binding: 123,
@@ -1996,25 +1996,25 @@ describe("normalizeAndValidateConfig()", () => {
 				);
 				expect(config).toEqual(
 					expect.not.objectContaining({
-						worker_namespaces: expect.anything,
+						dispatch_namespaces: expect.anything,
 					})
 				);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.hasErrors()).toBe(true);
 				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
-			  - \\"worker_namespaces\\" fields are experimental and may change or break at any time."
+			  - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
 		`);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
-			  - \\"worker_namespaces[0]\\" binding should be objects, but got \\"a string\\"
-			  - \\"worker_namespaces[1]\\" binding should be objects, but got 123
-			  - \\"worker_namespaces[2]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":456}.
-			  - \\"worker_namespaces[2]\\" should have a string \\"namespace\\" field but got {\\"binding\\":123,\\"namespace\\":456}.
-			  - \\"worker_namespaces[3]\\" should have a string \\"namespace\\" field but got {\\"binding\\":\\"WORKER_NAMESPACE_BINDING_1\\",\\"namespace\\":456}.
-			  - \\"worker_namespaces[5]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":\\"WORKER_NAMESPACE_BINDING_SERVICE_1\\"}.
-			  - \\"worker_namespaces[6]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"service\\":456}.
-			  - \\"worker_namespaces[6]\\" should have a string \\"namespace\\" field but got {\\"binding\\":123,\\"service\\":456}."
+			  - \\"dispatch_namespaces[0]\\" binding should be objects, but got \\"a string\\"
+			  - \\"dispatch_namespaces[1]\\" binding should be objects, but got 123
+			  - \\"dispatch_namespaces[2]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":456}.
+			  - \\"dispatch_namespaces[2]\\" should have a string \\"namespace\\" field but got {\\"binding\\":123,\\"namespace\\":456}.
+			  - \\"dispatch_namespaces[3]\\" should have a string \\"namespace\\" field but got {\\"binding\\":\\"DISPATCH_NAMESPACE_BINDING_1\\",\\"namespace\\":456}.
+			  - \\"dispatch_namespaces[5]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":\\"DISPATCH_NAMESPACE_BINDING_SERVICE_1\\"}.
+			  - \\"dispatch_namespaces[6]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"service\\":456}.
+			  - \\"dispatch_namespaces[6]\\" should have a string \\"namespace\\" field but got {\\"binding\\":123,\\"service\\":456}."
 		`);
 			});
 		});

package/src/__tests__/dev.test.tsx

@@ -668,12 +668,12 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				dev: {
-					ip: "0.0.0.0",
+					ip: "1.2.3.4",
 				},
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
+			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("1.2.3.4");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -683,12 +683,12 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				dev: {
-					ip: "1.1.1.1",
+					ip: "1.2.3.4",
 				},
 			});
 			fs.writeFileSync("index.js", `export default {};`);
-			await runWrangler("dev --ip=0.0.0.0");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
+			await runWrangler("dev --ip=5.6.7.8");
+			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("5.6.7.8");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -1005,7 +1005,7 @@ describe("wrangler dev", () => {
 			      --compatibility-date                         Date to use for compatibility checks  [string]
 			      --compatibility-flags, --compatibility-flag  Flags to use for compatibility checks  [array]
 			      --latest                                     Use the latest version of the worker runtime  [boolean] [default: true]
-			      --ip                                         IP address to listen on  [string] [default: \\"0.0.0.0\\"]
+			      --ip                                         IP address to listen on  [string]
 			      --port                                       Port to listen on  [number]
 			      --inspector-port                             Port for devtools to connect to  [number]
 			      --routes, --route                            Routes to upload  [array]
@@ -1017,6 +1017,8 @@ describe("wrangler dev", () => {
 			      --site-include                               Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.  [array]
 			      --site-exclude                               Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.  [array]
 			      --upstream-protocol                          Protocol to forward requests to host on, defaults to https.  [choices: \\"http\\", \\"https\\"]
+			      --var                                        A key-value pair to be injected into the script as a variable  [array]
+			      --define                                     A key-value pair to be substituted in the script  [array]
 			      --jsx-factory                                The function that is called for each JSX element  [string]
 			      --jsx-fragment                               The function that is called for each JSX fragment  [string]
 			      --tsconfig                                   Path to a custom tsconfig.json file  [string]

package/src/__tests__/helpers/hello-world-worker.js

@@ -0,0 +1,5 @@
+export default {
+	async fetch() {
+		return new Response("Hello World!");
+	},
+};

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

@@ -270,9 +270,7 @@ export function unsetSpecialMockFns() {
  */
 export async function mockFetchDashScript(resource: string): Promise<string> {
 	if (dashScriptMocks.has(resource)) {
-		const value = dashScriptMocks.get(resource) ?? "";
-
-		return value;
+		return dashScriptMocks.get(resource) ?? "";
 	}
 	throw new Error(`no mock found for \`init from-dash\` - ${resource}`);
 }
@@ -283,14 +281,16 @@ export async function mockFetchDashScript(resource: string): Promise<string> {
 export function setMockFetchDashScript({
 	accountId,
 	fromDashScriptName,
+	environment,
 	mockResponse,
 }: {
 	accountId: string;
 	fromDashScriptName: string;
+	environment: string;
 	mockResponse?: string;
 }) {
 	dashScriptMocks.set(
-		`/accounts/${accountId}/workers/scripts/${fromDashScriptName}`,
+		`/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${environment}/content`,
 		mockResponse
 	);
 }

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

@@ -29,7 +29,9 @@ const std = {
 function normalizeOutput(spy: jest.SpyInstance): string {
 	return normalizeErrorMarkers(
 		replaceByte(
-			stripTrailingWhitespace(normalizeSlashes(stripTimings(captureCalls(spy))))
+			stripTrailingWhitespace(
+				normalizeSlashes(normalizeTempDirs(stripTimings(captureCalls(spy))))
+			)
 		)
 	);
 }
@@ -93,5 +95,12 @@ export function stripTrailingWhitespace(str: string): string {
  * variation causing every few tests the value to change by ± .01
  */
 function replaceByte(stdout: string): string {
-	return stdout.replaceAll(/.[0-9][0-9] KiB/g, "xx KiB");
+	return stdout.replaceAll(/\d+\.\d+ KiB/g, "xx KiB");
+}
+
+/**
+ * Temp directories are created with random names, so we replace all comments temp dirs in them
+ */
+export function normalizeTempDirs(stdout: string): string {
+	return stdout.replaceAll(/\/\/.+\/tmp.+/g, "//tmpdir");
 }

package/src/__tests__/helpers/mock-get-zone-from-host.ts

@@ -0,0 +1,8 @@
+import { setMockResponse } from "./mock-cfetch";
+
+export function mockGetZoneFromHostRequest(host: string, zone?: string) {
+	setMockResponse("/zones", (_uri, _init, queryParams) => {
+		expect(queryParams.get("name")).toEqual(host);
+		return zone ? [{ id: zone }] : [];
+	});
+}

package/src/__tests__/helpers/mock-known-routes.ts

@@ -0,0 +1,7 @@
+import { setMockResponse } from "./mock-cfetch";
+
+export function mockCollectKnownRoutesRequest(
+	routes: { pattern: string; script: string }[]
+) {
+	setMockResponse(`/zones/:zoneId/workers/routes`, "GET", () => routes);
+}

package/src/__tests__/index.test.ts

@@ -31,21 +31,21 @@ describe("wrangler", () => {
 			"wrangler
 
 			Commands:
-			  wrangler init [name]       📥 Create a wrangler.toml configuration file
-			  wrangler dev [script]      👂 Start a local server for developing your worker
-			  wrangler publish [script]  🆙 Publish your Worker to Cloudflare.
-			  wrangler tail [name]       🦚 Starts a log tailing session for a published Worker.
-			  wrangler secret            🤫 Generate a secret that can be referenced in a Worker
-			  wrangler kv:namespace      🗂️  Interact with your Workers KV Namespaces
-			  wrangler kv:key            🔑 Individually manage Workers KV key-value pairs
-			  wrangler kv:bulk           💪 Interact with multiple Workers KV key-value pairs at once
-			  wrangler pages             ⚡️ Configure Cloudflare Pages
-			  wrangler r2                📦 Interact with an R2 store
-			  wrangler worker-namespace  📦 Interact with a worker namespace
-			  wrangler pubsub            📮 Interact and manage Pub/Sub Brokers
-			  wrangler login             🔓 Login to Cloudflare
-			  wrangler logout            🚪 Logout from Cloudflare
-			  wrangler whoami            🕵️  Retrieve your user info and test your auth config
+			  wrangler init [name]         📥 Create a wrangler.toml configuration file
+			  wrangler dev [script]        👂 Start a local server for developing your worker
+			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
+			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
+			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
+			  wrangler kv:namespace        🗂️  Interact with your Workers KV Namespaces
+			  wrangler kv:key              🔑 Individually manage Workers KV key-value pairs
+			  wrangler kv:bulk             💪 Interact with multiple Workers KV key-value pairs at once
+			  wrangler pages               ⚡️ Configure Cloudflare Pages
+			  wrangler r2                  📦 Interact with an R2 store
+			  wrangler dispatch-namespace  📦 Interact with a dispatch namespace
+			  wrangler pubsub              📮 Interact and manage Pub/Sub Brokers
+			  wrangler login               🔓 Login to Cloudflare
+			  wrangler logout              🚪 Logout from Cloudflare
+			  wrangler whoami              🕵️  Retrieve your user info and test your auth config
 
 			Flags:
 			  -c, --config   Path to .toml configuration file  [string]
@@ -70,21 +70,21 @@ describe("wrangler", () => {
 			wrangler
 
 			Commands:
-			  wrangler init [name]       📥 Create a wrangler.toml configuration file
-			  wrangler dev [script]      👂 Start a local server for developing your worker
-			  wrangler publish [script]  🆙 Publish your Worker to Cloudflare.
-			  wrangler tail [name]       🦚 Starts a log tailing session for a published Worker.
-			  wrangler secret            🤫 Generate a secret that can be referenced in a Worker
-			  wrangler kv:namespace      🗂️  Interact with your Workers KV Namespaces
-			  wrangler kv:key            🔑 Individually manage Workers KV key-value pairs
-			  wrangler kv:bulk           💪 Interact with multiple Workers KV key-value pairs at once
-			  wrangler pages             ⚡️ Configure Cloudflare Pages
-			  wrangler r2                📦 Interact with an R2 store
-			  wrangler worker-namespace  📦 Interact with a worker namespace
-			  wrangler pubsub            📮 Interact and manage Pub/Sub Brokers
-			  wrangler login             🔓 Login to Cloudflare
-			  wrangler logout            🚪 Logout from Cloudflare
-			  wrangler whoami            🕵️  Retrieve your user info and test your auth config
+			  wrangler init [name]         📥 Create a wrangler.toml configuration file
+			  wrangler dev [script]        👂 Start a local server for developing your worker
+			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
+			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
+			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
+			  wrangler kv:namespace        🗂️  Interact with your Workers KV Namespaces
+			  wrangler kv:key              🔑 Individually manage Workers KV key-value pairs
+			  wrangler kv:bulk             💪 Interact with multiple Workers KV key-value pairs at once
+			  wrangler pages               ⚡️ Configure Cloudflare Pages
+			  wrangler r2                  📦 Interact with an R2 store
+			  wrangler dispatch-namespace  📦 Interact with a dispatch namespace
+			  wrangler pubsub              📮 Interact and manage Pub/Sub Brokers
+			  wrangler login               🔓 Login to Cloudflare
+			  wrangler logout              🚪 Logout from Cloudflare
+			  wrangler whoami              🕵️  Retrieve your user info and test your auth config
 
 			Flags:
 			  -c, --config   Path to .toml configuration file  [string]
@@ -227,16 +227,16 @@ describe("wrangler", () => {
 		await runWrangler("build");
 		await endEventLoop();
 		expect(std.out).toMatchInlineSnapshot(`
-		      "▲ [WARNING] Deprecation: \`wrangler build\` has been deprecated.
+		"▲ [WARNING] Deprecation: \`wrangler build\` has been deprecated.
 
-		        Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build
-		        for more information.
-		        Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
+		  Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build
+		  for more information.
+		  Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
 
 
-		      --dry-run: exiting now.
-		      Total Upload: 0xx KiB / gzip: 0xx KiB"
-	    `);
+		Total Upload: xx KiB / gzip: xx KiB
+		--dry-run: exiting now."
+	`);
 	});
 });