C3: Turn auto-update back on (#4136)

* C3: Turn auto-update back on * Fix hardcoded npx call in workers * Only prepend to npm create
cloudflare · Oct 12, 2023 · 0f043a1 · 0f043a1
1 parent 2a0eefd
commit 0f043a1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/.changeset/yellow-cycles-fix.md b/.changeset/yellow-cycles-fix.md
@@ -0,0 +1,5 @@
+---
+"create-cloudflare": minor
+---
+
+Fixes an issue that was causing the auto-update check not to run
diff --git a/packages/create-cloudflare/src/cli.ts b/packages/create-cloudflare/src/cli.ts
@@ -51,7 +51,13 @@ const isUpdateAvailable = async () => {
 // Spawn a separate process running the most recent version of c3
 export const runLatest = async () => {
 	const args = process.argv.slice(2);
-	await runCommand(`${npm} create cloudflare@latest ${args.join(" ")}`);
+
+	// the parsing logic of `npm create` requires `--` to be supplied
+	// before any flags intended for the target command.
+	const argString =
+		npm === "npm" ? `-- ${args.join(" ")}` : `${args.join(" ")}`;
+
+	await runCommand(`${npm} create cloudflare@latest ${argString}`);
 };
 
 // Entrypoint to c3

diff --git a/packages/create-cloudflare/src/helpers/args.ts b/packages/create-cloudflare/src/helpers/args.ts
@@ -39,6 +39,12 @@ export const parseArgs = async (argv: string[]): Promise<Partial<C3Args>> => {
 			alias: "y",
 			type: "boolean",
 		})
+		.option("auto-update", {
+			type: "boolean",
+			default: C3_DEFAULTS.autoUpdate,
+			description:
+				"Automatically uses the latest version of `create-cloudflare`. Set --no-auto-update to disable",
+		})
 		.option("wrangler-defaults", { type: "boolean", hidden: true })
 		.version(version)
 		// note: we use strictOptions since `strict()` seems not to handle `positional`s correctly

diff --git a/packages/create-cloudflare/src/workers.ts b/packages/create-cloudflare/src/workers.ts
@@ -23,6 +23,7 @@ import {
 	npmInstall,
 	runCommand,
 } from "helpers/command";
+import { detectPackageManager } from "helpers/packages";
 import {
 	chooseAccount,
 	gitCommit,
@@ -34,6 +35,8 @@ import {
 } from "./common";
 import type { C3Args, PagesGeneratorContext as Context } from "types";
 
+const { dlx } = detectPackageManager();
+
 export const runWorkersGenerator = async (args: C3Args) => {
 	const { name, path } = setupProjectDirectory(args);
 
@@ -120,7 +123,7 @@ async function copyExistingWorkerFiles(ctx: Context) {
 			join(tmpdir(), "c3-wrangler-init--from-dash-")
 		);
 		await runCommand(
-			`npx wrangler@3 init --from-dash ${ctx.args.existingScript} -y --no-delegate-c3`,
+			`${dlx} wrangler@3 init --from-dash ${ctx.args.existingScript} -y --no-delegate-c3`,
 			{
 				silent: true,
 				cwd: tempdir, // use a tempdir because we don't want all the files