Un-revert #3107 and change --delegate-c3 default to true in v3 (#3211)

* [wrangler] Deprecate the init command (#3107)

* set --delegate-c3 default to true

* test deprecation (warning + c3 delegation)

keep existing tests to ensure deprecated behaviour is retained with --no-delegate-c3

Author: RamIdeas

packages/wrangler/src/__tests__/generate.test.ts

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { type PackageManager, getPackageManager } from "../package-manager";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
@@ -10,8 +11,17 @@ describe("generate", () => {
 	runInTempDir();
 	const { setIsTTY } = useMockIsTTY();
 	const std = mockConsoleMethods();
+	let mockPackageManager: PackageManager;
 	beforeEach(() => {
 		setIsTTY(true);
+
+		mockPackageManager = {
+			cwd: process.cwd(),
+			type: "mockpm" as "npm",
+			addDevDeps: jest.fn(),
+			install: jest.fn(),
+		};
+		(getPackageManager as jest.Mock).mockResolvedValue(mockPackageManager);
 	});
 
 	describe("cli functionality", () => {
@@ -32,6 +42,13 @@ describe("generate", () => {
 			expect(std.out).toMatchInlineSnapshot(
 				`"✨ Created no-template/wrangler.toml"`
 			);
+			expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] The \`init\` command is no longer supported. Please use \`mockpm create cloudflare\` instead.
+
+			  The \`init\` command will be removed in a future version.
+
+			"
+		`);
 		});
 
 		it("complains when given the --type argument", async () => {

packages/wrangler/src/__tests__/init.test.ts

@@ -177,3 +177,16 @@ jest.mock("prompts", () => {
 		}),
 	};
 });
+
+jest.mock("execa", () => {
+	const realModule = jest.requireActual("execa");
+
+	return {
+		...realModule,
+		execa: jest.fn((...args: unknown[]) => {
+			return args[0] === "mockpm"
+				? Promise.resolve()
+				: realModule.execa(...args);
+		}),
+	};
+});

packages/wrangler/src/__tests__/jest.setup.ts

@@ -46,6 +46,7 @@ export async function generateHandler(args: GenerateArgs) {
 			site: undefined,
 			yes: undefined,
 			fromDash: undefined,
+			delegateC3: false,
 			v: undefined,
 			config: undefined,
 			env: undefined,

packages/wrangler/src/generate/index.ts

@@ -2,6 +2,7 @@ import * as fs from "node:fs";
 import { writeFile, mkdir } from "node:fs/promises";
 import path, { dirname } from "node:path";
 import TOML from "@iarna/toml";
+import { execa } from "execa";
 import { findUp } from "find-up";
 import { version as wranglerVersion } from "../package.json";
 
@@ -59,6 +60,12 @@ export function initOptions(yargs: CommonYargsArgv) {
 				"The name of the Worker you wish to download from the Cloudflare dashboard for local development.",
 			type: "string",
 			requiresArg: true,
+		})
+		.option("delegate-c3", {
+			describe: "Delegate to Create Cloudflare CLI (C3)",
+			type: "boolean",
+			hidden: true,
+			default: true,
 		});
 }
 
@@ -173,6 +180,10 @@ export async function initHandler(args: InitArgs) {
 	let serviceMetadata: undefined | ServiceMetadataRes;
 
 	// If --from-dash, check that script actually exists
+	/*
+    Even though the init command is now deprecated and replaced by Create Cloudflare CLI (C3),
+    run this first so, if the script doesn't exist, we can fail early
+  */
 	if (fromDashScriptName) {
 		const config = readConfig(args.config, args);
 		accountId = await requireAuth(config);
@@ -188,6 +199,27 @@ export async function initHandler(args: InitArgs) {
 			}
 			throw err;
 		}
+
+		// Deprecate the `init --from-dash` command
+		const replacementC3Command = `\`${packageManager.type} create cloudflare --template pre-existing --name ${fromDashScriptName}\``;
+		logger.warn(
+			`The \`init --from-dash\` command is no longer supported. Please use ${replacementC3Command} instead.\nThe \`init\` command will be removed in a future version.`
+		);
+
+		// C3 will run wrangler with the --do-not-delegate flag to communicate with the API
+		if (args.delegateC3) {
+			logger.log(`Running ${replacementC3Command}...`);
+
+			await execa(packageManager.type, [
+				"create",
+				"cloudflare",
+				fromDashScriptName,
+				"--type",
+				"pre-existing",
+			]);
+
+			return;
+		}
 	}
 
 	if (fs.existsSync(wranglerTomlDestination)) {
@@ -204,6 +236,25 @@ export async function initHandler(args: InitArgs) {
 			return;
 		}
 	} else {
+		// Deprecate the `init` command
+		//    if a wrangler.toml file does not exist (C3 expects to scaffold *new* projects)
+		//    and if --from-dash is not set (C3 will run wrangler to communicate with the API)
+		if (!fromDashScriptName) {
+			const replacementC3Command = `\`${packageManager.type} create cloudflare\``;
+
+			logger.warn(
+				`The \`init\` command is no longer supported. Please use ${replacementC3Command} instead.\nThe \`init\` command will be removed in a future version.`
+			);
+
+			if (args.delegateC3) {
+				logger.log(`Running ${replacementC3Command}...`);
+
+				await execa(packageManager.type, ["create", "cloudflare"]);
+
+				return;
+			}
+		}
+
 		await mkdir(creationDirectory, { recursive: true });
 		const compatibilityDate = new Date().toISOString().substring(0, 10);