Merge branch 'main' into apple_expo_handling

t3-oss · Jan 25, 2025 · 08c7581 · 08c7581
2 parents 4d103ee + 0ce1b91
commit 08c7581
Show file tree

Hide file tree

Showing 8 changed files with 159 additions and 139 deletions.
diff --git a/apps/expo/src/utils/auth.tsx → apps/expo/src/utils/auth.ts b/apps/expo/src/utils/auth.tsx → apps/expo/src/utils/auth.ts
diff --git a/apps/expo/src/utils/base-url.tsx → apps/expo/src/utils/base-url.ts b/apps/expo/src/utils/base-url.tsx → apps/expo/src/utils/base-url.ts
diff --git a/apps/nextjs/src/app/api/auth/[...nextauth]/route.ts b/apps/nextjs/src/app/api/auth/[...nextauth]/route.ts
@@ -3,8 +3,6 @@ import { NextRequest, NextResponse } from "next/server";
 
 import { handlers, isSecureContext } from "@acme/auth";
 
-export const runtime = "edge";
-
 const EXPO_COOKIE_NAME = "__acme-expo-redirect-state";
 const AUTH_COOKIE_PATTERN = /authjs\.session-token=([^;]+)/;
 

diff --git a/apps/nextjs/src/app/api/trpc/[trpc]/route.ts b/apps/nextjs/src/app/api/trpc/[trpc]/route.ts
@@ -3,8 +3,6 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 import { appRouter, createTRPCContext } from "@acme/api";
 import { auth } from "@acme/auth";
 
-export const runtime = "edge";
-
 /**
  * Configure basic CORS headers
  * You should extend this to match your needs

diff --git a/apps/nextjs/src/app/page.tsx b/apps/nextjs/src/app/page.tsx
@@ -8,8 +8,6 @@ import {
   PostList,
 } from "./_components/posts";
 
-export const runtime = "edge";
-
 export default function HomePage() {
   // You can await this here if you don't want to show Suspense fallback below
   void api.post.all.prefetch();

diff --git a/package.json b/package.json
@@ -25,9 +25,9 @@
   },
   "devDependencies": {
     "@acme/prettier-config": "workspace:*",
-    "@turbo/gen": "^2.3.1",
+    "@turbo/gen": "^2.3.3",
     "prettier": "catalog:",
-    "turbo": "^2.3.1",
+    "turbo": "^2.3.3",
     "typescript": "catalog:"
   },
   "prettier": "@acme/prettier-config"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tooling/eslint/package.json b/tooling/eslint/package.json
@@ -20,7 +20,7 @@
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.0.0",
-    "eslint-plugin-turbo": "^2.3.1",
+    "eslint-plugin-turbo": "^2.3.3",
     "typescript-eslint": "^8.15.0"
   },
   "devDependencies": {