create-shopify-firebase-app 2.0.0 → 2.0.2

package/lib/index.js

@@ -1,7 +1,7 @@
 /**
  * create-shopify-firebase-app — CLI core (v2)
  *
- * Android Studio-level scaffolding experience for Shopify + Firebase apps.
+ * Full-stack scaffolding for Shopify + Firebase apps.
  *
  * Flow:
  * 1. App type selection (extension-only vs full-stack Firebase)
@@ -324,7 +324,7 @@ export async function run(argv) {
   }
 
   // ═══════════════════════════════════════════════════════════════════
-  // ── Interactive flow — like Android Studio's New Project wizard ────
+  // ── Interactive flow — guided project wizard ────
   // ═══════════════════════════════════════════════════════════════════
 
   // ── Banner ────────────────────────────────────────────────────────
@@ -640,15 +640,15 @@ export async function run(argv) {
       info("A browser window will open — sign in to your Partner account.");
       console.log();
       try {
-        await execInteractive("shopify auth login", outputDir);
+        await execInteractive("shopify auth login");
         ok("Logged into Shopify");
       } catch {
         warn("Shopify login failed — continuing with manual setup");
       }
 
       // ── Create / Link app via Shopify CLI ──────────────────────
-      // Run `shopify app config link` in the project directory
-      // This command handles: org selection, app creation/linking, TOML generation
+      // Must `cd` into project dir — Shopify CLI uses process.cwd(),
+      // not spawn's cwd option, for TOML generation.
       console.log();
       if (shopifyAction === "create") {
         info(`Creating a new Shopify app: ${c.cyan}${appName}${c.reset}`);
@@ -658,31 +658,63 @@ export async function run(argv) {
       }
       console.log();
 
+      // Use `cd` to ensure Shopify CLI writes files in the project directory
+      const cdCmd = process.platform === "win32"
+        ? `cd /d "${outputDir}" && shopify app config link`
+        : `cd "${outputDir}" && shopify app config link`;
+
       try {
-        await execInteractive("shopify app config link", outputDir);
-
-        // Parse the generated TOML for client_id
-        const tomlFiles = fs.readdirSync(outputDir).filter((f) => f.endsWith(".toml"));
-        for (const f of tomlFiles) {
-          const clientId = parseTomlField(path.join(outputDir, f), "client_id");
-          if (clientId && clientId !== "{{API_KEY}}") {
-            config.apiKey = clientId;
-            ok(`Client ID: ${c.cyan}${config.apiKey}${c.reset}`);
-            break;
+        await execInteractive(cdCmd);
+      } catch {
+        // Shopify CLI may exit non-zero even after creating/linking the app
+        // (e.g. "directory doesn't have a package.json" warning)
+        warn("Shopify CLI exited with a warning");
+      }
+
+      // ── Parse client_id from any TOML (runs regardless of exit code) ──
+      // Check project dir first, then parent dir (Shopify CLI fallback location)
+      const dirsToCheck = [outputDir, path.dirname(outputDir)];
+      for (const dir of dirsToCheck) {
+        if (config.apiKey) break;
+        try {
+          const tomlFiles = fs.readdirSync(dir).filter((f) => f.endsWith(".toml"));
+          for (const f of tomlFiles) {
+            const filePath = path.join(dir, f);
+            const clientId = parseTomlField(filePath, "client_id");
+            if (clientId && clientId !== "{{API_KEY}}" && clientId.length > 5) {
+              config.apiKey = clientId;
+              ok(`Client ID: ${c.cyan}${config.apiKey}${c.reset}`);
+
+              // If TOML was in parent dir (Shopify CLI bug), move it to project dir
+              if (dir !== outputDir) {
+                const destPath = path.join(outputDir, f);
+                try {
+                  // Don't overwrite our template — just read the client_id
+                  if (!fs.existsSync(destPath)) {
+                    fs.renameSync(filePath, destPath);
+                  } else {
+                    // Clean up the stray TOML from parent dir
+                    fs.unlinkSync(filePath);
+                  }
+                  info(`${c.dim}Picked up credentials from Shopify CLI${c.reset}`);
+                } catch {}
+              }
+              break;
+            }
           }
-        }
+        } catch {}
+      }
 
-        if (!config.apiKey) {
-          const res = await prompts({
-            type: "text",
-            name: "apiKey",
-            message: "Could not read Client ID from TOML. Paste it here",
-            validate: (v) => (v.trim() ? true : "Required"),
-          }, { onCancel });
-          config.apiKey = res.apiKey;
-        }
-      } catch {
-        warn("Shopify CLI exited — entering credentials manually");
+      if (!config.apiKey) {
+        console.log();
+        info("Could not read Client ID from Shopify CLI output.");
+        const res = await prompts({
+          type: "text",
+          name: "apiKey",
+          message: "Paste your Client ID (from Partner Dashboard → Apps)",
+          validate: (v) => (v.trim() ? true : "Required"),
+        }, { onCancel });
+        config.apiKey = res.apiKey;
       }
     }
 
@@ -958,7 +990,7 @@ function printHelp() {
   ${c.bold}create-shopify-firebase-app${c.reset}
 
   Build Shopify apps for free. Serverless, zero-framework.
-  Like Android Studio — but for Shopify + Firebase.
+  The easiest way to build Shopify apps on Firebase.
 
   ${c.bold}Usage:${c.reset}
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-shopify-firebase-app",
-  "version": "2.0.0",
-  "description": "Android Studio-level scaffolding for Shopify apps. Multi-page dashboard, App Bridge, Polaris components, TypeScript or JavaScript — deploy for free on Firebase.",
+  "version": "2.0.2",
+  "description": "Create Shopify apps powered by Firebase — multi-page dashboard, App Bridge, Polaris components, TypeScript or JavaScript. Deploy for free.",
   "keywords": [
     "shopify",
     "firebase",