create-100x-mobile 0.5.1 → 0.5.3

package/dist/commands/new/steps.js

@@ -18,6 +18,7 @@ exports.writeInstantEnvironment = writeInstantEnvironment;
 exports.initializeConvex = initializeConvex;
 exports.ensureExpoPublicConvexUrl = ensureExpoPublicConvexUrl;
 exports.setConvexClerkEnv = setConvexClerkEnv;
+exports.setupCloudflare = setupCloudflare;
 exports.initializeGit = initializeGit;
 exports.runHealthChecks = runHealthChecks;
 const node_path_1 = require("node:path");
@@ -328,6 +329,7 @@ async function promptClerkSetup(options) {
 async function promptInstantSetup(options, authMode) {
     let appId = options.instantAppId?.trim() ?? "";
     if ((0, scaffold_1.isMagicCodeInstantAuthMode)(authMode)) {
+        let adminToken = "";
         if (options.interactive) {
             prompts_1.log.info("");
             prompts_1.log.info(picocolors_1.default.bold((0, scaffold_1.isCloudflareInstantAuthMode)(authMode)
@@ -335,7 +337,7 @@ async function promptInstantSetup(options, authMode) {
                 : "InstantDB Magic Code Setup"));
             prompts_1.log.info(picocolors_1.default.dim("Create an app id with: npx instant-cli init-without-files --title my-app"));
             if ((0, scaffold_1.isCloudflareInstantAuthMode)(authMode)) {
-                prompts_1.log.info(picocolors_1.default.dim("Cloudflare Worker, R2, and D1 files will be generated. Run `bun run cloudflare:deploy` after installing dependencies."));
+                prompts_1.log.info(picocolors_1.default.dim("Cloudflare Worker, R2, and D1 files will be generated and deployed automatically."));
             }
             if (!appId) {
                 prompts_1.log.info(picocolors_1.default.dim("Press Enter to skip and configure later."));
@@ -348,8 +350,21 @@ async function promptInstantSetup(options, authMode) {
                     appId = appIdInput.trim();
                 }
             }
+            if ((0, scaffold_1.isCloudflareInstantAuthMode)(authMode) && appId) {
+                prompts_1.log.info("");
+                prompts_1.log.info(picocolors_1.default.dim("The admin token lets the Cloudflare Worker sync upload metadata to InstantDB."));
+                prompts_1.log.info(picocolors_1.default.dim("Get it from: https://instantdb.com/dash → Your App → Admin Tokens"));
+                const adminTokenInput = await (0, prompts_1.text)({
+                    message: "InstantDB Admin Token",
+                    placeholder: "your-instant-admin-token",
+                    defaultValue: "",
+                });
+                if (!(0, prompts_1.isCancel)(adminTokenInput) && adminTokenInput) {
+                    adminToken = adminTokenInput.trim();
+                }
+            }
         }
-        return { authMode, appId };
+        return { authMode, appId, adminToken };
     }
     let clerkPublishableKey = options.clerkPublishableKey?.trim() ?? "";
     let clerkClientName = options.instantClerkClientName?.trim() || "clerk";
@@ -444,7 +459,8 @@ async function writeInstantEnvironment(projectDir, instant) {
     }
     if ((0, scaffold_1.isCloudflareInstantAuthMode)(instant.authMode)) {
         envContents = (0, dotenv_1.upsertDotenvVar)(envContents, "INSTANT_APP_ID", instant.appId);
-        envContents = (0, dotenv_1.upsertDotenvVar)(envContents, "INSTANT_ADMIN_TOKEN", "");
+        const adminToken = "adminToken" in instant ? instant.adminToken : "";
+        envContents = (0, dotenv_1.upsertDotenvVar)(envContents, "INSTANT_ADMIN_TOKEN", adminToken);
         envContents = (0, dotenv_1.upsertDotenvVar)(envContents, "ALLOWED_ORIGINS", "http://localhost:3000,http://localhost:8080,http://localhost:8081,http://localhost:19006");
         envContents = (0, dotenv_1.upsertDotenvVar)(envContents, "MAX_UPLOAD_BYTES", "26214400");
         envContents = (0, dotenv_1.upsertDotenvVar)(envContents, "USER_STORAGE_LIMIT_BYTES", "524288000");
@@ -524,6 +540,61 @@ async function setConvexClerkEnv(projectDir, clerkDomain) {
         return false;
     }
 }
+async function setupCloudflare(projectDir) {
+    const result = {
+        configured: false,
+        loggedIn: false,
+        deployed: false,
+        workerUrl: "",
+    };
+    // Step 1: cloudflare:configure (alchemy configure)
+    try {
+        await (0, run_1.run)("bun", ["run", "cloudflare:configure"], { cwd: projectDir });
+        result.configured = true;
+    }
+    catch (error) {
+        prompts_1.log.warn(`Cloudflare configure failed: ${toErrorMessage(error)}`);
+        prompts_1.log.info(picocolors_1.default.dim("Run manually: bun run cloudflare:configure"));
+        return result;
+    }
+    // Step 2: cloudflare:login (alchemy login)
+    try {
+        await (0, run_1.run)("bun", ["run", "cloudflare:login"], { cwd: projectDir });
+        result.loggedIn = true;
+    }
+    catch (error) {
+        prompts_1.log.warn(`Cloudflare login failed: ${toErrorMessage(error)}`);
+        prompts_1.log.info(picocolors_1.default.dim("Run manually: bun run cloudflare:login"));
+        return result;
+    }
+    // Step 3: cloudflare:deploy (alchemy deploy) — capture output for worker URL
+    try {
+        const deployOutput = await (0, run_1.runCapture)("bun", ["run", "cloudflare:deploy"], { cwd: projectDir });
+        result.deployed = true;
+        // Try to extract the storageWorkerUrl from the deploy output
+        const urlMatch = deployOutput.match(/storageWorkerUrl[:\s]*["']?(https?:\/\/[^\s"']+)["']?/i);
+        if (urlMatch?.[1]) {
+            result.workerUrl = urlMatch[1];
+            // Write the worker URL to .env.local
+            const envLocalPath = (0, node_path_1.join)(projectDir, ".env.local");
+            let envContents = "";
+            try {
+                envContents = await (0, fs_1.readTextFile)(envLocalPath);
+            }
+            catch {
+                // .env.local may not exist yet
+            }
+            envContents = (0, dotenv_1.upsertDotenvVar)(envContents, "EXPO_PUBLIC_STORAGE_WORKER_URL", result.workerUrl);
+            await (0, fs_1.writeTextFile)(envLocalPath, envContents);
+        }
+    }
+    catch (error) {
+        prompts_1.log.warn(`Cloudflare deploy failed: ${toErrorMessage(error)}`);
+        prompts_1.log.info(picocolors_1.default.dim("Run manually: bun run cloudflare:deploy"));
+        return result;
+    }
+    return result;
+}
 async function initializeGit(projectDir) {
     try {
         await (0, run_1.run)("git", ["init"], { cwd: projectDir });

package/dist/commands/new.js

@@ -257,9 +257,11 @@ async function cmdNew(rawArgs) {
         prompts_1.log.info(picocolors_1.default.dim(`Client name: ${instant.clerkClientName}`));
         prompts_1.log.info(picocolors_1.default.dim(`Clerk publishable key: ${instant.clerkPublishableKey}`));
     }
+    const isCloudflareMode = backend === "instantdb" && (0, scaffold_1.isCloudflareInstantAuthMode)(instantAuthMode);
     const totalSteps = 1 + // project generation
         (options.installDependencies ? 2 : 0) +
         (backend === "convex" ? 2 + (clerk.domain ? 1 : 0) : 1) +
+        (isCloudflareMode && options.installDependencies ? 1 : 0) + // cloudflare setup
         (options.initializeGit ? 1 : 0) +
         1; // health check
     let currentStep = 0;
@@ -319,6 +321,7 @@ async function cmdNew(rawArgs) {
     else {
         prompts_1.log.info(picocolors_1.default.dim("Skipping dependency installation (--no-install)."));
     }
+    let cloudflareSetup = null;
     if (backend === "convex") {
         currentStep++;
         prompts_1.log.step(`Setting up Convex ${stepLabel()}`);
@@ -348,6 +351,23 @@ async function cmdNew(rawArgs) {
             }
         }
     }
+    if (isCloudflareMode && options.installDependencies) {
+        currentStep++;
+        prompts_1.log.step(`Setting up Cloudflare storage ${stepLabel()}`);
+        cloudflareSetup = await (0, steps_1.setupCloudflare)(projectDir);
+        if (cloudflareSetup.deployed) {
+            if (cloudflareSetup.workerUrl) {
+                prompts_1.log.success(`Cloudflare deployed. Worker URL: ${picocolors_1.default.cyan(cloudflareSetup.workerUrl)}`);
+            }
+            else {
+                prompts_1.log.success("Cloudflare deployed.");
+                prompts_1.log.info(picocolors_1.default.dim("Add the storageWorkerUrl to EXPO_PUBLIC_STORAGE_WORKER_URL in .env.local."));
+            }
+        }
+        else {
+            prompts_1.log.warn("Cloudflare setup did not complete fully.");
+        }
+    }
     if (options.initializeGit) {
         currentStep++;
         prompts_1.log.step(`Initializing git repository ${stepLabel()}`);
@@ -372,17 +392,19 @@ async function cmdNew(rawArgs) {
     }
     prompts_1.log.info("");
     if (backend === "instantdb") {
-        const isCloudflareMode = instant?.authMode && (0, scaffold_1.isCloudflareInstantAuthMode)(instant.authMode);
         const isMagicCodeMode = instant?.authMode && (0, scaffold_1.isMagicCodeInstantAuthMode)(instant.authMode);
         const instantReady = isMagicCodeMode
             ? Boolean(instant?.appId)
             : Boolean(instant?.authMode === "clerk" &&
                 instant.appId &&
                 instant.clerkPublishableKey);
+        const cloudflareFullyDeployed = cloudflareSetup?.deployed && cloudflareSetup?.workerUrl;
         if (instantReady) {
-            prompts_1.log.success(picocolors_1.default.bold(picocolors_1.default.green(isCloudflareMode
-                ? "Your app is ready! Deploy Cloudflare storage next."
-                : "Your app is ready!")));
+            prompts_1.log.success(picocolors_1.default.bold(picocolors_1.default.green(isCloudflareMode && cloudflareFullyDeployed
+                ? "Your app is ready! Cloudflare storage deployed."
+                : isCloudflareMode
+                    ? "Your app is ready! Deploy Cloudflare storage next."
+                    : "Your app is ready!")));
         }
         else if (isMagicCodeMode) {
             prompts_1.log.success(picocolors_1.default.bold(picocolors_1.default.green(isCloudflareMode
@@ -402,15 +424,36 @@ async function cmdNew(rawArgs) {
             prompts_1.log.info(`  ${picocolors_1.default.cyan("bun install")} ${picocolors_1.default.dim("# or npm install")}`);
             prompts_1.log.info(`  ${picocolors_1.default.cyan("bunx expo start")}`);
         }
-        if (isCloudflareMode) {
+        if (isCloudflareMode && !cloudflareFullyDeployed) {
             prompts_1.log.info("");
-            prompts_1.log.info(picocolors_1.default.dim("  Cloudflare setup:"));
-            prompts_1.log.info(picocolors_1.default.dim("  INSTANT_APP_ID is written to .env.local for Alchemy deploys."));
-            prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:configure")}`);
-            prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:login")}`);
-            prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:deploy")}`);
+            if (!cloudflareSetup || !cloudflareSetup.configured) {
+                // Nothing ran — show all steps
+                prompts_1.log.info(picocolors_1.default.dim("  Cloudflare setup (run manually):"));
+                prompts_1.log.info(picocolors_1.default.dim("  INSTANT_APP_ID is written to .env.local for Alchemy deploys."));
+                prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:configure")}`);
+                prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:login")}`);
+                prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:deploy")}`);
+            }
+            else if (!cloudflareSetup.loggedIn) {
+                prompts_1.log.info(picocolors_1.default.dim("  Cloudflare setup (continue from login):"));
+                prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:login")}`);
+                prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:deploy")}`);
+            }
+            else if (!cloudflareSetup.deployed) {
+                prompts_1.log.info(picocolors_1.default.dim("  Cloudflare setup (deploy remaining):"));
+                prompts_1.log.info(`  ${picocolors_1.default.cyan("bun run cloudflare:deploy")}`);
+            }
+            else {
+                // deployed but worker URL not extracted
+                prompts_1.log.info(picocolors_1.default.dim("  Cloudflare deployed but worker URL not detected."));
+            }
             prompts_1.log.info(picocolors_1.default.dim("  Add the printed storageWorkerUrl to EXPO_PUBLIC_STORAGE_WORKER_URL in .env.local."));
         }
+        else if (isCloudflareMode && cloudflareFullyDeployed) {
+            prompts_1.log.info("");
+            prompts_1.log.info(`  ${picocolors_1.default.green("✓")} Cloudflare Worker URL: ${picocolors_1.default.cyan(cloudflareSetup.workerUrl)}`);
+            prompts_1.log.info(picocolors_1.default.dim("  EXPO_PUBLIC_STORAGE_WORKER_URL set in .env.local."));
+        }
         if (isMagicCodeMode) {
             if (!instantReady) {
                 prompts_1.log.info("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-100x-mobile",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Scaffold a full-stack mobile app with Expo + Convex + Clerk in seconds",
   "main": "dist/cli.js",
   "bin": {
@@ -13,7 +13,7 @@
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "check": "npm run typecheck && npm test && npm pack --dry-run",
-    "prepublishOnly": "npm run check"
+    "prepublishOnly": "npm run build && npm run check"
   },
   "files": [
     "dist"