Merge branch 'main' into lint-next-no-page-custom-font

.vscode/launch.json

@@ -6,8 +6,12 @@
       "type": "node-terminal",
       "request": "launch",
       "command": "pnpm dev",
-      "cwd": "${workspaceFolder}/apps/nextjs/",
-      "skipFiles": ["<node_internals>/**"]
+      "cwd": "${workspaceFolder}/apps/nextjs",
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "sourceMapPathOverrides": {
+        "/turbopack/[project]/*": "${webRoot}/*" //https://github.com/vercel/next.js/issues/62008
+      }
     }
   ]
 }

.vscode/settings.json

@@ -3,6 +3,9 @@
     "source.fixAll.eslint": "explicit"
   },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[typescript,typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "editor.formatOnSave": true,
   "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }],
   "eslint.runtime": "node",

README.md

@@ -8,11 +8,11 @@
 >
 > OAuth deployments are now working for preview deployments. Read [deployment guide](https://github.com/t3-oss/create-t3-turbo#auth-proxy) and [check out the source](./apps/auth-proxy) to learn more!
 
+## Installation
+
 > [!NOTE]
 >
-> Due to high demand, this repo now uses the `app` directory with some new experimental features. If you want to use the more traditional `pages` router, [check out the repo before the update](https://github.com/t3-oss/create-t3-turbo/tree/414aff131ca124573e721f3779df3edb64989fd4).
-
-## Installation
+> Make sure to follow the system requirements specified in [`package.json#engines`](./package.json#L4) before proceeding.
 
 There are two ways of initializing an app using the `create-t3-turbo` starter. You can either use this repository as a template:
 

apps/auth-proxy/package.json

@@ -17,7 +17,7 @@
     "@acme/prettier-config": "workspace:*",
     "@acme/tailwind-config": "workspace:*",
     "@acme/tsconfig": "workspace:*",
-    "@types/node": "^20.16.10",
+    "@types/node": "^20.16.11",
     "eslint": "catalog:",
     "h3": "^1.13.0",
     "nitropack": "^2.9.7",

apps/expo/package.json

@@ -22,24 +22,24 @@
     "@trpc/client": "catalog:",
     "@trpc/react-query": "catalog:",
     "@trpc/server": "catalog:",
-    "expo": "~51.0.36",
+    "expo": "~51.0.38",
     "expo-constants": "~16.0.2",
-    "expo-dev-client": "~4.0.23",
+    "expo-dev-client": "~4.0.28",
     "expo-linking": "~6.3.1",
-    "expo-router": "~3.5.21",
+    "expo-router": "~3.5.23",
     "expo-secure-store": "^13.0.2",
-    "expo-splash-screen": "~0.27.5",
+    "expo-splash-screen": "~0.27.6",
     "expo-status-bar": "~1.12.1",
     "expo-web-browser": "^13.0.3",
     "nativewind": "~4.0.36",
     "react": "catalog:react18",
     "react-dom": "catalog:react18",
-    "react-native": "~0.74.5",
-    "react-native-css-interop": "~0.0.34",
-    "react-native-gesture-handler": "~2.16.2",
-    "react-native-reanimated": "~3.10.1",
-    "react-native-safe-area-context": "~4.10.8",
-    "react-native-screens": "~3.31.1",
+    "react-native": "~0.74.6",
+    "react-native-css-interop": "~0.0.36",
+    "react-native-gesture-handler": "~2.20.0",
+    "react-native-reanimated": "~3.15.5",
+    "react-native-safe-area-context": "~4.11.1",
+    "react-native-screens": "~3.34.0",
     "superjson": "2.2.1"
   },
   "devDependencies": {
@@ -48,8 +48,8 @@
     "@acme/prettier-config": "workspace:*",
     "@acme/tailwind-config": "workspace:*",
     "@acme/tsconfig": "workspace:*",
-    "@babel/core": "^7.25.7",
-    "@babel/preset-env": "^7.25.7",
+    "@babel/core": "^7.25.8",
+    "@babel/preset-env": "^7.25.8",
     "@babel/runtime": "^7.25.7",
     "@types/babel__core": "^7.20.5",
     "@types/react": "catalog:react18",

apps/expo/src/utils/auth.tsx

@@ -14,12 +14,14 @@ export const signIn = async () => {
     redirectTo,
   );
 
-  if (result.type !== "success") return;
+  if (result.type !== "success") return false;
   const url = Linking.parse(result.url);
   const sessionToken = String(url.queryParams?.session_token);
-  if (!sessionToken) return;
+  if (!sessionToken) throw new Error("No session token found");
 
   setToken(sessionToken);
+
+  return true;
 };
 
 export const useUser = () => {
@@ -32,7 +34,9 @@ export const useSignIn = () => {
   const router = useRouter();
 
   return async () => {
-    await signIn();
+    const success = await signIn();
+    if (!success) return;
+
     await utils.invalidate();
     router.replace("/");
   };

apps/nextjs/package.json

@@ -25,7 +25,7 @@
     "@trpc/react-query": "catalog:",
     "@trpc/server": "catalog:",
     "geist": "^1.3.1",
-    "next": "^14.2.14",
+    "next": "^14.2.15",
     "react": "catalog:react18",
     "react-dom": "catalog:react18",
     "superjson": "2.2.1",
@@ -36,12 +36,12 @@
     "@acme/prettier-config": "workspace:*",
     "@acme/tailwind-config": "workspace:*",
     "@acme/tsconfig": "workspace:*",
-    "@types/node": "^20.16.10",
+    "@types/node": "^20.16.11",
     "@types/react": "catalog:react18",
     "@types/react-dom": "catalog:react18",
     "dotenv-cli": "^7.4.2",
     "eslint": "catalog:",
-    "jiti": "^2.3.1",
+    "jiti": "^2.3.3",
     "prettier": "catalog:",
     "tailwindcss": "catalog:",
     "typescript": "catalog:"

package.json

@@ -2,9 +2,10 @@
   "name": "create-t3-turbo",
   "private": true,
   "engines": {
-    "node": ">=20.16.0"
+    "node": ">=20.16.0",
+    "pnpm": "^9.6.0"
   },
-  "packageManager": "[email protected].0",
+  "packageManager": "[email protected].1",
   "scripts": {
     "build": "turbo run build",
     "clean": "git clean -xdf node_modules",

packages/auth/package.json

@@ -22,7 +22,7 @@
     "@auth/core": "0.34.2",
     "@auth/drizzle-adapter": "1.4.2",
     "@t3-oss/env-nextjs": "^0.11.1",
-    "next": "^14.2.14",
+    "next": "^14.2.15",
     "next-auth": "5.0.0-beta.20",
     "react": "catalog:react18",
     "react-dom": "catalog:react18",

packages/db/package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@vercel/postgres": "^0.10.0",
-    "drizzle-orm": "^0.34.0",
+    "drizzle-orm": "^0.35.1",
     "drizzle-zod": "^0.5.1",
     "zod": "catalog:"
   },
@@ -40,7 +40,7 @@
     "@acme/prettier-config": "workspace:*",
     "@acme/tsconfig": "workspace:*",
     "dotenv-cli": "^7.4.2",
-    "drizzle-kit": "^0.25.0",
+    "drizzle-kit": "^0.26.2",
     "eslint": "catalog:",
     "prettier": "catalog:",
     "typescript": "catalog:"

packages/db/src/client.ts

@@ -3,4 +3,8 @@ import { drizzle } from "drizzle-orm/vercel-postgres";
 
 import * as schema from "./schema";
 
-export const db = drizzle(sql, { schema, casing: "snake_case" });
+export const db = drizzle({
+  client: sql,
+  schema,
+  casing: "snake_case",
+});

packages/ui/components.json

@@ -4,7 +4,7 @@
   "rsc": true,
   "tsx": true,
   "tailwind": {
-    "config": "./tailwind.config.ts",
+    "config": "../../tooling/tailwind/web.ts",
     "css": "unused.css",
     "baseColor": "zinc",
     "cssVariables": true

packages/ui/package.json

@@ -36,11 +36,12 @@
     "next-themes": "^0.3.0",
     "react-hook-form": "^7.53.0",
     "sonner": "^1.5.0",
-    "tailwind-merge": "^2.5.3"
+    "tailwind-merge": "^2.5.4"
   },
   "devDependencies": {
     "@acme/eslint-config": "workspace:*",
     "@acme/prettier-config": "workspace:*",
+    "@acme/tailwind-config": "workspace:*",
     "@acme/tsconfig": "workspace:*",
     "@types/react": "catalog:react18",
     "eslint": "catalog:",