create-whop-kit 0.8.0 → 0.9.1

package/dist/{chunk-TNUTE5L4.js → chunk-KXM3AHGK.js}

@@ -135,17 +135,6 @@ function vercelEnvSet(key, value, environment = "production", projectDir) {
   );
   return result.success;
 }
-function vercelEnvSetBatch(vars, projectDir) {
-  const success = [];
-  const failed = [];
-  for (const [key, value] of Object.entries(vars)) {
-    if (!value) continue;
-    const ok = vercelEnvSet(key, value, "production", projectDir) && vercelEnvSet(key, value, "preview", projectDir) && vercelEnvSet(key, value, "development", projectDir);
-    if (ok) success.push(key);
-    else failed.push(key);
-  }
-  return { success, failed };
-}
 
 // src/deploy/github.ts
 import * as p2 from "@clack/prompts";
@@ -207,6 +196,11 @@ async function createGitHubRepo(projectDir, projectName) {
   s.stop("GitHub repo created");
   return `https://github.com/${projectName}`;
 }
+function getGitHubOrgs() {
+  const result = exec("gh api user/orgs --jq '.[].login'");
+  if (!result.success || !result.stdout.trim()) return [];
+  return result.stdout.trim().split("\n").filter(Boolean);
+}
 
 // src/deploy/whop-api.ts
 var WHOP_API = "https://api.whop.com/api/v1";
@@ -294,175 +288,218 @@ function openUrl(url) {
 }
 async function runDeployPipeline(options) {
   const { projectDir, projectName, databaseUrl, framework } = options;
-  p3.log.info(pc3.bold("\n\u2500\u2500 GitHub \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-  if (!isGhInstalled()) {
-    const install = await p3.confirm({
-      message: "GitHub CLI (gh) not found. Install it?",
-      initialValue: true
-    });
-    if (p3.isCancel(install) || !install) {
-      p3.log.warning("Skipping GitHub. Deploy will upload directly (no auto-deploy on push).");
-    } else {
-      await installGh();
+  const setupMode = await p3.select({
+    message: "How would you like to deploy?",
+    options: [
+      {
+        value: "github-vercel",
+        label: "GitHub + Vercel (recommended)",
+        hint: "Private repo, auto-deploy on every push"
+      },
+      {
+        value: "github-only",
+        label: "GitHub only",
+        hint: "Push code to GitHub, deploy later"
+      },
+      {
+        value: "vercel-only",
+        label: "Vercel only",
+        hint: "Deploy without GitHub (no auto-deploy on push)"
+      }
+    ]
+  });
+  if (p3.isCancel(setupMode)) return null;
+  const useGithub = setupMode === "github-vercel" || setupMode === "github-only";
+  const useVercel = setupMode === "github-vercel" || setupMode === "vercel-only";
+  let githubRepoUrl = null;
+  let productionUrl = null;
+  if (useGithub) {
+    p3.log.info(pc3.bold("\n\u2500\u2500 GitHub \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    if (!isGhInstalled()) {
+      p3.log.info("The GitHub CLI (gh) is needed to create your repo.");
+      const installed = await installGh();
+      if (!installed) {
+        p3.log.warning("Skipping GitHub \u2014 install gh manually: https://cli.github.com");
+      }
+    }
+    if (isGhInstalled()) {
+      if (!isGhAuthenticated()) {
+        const loginOk = await ghLogin();
+        if (!loginOk) {
+          p3.log.warning("GitHub auth failed. Skipping repo creation.");
+        }
+      }
+      if (isGhAuthenticated()) {
+        const orgs = getGitHubOrgs();
+        let repoFullName = projectName;
+        if (orgs.length > 0) {
+          const orgChoice = await p3.select({
+            message: "Which GitHub account?",
+            options: [
+              { value: "", label: "Personal account", hint: "your personal GitHub" },
+              ...orgs.map((org) => ({
+                value: org,
+                label: org,
+                hint: "organization"
+              }))
+            ]
+          });
+          if (!p3.isCancel(orgChoice) && orgChoice) {
+            repoFullName = `${orgChoice}/${projectName}`;
+          }
+        }
+        githubRepoUrl = await createGitHubRepo(projectDir, repoFullName);
+        if (githubRepoUrl) {
+          p3.log.success(`Code pushed to ${pc3.cyan(githubRepoUrl)}`);
+        }
+      }
     }
   }
-  let githubRepoUrl = null;
-  if (isGhInstalled()) {
-    if (!isGhAuthenticated()) {
-      const loginOk = await ghLogin();
+  if (useVercel) {
+    p3.log.info(pc3.bold("\n\u2500\u2500 Vercel \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    const vercelOk = await installOrUpdateVercel();
+    if (!vercelOk) {
+      p3.log.error("Could not set up Vercel CLI.");
+      return githubRepoUrl ? { productionUrl: "", githubUrl: githubRepoUrl } : null;
+    }
+    if (!isVercelAuthenticated()) {
+      const loginOk = await vercelLogin();
       if (!loginOk) {
-        p3.log.warning("GitHub auth failed. Skipping GitHub repo creation.");
+        p3.log.error("Vercel auth failed. Run " + pc3.bold("whop-kit deploy") + " later.");
+        return githubRepoUrl ? { productionUrl: "", githubUrl: githubRepoUrl } : null;
       }
     }
-    if (isGhAuthenticated()) {
-      githubRepoUrl = await createGitHubRepo(projectDir, projectName);
-      if (githubRepoUrl) {
-        p3.log.success(`Code pushed to ${pc3.cyan(githubRepoUrl)}`);
+    const vercelUser = getVercelUser();
+    p3.log.success(`Signed in${vercelUser ? ` as ${pc3.bold(vercelUser)}` : ""}`);
+    await vercelLink(projectDir);
+    if (githubRepoUrl) {
+      const s = p3.spinner();
+      s.start("Connecting GitHub to Vercel (auto-deploy on push)...");
+      const connectResult = exec(`vercel git connect ${githubRepoUrl}`, projectDir, 3e4);
+      if (connectResult.success) {
+        s.stop("Connected \u2014 every git push will auto-deploy");
       } else {
-        p3.log.warning("Could not create GitHub repo. Continuing without it.");
+        s.stop("Auto-connect failed (connect manually in Vercel dashboard \u2192 Git)");
       }
     }
-  }
-  p3.log.info(pc3.bold("\n\u2500\u2500 Vercel \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-  const vercelOk = await installOrUpdateVercel();
-  if (!vercelOk) return null;
-  if (!isVercelAuthenticated()) {
-    const loginOk = await vercelLogin();
-    if (!loginOk) {
-      p3.log.error("Vercel auth failed. Run " + pc3.bold("whop-kit deploy") + " later.");
-      return null;
+    if (databaseUrl) {
+      let s = p3.spinner();
+      s.start("Setting DATABASE_URL \u2192 production...");
+      vercelEnvSet("DATABASE_URL", databaseUrl, "production", projectDir);
+      s.stop("DATABASE_URL \u2192 production \u2713");
+      s = p3.spinner();
+      s.start("Setting DATABASE_URL \u2192 preview...");
+      vercelEnvSet("DATABASE_URL", databaseUrl, "preview", projectDir);
+      s.stop("DATABASE_URL \u2192 preview \u2713");
+      s = p3.spinner();
+      s.start("Setting DATABASE_URL \u2192 development...");
+      vercelEnvSet("DATABASE_URL", databaseUrl, "development", projectDir);
+      s.stop("DATABASE_URL \u2192 development \u2713");
     }
-  }
-  const vercelUser = getVercelUser();
-  p3.log.success(`Signed in${vercelUser ? ` as ${pc3.bold(vercelUser)}` : ""}`);
-  const linkOk = await vercelLink(projectDir);
-  if (!linkOk) {
-    p3.log.warning("Could not link project.");
-  }
-  if (githubRepoUrl) {
-    const s2 = p3.spinner();
-    s2.start("Connecting GitHub repo to Vercel (enables auto-deploy on push)...");
-    const connectResult = exec(
-      `vercel git connect ${githubRepoUrl}`,
-      projectDir,
-      3e4
-    );
-    if (connectResult.success) {
-      s2.stop("GitHub connected \u2014 future pushes will auto-deploy");
-    } else {
-      s2.stop("Could not auto-connect GitHub (connect manually in Vercel dashboard)");
+    productionUrl = await vercelDeploy(projectDir);
+    if (!productionUrl) {
+      p3.log.error("Deploy failed. Try: " + pc3.bold(`cd ${projectName} && vercel deploy --prod`));
     }
   }
-  if (databaseUrl) {
-    const s2 = p3.spinner();
-    s2.start("Setting DATABASE_URL on Vercel...");
-    vercelEnvSet("DATABASE_URL", databaseUrl, "production", projectDir);
-    vercelEnvSet("DATABASE_URL", databaseUrl, "preview", projectDir);
-    vercelEnvSet("DATABASE_URL", databaseUrl, "development", projectDir);
-    s2.stop("DATABASE_URL configured");
-  }
-  const productionUrl = await vercelDeploy(projectDir);
-  if (!productionUrl) {
-    p3.log.error("Deployment failed. Try: " + pc3.bold(`cd ${projectName} && vercel deploy --prod`));
-    return null;
-  }
-  p3.log.info(pc3.bold("\n\u2500\u2500 Whop \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-  const connectWhop = await p3.confirm({
-    message: "Connect to Whop? (creates OAuth app + webhooks automatically)",
-    initialValue: true
-  });
-  if (p3.isCancel(connectWhop) || !connectWhop) {
-    return { productionUrl };
-  }
-  p3.note(
-    [
-      `${pc3.bold("1.")} Go to the Whop Developer Dashboard`,
-      `   ${pc3.cyan("https://whop.com/dashboard/developer")}`,
-      "",
-      `${pc3.bold("2.")} Click ${pc3.bold('"Create"')} under "Company API Keys"`,
-      "",
-      `${pc3.bold("3.")} Name it anything (e.g. "${projectName}")`,
-      "",
-      `${pc3.bold("4.")} Select these permissions:`,
-      `   ${pc3.green("\u2022")} developer:create_app`,
-      `   ${pc3.green("\u2022")} developer:manage_api_key`,
-      `   ${pc3.green("\u2022")} developer:manage_webhook`,
-      "",
-      `${pc3.bold("5.")} Create the key and paste it below`
-    ].join("\n"),
-    "Create a Company API Key"
-  );
-  openUrl("https://whop.com/dashboard/developer");
-  let apiKey = options.whopCompanyKey ?? "";
-  if (!apiKey) {
-    const result = await p3.text({
-      message: "Paste your Company API key",
-      placeholder: "paste the key here...",
-      validate: (v) => !v ? "API key is required" : void 0
+  if (productionUrl) {
+    p3.log.info(pc3.bold("\n\u2500\u2500 Whop \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    const connectWhop = await p3.confirm({
+      message: "Connect to Whop? (creates OAuth app + webhooks automatically)",
+      initialValue: true
     });
-    if (p3.isCancel(result)) return { productionUrl };
-    apiKey = result;
-  }
-  const s = p3.spinner();
-  s.start("Validating API key...");
-  const keyValid = await validateApiKey(apiKey);
-  if (!keyValid) {
-    s.stop("Invalid API key");
-    p3.log.error("Check permissions: developer:create_app, developer:manage_api_key, developer:manage_webhook");
-    return { productionUrl };
-  }
-  s.stop("API key valid");
-  const callbackPath = "/api/auth/callback";
-  const redirectUris = [
-    `http://localhost:3000${callbackPath}`,
-    `${productionUrl}${callbackPath}`
-  ];
-  s.start("Creating Whop OAuth app...");
-  const app = await createWhopApp(apiKey, projectName, redirectUris);
-  if (!app) {
-    s.stop("Failed to create app");
-    p3.log.error("Create manually at: " + pc3.cyan("https://whop.com/dashboard/developer"));
-    return { productionUrl };
-  }
-  s.stop(`OAuth app created: ${pc3.bold(app.id)}`);
-  const webhookUrl = `${productionUrl}/api/webhooks/whop`;
-  s.start("Creating webhook endpoint...");
-  const webhook = await createWhopWebhook(apiKey, webhookUrl, WEBHOOK_EVENTS);
-  if (!webhook) {
-    s.stop("Failed to create webhook");
-    p3.log.warning("Create manually in the Whop dashboard.");
-  } else {
-    s.stop("Webhook created");
-  }
-  const envVars = {};
-  if (framework === "nextjs") {
-    envVars["NEXT_PUBLIC_WHOP_APP_ID"] = app.id;
-  } else {
-    envVars["WHOP_APP_ID"] = app.id;
-  }
-  envVars["WHOP_API_KEY"] = app.client_secret;
-  if (webhook?.secret) {
-    envVars["WHOP_WEBHOOK_SECRET"] = webhook.secret;
-  }
-  s.start("Pushing Whop credentials to Vercel...");
-  const { success, failed } = vercelEnvSetBatch(envVars, projectDir);
-  if (failed.length > 0) {
-    s.stop(`${success.length} pushed, ${failed.length} failed`);
-  } else {
-    s.stop("Credentials pushed to Vercel");
-  }
-  s.start("Redeploying with full configuration...");
-  const redeployResult = exec("vercel deploy --prod --yes", projectDir, 3e5);
-  if (redeployResult.success) {
-    s.stop("Redeployed successfully");
-  } else {
-    s.stop("Redeploy pending \u2014 will apply on next git push");
+    if (!p3.isCancel(connectWhop) && connectWhop) {
+      p3.note(
+        [
+          `${pc3.bold("1.")} Go to the Whop Developer Dashboard`,
+          `   ${pc3.cyan("https://whop.com/dashboard/developer")}`,
+          "",
+          `${pc3.bold("2.")} Click ${pc3.bold('"Create"')} under "Company API Keys"`,
+          "",
+          `${pc3.bold("3.")} Name it anything (e.g. "${projectName}")`,
+          "",
+          `${pc3.bold("4.")} Select these permissions:`,
+          `   ${pc3.green("\u2022")} developer:create_app`,
+          `   ${pc3.green("\u2022")} developer:manage_api_key`,
+          `   ${pc3.green("\u2022")} developer:manage_webhook`,
+          "",
+          `${pc3.bold("5.")} Create the key and paste it below`
+        ].join("\n"),
+        "Create a Company API Key"
+      );
+      openUrl("https://whop.com/dashboard/developer");
+      let apiKey = options.whopCompanyKey ?? "";
+      if (!apiKey) {
+        const result = await p3.text({
+          message: "Paste your Company API key",
+          placeholder: "paste the key here...",
+          validate: (v) => !v ? "API key is required" : void 0
+        });
+        if (p3.isCancel(result)) {
+          return { productionUrl, githubUrl: githubRepoUrl ?? void 0 };
+        }
+        apiKey = result;
+      }
+      const s = p3.spinner();
+      s.start("Validating API key...");
+      const keyValid = await validateApiKey(apiKey);
+      if (!keyValid) {
+        s.stop("Invalid API key");
+        p3.log.error("Check permissions: developer:create_app, developer:manage_api_key, developer:manage_webhook");
+        return { productionUrl, githubUrl: githubRepoUrl ?? void 0 };
+      }
+      s.stop("API key valid");
+      const redirectUris = [
+        "http://localhost:3000/api/auth/callback",
+        `${productionUrl}/api/auth/callback`
+      ];
+      s.start("Creating Whop OAuth app...");
+      const app = await createWhopApp(apiKey, projectName, redirectUris);
+      if (!app) {
+        s.stop("Failed");
+        p3.log.error("Create manually: " + pc3.cyan("https://whop.com/dashboard/developer"));
+        return { productionUrl, githubUrl: githubRepoUrl ?? void 0 };
+      }
+      s.stop(`OAuth app created: ${pc3.bold(app.id)}`);
+      s.start("Creating webhook...");
+      const webhook = await createWhopWebhook(apiKey, `${productionUrl}/api/webhooks/whop`, WEBHOOK_EVENTS);
+      if (!webhook) {
+        s.stop("Failed (create manually in Whop dashboard)");
+      } else {
+        s.stop("Webhook created");
+      }
+      if (useVercel) {
+        const envVars = {};
+        if (framework === "nextjs") {
+          envVars["NEXT_PUBLIC_WHOP_APP_ID"] = app.id;
+        } else {
+          envVars["WHOP_APP_ID"] = app.id;
+        }
+        envVars["WHOP_API_KEY"] = app.client_secret;
+        if (webhook?.secret) envVars["WHOP_WEBHOOK_SECRET"] = webhook.secret;
+        for (const [key, value] of Object.entries(envVars)) {
+          const vs = p3.spinner();
+          vs.start(`Pushing ${key}...`);
+          vercelEnvSet(key, value, "production", projectDir);
+          vercelEnvSet(key, value, "preview", projectDir);
+          vercelEnvSet(key, value, "development", projectDir);
+          vs.stop(`${key} \u2713`);
+        }
+        s.start("Redeploying with full configuration...");
+        const redeploy = exec("vercel deploy --prod --yes", projectDir, 3e5);
+        s.stop(redeploy.success ? "Redeployed" : "Redeploy pending \u2014 will apply on next git push");
+      }
+      return {
+        productionUrl,
+        githubUrl: githubRepoUrl ?? void 0,
+        whopAppId: app.id,
+        whopApiKey: app.client_secret,
+        webhookSecret: webhook?.secret
+      };
+    }
   }
   return {
-    productionUrl,
-    whopAppId: app.id,
-    whopApiKey: app.client_secret,
-    webhookSecret: webhook?.secret
+    productionUrl: productionUrl ?? "",
+    githubUrl: githubRepoUrl ?? void 0
   };
 }
 

package/dist/cli-create.js

@@ -675,7 +675,7 @@ var init_default = defineCommand({
       })();
       if (shouldDeploy) {
         deployAttempted = true;
-        const { runDeployPipeline } = await import("./deploy-4GLNQM3I.js");
+        const { runDeployPipeline } = await import("./deploy-64CNJIBD.js");
         deployResult = await runDeployPipeline({
           projectDir,
           projectName,
@@ -690,23 +690,23 @@ var init_default = defineCommand({
     if (deployResult?.productionUrl) {
       if (dbUrl) summary += `${pc5.green("\u2713")} Database connected
 `;
-      summary += `${pc5.green("\u2713")} Deployed to Vercel
+      if (deployResult.githubUrl) summary += `${pc5.green("\u2713")} GitHub: ${pc5.dim(deployResult.githubUrl)}
+`;
+      summary += `${pc5.green("\u2713")} Vercel: ${pc5.cyan(deployResult.productionUrl)}
 `;
       if (deployResult.whopAppId) summary += `${pc5.green("\u2713")} Whop app: ${deployResult.whopAppId}
 `;
       if (deployResult.webhookSecret) summary += `${pc5.green("\u2713")} Webhooks configured
 `;
       summary += `
-`;
-      summary += `  ${pc5.bold("Production:")} ${pc5.cyan(deployResult.productionUrl)}
-`;
-      summary += `  ${pc5.bold("Local dev:")}  ${pc5.cyan("http://localhost:3000")}
-`;
-      summary += `
 `;
       summary += `  ${pc5.bold("cd")} ${basename2(projectName)}
 `;
-      summary += `  ${pc5.bold(`${pm} run dev`)}      ${pc5.dim("# start local dev server")}`;
+      summary += `  ${pc5.bold(`${pm} run dev`)}      ${pc5.dim("# local development at localhost:3000")}
+`;
+      if (deployResult.githubUrl) {
+        summary += `  ${pc5.bold("git push")}         ${pc5.dim("# auto-deploys to Vercel")}`;
+      }
     } else if (deployFailed) {
       if (dbUrl) summary += `${pc5.green("\u2713")} Database configured
 `;

package/dist/cli-kit.js

@@ -9,7 +9,7 @@ import {
 } from "./chunk-HOQ5QQ2M.js";
 import {
   runDeployPipeline
-} from "./chunk-TNUTE5L4.js";
+} from "./chunk-KXM3AHGK.js";
 import {
   detectPackageManager,
   exec

package/dist/{deploy-4GLNQM3I.js → deploy-64CNJIBD.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runDeployPipeline
-} from "./chunk-TNUTE5L4.js";
+} from "./chunk-KXM3AHGK.js";
 import "./chunk-42L7PRMT.js";
 export {
   runDeployPipeline

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-whop-kit",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "Scaffold and manage Whop-powered apps with whop-kit",
   "type": "module",
   "license": "MIT",