fabrica-e-commerce 0.1.3 → 0.1.5

package/README.md

@@ -38,7 +38,7 @@ On Windows CMD, these commands do not require Unix tools such as `find` or `xarg
 
 ## Commands
 
-- `build` — checks dependencies (git, GitHub CLI, Vercel CLI), creates a Fabrica Connect Supabase job, opens the OAuth bridge, asks for required secrets, clones `https://github.com/trucount/fabrica-final-e-c.git`, verifies/logs in to Vercel (`vercel login`), pushes that code to a **new GitHub repository** under your account, connects the Vercel project to that repo for continuous deployment, writes every environment variable to production/preview/development, and deploys with `vercel --prod`.
+- `build` — checks dependencies (git, GitHub CLI, Vercel CLI), creates a Fabrica Connect Supabase job, opens the OAuth bridge, asks for required secrets, clones `https://github.com/trucount/fabrica-final-e-c.git`, verifies/logs in to Vercel (`vercel login`), publishes that code to a **new GitHub repository** under your account, connects the Vercel project to that repo for continuous deployment, writes every environment variable to production/preview/development, and deploys with `vercel --prod`.
 - `list` — shows locally saved deployments and lets you replace a saved project's Vercel environment variable (across production, preview, and development), then redeploys.
 - `vins` — verifies the CLI's external dependencies (`git`, GitHub CLI `gh`, and the Vercel CLI via `npx`) and automatically installs anything missing using your system's package manager (`apt-get`/`dnf`/`pacman` on Linux, `brew` on macOS, `winget`/`choco` on Windows). Prints manual install links for anything it can't install automatically.
 - `info` / `.info` — prints package, bridge, repository, and local data paths.
@@ -62,7 +62,7 @@ On Windows CMD, these commands do not require Unix tools such as `find` or `xarg
 5. Adds `SUPABASE_URL` and `SUPABASE_ANON_KEY` from the bridge response.
 6. **Step 3 — deploy:**
    - Verifies you're logged in to Vercel (`vercel whoami`); if not, runs an interactive `vercel login` and waits for it to finish.
-   - Logs in to the GitHub CLI if needed (`gh auth login`), detaches the cloned code from the template's git history, and pushes it to a **brand new private GitHub repository** under your account via `gh repo create --source . --push`.
+   - Logs in to the GitHub CLI if needed (`gh auth login`), detaches the cloned code from the template's git history, and publishes it to a **brand new private GitHub repository** under your account using the GitHub API, avoiding separate `git push` credential prompts.
    - Links a new Vercel project with `vercel link --yes --project <name>` and connects it to the new GitHub repo with `vercel git connect` so future pushes auto-deploy.
    - Writes every collected environment variable (including the Supabase URL/anon key) to the **production, preview, and development** environments with `vercel env add`, so the values are permanent for the project, not just the first deploy.
    - Creates the production deployment with `vercel --prod --yes`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fabrica-e-commerce",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Orange themed CMD launcher for deploying Fabrica e-commerce stores with Supabase and Vercel.",
   "type": "module",
   "bin": {

package/src/github.js

@@ -1,5 +1,8 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
 import process from 'node:process';
 import { commandExists, runCommand, runCommandCapture } from './system.js';
+import { choose } from './prompt.js';
 import { kv, section, spinner } from './ui.js';
 
 export async function isGithubCliInstalled() {
@@ -11,6 +14,11 @@ export async function isLoggedInToGithub() {
   return result.code === 0;
 }
 
+async function setupGithubGitCredentials() {
+  const result = await runCommandCapture('gh', ['auth', 'setup-git']);
+  return result.code === 0;
+}
+
 export async function ensureGithubLogin() {
   section('GitHub login');
   if (!(await isGithubCliInstalled())) {
@@ -19,15 +27,23 @@ export async function ensureGithubLogin() {
   const spin = spinner('Checking GitHub CLI login');
   if (await isLoggedInToGithub()) {
     spin.succeed('Already logged in to GitHub');
-    return;
+  } else {
+    spin.fail('Not logged in to GitHub');
+    console.log('A browser/device flow will open so you can log in with "gh auth login"...');
+    await runCommand('gh', ['auth', 'login', '--hostname', 'github.com', '--git-protocol', 'https', '--web']);
+    if (!(await isLoggedInToGithub())) {
+      throw new Error('GitHub login was not completed. Run "fabrica build" again after logging in with "gh auth login".');
+    }
+    kv('GitHub', 'Logged in');
   }
-  spin.fail('Not logged in to GitHub');
-  console.log('A browser/device flow will open so you can log in with "gh auth login"...');
-  await runCommand('gh', ['auth', 'login', '--hostname', 'github.com', '--git-protocol', 'https', '--web']);
-  if (!(await isLoggedInToGithub())) {
-    throw new Error('GitHub login was not completed. Run "fabrica build" again after logging in with "gh auth login".');
+
+  const gitSpin = spinner('Configuring GitHub API credentials');
+  if (await setupGithubGitCredentials()) {
+    gitSpin.succeed('GitHub API credentials ready');
+  } else {
+    gitSpin.fail('Could not configure GitHub git credentials automatically');
+    console.log('Continuing with GitHub API publishing; if Git later asks for credentials, run: gh auth setup-git');
   }
-  kv('GitHub', 'Logged in');
 }
 
 async function getGithubLogin() {
@@ -36,15 +52,106 @@ async function getGithubLogin() {
   return result.stdout.trim();
 }
 
+async function githubRepoExists(owner, repoName) {
+  const result = await runCommandCapture('gh', ['repo', 'view', `${owner}/${repoName}`, '--json', 'name']);
+  return result.code === 0;
+}
+
+async function ensureGithubRepo(owner, repoName) {
+  const fullName = `${owner}/${repoName}`;
+  if (await githubRepoExists(owner, repoName)) {
+    const action = await choose(`GitHub repo ${fullName} already exists. What should Fabrica do?`, [
+      { name: 'Use the existing repo and publish this storefront to it', value: 'use' },
+      { name: 'Stop so I can choose a different Vercel project/repo name', value: 'stop' }
+    ]);
+    if (action === 'stop') throw new Error(`GitHub repo ${fullName} already exists. Re-run build with a different project name.`);
+    return;
+  }
+
+  const spin = spinner(`Creating GitHub repo ${fullName}`);
+  const create = await runCommandCapture('gh', ['repo', 'create', fullName, '--private']);
+  if (create.code !== 0) {
+    spin.fail('Could not create GitHub repository');
+    throw new Error(create.stderr || 'gh repo create failed');
+  }
+  spin.succeed(`Created GitHub repo ${fullName}`);
+}
+
+async function setOrigin(project, repoUrl) {
+  const existing = await runCommandCapture('git', ['remote', 'get-url', 'origin'], { cwd: project.target });
+  if (existing.code === 0) {
+    await runCommand('git', ['remote', 'set-url', 'origin', repoUrl], { cwd: project.target });
+  } else {
+    await runCommand('git', ['remote', 'add', 'origin', repoUrl], { cwd: project.target });
+  }
+}
+
+
+async function ghApiJson(args, body) {
+  const result = await runCommandCapture('gh', ['api', ...args, '--input', '-'], { input: JSON.stringify(body) });
+  if (result.code !== 0) throw new Error(result.stderr || result.stdout || `gh api ${args.join(' ')} failed`);
+  return result.stdout ? JSON.parse(result.stdout) : {};
+}
+
+async function ghApiGet(args) {
+  const result = await runCommandCapture('gh', ['api', ...args]);
+  if (result.code !== 0) return null;
+  return result.stdout ? JSON.parse(result.stdout) : {};
+}
+
+async function listTrackedFiles(project) {
+  const result = await runCommandCapture('git', ['ls-files', '-z'], { cwd: project.target });
+  if (result.code !== 0) throw new Error(result.stderr || 'Could not list storefront files for GitHub upload.');
+  return result.stdout.split('\0').filter(Boolean);
+}
+
+async function createGithubBlob(project, owner, repoName, filePath) {
+  const absolute = path.join(project.target, filePath);
+  const content = await fs.readFile(absolute);
+  const blob = await ghApiJson([`repos/${owner}/${repoName}/git/blobs`], {
+    content: content.toString('base64'),
+    encoding: 'base64'
+  });
+  return { path: filePath.replace(/\\/g, '/'), mode: '100644', type: 'blob', sha: blob.sha };
+}
+
+async function publishWithGithubApi(project, owner, repoName) {
+  const spin = spinner('Publishing storefront through GitHub API');
+  const files = await listTrackedFiles(project);
+  const treeItems = [];
+  for (const filePath of files) {
+    treeItems.push(await createGithubBlob(project, owner, repoName, filePath));
+  }
+
+  const tree = await ghApiJson([`repos/${owner}/${repoName}/git/trees`], { tree: treeItems });
+
+  const existingRef = await ghApiGet([`repos/${owner}/${repoName}/git/ref/heads/main`]);
+  const parents = existingRef?.object?.sha ? [existingRef.object.sha] : [];
+  const commit = await ghApiJson([`repos/${owner}/${repoName}/git/commits`], {
+    message: 'Initial commit from Fabrica storefront',
+    tree: tree.sha,
+    parents
+  });
+
+  if (existingRef?.ref) {
+    await ghApiJson([`repos/${owner}/${repoName}/git/refs/heads/main`, '--method', 'PATCH'], { sha: commit.sha, force: true });
+  } else {
+    await ghApiJson([`repos/${owner}/${repoName}/git/refs`], { ref: 'refs/heads/main', sha: commit.sha });
+  }
+  spin.succeed('Published storefront to GitHub without git push');
+}
+
+
 // Re-homes the cloned storefront code into a brand new GitHub repository
 // owned by the logged-in user, so the deployed Vercel project can stay
-// connected to that repo (git push -> auto deploy) instead of the original
+// connected to that repo (future changes can auto deploy) instead of the original
 // template repository.
 export async function createGithubRepoFromClone(project) {
   section('GitHub repository');
   await ensureGithubLogin();
   const owner = await getGithubLogin();
   const repoName = project.projectName;
+  const repoUrl = `https://github.com/${owner}/${repoName}.git`;
 
   // Detach from the template's git history and start a clean repo so we
   // don't try to push into someone else's repository history.
@@ -57,15 +164,11 @@ export async function createGithubRepoFromClone(project) {
   await runCommand('git', ['add', '-A'], { cwd: project.target });
   await runCommand('git', ['-c', 'user.email=fabrica-cli@local', '-c', 'user.name=Fabrica CLI', 'commit', '-m', 'Initial commit from Fabrica storefront'], { cwd: project.target });
 
-  const spin = spinner(`Creating GitHub repo ${owner}/${repoName}`);
-  const create = await runCommandCapture('gh', ['repo', 'create', repoName, '--private', '--source', '.', '--remote', 'origin', '--push'], { cwd: project.target });
-  if (create.code !== 0) {
-    spin.fail('Could not create GitHub repository');
-    throw new Error(create.stderr || 'gh repo create failed');
-  }
-  spin.succeed(`Pushed code to ${owner}/${repoName}`);
+  await ensureGithubRepo(owner, repoName);
+  await setOrigin(project, repoUrl);
+  await publishWithGithubApi(project, owner, repoName);
 
-  const repoUrl = `https://github.com/${owner}/${repoName}`;
-  kv('GitHub repo', repoUrl);
-  return { owner, repoName, repoUrl };
+  const browserUrl = `https://github.com/${owner}/${repoName}`;
+  kv('GitHub repo', browserUrl);
+  return { owner, repoName, repoUrl: browserUrl };
 }

package/src/system.js

@@ -46,6 +46,7 @@ export function runCommandCapture(command, args, options = {}) {
     let child;
     try {
       child = spawn(executable(command), args, spawnOptions(command, options, 'pipe'));
+      if (options.input) child.stdin.end(options.input);
     } catch (error) {
       resolve({ code: null, stdout: '', stderr: '', error });
       return;

package/src/ui.js

@@ -21,7 +21,7 @@ export function help() {
   banner();
   console.log(`
 ${orange('Commands')}
-  ${bold('build')}      Connect Supabase, collect secrets, clone the store, push to a new GitHub repo, deploy to Vercel
+  ${bold('build')}      Connect Supabase, collect secrets, clone the store, publish to a new GitHub repo, deploy to Vercel
   ${bold('list')}       Show deployed Fabrica projects and edit env variables
   ${bold('vins')}       Verify CLI dependencies (git, gh, vercel) and auto-install anything missing
   ${bold('info')}       Show package, bridge, repo, and local storage information