wrangler 2.0.23 → 2.0.26

package/src/__tests__/configuration.test.ts

@@ -26,7 +26,7 @@ describe("normalizeAndValidateConfig()", () => {
 			compatibility_flags: [],
 			configPath: undefined,
 			dev: {
-				ip: "localhost",
+				ip: "0.0.0.0",
 				local_protocol: "http",
 				port: undefined, // the default of 8787 is set at runtime
 				upstream_protocol: "https",
@@ -40,6 +40,10 @@ describe("normalizeAndValidateConfig()", () => {
 			tsconfig: undefined,
 			kv_namespaces: [],
 			legacy_env: true,
+			logfwdr: {
+				bindings: [],
+				schema: undefined,
+			},
 			send_metrics: undefined,
 			main: undefined,
 			migrations: [],
@@ -68,6 +72,7 @@ describe("normalizeAndValidateConfig()", () => {
 			no_bundle: undefined,
 			minify: undefined,
 			node_compat: undefined,
+			first_party_worker: undefined,
 		});
 		expect(diagnostics.hasErrors()).toBe(false);
 		expect(diagnostics.hasWarnings()).toBe(false);
@@ -463,6 +468,56 @@ describe("normalizeAndValidateConfig()", () => {
 		});
 
 		describe("[assets]", () => {
+			it("normalizes a string input to an object", () => {
+				const { config, diagnostics } = normalizeAndValidateConfig(
+					{
+						assets: "path/to/assets",
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(config.assets).toMatchInlineSnapshot(`
+			Object {
+			  "browser_TTL": undefined,
+			  "bucket": "path/to/assets",
+			  "exclude": Array [],
+			  "include": Array [],
+			  "serve_single_page_app": false,
+			}
+		`);
+				expect(diagnostics.hasWarnings()).toBe(true);
+				expect(diagnostics.hasErrors()).toBe(false);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - \\"assets\\" fields are experimental and may change or break at any time."
+		`);
+			});
+
+			it("errors when input is not a string or object", () => {
+				const { config, diagnostics } = normalizeAndValidateConfig(
+					{
+						assets: 123,
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(config.assets).toBeUndefined();
+				expect(diagnostics.hasWarnings()).toBe(true);
+				expect(diagnostics.hasErrors()).toBe(true);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - \\"assets\\" fields are experimental and may change or break at any time."
+		`);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - Expected the \`assets\` field to be a string or an object, but got number."
+		`);
+			});
+
 			it("should error if `assets` config is missing `bucket`", () => {
 				const expectedConfig: RawConfig = {
 					// @ts-expect-error we're intentionally passing an invalid configuration here
@@ -478,7 +533,9 @@ describe("normalizeAndValidateConfig()", () => {
 					{ env: undefined }
 				);
 
-				expect(config).toEqual(expect.objectContaining(expectedConfig));
+				expect(config.assets).toEqual(
+					expect.objectContaining(expectedConfig.assets)
+				);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.hasErrors()).toBe(true);
 
@@ -498,6 +555,8 @@ describe("normalizeAndValidateConfig()", () => {
 						bucket: "BUCKET",
 						include: [222, 333],
 						exclude: [444, 555],
+						browser_TTL: "not valid",
+						serve_single_page_app: "INVALID",
 					},
 				};
 
@@ -514,12 +573,14 @@ describe("normalizeAndValidateConfig()", () => {
 			            - \\"assets\\" fields are experimental and may change or break at any time."
 		        `);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-			          "Processing wrangler configuration:
-			            - Expected \\"assets.include.[0]\\" to be of type string but got 222.
-			            - Expected \\"assets.include.[1]\\" to be of type string but got 333.
-			            - Expected \\"assets.exclude.[0]\\" to be of type string but got 444.
-			            - Expected \\"assets.exclude.[1]\\" to be of type string but got 555."
-		        `);
+			"Processing wrangler configuration:
+			  - Expected \\"assets.include.[0]\\" to be of type string but got 222.
+			  - Expected \\"assets.include.[1]\\" to be of type string but got 333.
+			  - Expected \\"assets.exclude.[0]\\" to be of type string but got 444.
+			  - Expected \\"assets.exclude.[1]\\" to be of type string but got 555.
+			  - Expected \\"assets.browser_TTL\\" to be of type number but got \\"not valid\\".
+			  - Expected \\"assets.serve_single_page_app\\" to be of type boolean but got \\"INVALID\\"."
+		`);
 			});
 		});
 
@@ -858,6 +919,7 @@ describe("normalizeAndValidateConfig()", () => {
 				no_bundle: true,
 				minify: true,
 				node_compat: true,
+				first_party_worker: true,
 			};
 
 			const { config, diagnostics } = normalizeAndValidateConfig(
@@ -931,6 +993,7 @@ describe("normalizeAndValidateConfig()", () => {
 				no_bundle: "INVALID",
 				minify: "INVALID",
 				node_compat: "INVALID",
+				first_party_worker: "INVALID",
 			} as unknown as RawEnvironment;
 
 			const { config, diagnostics } = normalizeAndValidateConfig(
@@ -997,7 +1060,8 @@ describe("normalizeAndValidateConfig()", () => {
 			  - The field \\"define.DEF1\\" should be a string but got 1777.
 			  - Expected \\"no_bundle\\" to be of type boolean but got \\"INVALID\\".
 			  - Expected \\"minify\\" to be of type boolean but got \\"INVALID\\".
-			  - Expected \\"node_compat\\" to be of type boolean but got \\"INVALID\\"."
+			  - Expected \\"node_compat\\" to be of type boolean but got \\"INVALID\\".
+			  - Expected \\"first_party_worker\\" to be of type boolean but got \\"INVALID\\"."
 		`);
 		});
 
@@ -2311,6 +2375,7 @@ describe("normalizeAndValidateConfig()", () => {
 				no_bundle: true,
 				minify: true,
 				node_compat: true,
+				first_party_worker: true,
 			};
 
 			const { config, diagnostics } = normalizeAndValidateConfig(
@@ -2354,6 +2419,7 @@ describe("normalizeAndValidateConfig()", () => {
 				no_bundle: false,
 				minify: false,
 				node_compat: false,
+				first_party_worker: false,
 			};
 			const rawConfig: RawConfig = {
 				name: "mock-name",
@@ -2376,6 +2442,7 @@ describe("normalizeAndValidateConfig()", () => {
 				no_bundle: true,
 				minify: true,
 				node_compat: true,
+				first_party_worker: true,
 				env: {
 					ENV1: rawEnv,
 				},
@@ -2637,6 +2704,7 @@ describe("normalizeAndValidateConfig()", () => {
 				no_bundle: "INVALID",
 				minify: "INVALID",
 				node_compat: "INVALID",
+				first_party_worker: "INVALID",
 			} as unknown as RawEnvironment;
 
 			const { config, diagnostics } = normalizeAndValidateConfig(
@@ -2672,7 +2740,8 @@ describe("normalizeAndValidateConfig()", () => {
 			    - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\".
 			    - Expected \\"no_bundle\\" to be of type boolean but got \\"INVALID\\".
 			    - Expected \\"minify\\" to be of type boolean but got \\"INVALID\\".
-			    - Expected \\"node_compat\\" to be of type boolean but got \\"INVALID\\"."
+			    - Expected \\"node_compat\\" to be of type boolean but got \\"INVALID\\".
+			    - Expected \\"first_party_worker\\" to be of type boolean but got \\"INVALID\\"."
 		`);
 		});
 
@@ -3670,6 +3739,7 @@ describe("normalizeAndValidateConfig()", () => {
 			it("should remove and warn about deprecated properties", () => {
 				const environment: RawEnvironment = {
 					zone_id: "ZONE_ID",
+					"kv-namespaces": "BAD_KV_NAMESPACE",
 					experimental_services: [
 						{
 							name: "mock-name",
@@ -3695,14 +3765,16 @@ describe("normalizeAndValidateConfig()", () => {
 				expect(diagnostics.hasErrors()).toBe(false);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-			          "Processing wrangler configuration:
+			"Processing wrangler configuration:
 
-			            - \\"env.ENV1\\" environment configuration
-			              - Deprecation: \\"zone_id\\":
-			                This is unnecessary since we can deduce this from routes directly.
-			              - Deprecation: \\"experimental_services\\":
-			                The \\"experimental_services\\" field is no longer supported. Simply rename the [experimental_services] field to [services]."
-		        `);
+			  - \\"env.ENV1\\" environment configuration
+			    - Deprecation: \\"kv-namespaces\\":
+			      The \\"kv-namespaces\\" field is no longer supported, please rename to \\"kv_namespaces\\"
+			    - Deprecation: \\"zone_id\\":
+			      This is unnecessary since we can deduce this from routes directly.
+			    - Deprecation: \\"experimental_services\\":
+			      The \\"experimental_services\\" field is no longer supported. Simply rename the [experimental_services] field to [services]."
+		`);
 			});
 		});
 

package/src/__tests__/dev.test.tsx

@@ -68,6 +68,28 @@ describe("wrangler dev", () => {
 		});
 	});
 
+	describe("usage-model", () => {
+		it("should read wrangler.toml's usage_model", async () => {
+			writeWranglerToml({
+				main: "index.js",
+				usage_model: "unbound",
+			});
+			fs.writeFileSync("index.js", `export default {};`);
+			await runWrangler("dev");
+			expect((Dev as jest.Mock).mock.calls[0][0].usageModel).toEqual("unbound");
+		});
+
+		it("should read wrangler.toml's usage_model in local mode", async () => {
+			writeWranglerToml({
+				main: "index.js",
+				usage_model: "unbound",
+			});
+			fs.writeFileSync("index.js", `export default {};`);
+			await runWrangler("dev --local");
+			expect((Dev as jest.Mock).mock.calls[0][0].usageModel).toEqual("unbound");
+		});
+	});
+
 	describe("entry-points", () => {
 		it("should error if there is no entry-point specified", async () => {
 			writeWranglerToml();
@@ -630,13 +652,13 @@ describe("wrangler dev", () => {
 	});
 
 	describe("ip", () => {
-		it("should default ip to localhost", async () => {
+		it("should default ip to 0.0.0.0", async () => {
 			writeWranglerToml({
 				main: "index.js",
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("localhost");
+			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -849,7 +871,7 @@ describe("wrangler dev", () => {
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("localhost");
+			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
 			expect(std.out).toMatchInlineSnapshot(`
 			        "Your worker has access to the following bindings:
 			        - Durable Objects:
@@ -983,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, defaults to \`localhost\`  [string]
+			      --ip                                         IP address to listen on  [string] [default: \\"0.0.0.0\\"]
 			      --port                                       Port to listen on  [number]
 			      --inspector-port                             Port for devtools to connect to  [number]
 			      --routes, --route                            Routes to upload  [array]
@@ -1038,6 +1060,7 @@ describe("wrangler dev", () => {
 		it("should error if config.assets and --site are used together", async () => {
 			writeWranglerToml({
 				main: "./index.js",
+				// @ts-expect-error we allow string inputs here
 				assets: "abc",
 			});
 			fs.writeFileSync("index.js", `export default {};`);
@@ -1051,6 +1074,7 @@ describe("wrangler dev", () => {
 		it("should error if config.assets and config.site are used together", async () => {
 			writeWranglerToml({
 				main: "./index.js",
+				// @ts-expect-error we allow string inputs here
 				assets: "abc",
 				site: {
 					bucket: "xyz",
@@ -1102,6 +1126,7 @@ describe("wrangler dev", () => {
 		it("should warn if config.assets is used", async () => {
 			writeWranglerToml({
 				main: "./index.js",
+				// @ts-expect-error we allow string inputs here
 				assets: "./assets",
 			});
 			fs.writeFileSync("index.js", `export default {};`);

package/src/__tests__/generate.test.ts

@@ -0,0 +1,93 @@
+import fs from "node:fs";
+import path from "node:path";
+import process from "node:process";
+import { setup } from "create-cloudflare";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { mockConfirm, clearConfirmMocks } from "./helpers/mock-dialogs";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+const createCloudflareMock = setup as jest.Mock;
+
+describe("generate", () => {
+	runInTempDir();
+	const std = mockConsoleMethods();
+
+	afterEach(() => {
+		clearConfirmMocks();
+	});
+
+	it("defers to `wrangler init` when no template is given", async () => {
+		mockConfirm(
+			{
+				text: "Would you like to use git to manage this Worker?",
+				result: false,
+			},
+			{
+				text: "No package.json found. Would you like to create one?",
+				result: false,
+			}
+		);
+		await runWrangler("generate no-template");
+		expect(std.out).toMatchInlineSnapshot(
+			`"✨ Created no-template/wrangler.toml"`
+		);
+	});
+
+	it("runs `create-cloudflare` when a template is given", async () => {
+		await expect(
+			runWrangler("generate my-worker some-template")
+		).resolves.toBeUndefined();
+
+		expect(createCloudflareMock).toBeCalled();
+	});
+
+	it("complains when given the --type argument", async () => {
+		await expect(
+			runWrangler("generate worker-name worker-template --type rust")
+		).rejects.toThrowErrorMatchingInlineSnapshot(
+			`"The --type option is no longer supported."`
+		);
+	});
+
+	it("complains when given the --site argument", async () => {
+		await expect(runWrangler("generate worker-name worker-template --site"))
+			.rejects.toThrowErrorMatchingInlineSnapshot(`
+					"The --site option is no longer supported.
+					If you wish to create a brand new Worker Sites project then clone the \`worker-sites-template\` starter repository:
+
+					\`\`\`
+					git clone --depth=1 --branch=wrangler2 https://github.com/cloudflare/worker-sites-template worker-name
+					cd worker-name
+					\`\`\`
+
+					Find out more about how to create and maintain Sites projects at https://developers.cloudflare.com/workers/platform/sites.
+					Have you considered using Cloudflare Pages instead? See https://pages.cloudflare.com/."
+				`);
+	});
+
+	it("auto-increments the worker directory name", async () => {
+		fs.mkdirSync("my-worker");
+		await expect(
+			runWrangler("generate my-worker some-template")
+		).resolves.toBeUndefined();
+
+		expect(createCloudflareMock).lastCalledWith(
+			path.resolve(process.cwd(), "my-worker-1"),
+			"some-template",
+			{ debug: false, force: false, init: true }
+		);
+
+		fs.mkdirSync("my-worker-1");
+
+		await expect(
+			runWrangler("generate my-worker some-template")
+		).resolves.toBeUndefined();
+
+		expect(createCloudflareMock).lastCalledWith(
+			path.resolve(process.cwd(), "my-worker-2"),
+			"some-template",
+			{ debug: false, force: false, init: true }
+		);
+	});
+});

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

@@ -1,8 +1,10 @@
+import { Readable } from "node:stream";
 import { URL, URLSearchParams } from "node:url";
 import { pathToRegexp } from "path-to-regexp";
+import { Response } from "undici";
 import { getCloudflareApiBaseUrl } from "../../cfetch";
 import type { FetchResult, FetchError } from "../../cfetch";
-import type { RequestInit } from "undici";
+import type { RequestInit, BodyInit, HeadersInit } from "undici";
 
 /**
  * The signature of the function that will handle a mock request.
@@ -180,6 +182,8 @@ export function unsetAllMocks() {
  */
 
 const kvGetMocks = new Map<string, string | Buffer>();
+const r2GetMocks = new Map<string, string | undefined>();
+const dashScriptMocks = new Map<string, string | undefined>();
 
 /**
  * @mocked typeof fetchKVGetValue
@@ -206,6 +210,87 @@ export function setMockFetchKVGetValue(
 	kvGetMocks.set(`${accountId}/${namespaceId}/${key}`, value);
 }
 
-export function unsetMockFetchKVGetValues() {
+/**
+ * @mocked typeof fetchR2Objects
+ */
+export async function mockFetchR2Objects(
+	resource: string,
+	bodyInit: {
+		body: BodyInit | Readable;
+		headers: HeadersInit | undefined;
+		method: "PUT" | "GET" | "DELETE";
+	}
+): Promise<Response> {
+	/**
+	 * Here we destroy & removeListeners to "drain" the stream, for testing purposes
+	 * mimicking the fetch request taking in the stream and draining it.
+	 */
+	if (bodyInit.body instanceof Readable) {
+		bodyInit.body.destroy();
+		bodyInit.body.removeAllListeners();
+	}
+
+	if (r2GetMocks.has(resource)) {
+		const value = r2GetMocks.get(resource);
+
+		return new Response(value);
+	}
+	throw new Error(`no mock found for \`r2 object\` - ${resource}`);
+}
+
+/**
+ * Mock setter for usage within test blocks, companion helper to `mockFetchR2Objects`
+ */
+export function setMockFetchR2Objects({
+	accountId,
+	bucketName,
+	objectName,
+	mockResponse,
+}: {
+	accountId: string;
+	bucketName: string;
+	objectName: string;
+	mockResponse?: string;
+}) {
+	r2GetMocks.set(
+		`/accounts/${accountId}/r2/buckets/${bucketName}/objects/${objectName}`,
+		mockResponse
+	);
+}
+
+export function unsetSpecialMockFns() {
 	kvGetMocks.clear();
+	r2GetMocks.clear();
+	dashScriptMocks.clear();
+}
+
+/**
+ * @mocked typeof fetchDashScript
+ * multipart/form-data is the response for modules and raw text for the Script endpoint.
+ */
+export async function mockFetchDashScript(resource: string): Promise<string> {
+	if (dashScriptMocks.has(resource)) {
+		const value = dashScriptMocks.get(resource) ?? "";
+
+		return value;
+	}
+	throw new Error(`no mock found for \`init from-dash\` - ${resource}`);
+}
+
+/**
+ * Mock setter for usage within test blocks, companion helper to `mockFetchDashScript`
+ */
+export function setMockFetchDashScript({
+	accountId,
+	fromDashScriptName,
+	mockResponse,
+}: {
+	accountId: string;
+	fromDashScriptName: string;
+	mockResponse?: string;
+}) {
+	dashScriptMocks.set(
+		`/accounts/${accountId}/workers/scripts/${fromDashScriptName}`,
+		mockResponse
+	);
 }

package/src/__tests__/index.test.ts

@@ -203,36 +203,19 @@ describe("wrangler", () => {
 			await runWrangler("r2");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-			        "wrangler r2
+			"wrangler r2
 
-			        📦 Interact with an R2 store
+			📦 Interact with an R2 store
 
-			        Commands:
-			          wrangler r2 bucket  Manage R2 buckets
-
-			        Flags:
-			          -c, --config   Path to .toml configuration file  [string]
-			          -h, --help     Show help  [boolean]
-			          -v, --version  Show version number  [boolean]"
-		      `);
-		});
-	});
+			Commands:
+			  wrangler r2 object  Manage R2 objects
+			  wrangler r2 bucket  Manage R2 buckets
 
-	describe("Deprecated commands", () => {
-		it("should print a deprecation message for 'generate'", async () => {
-			await runWrangler("generate").catch((err) => {
-				expect(err.message).toMatchInlineSnapshot(`
-			          "Deprecation:
-			          \`wrangler generate\` has been deprecated.
-			          Try running \`wrangler init\` to generate a basic Worker, or cloning the template repository instead:
-
-			          \`\`\`
-			          git clone https://github.com/cloudflare/worker-template
-			          \`\`\`
-
-			          Please refer to https://developers.cloudflare.com/workers/wrangler/deprecations/#generate for more information."
-		        `);
-			});
+			Flags:
+			  -c, --config   Path to .toml configuration file  [string]
+			  -h, --help     Show help  [boolean]
+			  -v, --version  Show version number  [boolean]"
+		`);
 		});
 	});