Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusmarminge committed Jan 25, 2025
1 parent 715a27a commit 5f82261
Show file tree
Hide file tree
Showing 13 changed files with 2,227 additions and 840 deletions.
4 changes: 2 additions & 2 deletions apps/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@trpc/client": "catalog:",
"@trpc/react-query": "catalog:",
"@trpc/server": "catalog:",
"expo": "~52.0.11",
"expo": "~52.0.27",
"expo-constants": "~17.0.3",
"expo-dev-client": "~5.0.2",
"expo-linking": "~7.0.3",
Expand All @@ -34,7 +34,7 @@
"nativewind": "~4.1.23",
"react": "catalog:react18",
"react-dom": "catalog:react18",
"react-native": "~0.76.3",
"react-native": "0.78.0-rc.1",
"react-native-css-interop": "~0.1.22",
"react-native-gesture-handler": "~2.21.2",
"react-native-reanimated": "~3.16.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@trpc/react-query": "catalog:",
"@trpc/server": "catalog:",
"geist": "^1.3.1",
"next": "^14.2.15",
"next": "^15.1.6",
"react": "catalog:react18",
"react-dom": "catalog:react18",
"superjson": "2.2.1",
Expand Down
7 changes: 4 additions & 3 deletions apps/nextjs/src/app/api/auth/[...nextauth]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ export const GET = async (
) => {
// First step must be to correct the request URL.
const req = rewriteRequestUrlInDevelopment(_req);
const jar = await cookies();

const nextauthAction = props.params.nextauth[0];
const isExpoSignIn = req.nextUrl.searchParams.get("expo-redirect");
const isExpoCallback = cookies().get(EXPO_COOKIE_NAME);
const isExpoCallback = jar.get(EXPO_COOKIE_NAME);

if (nextauthAction === "signin" && !!isExpoSignIn) {
// set a cookie we can read in the callback
// to know to send the user back to expo
cookies().set({
jar.set({
name: EXPO_COOKIE_NAME,
value: isExpoSignIn,
maxAge: 60 * 10, // 10 min
Expand All @@ -52,7 +53,7 @@ export const GET = async (
}

if (nextauthAction === "callback" && !!isExpoCallback) {
cookies().delete(EXPO_COOKIE_NAME);
jar.delete(EXPO_COOKIE_NAME);

// Run original handler, then extract the session token from the response
// Send it back via a query param in the Expo deep link. The Expo app
Expand Down
2 changes: 1 addition & 1 deletion apps/nextjs/src/trpc/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { createQueryClient } from "./query-client";
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(async () => {
const heads = new Headers(headers());
const heads = new Headers(await headers());
heads.set("x-trpc-source", "rsc");

return createTRPCContext({
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@auth/core": "0.37.2",
"@auth/drizzle-adapter": "1.7.4",
"@t3-oss/env-nextjs": "^0.11.1",
"next": "^14.2.15",
"next": "^15.1.6",
"next-auth": "5.0.0-beta.25",
"react": "catalog:react18",
"react-dom": "catalog:react18",
Expand Down
4 changes: 1 addition & 3 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@
},
"dependencies": {
"@hookform/resolvers": "^3.9.1",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-icons": "^1.3.2",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-slot": "^1.1.0",
"class-variance-authority": "^0.7.0",
"next-themes": "^0.4.3",
"radix-ui": "^1.1.2",
"react-hook-form": "^7.53.2",
"sonner": "^1.7.0",
"tailwind-merge": "^2.5.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { VariantProps } from "class-variance-authority";
import * as React from "react";
import { Slot } from "@radix-ui/react-slot";
import { Slot } from "radix-ui";
import { cva } from "class-variance-authority";

import { cn } from "@acme/ui";
Expand Down Expand Up @@ -43,7 +43,7 @@ interface ButtonProps

const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : "button";
const Comp = asChild ? Slot.Slot : "button";
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/dropdown-menu.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"use client";

import * as React from "react";
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
import {
CheckIcon,
ChevronRightIcon,
DotFilledIcon,
} from "@radix-ui/react-icons";
import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";

import { cn } from "@acme/ui";

Expand Down
10 changes: 5 additions & 5 deletions packages/ui/src/form.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import type * as LabelPrimitive from "@radix-ui/react-label";
import type { Label as LabelPrimitive } from "radix-ui";
import type {
ControllerProps,
FieldPath,
Expand All @@ -10,7 +10,7 @@ import type {
import type { ZodType, ZodTypeDef } from "zod";
import * as React from "react";
import { zodResolver } from "@hookform/resolvers/zod";
import { Slot } from "@radix-ui/react-slot";
import { Slot } from "radix-ui";
import {
useForm as __useForm,
Controller,
Expand Down Expand Up @@ -127,14 +127,14 @@ const FormLabel = React.forwardRef<
FormLabel.displayName = "FormLabel";

const FormControl = React.forwardRef<
React.ElementRef<typeof Slot>,
React.ComponentPropsWithoutRef<typeof Slot>
React.ElementRef<typeof Slot.Slot>,
React.ComponentPropsWithoutRef<typeof Slot.Slot>
>(({ ...props }, ref) => {
const { error, formItemId, formDescriptionId, formMessageId } =
useFormField();

return (
<Slot
<Slot.Slot
ref={ref}
id={formItemId}
aria-describedby={
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/label.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { VariantProps } from "class-variance-authority";
import * as React from "react";
import * as LabelPrimitive from "@radix-ui/react-label";
import { cva } from "class-variance-authority";
import { Label as LabelPrimitive } from "radix-ui";

import { cn } from "@acme/ui";

Expand Down
Loading

0 comments on commit 5f82261

Please sign in to comment.