Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump #1287

Merged
merged 3 commits into from
Jan 25, 2025
Merged

bump #1287

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.18
22.12
4 changes: 2 additions & 2 deletions apps/auth-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"@acme/prettier-config": "workspace:*",
"@acme/tailwind-config": "workspace:*",
"@acme/tsconfig": "workspace:*",
"@types/node": "^20.17.7",
"@types/node": "^22.10.10",
"eslint": "catalog:",
"h3": "^1.13.0",
"h3": "^1.14.0",
"nitropack": "^2.10.4",
"prettier": "catalog:",
"typescript": "catalog:"
Expand Down
2 changes: 1 addition & 1 deletion apps/expo/eas.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"build": {
"base": {
"node": "20.18.1",
"node": "22.12.0",
"pnpm": "9.14.2",
"ios": {
"resourceClass": "m-medium"
Expand Down
3 changes: 3 additions & 0 deletions apps/expo/nativewind-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/// <reference types="nativewind/types" />

// NOTE: This file should not be edited and should be committed with your source code. It is generated by NativeWind.
44 changes: 22 additions & 22 deletions apps/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,41 +16,41 @@
},
"dependencies": {
"@bacons/text-decoder": "^0.0.0",
"@expo/metro-config": "^0.18.11",
"@shopify/flash-list": "1.7.1",
"@expo/metro-config": "^0.19.9",
"@shopify/flash-list": "1.7.2",
"@tanstack/react-query": "catalog:",
"@trpc/client": "catalog:",
"@trpc/react-query": "catalog:",
"@trpc/server": "catalog:",
"expo": "~51.0.38",
"expo-constants": "~16.0.2",
"expo-dev-client": "~4.0.28",
"expo-linking": "~6.3.1",
"expo-router": "~3.5.23",
"expo-secure-store": "^13.0.2",
"expo-splash-screen": "~0.27.6",
"expo-status-bar": "~1.12.1",
"expo-web-browser": "^13.0.3",
"nativewind": "~4.0.36",
"expo": "~52.0.27",
"expo-constants": "~17.0.4",
"expo-dev-client": "~5.0.10",
"expo-linking": "~7.0.4",
"expo-router": "~4.0.17",
"expo-secure-store": "^14.0.1",
"expo-splash-screen": "~0.29.21",
"expo-status-bar": "~2.0.1",
"expo-web-browser": "^14.0.2",
"nativewind": "~4.1.23",
"react": "catalog:react18",
"react-dom": "catalog:react18",
"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"
"react-native": "~0.77.0",
"react-native-css-interop": "~0.1.22",
"react-native-gesture-handler": "~2.22.1",
"react-native-reanimated": "~3.16.7",
"react-native-safe-area-context": "~5.1.0",
"react-native-screens": "~4.5.0",
"superjson": "2.2.2"
},
"devDependencies": {
"@acme/api": "workspace:*",
"@acme/eslint-config": "workspace:*",
"@acme/prettier-config": "workspace:*",
"@acme/tailwind-config": "workspace:*",
"@acme/tsconfig": "workspace:*",
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@babel/runtime": "^7.26.0",
"@babel/core": "^7.26.7",
"@babel/preset-env": "^7.26.7",
"@babel/runtime": "^7.26.7",
"@types/babel__core": "^7.20.5",
"@types/react": "catalog:react18",
"eslint": "catalog:",
Expand Down
1 change: 0 additions & 1 deletion apps/expo/src/types/nativewind-env.d.ts

This file was deleted.

9 changes: 8 additions & 1 deletion apps/expo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
"checkJs": false,
"moduleSuffixes": [".ios", ".android", ".native", ""]
},
"include": ["src", "*.ts", "*.js", ".expo/types/**/*.ts", "expo-env.d.ts"],
"include": [
"src",
"*.ts",
"*.js",
".expo/types/**/*.ts",
"expo-env.d.ts",
"nativewind-env.d.ts"
],
"exclude": ["node_modules"]
}
6 changes: 3 additions & 3 deletions apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
"next": "^14.2.15",
"react": "catalog:react18",
"react-dom": "catalog:react18",
"superjson": "2.2.1",
"superjson": "2.2.2",
"zod": "catalog:"
},
"devDependencies": {
"@acme/eslint-config": "workspace:*",
"@acme/prettier-config": "workspace:*",
"@acme/tailwind-config": "workspace:*",
"@acme/tsconfig": "workspace:*",
"@types/node": "^20.17.7",
"@types/node": "^22.10.10",
"@types/react": "catalog:react18",
"@types/react-dom": "catalog:react18",
"dotenv-cli": "^7.4.4",
"dotenv-cli": "^8.0.0",
"eslint": "catalog:",
"jiti": "^1.21.6",
"prettier": "catalog:",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "create-t3-turbo",
"private": true,
"engines": {
"node": ">=20.18.1",
"node": ">=22.10.0",
"pnpm": "^9.14.2"
},
"packageManager": "[email protected]",
Expand All @@ -25,9 +25,9 @@
},
"devDependencies": {
"@acme/prettier-config": "workspace:*",
"@turbo/gen": "^2.3.3",
"@turbo/gen": "^2.3.4",
"prettier": "catalog:",
"turbo": "^2.3.3",
"turbo": "^2.3.4",
"typescript": "catalog:"
},
"prettier": "@acme/prettier-config"
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@acme/db": "workspace:*",
"@acme/validators": "workspace:*",
"@trpc/server": "catalog:",
"superjson": "2.2.1",
"superjson": "2.2.2",
"zod": "catalog:"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
},
"dependencies": {
"@vercel/postgres": "^0.10.0",
"drizzle-orm": "^0.36.4",
"drizzle-zod": "^0.5.1",
"drizzle-orm": "^0.38.4",
"drizzle-zod": "^0.6.1",
"zod": "catalog:"
},
"devDependencies": {
"@acme/eslint-config": "workspace:*",
"@acme/prettier-config": "workspace:*",
"@acme/tsconfig": "workspace:*",
"dotenv-cli": "^7.4.4",
"drizzle-kit": "^0.28.1",
"dotenv-cli": "^8.0.0",
"drizzle-kit": "^0.30.2",
"eslint": "catalog:",
"prettier": "catalog:",
"typescript": "catalog:"
Expand Down
16 changes: 7 additions & 9 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,14 @@
"ui-add": "pnpm dlx shadcn@latest add && prettier src --write --list-different"
},
"dependencies": {
"@hookform/resolvers": "^3.9.1",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@hookform/resolvers": "^3.10.0",
"@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",
"react-hook-form": "^7.53.2",
"sonner": "^1.7.0",
"tailwind-merge": "^2.5.4"
"class-variance-authority": "^0.7.1",
"next-themes": "^0.4.4",
"radix-ui": "^1.1.2",
"react-hook-form": "^7.54.2",
"sonner": "^1.7.2",
"tailwind-merge": "^2.6.0"
},
"devDependencies": {
"@acme/eslint-config": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/button.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 { Slot } from "@radix-ui/react-slot";
import { cva } from "class-variance-authority";
import { Slot } from "radix-ui";

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
Loading