Merge branch 'main' into sk/add-lefthook

Author: therealsamyak

.github/workflows/release.yaml

@@ -9,7 +9,7 @@ on:
   push:
     branches:
       - main
-  pull_request:
+  pull_request_target:
     types: [labeled]
 
 jobs:
@@ -80,6 +80,7 @@ jobs:
         env:
           NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
           BTS_TELEMETRY: 1
+          CONVEX_INGEST_URL: ${{ secrets.CONVEX_INGEST_URL }}
 
       - name: Update CLI types dependency
         if: steps.version.outputs.version != ''
@@ -93,6 +94,7 @@ jobs:
         run: cd apps/cli && bun run build
         env:
           BTS_TELEMETRY: 1
+          CONVEX_INGEST_URL: ${{ secrets.CONVEX_INGEST_URL }}
 
       - name: Update create-bts alias package version
         if: steps.version.outputs.version != ''
@@ -107,17 +109,19 @@ jobs:
         env:
           NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
           BTS_TELEMETRY: 1
+          CONVEX_INGEST_URL: ${{ secrets.CONVEX_INGEST_URL }}
 
       - name: Publish create-bts alias to NPM
         if: steps.version.outputs.version != ''
         run: cd packages/create-bts && bun publish --access public
         env:
           NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
           BTS_TELEMETRY: 1
+          CONVEX_INGEST_URL: ${{ secrets.CONVEX_INGEST_URL }}
 
   canary:
     runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request' && github.event.label.name == 'canary'
+    if: github.event_name == 'pull_request_target' && github.event.label.name == 'canary'
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

.github/workflows/test.yaml

@@ -0,0 +1,50 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request_review:
+    types: [submitted]
+  pull_request:
+    types: [labeled]
+
+jobs:
+  test:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request_review' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'main') || (github.event_name == 'pull_request' && github.event.label.name == 'canary')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ (github.event_name == 'pull_request_review' || github.event_name == 'pull_request') && github.event.pull_request.head.sha || github.sha }}
+
+      - name: Setup Git user
+        shell: bash
+        run: |
+          git config --global user.name github-actions[bot]
+          git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Install Dependencies
+        run: bun install --frozen-lockfile
+        env:
+          BTS_TELEMETRY: 0
+
+      - name: Build Workspace Dependencies
+        run: cd packages/types && bun run build
+
+      - name: Run Tests
+        working-directory: apps/cli
+        run: bun run test:ci
+        env:
+          AGENT: 1

.gitignore

@@ -38,4 +38,6 @@ yarn-error.log*
 .vscode
 .env*.local
 
-.smoke
+.smoke
+
+.idea

apps/cli/bunfig.toml

@@ -0,0 +1,17 @@
+[test]
+# Preload setup file for global setup/teardown
+preload = ["./test/setup.ts"]
+
+# Per-test timeout (3 minutes for smoke tests)
+timeout = 180000
+
+# Skip test files from coverage reports
+coverageSkipTestFiles = true
+
+# Exclude patterns from coverage
+coveragePathIgnorePatterns = [
+    "test/**",
+    "dist/**",
+    "templates/**",
+    "node_modules/**",
+]

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.8.0",
+  "version": "3.8.3",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",
@@ -51,8 +51,10 @@
     "build": "tsdown --publint",
     "dev": "tsdown --watch",
     "check-types": "tsc --noEmit",
-    "test": "bun run build && vitest run; rm -rf .smoke || true",
-    "test:ui": "bun run build && vitest --ui",
+    "test": "bun run build && bun test",
+    "test:watch": "bun run build && bun test --watch",
+    "test:coverage": "bun run build && bun test --coverage",
+    "test:ci": "bun run build && AGENT=1 bun test --bail=5",
     "prepublishOnly": "npm run build"
   },
   "exports": {
@@ -84,12 +86,11 @@
     "zod": "^4.1.13"
   },
   "devDependencies": {
+    "@types/bun": "^1.2.17",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^24.10.2",
-    "@vitest/ui": "^4.0.15",
     "publint": "^0.3.16",
     "tsdown": "^0.17.2",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.15"
+    "typescript": "^5.9.3"
   }
 }

apps/cli/src/constants.ts

@@ -42,8 +42,8 @@ export const DEFAULT_CONFIG = getDefaultConfig();
 export const dependencyVersionMap = {
   typescript: "^5",
 
-  "better-auth": "1.4.5",
-  "@better-auth/expo": "1.4.5",
+  "better-auth": "^1.4.7",
+  "@better-auth/expo": "^1.4.7",
 
   "@clerk/nextjs": "^6.31.5",
   "@clerk/clerk-react": "^5.45.0",
@@ -112,7 +112,7 @@ export const dependencyVersionMap = {
   fastify: "^5.3.3",
   "@fastify/cors": "^11.0.1",
 
-  turbo: "^2.5.4",
+  turbo: "^2.6.3",
 
   ai: "^5.0.49",
   "@ai-sdk/google": "^2.0.13",
@@ -154,14 +154,14 @@ export const dependencyVersionMap = {
   "@tanstack/solid-query-devtools": "^5.87.4",
   "@tanstack/solid-router-devtools": "^1.131.44",
 
-  wrangler: "^4.40.3",
-  "@cloudflare/vite-plugin": "^1.13.8",
-  "@opennextjs/cloudflare": "^1.6.5",
+  wrangler: "^4.54.0",
+  "@cloudflare/vite-plugin": "^1.17.1",
+  "@opennextjs/cloudflare": "^1.14.6",
   "nitro-cloudflare-dev": "^0.2.2",
-  "@sveltejs/adapter-cloudflare": "^7.2.1",
-  "@cloudflare/workers-types": "^4.20250822.0",
+  "@sveltejs/adapter-cloudflare": "^7.2.4",
+  "@cloudflare/workers-types": "^4.20251213.0",
 
-  alchemy: "^0.81.1",
+  alchemy: "^0.81.2",
 
   dotenv: "^17.2.2",
   tsdown: "^0.16.5",

apps/cli/src/helpers/core/env-setup.ts

@@ -161,6 +161,14 @@ export async function setupEnvironmentVariables(config: ProjectConfig) {
         },
       ];
 
+      if (hasNextJs) {
+        clientVars.push({
+          key: "PORT",
+          value: "3001",
+          condition: true,
+        });
+      }
+
       if (backend === "convex" && auth === "clerk") {
         if (hasNextJs) {
           clientVars.push(

apps/cli/src/helpers/core/project-config.ts

@@ -81,6 +81,10 @@ async function updateRootPackageJson(projectDir: string, options: ProjectConfig)
     }
   }
 
+  if (database === "sqlite" && dbSetup !== "d1" && orm !== "none") {
+    scripts["db:local"] = pmConfig.filter(dbPackageName, "db:local");
+  }
+
   if (dbSetup === "docker") {
     scripts["db:start"] = pmConfig.filter(dbPackageName, "db:start");
     scripts["db:watch"] = pmConfig.filter(dbPackageName, "db:watch");
@@ -183,7 +187,7 @@ async function updateDbPackageJson(projectDir: string, options: ProjectConfig) {
   const isD1Alchemy = dbSetup === "d1" && serverDeploy === "alchemy";
 
   if (database !== "none") {
-    if (database === "sqlite" && orm === "drizzle" && dbSetup !== "d1") {
+    if (database === "sqlite" && dbSetup !== "d1") {
       scripts["db:local"] = "turso dev --db-file local.db";
     }
 

apps/cli/src/helpers/deployment/alchemy/alchemy-next-setup.ts

@@ -24,6 +24,7 @@ export async function setupNextAlchemyDeploy(
     if (!options?.skipAppScripts) {
       pkg.scripts = {
         ...pkg.scripts,
+        dev: "alchemy dev",
         deploy: "alchemy deploy",
         destroy: "alchemy destroy",
       };

apps/cli/src/helpers/deployment/alchemy/alchemy-nuxt-setup.ts

@@ -24,6 +24,7 @@ export async function setupNuxtAlchemyDeploy(
     if (!options?.skipAppScripts) {
       pkg.scripts = {
         ...pkg.scripts,
+        dev: "alchemy dev",
         deploy: "alchemy deploy",
         destroy: "alchemy destroy",
       };