wrangler 2.0.29 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.0.29",
+	"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.7.1",
+		"miniflare": "^2.8.1",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",

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__/index.test.ts

@@ -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."
+	`);
 	});
 });
 

package/src/__tests__/init.test.ts

@@ -6,7 +6,12 @@ import { parseConfigFileTextToJson } from "typescript";
 import { version as wranglerVersion } from "../../package.json";
 import { getPackageManager } from "../package-manager";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { setMockFetchDashScript, unsetAllMocks } from "./helpers/mock-cfetch";
+import {
+	setMockFetchDashScript,
+	setMockResponse,
+	unsetAllMocks,
+	unsetSpecialMockFns,
+} from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import {
 	mockConfirm,
@@ -1908,6 +1913,7 @@ describe("init", () => {
 		mockAccountId({ accountId: "LCARS" });
 		afterEach(() => {
 			unsetAllMocks();
+			unsetSpecialMockFns();
 		});
 		const mockDashboardScript = `
 		export default {
@@ -1916,12 +1922,305 @@ describe("init", () => {
 			},
 		};
 		`;
+		const mockServiceMetadata = {
+			id: "memory-crystal",
+			default_environment: {
+				environment: "test",
+				created_on: "1987-9-27",
+				modified_on: "1987-9-27",
+				script: {
+					id: "memory-crystal",
+					tag: "test-tag",
+					etag: "some-etag",
+					handlers: [],
+					modified_on: "1987-9-27",
+					created_on: "1987-9-27",
+					migration_tag: "some-migration-tag",
+					usage_model: "bundled",
+					compatibility_date: "1987-9-27",
+				},
+			},
+			created_on: "1987-9-27",
+			modified_on: "1987-9-27",
+			usage_model: "bundled",
+			environments: [
+				{
+					environment: "test",
+					created_on: "1987-9-27",
+					modified_on: "1987-9-27",
+				},
+				{
+					environment: "staging",
+					created_on: "1987-9-27",
+					modified_on: "1987-9-27",
+				},
+			],
+		};
+		const mockBindingsRes = [
+			{
+				type: "secret_text",
+				name: "ABC",
+			},
+			{
+				type: "plain_text",
+				name: "ANOTHER",
+				text: "thing",
+			},
+			{
+				type: "durable_object_namespace",
+				name: "DURABLE_TEST",
+				class_name: "Durability",
+				script_name: "another-durable-object-worker",
+				environment: "production",
+			},
+			{
+				type: "kv_namespace",
+				name: "kv_testing",
+				namespace_id: "some-namespace-id",
+			},
+			{
+				type: "r2_bucket",
+				bucket_name: "test-bucket",
+				name: "test-bucket",
+			},
+			{
+				environment: "production",
+				name: "website",
+				service: "website",
+				type: "service",
+			},
+			{
+				type: "namespace",
+				name: "name-namespace-mock",
+				namespace: "namespace-mock",
+			},
+			{
+				name: "httplogs",
+				type: "logfwdr",
+				destination: "httplogs",
+			},
+			{
+				name: "trace",
+				type: "logfwdr",
+				destination: "trace",
+			},
+			{
+				type: "wasm_module",
+				name: "WASM_MODULE_ONE",
+				part: "./some_wasm.wasm",
+			},
+			{
+				type: "wasm_module",
+				name: "WASM_MODULE_TWO",
+				part: "./more_wasm.wasm",
+			},
+			{
+				type: "text_blob",
+				name: "TEXT_BLOB_ONE",
+				part: "./my-entire-app-depends-on-this.cfg",
+			},
+			{
+				type: "text_blob",
+				name: "TEXT_BLOB_TWO",
+				part: "./the-entirety-of-human-knowledge.txt",
+			},
+			{ type: "data_blob", name: "DATA_BLOB_ONE", part: "DATA_BLOB_ONE" },
+			{ type: "data_blob", name: "DATA_BLOB_TWO", part: "DATA_BLOB_TWO" },
+			{
+				type: "some unsafe thing",
+				name: "UNSAFE_BINDING_ONE",
+				data: { some: { unsafe: "thing" } },
+			},
+			{
+				type: "another unsafe thing",
+				name: "UNSAFE_BINDING_TWO",
+				data: 1337,
+			},
+		];
+		const mockRoutesRes = [
+			{
+				id: "some-route-id",
+				pattern: "delta.quadrant",
+			},
+		];
+		const mockConfigExpected = {
+			main: "src/index.ts",
+			compatibility_date: "1987-9-27",
+			name: "isolinear-optical-chip",
+			migrations: [
+				{
+					new_classes: ["Durability"],
+					tag: "some-migration-tag",
+				},
+			],
+			durable_objects: {
+				bindings: [
+					{
+						class_name: "Durability",
+						name: "DURABLE_TEST",
+						script_name: "another-durable-object-worker",
+						environment: "production",
+					},
+				],
+			},
+			kv_namespaces: [
+				{
+					binding: "kv_testing",
+					id: "some-namespace-id",
+				},
+			],
+			r2_buckets: [
+				{
+					bucket_name: "test-bucket",
+					binding: "test-bucket",
+				},
+			],
+			dispatch_namespaces: [
+				{
+					binding: "name-namespace-mock",
+					namespace: "namespace-mock",
+				},
+			],
+			route: "delta.quadrant",
+			services: [
+				{
+					environment: "production",
+					binding: "website",
+					service: "website",
+				},
+			],
+			triggers: {
+				crons: ["0 0 0 * * *"],
+			},
+			usage_model: "bundled",
+			vars: {
+				name: "ANOTHER",
+				text: "thing",
+			},
+			env: {
+				test: {},
+				staging: {},
+			},
+			unsafe: {
+				bindings: [
+					{
+						name: "UNSAFE_BINDING_ONE",
+						type: "some unsafe thing",
+						data: { some: { unsafe: "thing" } },
+					},
+					{
+						name: "UNSAFE_BINDING_TWO",
+						type: "another unsafe thing",
+						data: 1337,
+					},
+				],
+			},
+			wasm_modules: {
+				WASM_MODULE_ONE: "./some_wasm.wasm",
+				WASM_MODULE_TWO: "./more_wasm.wasm",
+			},
+			text_blobs: {
+				TEXT_BLOB_ONE: "./my-entire-app-depends-on-this.cfg",
+				TEXT_BLOB_TWO: "./the-entirety-of-human-knowledge.txt",
+			},
+			data_blobs: {
+				DATA_BLOB_ONE: "DATA_BLOB_ONE",
+				DATA_BLOB_TWO: "DATA_BLOB_TWO",
+			},
+			logfwdr: {
+				schema: "",
+				bindings: [
+					{
+						name: "httplogs",
+						destination: "httplogs",
+					},
+					{
+						name: "trace",
+						destination: "trace",
+					},
+				],
+			},
+		};
+
+		function mockSupportingDashRequests({
+			expectedAccountId = "",
+			expectedScriptName = "",
+			expectedEnvironment = "",
+		}) {
+			setMockResponse(
+				`/accounts/:accountId/workers/services/:scriptName`,
+				"GET",
+				([_url, accountId, scriptName]) => {
+					expect(accountId).toEqual(expectedAccountId);
+					expect(scriptName).toEqual(expectedScriptName);
+
+					return mockServiceMetadata;
+				}
+			);
+			setMockResponse(
+				`/accounts/:accountId/workers/services/:scriptName/environments/:environment/bindings`,
+				"GET",
+				([_url, accountId, scriptName, environment]) => {
+					expect(accountId).toEqual(expectedAccountId);
+					expect(scriptName).toEqual(expectedScriptName);
+					expect(environment).toEqual(expectedEnvironment);
+
+					return mockBindingsRes;
+				}
+			);
+			setMockResponse(
+				`/accounts/:accountId/workers/services/:scriptName/environments/:environment/routes`,
+				"GET",
+				([_url, accountId, scriptName, environment]) => {
+					expect(accountId).toEqual(expectedAccountId);
+					expect(scriptName).toEqual(expectedScriptName);
+					expect(environment).toEqual(expectedEnvironment);
+
+					return mockRoutesRes;
+				}
+			);
+			setMockResponse(
+				`/accounts/:accountId/workers/services/:scriptName/environments/:environment`,
+				"GET",
+				([_url, accountId, scriptName, environment]) => {
+					expect(accountId).toEqual(expectedAccountId);
+					expect(scriptName).toEqual(expectedScriptName);
+					expect(environment).toEqual(expectedEnvironment);
+
+					return mockServiceMetadata.default_environment;
+				}
+			);
+			setMockResponse(
+				`/accounts/:accountId/workers/scripts/:scriptName/schedules`,
+				"GET",
+				([_url, accountId, scriptName]) => {
+					expect(accountId).toEqual(expectedAccountId);
+					expect(scriptName).toEqual(expectedScriptName);
+
+					return {
+						schedules: [
+							{
+								cron: "0 0 0 * * *",
+								created_on: new Date(1987, 9, 27),
+								modified_on: new Date(1987, 9, 27),
+							},
+						],
+					};
+				}
+			);
+		}
 
 		//TODO: Tests for a case when a worker name doesn't exist - JACOB & CASS
 		it("should download source script from dashboard w/ positional <name> in TypeScript project", async () => {
+			mockSupportingDashRequests({
+				expectedAccountId: "LCARS",
+				expectedScriptName: "memory-crystal",
+				expectedEnvironment: "test",
+			});
 			setMockFetchDashScript({
 				accountId: "LCARS",
 				fromDashScriptName: "memory-crystal",
+				environment: mockServiceMetadata.default_environment.environment,
 				mockResponse: mockDashboardScript,
 			});
 			mockConfirm(
@@ -1960,17 +2259,22 @@ describe("init", () => {
 					},
 					"isolinear-optical-chip/tsconfig.json": true,
 					"isolinear-optical-chip/wrangler.toml": wranglerToml({
-						...MINIMAL_WRANGLER_TOML,
-						name: "isolinear-optical-chip",
+						...mockConfigExpected,
 					}),
 				},
 			});
 		});
 
 		it("should download source script from dashboard w/ out positional <name>", async () => {
+			mockSupportingDashRequests({
+				expectedAccountId: "LCARS",
+				expectedScriptName: "isolinear-optical-chip",
+				expectedEnvironment: "test",
+			});
 			setMockFetchDashScript({
 				accountId: "LCARS",
 				fromDashScriptName: "isolinear-optical-chip",
+				environment: mockServiceMetadata.default_environment.environment,
 				mockResponse: mockDashboardScript,
 			});
 			mockConfirm(
@@ -2007,7 +2311,7 @@ describe("init", () => {
 					},
 					"isolinear-optical-chip/tsconfig.json": true,
 					"isolinear-optical-chip/wrangler.toml": wranglerToml({
-						...MINIMAL_WRANGLER_TOML,
+						...mockConfigExpected,
 						name: "isolinear-optical-chip",
 					}),
 				},
@@ -2015,9 +2319,15 @@ describe("init", () => {
 		});
 
 		it("should download source script from dashboard as plain JavaScript", async () => {
+			mockSupportingDashRequests({
+				expectedAccountId: "LCARS",
+				expectedScriptName: "isolinear-optical-chip",
+				expectedEnvironment: "test",
+			});
 			setMockFetchDashScript({
 				accountId: "LCARS",
 				fromDashScriptName: "isolinear-optical-chip",
+				environment: mockServiceMetadata.default_environment.environment,
 				mockResponse: mockDashboardScript,
 			});
 			mockConfirm(
@@ -2054,12 +2364,53 @@ describe("init", () => {
 					},
 					"isolinear-optical-chip/tsconfig.json": false,
 					"isolinear-optical-chip/wrangler.toml": wranglerToml({
-						...MINIMAL_WRANGLER_TOML,
+						...mockConfigExpected,
 						name: "isolinear-optical-chip",
 					}),
 				},
 			});
 		});
+		it("should throw an error to retry if a request fails", async () => {
+			setMockResponse(
+				`/accounts/:accountId/workers/services/:scriptName`,
+				"GET",
+				() => mockServiceMetadata
+			);
+			setMockResponse(
+				`/accounts/:accountId/workers/services/:scriptName/environments/:environment/bindings`,
+				"GET",
+				() => Promise.reject()
+			);
+
+			setMockFetchDashScript({
+				accountId: "LCARS",
+				fromDashScriptName: "isolinear-optical-chip",
+				environment: mockServiceMetadata.default_environment.environment,
+				mockResponse: mockDashboardScript,
+			});
+			mockConfirm(
+				{
+					text: "Would you like to use git to manage this Worker?",
+					result: false,
+				},
+				{
+					text: "Would you like to use TypeScript?",
+					result: false,
+				},
+				{
+					text: "No package.json found. Would you like to create one?",
+					result: true,
+				},
+				{
+					text: "Would you like to install the type definitions for Workers into your package.json?",
+					result: true,
+				}
+			);
+
+			await expect(
+				runWrangler("init  --from-dash isolinear-optical-chip")
+			).rejects.toThrowError();
+		});
 
 		it("should not continue if no worker name is provided", async () => {
 			await expect(