From 53467d67501165583cdc2a5b3829e80aace25b46 Mon Sep 17 00:00:00 2001
From: dswbx <dennis.senn@gmx.ch>
Date: Tue, 8 Apr 2025 12:43:50 +0200
Subject: [PATCH] fix: create: cloudflare starter wasn't creating a r2 bucket

---
 app/.gitignore                                |  2 +-
 app/package.json                              |  2 +-
 .../commands/create/templates/cloudflare.ts   | 75 +++++++++++--------
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/app/.gitignore b/app/.gitignore
index 88683bb..8415a0f 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,4 +1,4 @@
 playwright-report
 test-results
 bknd.config.*
-app/__test__/helper.d.ts
\ No newline at end of file
+__test__/helper.d.ts
\ No newline at end of file
diff --git a/app/package.json b/app/package.json
index fddd79c..686ea44 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "sideEffects": false,
   "bin": "./dist/cli/index.js",
-  "version": "0.11.0-rc.5",
+  "version": "0.11.0-rc.6",
   "description": "Lightweight Firebase/Supabase alternative built to run anywhere — incl. Next.js, React Router, Astro, Cloudflare, Bun, Node, AWS Lambda & more.",
   "homepage": "https://bknd.io",
   "repository": {
diff --git a/app/src/cli/commands/create/templates/cloudflare.ts b/app/src/cli/commands/create/templates/cloudflare.ts
index d95f2d4..f1f456e 100644
--- a/app/src/cli/commands/create/templates/cloudflare.ts
+++ b/app/src/cli/commands/create/templates/cloudflare.ts
@@ -29,13 +29,15 @@ export const cloudflare = {
          { dir: ctx.dir },
       );
 
-      const db = ctx.skip ? "d1" : await $p.select({
-         message: "What database do you want to use?",
-         options: [
-            { label: "Cloudflare D1", value: "d1" },
-            { label: "LibSQL", value: "libsql" },
-         ],
-      });
+      const db = ctx.skip
+         ? "d1"
+         : await $p.select({
+              message: "What database do you want to use?",
+              options: [
+                 { label: "Cloudflare D1", value: "d1" },
+                 { label: "LibSQL", value: "libsql" },
+              ],
+           });
       if ($p.isCancel(db)) {
          process.exit(1);
       }
@@ -64,17 +66,19 @@ export const cloudflare = {
 
 async function createD1(ctx: TemplateSetupCtx) {
    const default_db = "data";
-   const name = ctx.skip ? default_db : await $p.text({
-      message: "Enter database name",
-      initialValue: default_db,
-      placeholder: default_db,
-      validate: (v) => {
-         if (!v) {
-            return "Invalid name";
-         }
-         return;
-      },
-   });
+   const name = ctx.skip
+      ? default_db
+      : await $p.text({
+           message: "Enter database name",
+           initialValue: default_db,
+           placeholder: default_db,
+           validate: (v) => {
+              if (!v) {
+                 return "Invalid name";
+              }
+              return;
+           },
+        });
    if ($p.isCancel(name)) {
       process.exit(1);
    }
@@ -153,13 +157,16 @@ async function createLibsql(ctx: TemplateSetupCtx) {
 }
 
 async function createR2(ctx: TemplateSetupCtx) {
-   const create = ctx.skip ?? await $p.confirm({
-      message: "Do you want to use a R2 bucket?",
-      initialValue: true,
-   });
+   const create = ctx.skip
+      ? false
+      : await $p.confirm({
+           message: "Do you want to use a R2 bucket?",
+           initialValue: true,
+        });
    if ($p.isCancel(create)) {
       process.exit(1);
    }
+
    if (!create) {
       await overrideJson(
          WRANGLER_FILE,
@@ -173,17 +180,19 @@ async function createR2(ctx: TemplateSetupCtx) {
    }
 
    const default_bucket = "bucket";
-   const name = ctx.skip ? default_bucket : await $p.text({
-      message: "Enter bucket name",
-      initialValue: default_bucket,
-      placeholder: default_bucket,
-      validate: (v) => {
-         if (!v) {
-            return "Invalid name";
-         }
-         return;
-      },
-   });
+   const name = ctx.skip
+      ? default_bucket
+      : await $p.text({
+           message: "Enter bucket name",
+           initialValue: default_bucket,
+           placeholder: default_bucket,
+           validate: (v) => {
+              if (!v) {
+                 return "Invalid name";
+              }
+              return;
+           },
+        });
    if ($p.isCancel(name)) {
       process.exit(1);
    }