Skip to content

Commit

Permalink
Merge branch 'main' into next15
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusmarminge committed Nov 23, 2024
2 parents d796f59 + ceb7e3c commit ede820e
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 796 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ tooling
## Quick Start

> **Note**
> The [db](./packages/db) package is preconfigured to use Supabase and is **edge-bound** with the [Vercel Postgres](https://github.com/vercel/storage/tree/main/packages/postgres) driver. If you're using something else, make the necessary modifications to the [schema](./packages/db/src/schema) as well as the [client](./packages/db/src/index.ts) and the [drizzle config](./packages/db/drizzle.config.ts). If you want to switch to non-edge database driver, remove `export const runtime = "edge";` [from all pages and api routes](https://github.com/t3-oss/create-t3-turbo/issues/634#issuecomment-1730240214).
> The [db](./packages/db) package is preconfigured to use Supabase and is **edge-bound** with the [Vercel Postgres](https://github.com/vercel/storage/tree/main/packages/postgres) driver. If you're using something else, make the necessary modifications to the [schema](./packages/db/src/schema.ts) as well as the [client](./packages/db/src/index.ts) and the [drizzle config](./packages/db/drizzle.config.ts). If you want to switch to non-edge database driver, remove `export const runtime = "edge";` [from all pages and api routes](https://github.com/t3-oss/create-t3-turbo/issues/634#issuecomment-1730240214).
To get it running, follow the steps below:

Expand Down
2 changes: 1 addition & 1 deletion apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@types/node": "^20.17.7",
"@types/react": "catalog:react19",
"@types/react-dom": "catalog:react19",
"dotenv-cli": "^7.4.2",
"dotenv-cli": "^7.4.4",
"eslint": "catalog:",
"jiti": "^1.21.6",
"prettier": "catalog:",
Expand Down
4 changes: 2 additions & 2 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"dependencies": {
"@vercel/postgres": "^0.10.0",
"drizzle-orm": "^0.35.3",
"drizzle-orm": "^0.36.4",
"drizzle-zod": "^0.5.1",
"zod": "catalog:"
},
Expand All @@ -40,7 +40,7 @@
"@acme/prettier-config": "workspace:*",
"@acme/tsconfig": "workspace:*",
"dotenv-cli": "^7.4.4",
"drizzle-kit": "^0.26.2",
"drizzle-kit": "^0.28.1",
"eslint": "catalog:",
"prettier": "catalog:",
"typescript": "catalog:"
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-slot": "^1.1.0",
"class-variance-authority": "^0.7.0",
"next-themes": "^0.3.0",
"next-themes": "^0.4.3",
"react-hook-form": "^7.53.2",
"sonner": "^1.7.0",
"tailwind-merge": "^2.5.4"
Expand Down
Loading

0 comments on commit ede820e

Please sign in to comment.