Merge branch 'bun'

timothymiller · Oct 28, 2023 · 0adb1a0 · 0adb1a0 · github-actions · Oct 28, 2023
2 parents 5e61768 + 5b9d8c2
commit 0adb1a0
Show file tree

Hide file tree

Showing 35 changed files with 196 additions and 19,104 deletions.
diff --git a/.github/actions/pnpm-install/action.yml b/.github/actions/pnpm-install/action.yml
diff --git a/.github/script/submit-android b/.github/script/submit-android
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -22,22 +22,22 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+      - name: 'Bun setup'
+        uses: oven-sh/setup-bun@v1
         with:
-          node-version: 18
+          bun-version: latest
 
-      - name: 📥 Monorepo install
-        uses: ./.github/actions/pnpm-install
+      - name: 'Bun install'
+        run: bun install
 
       - name: Migrate database
-        run: pnpm --filter @t4/api migrate
+        run: cd packages/api && bun run migrate
         env:
           NO_D1_WARNING: true
           CLOUDFLARE_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
 
       - name: Deploy
-        uses: cloudflare/wrangler-action@v3.1.0
+        uses: cloudflare/wrangler-action@v3.3.1
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           workingDirectory: packages/api

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -25,13 +25,13 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+      - name: 'Bun setup'
+        uses: oven-sh/setup-bun@v1
         with:
-          node-version: 18
+          bun-version: latest
 
-      - name: 📥 Monorepo install
-        uses: ./.github/actions/pnpm-install
+      - name: 'Bun install'
+        run: bun install
 
       - name: Build
         run: |

diff --git a/.github/workflows/expo.yml b/.github/workflows/expo.yml
@@ -26,13 +26,13 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+      - name: 'Bun setup'
+        uses: oven-sh/setup-bun@v1
         with:
-          node-version: 18
+          bun-version: latest
 
-      - name: 📥 Monorepo install
-        uses: ./.github/actions/pnpm-install
+      - name: 'Bun install'
+        run: bun install
 
       - name: Setup EAS
         uses: expo/expo-github-action@v8

diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
@@ -27,13 +27,13 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+      - name: 'Bun setup'
+        uses: oven-sh/setup-bun@v1
         with:
-          node-version: 18
+          bun-version: latest
 
-      - name: 📥 Monorepo install
-        uses: ./.github/actions/pnpm-install
+      - name: 'Bun install'
+        run: bun install
 
       - name: Build
         run: |

diff --git a/.github/workflows/vscode.yml b/.github/workflows/vscode.yml
@@ -37,8 +37,8 @@ jobs:
 
       - name: 📥 Monorepo install
         # if: steps.check.outputs.changed == 'true'
-        uses: ./.github/actions/pnpm-install
+        uses: ./.github/actions/bun-install
 
       - name: Publish
         # if: steps.check.outputs.changed == 'true'
-        run: cd apps/vscode && pnpm dlx @vscode/vsce publish --no-dependencies -p ${{ secrets.VSCE_TOKEN }}
+        run: cd apps/vscode && bun dlx @vscode/vsce publish --no-dependencies -p ${{ secrets.VSCE_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-.pnpm-debug.log*
+.bun-debug.log*
 
 # local env files
 **.env

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -5,7 +5,5 @@
 # Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
 
 tasks:
-  - init: pnpm install && pnpm run build
-    command: pnpm run dev
-
-
+  - init: bun install && bun run build
+    command: bun run dev
diff --git a/.npmrc b/.npmrc
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -34,7 +34,7 @@
     "LICENSE": false,
     ".gitpod.yml": false,
     ".npmrc": false,
-    "pnpm-workspace.yaml": false,
+    "bun-workspace.yaml": false,
     "renovate.json": false,
     "turbo.json": false,
     "**/cfImageLoader.js": false,
@@ -50,11 +50,10 @@
   "search.exclude": {
     "**/out": true
   },
-  "explorerExclude.backup": {},
   "typescript.tsdk": "node_modules/typescript/lib",
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
-    "package.json": "package-lock.json, pnpm-lock.yaml",
+    "package.json": "package-lock.json, bun-lock.yaml",
     "*.js": "${capture}.js.map, ${capture}.d.ts, ${capture}.d.ts.map",
     "*.ts": "$(capture).test.ts, $(capture).test.tsx, $(capture).test.node.ts, $(capture).test.node.tsx, $(capture).test.native.ts, $(capture).test.native.tsx, $(capture).test.ios.ts, $(capture).test.ios.tsx, $(capture).test.web.ts, $(capture).test.web.tsx, $(capture).test.android.ts, $(capture).test.android.tsx, ${capture}.native.tsx, ${capture}.ios.tsx, ${capture}.android.tsx, ${capture}.web.tsx, ${capture}.native.ts, ${capture}.ios.ts, ${capture}.android.ts, ${capture}.web.ts, ${capture}.native.js, ${capture}.ios.js, ${capture}.android.js, ${capture}.web.js, ${capture}.native.jsx, ${capture}.ios.jsx, ${capture}.android.jsx, ${capture}.web.jsx",
     "*.tsx": "$(capture).test.ts, $(capture).test.tsx, $(capture).test.node.ts, $(capture).test.node.tsx, $(capture).test.native.ts, $(capture).test.native.tsx, $(capture).test.ios.ts, $(capture).test.ios.tsx, $(capture).test.web.ts, $(capture).test.web.tsx, $(capture).test.android.ts, $(capture).test.android.tsx, ${capture}.native.tsx, ${capture}.ios.tsx, ${capture}.android.tsx, ${capture}.web.tsx, ${capture}.native.ts, ${capture}.ios.ts, ${capture}.android.ts, ${capture}.web.ts, ${capture}.native.js, ${capture}.ios.js, ${capture}.android.js, ${capture}.web.js, ${capture}.native.jsx, ${capture}.ios.jsx, ${capture}.android.jsx, ${capture}.web.jsx"

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@
 </p>
 
 <p align="center">
-  Get started with the <a rel="noopener noreferrer" target="_blank" href="https://t4stack.com">T4 Stack</a> by running <code>pnpm create t4-app</code>
+  Get started with the <a rel="noopener noreferrer" target="_blank" href="https://t4stack.com">T4 Stack</a> by running <code>bun create t4-app</code>
 </p>
 
 <p align="center">
@@ -122,28 +122,28 @@ Build native apps for iOS, Android, macOS, Windows, and Linux using the same cod
 
 ### Basic Setup
 
-> pnpm v8.6 is required to use `create-t4-app`
+> bun v8.6 is required to use `create-t4-app`
 
 <p align="left">
-  <a href="https://pnpm.io">
-    <img src="https://img.shields.io/badge/pnpm-%234a4a4a.svg?style=for-the-badge&logo=pnpm&logoColor=f69220" alt="pnpm is required to use `create-t4-app`">
+  <a href="https://bun.io">
+    <img src="https://img.shields.io/badge/bun-%234a4a4a.svg?style=for-the-badge&logo=bun&logoColor=f69220" alt="bun is required to use `create-t4-app`">
   </a>
 </p>
 
 To scaffold an app using `create-t4-app`, run any of the following commands.
 
-### **pnpm**
+### **bun**
 
 ```bash
-pnpm create t4-app
+bun create t4-app
 ```
 
 ### **Tauri**
 
 If you would like to use Tauri use:
 
 ```bash
-pnpm create t4-app --tauri
+bun create t4-app --tauri
 ```
 
 ## ❓ Why T4?
@@ -177,7 +177,7 @@ The VSCode extension is optional but highly recommended. It provides a better de
 ## ✨ Features
 
 - ✅ Tamagui UI kit across all platforms.
-- ✅ PNPM support
+- ✅ bun support
 - ✅ Million.js Support
 - ✅ Supabase Auth
 - ✅ Uses Next.js for building web apps.

diff --git a/SECURITY.md b/SECURITY.md
@@ -1,6 +1,6 @@
 # Security Policy for T4 App
 
-### Reporting Security Vulnerabilities
+## Reporting Security Vulnerabilities
 
 We take the security of our project seriously and appreciate any efforts to responsibly disclose vulnerabilities. If you discover any security vulnerabilities or potential threats in our T4 App, please report them to our security team by emailing [email protected]. We request that you provide us with sufficient information to reproduce the vulnerability, including steps to replicate, affected versions, and any additional details that may be helpful for our investigation.
 

diff --git a/apps/cli/bin/index.js b/apps/cli/bin/index.js
@@ -73,7 +73,7 @@ const removeUnnecessaryFiles = async (folderName) => {
 const installDependencies = async (folderName) => {
   const installSpinner = ora(chalk.green.bold('Installing dependencies')).start()
   try {
-    await exec(`cd ${folderName} && pnpm install`)
+    await exec(`cd ${folderName} && bun install`)
     installSpinner.succeed()
   } catch (error) {
     installSpinner.fail()
@@ -84,7 +84,7 @@ const installDependencies = async (folderName) => {
 const generateDrizzleClient = async (folderName) => {
   const drizzleSpinner = ora(chalk.green.bold('Generating Drizzle client')).start()
   try {
-    await exec(`cd ${folderName} && pnpm generate`)
+    await exec(`cd ${folderName} && bun generate`)
     drizzleSpinner.succeed()
   } catch (error) {
     drizzleSpinner.fail()
@@ -125,8 +125,8 @@ This script follows the steps below to create your project:
     console.log(chalk.green.bold(`
 🚀 Successfully created t4 project!
 Make sure you have a Supabase account and have created a new project.
-After filling out your .env file, run 'pnpm migrate:local' to create your database tables.
-To start the API and web development servers, run 'pnpm api' and 'pnpm web' in separate terminal tabs.
+After filling out your .env file, run 'bun migrate:local' to create your database tables.
+To start the API and web development servers, run 'bun api' and 'bun web' in separate terminal tabs.
 `))
   } catch (error) {
     console.error(chalk.red.bold(`🚫 Error: ${error.message}`))

diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -19,12 +19,12 @@
   },
   "homepage": "https://github.com/timothymiller/t4-app#readme",
   "dependencies": {
-    "@ducanh2912/next-pwa": "^9.7.2",
-    "@t4/ui": "^2.0.0",
-    "million": "2.6.2",
-    "next": "13.5.3",
-    "nextra": "^2.13.2",
-    "nextra-theme-docs": "^2.13.2",
+    "@ducanh2912/next-pwa": "^9.6.0",
+    "@t4/ui": "*",
+    "million": "2.6.0-beta.16",
+    "next": "13.5.1",
+    "nextra": "^2.12.3",
+    "nextra-theme-docs": "^2.12.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

diff --git a/apps/docs/pages/faq.mdx b/apps/docs/pages/faq.mdx
@@ -27,7 +27,7 @@ Prisma is not supported in Cloudflare Workers because it's a chunky boi in terms
 
 ## Supabase warning logged in local dev
 
-If you see this warning in your console when running `pnpm web`. You can safely ignore it.
+If you see this warning in your console when running `bun web`. You can safely ignore it.
 
 ```bash
 No storage option exists to persist the session, which may result in unexpected behavior when using auth.

diff --git a/apps/docs/pages/getting-started.mdx b/apps/docs/pages/getting-started.mdx
@@ -1,19 +1,19 @@
 ## 🚀 Getting Started
 
-> pnpm v8.6+ is required to use `create-t4-app`
+> bun v8.6+ is required to use `create-t4-app`
 
 To scaffold an app using `create-t4-app`, run any of the following commands.
 
-### **pnpm**
+### **bun**
 
 ```bash
-pnpm create t4-app
+bun create t4-app
 ```
 
 ### **Tauri**
 
 If you would like to use Tauri use:
 
 ```bash
-pnpm create t4-app yourappname --tauri
+bun create t4-app yourappname --tauri
 ```
diff --git a/apps/docs/pages/index.mdx b/apps/docs/pages/index.mdx
@@ -59,7 +59,7 @@ Build native apps for iOS, Android, macOS, Windows, and Linux using the same cod
 ## ✨ Features
 
 - ✅ Tamagui UI kit across all platforms.
-- ✅ PNPM support
+- ✅ bun support
 - ✅ Million.js Support
 - ✅ Supabase Auth
 - ✅ Uses Next.js for building web apps.