Merge branch 'main' of github.com:tonik/stapler

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+  "changelog": ["@changesets/cli/changelog", { "repo": "tonik/stapler" }],
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

.changeset/pre.json

@@ -0,0 +1,9 @@
+{
+  "mode": "pre",
+  "tag": "alpha",
+  "initialVersions": {
+    "@create-stapler-app/cli": "0.1.0",
+    "@create-stapler-app/core": "0.1.0"
+  },
+  "changesets": []
+}

.github/workflows/release.yml

@@ -0,0 +1,38 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main # or your default branch
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js 20.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.x
+
+      - name: Setup pnpm
+        uses: pnpm/[email protected]
+        with:
+          version: 9.6.0
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Create Release Pull Request or Publish to npm
+        id: changesets
+        uses: changesets/action@v1
+        with:
+          publish: pnpm release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

README.md

@@ -2,6 +2,10 @@
 
 **Stapler** is a CLI tool that scaffolds an entire fullstack app using a monorepo structure. It integrates **Next.js**, **Supabase**, **Payload CMS**, **Vercel**, and more, leveraging **Turbo** and **pnpm** to optimize your development workflow.
 
+## Requirements
+- node.js
+- npx
+
 ## Features
 
 - **Fullstack scaffolding**: Quickly set up a monorepo with Next.js, Supabase, Payload CMS, and Vercel.

package.json

@@ -1,5 +1,7 @@
 {
   "name": "stapler",
+  "description": "Stapler: an amazing CLI tool that scaffolds an entire fullstack app for you",
+  "version": "0.1.0",
   "private": true,
   "scripts": {
     "build": "turbo build",
@@ -8,6 +10,7 @@
     "format": "prettier --write \"**/*.{ts,tsx,md}\""
   },
   "devDependencies": {
+    "@changesets/cli": "^2.27.9",
     "prettier": "^3.2.5",
     "turbo": "^2.1.1",
     "typescript": "^5.4.5"
@@ -16,8 +19,6 @@
   "engines": {
     "node": ">=18"
   },
-  "description": "This is an official starter Turborepo.",
-  "version": "1.0.0",
   "main": "index.js",
   "dependencies": {
     "eslint": "^8.57.0",

packages/cli/package.json

@@ -1,11 +1,15 @@
 {
-  "name": "@create-stapler-app/cli",
+  "name": "@tonik/create-stapler-app",
   "version": "0.1.0",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "bin": {
     "create-stapler-app": "./dist/index.mjs"
   },
+  "publishConfig": {
+    "access": "public",
+    "tag": "alpha"
+  },
   "scripts": {
     "build": "tsup index.ts --out-dir dist --format esm --dts",
     "dev": "tsc -w"

packages/core/package.json

@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "private": true,
   "scripts": {
     "build": "tsc --emitDeclarationOnly && tsup index.ts --out-dir dist --format cjs",
     "dev": "tsc -w"

packages/core/utils/supabase/connectProject.ts

@@ -20,7 +20,7 @@ const instructions = [
 export const connectSupabaseProject = async (projectName: string, currentDir: string) => {
   try {
     console.log('🖇️  Getting information about newly created Supabase project...');
-    const { stdout: projectsList } = await execAsync('supabase projects list');
+    const { stdout: projectsList } = await execAsync('npx supabase projects list');
     const projects = parseProjectsList(projectsList);
     const newProject = projects.find((project) => project.name === projectName);
 
@@ -31,7 +31,9 @@ export const connectSupabaseProject = async (projectName: string, currentDir: st
     }
 
     console.log('🖇️  Getting Supabase project keys...');
-    const { stdout: projectAPIKeys } = await execAsync(`supabase projects api-keys --project-ref ${newProject.refId}`);
+    const { stdout: projectAPIKeys } = await execAsync(
+      `npx supabase projects api-keys --project-ref ${newProject.refId}`,
+    );
 
     const { anonKey, serviceRoleKey } = getSupabaseKeys(projectAPIKeys);
 
@@ -52,7 +54,7 @@ export const connectSupabaseProject = async (projectName: string, currentDir: st
     });
 
     console.log('🖇️  Linking Supabase project...');
-    execSync(`supabase link --project-ref ${newProject.refId}`, { stdio: 'inherit' });
+    execSync(`npx supabase link --project-ref ${newProject.refId}`, { stdio: 'inherit' });
 
     for (const instruction of instructions) {
       console.log(instruction);

packages/core/utils/supabase/createProject.ts

@@ -3,7 +3,7 @@ import { execSync } from 'child_process';
 export const createSupabaseProject = async (name: string) => {
   console.log('🖇️  Creating Supabase project...');
 
-  execSync(`supabase projects create ${name}`, {
+  execSync(`npx supabase projects create ${name}`, {
     stdio: 'inherit',
   });
 };

packages/core/utils/supabase/install.ts

@@ -4,47 +4,16 @@ import path from 'path';
 import { supabaseFiles } from '../../templates/supabase/installConfig';
 import { templateGenerator } from '../generator/generator';
 
-const checkAndInstallSupabaseCLI = (): void => {
-  console.log('🖇️  Checking Supabase CLI installation...');
-
-  try {
-    execSync('supabase --version', { stdio: 'ignore' });
-  } catch (error) {
-    console.log('🖇️  Installing Supabase CLI...');
-    try {
-      // For macOS/Linux using Homebrew
-      if (process.platform === 'darwin' || process.platform === 'linux') {
-        execSync('brew install supabase/tap/supabase', { stdio: 'inherit' });
-      }
-      // For Windows using npm
-      else if (process.platform === 'win32') {
-        execSync('npm install -g supabase', { stdio: 'inherit' });
-      } else {
-        throw new Error('Unsupported operating system');
-      }
-    } catch (installError) {
-      console.error('\n🖇️  Failed to install Supabase CLI automatically. Please install it manually:');
-      console.log('\n🖇️  MacOS/Linux:');
-      console.log('🖇️  brew install supabase/tap/supabase');
-      console.log('\n🖇️  Windows:');
-      console.log('🖇️  npm install -g supabase');
-      console.log('\n🖇️  For other installation methods, visit:');
-      console.log('🖇️  https://supabase.com/docs/guides/local-development/cli/getting-started \n');
-      process.exit(1);
-    }
-  }
-};
-
 const supabaseLogin = () => {
   console.log('🖇️  Logging into Supabase...');
 
   try {
-    execSync('supabase projects list', { stdio: 'ignore' });
+    execSync('npx supabase projects list', { stdio: 'ignore' });
     console.log('🖇️  Already logged into Supabase. Skipping login.');
     return;
   } catch (error) {
     try {
-      execSync('supabase login', { stdio: 'inherit' });
+      execSync('npx supabase login', { stdio: 'inherit' });
     } catch {
       console.error('\n🖇️  Failed to log in to Supabase.');
       console.log('\n🖇️  Please log in manually with "supabase login" and re-run "create-stapler-app".');
@@ -56,7 +25,7 @@ const supabaseLogin = () => {
 const initializeSupabaseProject = (): void => {
   console.log('🖇️  Initialize Supabase project...');
   try {
-    execSync(`supabase init`, { stdio: ['pipe'], encoding: 'utf-8' });
+    execSync(`npx supabase init`, { stdio: ['pipe'], encoding: 'utf-8' });
   } catch (error: any) {
     const errorMessage = error.stderr;
 
@@ -76,7 +45,6 @@ const initializeSupabaseProject = (): void => {
 export const installSupabase = async (destinationDirectory: string) => {
   console.log('🖇️  Installing supabase-js...');
   try {
-    checkAndInstallSupabaseCLI();
     supabaseLogin();
     initializeSupabaseProject();
   } catch (error) {

packages/core/utils/vercel/connectWithGH.ts

@@ -8,7 +8,7 @@ export const connectWithGH = async () => {
 
   for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
     try {
-      execSync('vercel git connect', {
+      execSync('npx vercel git connect', {
         stdio: ['pipe'],
         encoding: 'utf-8',
       });

packages/core/utils/vercel/deploy.ts

@@ -20,13 +20,13 @@ export const deployVercelProject = async () => {
 
   await fs.writeFile('vercel.json', JSON.stringify(vercelConfig, null, 2));
 
-  console.log('🖇️  Creating preview deployment...');
-  const previewUrl = getDeploymentUrl(false);
-
   console.log('🖇️  Creating production deployment...');
   const productionUrl = getDeploymentUrl(true);
 
-  console.log(`🖇️  You can access your preview deployment at: \x1b[36m${previewUrl}\x1b[0m$`);
+  console.log('🖇️  Creating preview deployment...');
+  const previewUrl = getDeploymentUrl(false);
+
+  console.log(`🖇️  You can access your preview deployment at: \x1b[36m${previewUrl}\x1b[0m`);
 
-  console.log(`🖇️  You can access your production deployment at: \x1b[36m${productionUrl}\x1b[0m$`);
+  console.log(`🖇️  You can access your production deployment at: \x1b[36m${productionUrl}\x1b[0m`);
 };

packages/core/utils/vercel/setupAndCreate.ts

@@ -1,53 +1,29 @@
 import { execSync } from 'child_process';
 
-const vercelVersion = (): boolean => {
-  try {
-    execSync('vercel --version', { encoding: 'utf8' });
-    return true;
-  } catch {
-    return false;
-  }
-};
-
 const getUserName = (): string | null => {
   try {
-    const user = execSync('vercel whoami', { stdio: 'pipe', encoding: 'utf-8' });
-    console.log('test', user);
+    const user = execSync('npx vercel whoami', { stdio: 'pipe', encoding: 'utf-8' });
     return user;
   } catch {
     return null;
   }
 };
 
 export const setupAndCreateVercelProject = async () => {
-  console.log('🖇️  Checking if Vercel CLI is installed...');
-
-  const isVercelInstalled = vercelVersion();
-
-  if (!isVercelInstalled) {
-    console.log('🖇️  Installing Vercel CLI...');
-    try {
-      execSync('npm install -g vercel');
-    } catch {
-      console.error('🖇️  Failed to install Vercel CLI...');
-      process.exit(1);
-    }
-  }
-
   const vercelUserName = getUserName();
 
   if (!vercelUserName) {
     console.log('🖇️  Logging in to Vercel...');
     try {
-      execSync('vercel login', { stdio: 'inherit' });
+      execSync('npx vercel login', { stdio: 'inherit' });
     } catch (error) {
       console.log('\n🖇️  Oops! Something went wrong while logging in to Vercel...');
       console.log('🖇️  You might already be logged in with this email in another project.');
       console.log(
         '🖇️  In this case, select "Continue with Email" and enter the email you\'re already logged in with.\n',
       );
       try {
-        execSync('vercel login', { stdio: 'inherit' });
+        execSync('npx vercel login', { stdio: 'inherit' });
       } catch {
         console.log('\n🖇️  Please check the error above and try again.');
         console.log('🖇️  After successfully logging in with "vercel login", please run create-stapler-app again.\n');
@@ -59,8 +35,8 @@ export const setupAndCreateVercelProject = async () => {
   }
 
   console.log('🖇️  Initializing Vercel project...');
-  execSync('vercel init');
+  execSync('npx vercel init');
 
   console.log('🖇️  Linking Vercel project...');
-  execSync('vercel link', { stdio: 'inherit' });
+  execSync('npx vercel link', { stdio: 'inherit' });
 };

packages/core/utils/vercel/utils/getDeploymentUrl.ts

@@ -4,7 +4,10 @@ export const getDeploymentUrl = (production: boolean = false): string => {
   const command = production ? 'vercel --prod' : 'vercel';
 
   try {
-    const output = execSync(command, { encoding: 'utf8' });
+    const output = execSync(command, {
+      stdio: ['inherit', 'pipe', 'inherit'],
+      encoding: 'utf8',
+    });
 
     if (output) {
       return output;