create-croissant 0.1.45 → 0.1.46

package/dist/add.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import i from"path";import{fileURLToPath as E}from"url";import s from"chalk";import{Command as P}from"commander";import{execa as j}from"execa";import e from"fs-extra";import k from"inquirer";import g from"ora";var A=E(import.meta.url),x=i.dirname(A),y=new P;y.name("croissant-add").description("Add a mobile or desktop app to an existing Croissant Stack project").action(async()=>{console.log(s.bold.yellow(`
+import i from"path";import{fileURLToPath as E}from"url";import s from"chalk";import{Command as P}from"commander";import{execa as j}from"execa";import t from"fs-extra";import k from"inquirer";import g from"ora";var A=E(import.meta.url),x=i.dirname(A),v=new P;v.name("croissant-add").description("Add a mobile or desktop app to an existing Croissant Stack project").action(async()=>{console.log(s.bold.yellow(`
 \u{1F950} Croissant Stack: Add App
-`));let p=i.join(process.cwd(),"package.json");await e.pathExists(p)||(console.error(s.red(`
+`));let p=i.join(process.cwd(),"package.json");await t.pathExists(p)||(console.error(s.red(`
 Error: package.json not found. Are you in the root of your project?
-`)),process.exit(1));let t=await e.readJson(p);(!t.scripts||!t.scripts.dev&&!t.scripts.build)&&(console.error(s.red(`
+`)),process.exit(1));let e=await t.readJson(p);(!e.scripts||!e.scripts.dev&&!e.scripts.build)&&(console.error(s.red(`
 Error: This doesn't look like a Croissant Stack project.
-`)),process.exit(1));let u=i.join(process.cwd(),"apps/mobile"),h=i.join(process.cwd(),"apps/desktop"),f=await e.pathExists(u),b=await e.pathExists(h);if(f&&b){console.log(s.blue(`Both mobile and desktop apps are already present. Nothing to add!
-`));return}let l=[];f||l.push({name:"Mobile App (Expo)",value:"mobile"}),b||l.push({name:"Desktop App (Electron)",value:"desktop"});let{type:a}=await k.prompt([{type:"list",name:"type",message:"Which app would you like to add?",choices:l}]),c=process.cwd(),w=g(`Adding ${a} app...`).start();try{let n=i.join(x,"..","template");if(await e.pathExists(n)||(n=i.resolve(x,"../../..")),a==="mobile"){let r=i.join(n,"apps/mobile");await e.copy(r,u),t.scripts=t.scripts||{},t.scripts["dev:mobile"]="turbo run dev --filter=mobile",t.scripts["build:mobile"]="turbo run build --filter=mobile",await e.writeJson(p,t,{spaces:2});let d=i.join(c,"packages/auth/src/lib/auth.ts");if(await e.pathExists(d)){let o=await e.readFile(d,"utf8");o.includes("@better-auth/expo")||(o=`import { expo } from "@better-auth/expo";
+`)),process.exit(1));let u=i.join(process.cwd(),"apps/mobile"),h=i.join(process.cwd(),"apps/desktop"),b=await t.pathExists(u),f=await t.pathExists(h);if(b&&f){console.log(s.blue(`Both mobile and desktop apps are already present. Nothing to add!
+`));return}let l=[];b||l.push({name:"Mobile App (Expo)",value:"mobile"}),f||l.push({name:"Desktop App (Electron)",value:"desktop"});let{type:a}=await k.prompt([{type:"list",name:"type",message:"Which app would you like to add?",choices:l}]),c=process.cwd(),w=g(`Adding ${a} app...`).start();try{let n=i.join(x,"..","template");if(await t.pathExists(n)||(n=i.resolve(x,"../../..")),a==="mobile"){let r=i.join(n,"apps/mobile");await t.copy(r,u),e.scripts=e.scripts||{},e.scripts["dev:mobile"]="turbo run dev --filter=mobile",e.scripts["dev:ios"]="turbo run dev --filter=mobile -- --ios",e.scripts["dev:android"]="turbo run dev --filter=mobile -- --android",e.scripts["build:mobile"]="turbo run build --filter=mobile",await t.writeJson(p,e,{spaces:2});let d=i.join(c,"packages/auth/src/lib/auth.ts");if(await t.pathExists(d)){let o=await t.readFile(d,"utf8");o.includes("@better-auth/expo")||(o=`import { expo } from "@better-auth/expo";
 ${o}`),o.includes("plugins: [expo()]")||(o=o.replace("emailAndPassword: { enabled: true },",`emailAndPassword: { enabled: true },
   plugins: [expo()],
   trustedOrigins: [
@@ -19,7 +19,7 @@ ${o}`),o.includes("plugins: [expo()]")||(o=o.replace("emailAndPassword: { enable
           "http://localhost:8081",
         ]
       : []),
-  ],`)),await e.writeFile(d,o)}let m=i.join(c,"packages/auth/package.json");if(await e.pathExists(m)){let o=await e.readJson(m);o.dependencies=o.dependencies||{},o.dependencies["@better-auth/expo"]||(o.dependencies["@better-auth/expo"]="latest",await e.writeJson(m,o,{spaces:2}))}}else if(a==="desktop"){let r=i.join(n,"apps/desktop");await e.copy(r,h),t.scripts=t.scripts||{},t.scripts["dev:desktop"]="turbo run dev --filter=desktop",t.scripts["build:desktop"]="turbo run build --filter=desktop",await e.writeJson(p,t,{spaces:2})}w.succeed(s.green(`${a==="mobile"?"Mobile":"Desktop"} app added successfully!`));let{install:v}=await k.prompt([{type:"confirm",name:"install",message:"Would you like to install dependencies now?",default:!0}]);if(v){let r=g("Installing dependencies...").start();try{await j("npm",["install"],{cwd:c}),r.succeed(s.green("Dependencies installed!"))}catch{r.fail(s.red("Failed to install dependencies. Run npm install manually."))}}console.log(s.bold.cyan(`
-Next steps:`)),console.log(a==="mobile"?"  npm run dev:mobile    # Start Expo development server":"  npm run dev:desktop   # Start Electron development server"),console.log(s.yellow(`
+  ],`)),await t.writeFile(d,o)}let m=i.join(c,"packages/auth/package.json");if(await t.pathExists(m)){let o=await t.readJson(m);o.dependencies=o.dependencies||{},o.dependencies["@better-auth/expo"]||(o.dependencies["@better-auth/expo"]="latest",await t.writeJson(m,o,{spaces:2}))}}else if(a==="desktop"){let r=i.join(n,"apps/desktop");await t.copy(r,h),e.scripts=e.scripts||{},e.scripts["dev:desktop"]="turbo run dev --filter=desktop",e.scripts["build:desktop"]="turbo run build --filter=desktop",await t.writeJson(p,e,{spaces:2})}w.succeed(s.green(`${a==="mobile"?"Mobile":"Desktop"} app added successfully!`));let{install:y}=await k.prompt([{type:"confirm",name:"install",message:"Would you like to install dependencies now?",default:!0}]);if(y){let r=g("Installing dependencies...").start();try{await j("pnpm",["install"],{cwd:c}),r.succeed(s.green("Dependencies installed!"))}catch{r.fail(s.red("Failed to install dependencies. Run pnpm install manually."))}}console.log(s.bold.cyan(`
+Next steps:`)),console.log(a==="mobile"?"  pnpm run dev:mobile    # Start Expo development server":"  pnpm run dev:desktop   # Start Electron development server"),console.log(s.yellow(`
 Happy hacking! \u{1F950}
-`))}catch(n){w.fail(s.red(`An error occurred while adding the ${a} app.`)),console.error(n),process.exit(1)}});y.parse(process.argv);
+`))}catch(n){w.fail(s.red(`An error occurred while adding the ${a} app.`)),console.error(n),process.exit(1)}});v.parse(process.argv);

package/dist/index.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import i from"path";import{fileURLToPath as x}from"url";import c from"chalk";import{Command as b}from"commander";import{execa as P}from"execa";import e from"fs-extra";import y from"inquirer";import g from"ora";var j=x(import.meta.url),w=i.dirname(j),k=new b;k.name("create-croissant").description("Scaffold a new project using the Croissant Stack").argument("[project-name]","Name of the project").action(async m=>{console.log(c.bold.yellow(`
+import i from"path";import{fileURLToPath as k}from"url";import p from"chalk";import{Command as b}from"commander";import{execa as P}from"execa";import e from"fs-extra";import y from"inquirer";import g from"ora";var j=k(import.meta.url),w=i.dirname(j),x=new b;x.name("create-croissant").description("Scaffold a new project using the Croissant Stack").argument("[project-name]","Name of the project").action(async u=>{console.log(p.bold.yellow(`
 \u{1F950} Welcome to the Croissant Stack!
-`));let l=await y.prompt([{type:"input",name:"name",message:"What is your project named?",default:m||"my-croissant-app",when:!m},{type:"confirm",name:"install",message:"Would you like to install dependencies?",default:!0},{type:"confirm",name:"mobile",message:"Would you like to include the mobile app (Expo)?",default:!0},{type:"confirm",name:"desktop",message:"Would you like to include the desktop app (Electron)?",default:!0}]),p=m||l.name,s=i.resolve(process.cwd(),p);e.existsSync(s)&&(console.error(c.red(`
-Error: Directory ${p} already exists.
-`)),process.exit(1));let h=g("Scaffolding your project...").start();try{await e.ensureDir(s);let d=i.join(w,"..","template");if(await e.pathExists(d))await e.copy(d,s);else{let a=i.resolve(w,"../../.."),n=["node_modules","dist",".git","packages/create-croissant",".turbo","package-lock.json"];await e.copy(a,s,{filter:t=>{let r=i.relative(a,t);return!n.some(o=>r.startsWith(o))}})}if(l.mobile){let a=i.join(s,"packages/auth/src/lib/auth.ts");if(await e.pathExists(a)){let t=await e.readFile(a,"utf8");t.includes("@better-auth/expo")||(t=`import { expo } from "@better-auth/expo";
+`));let l=await y.prompt([{type:"input",name:"name",message:"What is your project named?",default:u||"my-croissant-app",when:!u},{type:"confirm",name:"install",message:"Would you like to install dependencies?",default:!0},{type:"confirm",name:"mobile",message:"Would you like to include the mobile app (Expo)?",default:!0},{type:"confirm",name:"desktop",message:"Would you like to include the desktop app (Electron)?",default:!0}]),c=u||l.name,s=i.resolve(process.cwd(),c);e.existsSync(s)&&(console.error(p.red(`
+Error: Directory ${c} already exists.
+`)),process.exit(1));let f=g("Scaffolding your project...").start();try{await e.ensureDir(s);let d=i.join(w,"..","template");if(await e.pathExists(d))await e.copy(d,s);else{let a=i.resolve(w,"../../.."),n=["node_modules","dist",".git","packages/create-croissant",".turbo","pnpm-lock.yaml"];await e.copy(a,s,{filter:t=>{let r=i.relative(a,t);return!n.some(o=>r.startsWith(o))}})}if(l.mobile){let a=i.join(s,"packages/auth/src/lib/auth.ts");if(await e.pathExists(a)){let t=await e.readFile(a,"utf8");t.includes("@better-auth/expo")||(t=`import { expo } from "@better-auth/expo";
 ${t}`),t.includes("plugins: [expo()]")||(t=t.replace("emailAndPassword: { enabled: true },",`emailAndPassword: { enabled: true },
   plugins: [expo()],
   trustedOrigins: [
@@ -16,7 +16,7 @@ ${t}`),t.includes("plugins: [expo()]")||(t=t.replace("emailAndPassword: { enable
           "http://localhost:8081",
         ]
       : []),
-  ],`)),await e.writeFile(a,t)}let n=i.join(s,"packages/auth/package.json");if(await e.pathExists(n)){let t=await e.readJson(n);t.dependencies=t.dependencies||{},t.dependencies["@better-auth/expo"]||(t.dependencies["@better-auth/expo"]="latest",await e.writeJson(n,t,{spaces:2}))}}else{let a=i.join(s,"apps/mobile");if(await e.pathExists(a)){await e.remove(a);let n=i.join(s,"package.json");if(await e.pathExists(n)){let o=await e.readJson(n);o.scripts&&Object.keys(o.scripts).forEach(f=>{f.includes("mobile")&&delete o.scripts[f]}),await e.writeJson(n,o,{spaces:2})}let t=i.join(s,"packages/auth/src/lib/auth.ts");if(await e.pathExists(t)){let o=await e.readFile(t,"utf8");o=o.replace(/import \{ expo \} from "@better-auth\/expo";\n/,""),o=o.replace(/\s+plugins: \[expo\(\)\],/,""),o=o.replace(/\s+trustedOrigins: \[[\s\S]*?\],/,""),await e.writeFile(t,o)}let r=i.join(s,"packages/auth/package.json");if(await e.pathExists(r)){let o=await e.readJson(r);o.dependencies&&o.dependencies["@better-auth/expo"]&&(delete o.dependencies["@better-auth/expo"],await e.writeJson(r,o,{spaces:2}))}}}if(!l.desktop){let a=i.join(s,"apps/desktop");if(await e.pathExists(a)){await e.remove(a);let n=i.join(s,"package.json");if(await e.pathExists(n)){let t=await e.readJson(n);t.scripts&&Object.keys(t.scripts).forEach(r=>{r.includes("desktop")&&delete t.scripts[r]}),await e.writeJson(n,t,{spaces:2})}}}let u=i.join(s,"package.json");if(await e.pathExists(u)){let a=await e.readJson(u);a.name=p,a.version="0.1.0",delete a.private,await e.writeJson(u,a,{spaces:2})}if(h.succeed(c.green(`Project ${p} created at ${s}`)),l.install){let a=g("Installing dependencies...").start();try{await P("npm",["install"],{cwd:s}),a.succeed(c.green("Dependencies installed!"))}catch{a.fail(c.red("Failed to install dependencies. You may need to run npm install manually."))}}console.log(c.bold.cyan(`
-Next steps:`)),console.log(`  cd ${p}`),console.log("  npm run db:up    # Start your PostgreSQL database"),console.log(`  npm run dev      # Start development server
-`),console.log(c.yellow(`Happy hacking! \u{1F950}
-`))}catch(d){h.fail(c.red("An error occurred during scaffolding.")),console.error(d),process.exit(1)}});k.parse(process.argv);
+  ],`)),await e.writeFile(a,t)}let n=i.join(s,"packages/auth/package.json");if(await e.pathExists(n)){let t=await e.readJson(n);t.dependencies=t.dependencies||{},t.dependencies["@better-auth/expo"]||(t.dependencies["@better-auth/expo"]="latest",await e.writeJson(n,t,{spaces:2}))}}else{let a=i.join(s,"apps/mobile");if(await e.pathExists(a)){await e.remove(a);let n=i.join(s,"package.json");if(await e.pathExists(n)){let o=await e.readJson(n);o.scripts&&Object.keys(o.scripts).forEach(m=>{(m.includes("mobile")||m.includes("ios")||m.includes("android"))&&delete o.scripts[m]}),await e.writeJson(n,o,{spaces:2})}let t=i.join(s,"packages/auth/src/lib/auth.ts");if(await e.pathExists(t)){let o=await e.readFile(t,"utf8");o=o.replace(/import \{ expo \} from "@better-auth\/expo";\n/,""),o=o.replace(/\s+plugins: \[expo\(\)\],/,""),o=o.replace(/\s+trustedOrigins: \[[\s\S]*?\],/,""),await e.writeFile(t,o)}let r=i.join(s,"packages/auth/package.json");if(await e.pathExists(r)){let o=await e.readJson(r);o.dependencies&&o.dependencies["@better-auth/expo"]&&(delete o.dependencies["@better-auth/expo"],await e.writeJson(r,o,{spaces:2}))}}}if(!l.desktop){let a=i.join(s,"apps/desktop");if(await e.pathExists(a)){await e.remove(a);let n=i.join(s,"package.json");if(await e.pathExists(n)){let t=await e.readJson(n);t.scripts&&Object.keys(t.scripts).forEach(r=>{r.includes("desktop")&&delete t.scripts[r]}),await e.writeJson(n,t,{spaces:2})}}}let h=i.join(s,"package.json");if(await e.pathExists(h)){let a=await e.readJson(h);a.name=c,a.version="0.1.0",delete a.private,await e.writeJson(h,a,{spaces:2})}if(f.succeed(p.green(`Project ${c} created at ${s}`)),l.install){let a=g("Installing dependencies...").start();try{await P("pnpm",["install"],{cwd:s}),a.succeed(p.green("Dependencies installed!"))}catch{a.fail(p.red("Failed to install dependencies. You may need to run pnpm install manually."))}}console.log(p.bold.cyan(`
+Next steps:`)),console.log(`  cd ${c}`),console.log("  pnpm run db:up    # Start your PostgreSQL database"),console.log(`  pnpm run dev      # Start development server
+`),console.log(p.yellow(`Happy hacking! \u{1F950}
+`))}catch(d){f.fail(p.red("An error occurred during scaffolding.")),console.error(d),process.exit(1)}});x.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-croissant",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "description": "Scaffold a new project using the Croissant Stack",
   "repository": {
     "type": "git",
@@ -20,12 +20,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "npm run prepare-template && tsup src/index.ts src/add.ts --format esm --clean --minify",
-    "dev": "tsup src/index.ts src/add.ts --format esm --watch",
-    "typecheck": "tsc --noEmit",
-    "prepare-template": "node scripts/prepare-template.js"
-  },
   "dependencies": {
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
@@ -38,7 +32,13 @@
     "@types/fs-extra": "^11.0.4",
     "@types/inquirer": "^9.0.9",
     "@types/node": "^25.6.0",
-    "@workspace/config-typescript": "*",
-    "tsup": "^8.5.1"
+    "tsup": "^8.5.1",
+    "@workspace/config-typescript": "0.0.0"
+  },
+  "scripts": {
+    "build": "pnpm run prepare-template && tsup src/index.ts src/add.ts --format esm --clean --minify",
+    "dev": "tsup src/index.ts src/add.ts --format esm --watch",
+    "typecheck": "tsc --noEmit",
+    "prepare-template": "node scripts/prepare-template.js"
   }
-}
+}

package/template/.env.example

@@ -1,5 +1,5 @@
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/auth
-BETTER_AUTH_URL=http://localhost:3000
+BETTER_AUTH_URL=https://platform.local
 BETTER_AUTH_SECRET=your-secret-here
 # For production, set this to your domain
-# NEXT_PUBLIC_APP_URL=http://localhost:3000
+# NEXT_PUBLIC_APP_URL=https://platform.local

package/template/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "pnpm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    groups:
+      dependencies:
+        patterns:
+          - "*"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

package/template/.github/workflows/ci.yml

@@ -0,0 +1,143 @@
+name: CI
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+permissions:
+  contents: write
+  id-token: write
+
+jobs:
+  build:
+    name: Build and Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9.15.0
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Lint
+        run: pnpm run lint
+
+      - name: Typecheck
+        run: pnpm run typecheck
+
+      - name: Build
+        run: pnpm run build
+
+  release:
+    name: Release create-croissant
+    needs: build
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9.15.0
+          run_install: false
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Bump Version and Publish
+        run: |
+          # Configure git
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+          # Prepare the template from the latest monorepo state
+          pnpm --filter create-croissant run prepare-template
+
+          # Move into the package directory for versioning and publishing
+          cd packages/create-croissant
+
+          # Get the latest version from npm to avoid conflicts
+          NPM_VERSION=$(pnpm view create-croissant version 2>/dev/null || echo "0.0.0")
+          LOCAL_VERSION=$(node -p "require('./package.json').version")
+
+          echo "NPM version: $NPM_VERSION"
+          echo "Local version: $LOCAL_VERSION"
+
+          # If npm has a higher version, sync local version first
+          if [ "$NPM_VERSION" != "$LOCAL_VERSION" ] && [ "$(printf '%s\n' "$NPM_VERSION" "$LOCAL_VERSION" | sort -V | tail -n1)" = "$NPM_VERSION" ] && [ "$NPM_VERSION" != "0.0.0" ]; then
+            echo "Syncing local version to $NPM_VERSION to avoid conflict"
+            npm version $NPM_VERSION --no-git-tag-version
+          fi
+
+          # Bump version (patch)
+          npm version patch --no-git-tag-version
+          
+          NEW_VERSION=$(node -p "require('./package.json').version")
+          echo "New version to be published: $NEW_VERSION"
+
+          # Build the package
+          pnpm run build
+
+          # Publish to npm (using Trusted Publishing)
+          pnpm publish --provenance --access public --no-git-checks
+
+          # Go back to root for git operations
+          cd ../..
+
+          # After successful publish, commit the version change and tag it
+          git add packages/create-croissant/package.json
+          git commit -m "chore: release create-croissant v$NEW_VERSION [skip ci]"
+          git tag "v$NEW_VERSION"
+
+          # Push the version bump commit and tag back to main
+          git push origin main --follow-tags
+
+          # Create a GitHub Release
+          # --generate-notes automatically creates a changelog based on commits
+          # We use --target main to ensure the release is associated with the pushed branch
+          gh release create "v$NEW_VERSION" \
+            --target main \
+            --title "Release v$NEW_VERSION (create-croissant)" \
+            --generate-notes \
+            --latest
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/template/.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,23 @@
+name: Dependabot Auto-Merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v3
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: steps.metadata.outputs.update-type != 'version-update:semver-major'
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/template/README.md

@@ -7,7 +7,7 @@ A modern, type-safe full-stack monorepo powered by **TanStack Start**, **Better
 The fastest way to scaffold a new project with the Croissant Stack is using our CLI:
 
 ```bash
-npx create-croissant@latest
+pnpm dlx create-croissant@latest
 ```
 
 ---
@@ -21,7 +21,7 @@ npx create-croissant@latest
 - **API**: [oRPC](https://orpc.sh/) with a modular, namespaced router for end-to-end type-safety.
 - **Database**: [Drizzle ORM](https://orm.drizzle.team/) with PostgreSQL and Docker Compose setup.
 - **Styling**: [shadcn/ui](https://ui.shadcn.com/) components with Tailwind CSS.
-- **Monorepo Management**: Powered by [Turborepo](https://turbo.build/) for lightning-fast builds and smart task orchestration.
+- **Monorepo Management**: Powered by [pnpm](https://pnpm.io/) and [Turborepo](https://turbo.build/) for lightning-fast builds and smart task orchestration.
 - **Developer Experience**: 
   - Path aliases (`@/`) for clean imports.
   - Strict TypeScript across the entire stack.
@@ -47,7 +47,7 @@ npx create-croissant@latest
 ### 1. Install Dependencies
 
 ```bash
-npm install
+pnpm install
 ```
 
 ### 2. Set Up the Database
@@ -55,7 +55,7 @@ npm install
 Start the PostgreSQL database using Docker Compose:
 
 ```bash
-npm run db:up
+pnpm run db:up
 ```
 
 This command runs a PostgreSQL container named `samstack` on port `5432`.
@@ -72,7 +72,7 @@ Ensure you provide the necessary variables:
 
 ```env
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/auth
-BETTER_AUTH_URL=http://localhost:3000
+BETTER_AUTH_URL=https://platform.local
 BETTER_AUTH_SECRET=your-secret-here
 ```
 
@@ -82,36 +82,36 @@ Synchronize your schema with the database:
 
 ```bash
 # From packages/db or via turbo
-npm run db:push --filter @workspace/db
+pnpm run db:push --filter @workspace/db
 ```
 
 ### 5. Run Development Server
 
 ```bash
-npm run dev
+pnpm run dev
 ```
 
-The web application will be available at `http://localhost:3000`.
+The web application will be available at `https://platform.local`.
 
 ## 📦 Scripts
 
 All scripts are orchestrated by Turborepo. You can run them from the root directory:
 
 ### Core Scripts
-- `npm run dev`: Start all applications in development mode.
-- `npm run build`: Build all applications for production.
-- `npm run quality`: Run all quality checks (linting and formatting) using Oxc.
-- `npm run quality:fix`: Automatically fix linting and formatting issues using Oxc.
-- `npm run typecheck`: Run TypeScript type checking across the workspace.
-- `npm run ci`: Run linting, type-checking, and build (used in CI/CD).
+- `pnpm run dev`: Start all applications in development mode.
+- `pnpm run build`: Build all applications for production.
+- `pnpm run quality`: Run all quality checks (linting and formatting) using Oxc.
+- `pnpm run quality:fix`: Automatically fix linting and formatting issues using Oxc.
+- `pnpm run typecheck`: Run TypeScript type checking across the workspace.
+- `pnpm run ci`: Run linting, type-checking, and build (used in CI/CD).
 
 ### 🗄️ Database Scripts
 These handle Docker and Drizzle operations:
-- `npm run db:up`: Start the PostgreSQL Docker container.
-- `npm run db:down`: Stop and remove the database container.
-- `npm run db:logs`: Tail logs from the database container.
-- `npm run db:push --filter @workspace/db`: Push Drizzle schema to the database.
-- `npm run db:studio --filter @workspace/db`: Open Drizzle Studio to explore your data.
+- `pnpm run db:up`: Start the PostgreSQL Docker container.
+- `pnpm run db:down`: Stop and remove the database container.
+- `pnpm run db:logs`: Tail logs from the database container.
+- `pnpm run db:push --filter @workspace/db`: Push Drizzle schema to the database.
+- `pnpm run db:studio --filter @workspace/db`: Open Drizzle Studio to explore your data.
 
 ## 🎯 Turborepo Power
 
@@ -120,10 +120,10 @@ Turbo allows you to run tasks for specific packages using the `--filter` flag:
 
 ```bash
 # Only lint the platform app
-npm run lint -- --filter platform
+pnpm run lint --filter platform
 
 # Build the db package and everything that depends on it
-npm run build -- --filter @workspace/db...
+pnpm run build --filter @workspace/db...
 ```
 
 ### Smart Caching
@@ -151,14 +151,14 @@ type Outputs = InferRouterOutputs<typeof router>;
 To add components to the shared UI package:
 
 ```bash
-npx shadcn@latest add [component-name] -c apps/platform
+pnpm dlx shadcn@latest add [component-name] -c apps/platform
 ```
 
 This will place the UI components in `packages/ui/src/components`.
 
 ## 🛡️ Quality & Git Hooks
 
-This project uses **Husky** to ensure code quality. When pushing to the `main` branch, it automatically runs the CI pipeline (`npm run ci`) to prevent broken code from being pushed.
+This project uses **Husky** to ensure code quality. When pushing to the `main` branch, it automatically runs the CI pipeline (`pnpm run ci`) to prevent broken code from being pushed.
 
 Formatting and linting are handled by **Oxc**, which is significantly faster than ESLint and Prettier.
 

package/template/apps/desktop/README.md

@@ -11,24 +11,24 @@ An Electron application with React and TypeScript
 ### Install
 
 ```bash
-$ npm install
+$ pnpm install
 ```
 
 ### Development
 
 ```bash
-$ npm run dev
+$ pnpm run dev
 ```
 
 ### Build
 
 ```bash
 # For windows
-$ npm run build:win
+$ pnpm run build:win
 
 # For macOS
-$ npm run build:mac
+$ pnpm run build:mac
 
 # For Linux
-$ npm run build:linux
+$ pnpm run build:linux
 ```

package/template/apps/desktop/package.json

@@ -8,13 +8,13 @@
   "scripts": {
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
-    "typecheck": "npm run typecheck:node && npm run typecheck:web",
+    "typecheck": "pnpm run typecheck:node && pnpm run typecheck:web",
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
-    "build": "npm run typecheck && electron-vite build",
+    "build": "pnpm run typecheck && electron-vite build",
     "postinstall": "electron-builder install-app-deps",
-    "build:unpack": "npm run build && electron-builder --dir",
-    "build:win": "npm run build && electron-builder --win",
+    "build:unpack": "pnpm run build && electron-builder --dir",
+    "build:win": "pnpm run build && electron-builder --win",
     "build:mac": "electron-vite build && electron-builder --mac",
     "build:linux": "electron-vite build && electron-builder --linux"
   },
@@ -27,7 +27,7 @@
     "@electron-toolkit/tsconfig": "^2.0.0",
     "@types/node": "^22.19.1",
     "@vitejs/plugin-react": "^5.1.1",
-    "@workspace/config-typescript": "*",
+    "@workspace/config-typescript": "workspace:*",
     "electron": "39.8.9",
     "electron-builder": "^26.0.12",
     "electron-vite": "^5.0.0"

package/template/apps/mobile/README.md

@@ -7,13 +7,13 @@ This is an [Expo](https://expo.dev) project created with [`create-expo-app`](htt
 1. Install dependencies
 
    ```bash
-   npm install
+   pnpm install
    ```
 
 2. Start the app
 
    ```bash
-   npx expo start
+   pnpm dlx expo start
    ```
 
 In the output, you'll find options to open the app in a
@@ -30,7 +30,7 @@ You can start developing by editing the files inside the **app** directory. This
 When you're ready, run:
 
 ```bash
-npm run reset-project
+pnpm run reset-project
 ```
 
 This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing.

package/template/apps/mobile/app/(tabs)/explore.tsx

@@ -51,6 +51,7 @@ export default function ExploreScreen() {
         diameter: parseFloat(value.diameter) || 0,
         hasRings: false,
       };
+      console.log('connard')
 
       try {
         if (editingId) {

package/template/apps/mobile/app/(tabs)/index.tsx

@@ -1,45 +1,30 @@
-import { useEffect, useState } from "react";
-import { View, Text, StyleSheet, ScrollView, TouchableOpacity, Platform } from "react-native";
+import { useEffect } from "react";
+import { View, Text, StyleSheet, ScrollView, Platform } from "react-native";
 import { useRouter } from "expo-router";
 import { authClient } from "@/lib/auth-client";
-import { orpc } from "@/lib/orpc";
+import { useSecretData } from "@workspace/orpc/react";
 import { Button } from "@/components/ui/button";
 
 export default function DashboardScreen() {
   const router = useRouter();
-  const { data: session, isPending } = authClient.useSession();
-  const [secretData, setSecretData] = useState<string>("");
-  const [loadingSecret, setLoadingSecret] = useState(false);
+  const { data: session, isPending: isAuthPending } = authClient.useSession();
+  
+  const { data: secretData, isLoading: isLoadingSecret, error: secretError } = useSecretData({
+    enabled: !!session,
+  });
 
   useEffect(() => {
-    if (!isPending && !session) {
+    if (!isAuthPending && !session) {
       router.replace("/login");
-      return;
     }
-
-    if (session) {
-      const fetchSecret = async () => {
-        setLoadingSecret(true);
-        try {
-          const res = await orpc.getSecretData();
-          setSecretData(res.secret);
-        } catch (err: any) {
-          setSecretData("Error: " + (err.message || "Unknown error"));
-        } finally {
-          setLoadingSecret(false);
-        }
-      };
-
-      fetchSecret();
-    }
-  }, [session, isPending, router]);
+  }, [session, isAuthPending, router]);
 
   const handleSignOut = async () => {
     await authClient.signOut();
     router.replace("/");
   };
 
-  if (isPending) {
+  if (isAuthPending) {
     return (
       <View style={styles.center}>
         <Text>Loading dashboard...</Text>
@@ -57,7 +42,15 @@ export default function DashboardScreen() {
 
       <View style={styles.secureBox}>
         <Text style={styles.secureTitle}>Secure oRPC Data:</Text>
-        <Text style={styles.secureContent}>{secretData}</Text>
+        {isLoadingSecret ? (
+          <Text style={styles.secureContent}>Loading secret data...</Text>
+        ) : secretError ? (
+          <Text style={[styles.secureContent, styles.errorText]}>
+            Error: {secretError.message || "Unknown error"}
+          </Text>
+        ) : (
+          <Text style={styles.secureContent}>{secretData?.secret}</Text>
+        )}
       </View>
 
       <Button variant="destructive" onPress={handleSignOut} style={styles.signOutBtn}>
@@ -110,6 +103,9 @@ const styles = StyleSheet.create({
     fontFamily: Platform.OS === "ios" ? "Courier" : "monospace",
     fontSize: 12,
   },
+  errorText: {
+    color: "#ef4444",
+  },
   signOutBtn: {
     marginTop: 12,
   },