Skip to content

Commit 982d4d9

Browse files
trevorpfiztrevorpfiz
committed
chore: bump deps and implement latest t3-turbo changes
1 parent 80c0437 commit 982d4d9

39 files changed

+2432
-2479
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ yarn-error.log*
4747
# typescript
4848
*.tsbuildinfo
4949
dist/
50+
.cache
5051

5152
# turbo
5253
.turbo

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node-linker=hoisted
2+
link-workspace-packages=true

‎.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"editor.defaultFormatter": "esbenp.prettier-vscode",
66
"editor.formatOnSave": true,
77
"eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }],
8-
"eslint.useFlatConfig": true,
8+
"eslint.runtime": "node",
99
"eslint.workingDirectories": [
1010
{ "pattern": "apps/*/" },
1111
{ "pattern": "packages/*/" },

‎apps/expo/eas.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"build": {
66
"base": {
77
"node": "20.16.0",
8-
"pnpm": "9.6.0",
8+
"pnpm": "9.8.0",
99
"ios": {
1010
"resourceClass": "m-medium"
1111
}

‎apps/expo/metro.config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ function withMonorepoPaths(config) {
4848
}
4949

5050
/**
51-
* Move the Metro cache to the `node_modules/.cache/metro` folder.
52-
* This repository configured Turborepo to use this cache location as well.
51+
* Move the Metro cache to the `.cache/metro` folder.
5352
* If you have any environment variables, you can configure Turborepo to invalidate it when needed.
5453
*
5554
* @see https://turbo.build/repo/docs/reference/configuration#env
@@ -58,7 +57,7 @@ function withMonorepoPaths(config) {
5857
*/
5958
function withTurborepoManagedCache(config) {
6059
config.cacheStores = [
61-
new FileStore({ root: path.join(__dirname, "node_modules/.cache/metro") }),
60+
new FileStore({ root: path.join(__dirname, ".cache/metro") }),
6261
];
6362
return config;
6463
}

‎apps/expo/package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"main": "src/index.ts",
66
"scripts": {
7-
"clean": "git clean -xdf .expo .turbo node_modules",
7+
"clean": "git clean -xdf .cache .expo .turbo android ios node_modules",
88
"dev": "expo start -c",
99
"dev:android": "expo start --android",
1010
"dev:ios": "expo start --ios",
@@ -35,7 +35,7 @@
3535
"@react-native-google-signin/google-signin": "^12.2.1",
3636
"@react-navigation/drawer": "^6.7.2",
3737
"@react-navigation/native": "^6.1.18",
38-
"@rn-primitives/avatar": "^1.0.3",
38+
"@rn-primitives/avatar": "^1.0.4",
3939
"@rn-primitives/dialog": "^1.0.3",
4040
"@rn-primitives/hooks": "^1.0.3",
4141
"@rn-primitives/label": "^1.0.3",
@@ -58,34 +58,34 @@
5858
"class-variance-authority": "^0.7.0",
5959
"clsx": "^2.1.1",
6060
"date-fns": "^3.6.0",
61-
"expo": "^51.0.26",
61+
"expo": "^51.0.31",
6262
"expo-apple-authentication": "~6.4.2",
63-
"expo-av": "~14.0.6",
63+
"expo-av": "~14.0.7",
6464
"expo-build-properties": "~0.12.5",
6565
"expo-clipboard": "~6.0.3",
6666
"expo-constants": "~16.0.2",
6767
"expo-crypto": "~13.0.2",
68-
"expo-dev-client": "~4.0.22",
68+
"expo-dev-client": "~4.0.25",
6969
"expo-file-system": "~17.0.1",
7070
"expo-font": "~12.0.9",
7171
"expo-haptics": "~13.0.1",
72-
"expo-image": "~1.12.13",
72+
"expo-image": "~1.12.15",
7373
"expo-keep-awake": "~13.0.2",
7474
"expo-linear-gradient": "~13.0.2",
7575
"expo-linking": "~6.3.1",
7676
"expo-navigation-bar": "~3.0.7",
77-
"expo-notifications": "~0.28.15",
78-
"expo-router": "~3.5.21",
77+
"expo-notifications": "~0.28.16",
78+
"expo-router": "~3.5.23",
7979
"expo-secure-store": "~13.0.2",
8080
"expo-sharing": "~12.0.1",
8181
"expo-splash-screen": "~0.27.5",
8282
"expo-status-bar": "~1.12.1",
8383
"expo-system-ui": "~3.0.7",
84-
"expo-updates": "~0.25.22",
84+
"expo-updates": "~0.25.24",
8585
"expo-web-browser": "~13.0.3",
86-
"lucide-react-native": "^0.426.0",
87-
"nativewind": "^4.0.36",
88-
"openai": "^4.55.3",
86+
"lucide-react-native": "^0.436.0",
87+
"nativewind": "4.0.36",
88+
"openai": "^4.56.0",
8989
"react": "catalog:react18",
9090
"react-dom": "catalog:react18",
9191
"react-hook-form": "^7.52.2",
@@ -107,17 +107,17 @@
107107
"react-native-root-toast": "^3.6.0",
108108
"react-native-safe-area-context": "~4.10.8",
109109
"react-native-screens": "~3.34.0",
110-
"react-native-svg": "^15.5.0",
110+
"react-native-svg": "^15.6.0",
111111
"react-native-url-polyfill": "^2.0.0",
112-
"react-native-vision-camera": "^4.5.1",
112+
"react-native-vision-camera": "^4.5.2",
113113
"react-native-web": "~0.19.12",
114114
"superjson": "catalog:",
115-
"tailwind-merge": "^2.4.0",
115+
"tailwind-merge": "^2.5.2",
116116
"tailwindcss": "catalog:tailwind",
117117
"tailwindcss-animate": "catalog:tailwind",
118-
"victory-native": "^41.0.2",
118+
"victory-native": "^41.1.0",
119119
"zeego": "^1.10.0",
120-
"zustand": "^4.5.4"
120+
"zustand": "^4.5.5"
121121
},
122122
"devDependencies": {
123123
"@babel/core": "^7.25.2",
@@ -134,7 +134,7 @@
134134
"@types/aes-js": "^3.1.4",
135135
"@types/babel__core": "^7.20.5",
136136
"@types/jest": "^29.5.12",
137-
"@types/node": "^20.14.10",
137+
"@types/node": "^20.14.15",
138138
"@types/react": "catalog:react18",
139139
"eslint": "catalog:",
140140
"jest": "^29.7.0",

‎apps/expo/src/app/_layout.tsx

+5
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ const InitialLayout = () => {
5656
const [isLoaded, setIsLoaded] = useState(false);
5757
const [isSignedIn, setIsSignedIn] = useState(false);
5858

59+
console.log("isLoaded", isLoaded);
60+
console.log("isSignedIn", isSignedIn);
61+
5962
useEffect(() => {
6063
supabase.auth.getSession().then(({ data: { session } }) => {
6164
setIsSignedIn(!!session);
@@ -141,6 +144,8 @@ export default function RootLayout() {
141144
const { colorScheme, setColorScheme, isDarkColorScheme } = useColorScheme();
142145
const [isColorSchemeLoaded, setIsColorSchemeLoaded] = useState(false);
143146

147+
console.log("isColorSchemeLoaded", isColorSchemeLoaded);
148+
144149
useEffect(() => {
145150
(async () => {
146151
const theme = await AsyncStorage.getItem("theme");

‎apps/expo/src/lib/use-color-scheme.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { useColorScheme as useNativewindColorScheme } from "nativewind";
33
export function useColorScheme() {
44
const { colorScheme, setColorScheme, toggleColorScheme } =
55
useNativewindColorScheme();
6+
7+
console.log("colorSchemeasdfffff", colorScheme);
68
return {
79
colorScheme: colorScheme ?? "dark",
810
isDarkColorScheme: colorScheme === "dark",

‎apps/expo/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"~/*": ["./src/*"]
88
},
99
"jsx": "react-native",
10-
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",
1110
"types": ["nativewind/types"],
1211
"checkJs": false,
1312
"module": "esnext"

‎apps/nextjs/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "pnpm with-env next build",
8-
"clean": "git clean -xdf .next .turbo node_modules",
8+
"clean": "git clean -xdf .cache .next .turbo node_modules",
99
"dev": "pnpm with-env next dev",
1010
"format": "prettier --check . --ignore-path ../../.gitignore",
1111
"lint": "eslint",
@@ -20,32 +20,32 @@
2020
"@hyper/validators": "workspace:*",
2121
"@supabase/ssr": "catalog:supabase",
2222
"@supabase/supabase-js": "catalog:supabase",
23-
"@t3-oss/env-nextjs": "^0.11.0",
23+
"@t3-oss/env-nextjs": "^0.11.1",
2424
"@tanstack/react-query": "catalog:",
2525
"@trpc/client": "catalog:",
2626
"@trpc/react-query": "catalog:",
2727
"@trpc/server": "catalog:",
28-
"ai": "^3.2.43",
28+
"ai": "^3.3.17",
2929
"geist": "^1.3.1",
3030
"highlight.js": "^11.10.0",
3131
"lowlight": "^3.1.0",
32-
"lucide-react": "^0.418.0",
33-
"next": "^14.2.5",
34-
"next-safe-action": "^7.4.3",
32+
"lucide-react": "^0.436.0",
33+
"next": "^14.2.6",
34+
"next-safe-action": "^7.7.1",
3535
"novel": "^0.5.0",
3636
"react": "catalog:react18",
3737
"react-dom": "catalog:react18",
38-
"react-icons": "^5.2.1",
38+
"react-icons": "^5.3.0",
3939
"superjson": "catalog:",
40-
"use-debounce": "^10.0.2",
40+
"use-debounce": "^10.0.3",
4141
"zod": "catalog:"
4242
},
4343
"devDependencies": {
4444
"@hyper/eslint-config": "workspace:*",
4545
"@hyper/prettier-config": "workspace:*",
4646
"@hyper/tailwind-config": "workspace:*",
4747
"@hyper/tsconfig": "workspace:*",
48-
"@types/node": "^20.14.10",
48+
"@types/node": "^20.14.15",
4949
"@types/react": "catalog:react18",
5050
"@types/react-dom": "catalog:react18",
5151
"autoprefixer": "^10.4.19",

‎apps/nextjs/src/env.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable no-restricted-properties */
21
import { createEnv } from "@t3-oss/env-nextjs";
32
import { vercel } from "@t3-oss/env-nextjs/presets";
43
import { z } from "zod";

‎apps/nextjs/tailwind.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import baseConfig from "@hyper/tailwind-config/web";
66
export default {
77
// We need to append the path to the UI package to the content array so that
88
// those classes are included correctly.
9-
content: [...baseConfig.content, "../../packages/ui/**/*.{ts,tsx}"],
9+
content: [...baseConfig.content, "../../packages/ui/src/*.{ts,tsx}"],
1010
presets: [baseConfig],
1111
theme: {
1212
extend: {

‎apps/nextjs/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"~/*": ["./src/*"]
99
},
1010
"plugins": [{ "name": "next" }],
11-
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",
1211
"module": "esnext"
1312
},
1413
"include": [".", ".next/types/**/*.ts"],

‎package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"name": "wellchart",
2+
"name": "hyper",
33
"private": true,
44
"engines": {
55
"node": ">=20.16.0"
66
},
7-
"packageManager": "pnpm@9.6.0",
7+
"packageManager": "pnpm@9.8.0+sha256.56a9e76b51796ca7f73b85e44cf83712862091f4d498c0ce4d5b7ecdc6ba18f7",
88
"scripts": {
99
"build": "turbo run build",
1010
"clean": "git clean -xdf node_modules",
@@ -14,19 +14,19 @@
1414
"db:push": "turbo -F @hyper/db push",
1515
"db:studio": "turbo -F @hyper/db studio",
1616
"dev": "turbo watch dev",
17-
"format": "turbo run format --continue -- --cache --cache-location node_modules/.cache/.prettiercache",
18-
"format:fix": "turbo run format --continue -- --write --cache --cache-location node_modules/.cache/.prettiercache",
19-
"lint": "turbo lint --continue -- --cache --cache-location node_modules/.cache/.eslintcache",
20-
"lint:fix": "turbo run lint --continue -- --fix --cache --cache-location node_modules/.cache/.eslintcache",
17+
"format": "turbo run format --continue -- --cache --cache-location .cache/.prettiercache",
18+
"format:fix": "turbo run format --continue -- --write --cache --cache-location .cache/.prettiercache",
19+
"lint": "turbo run lint --continue -- --cache --cache-location .cache/.eslintcache",
20+
"lint:fix": "turbo run lint --continue -- --fix --cache --cache-location .cache/.eslintcache",
2121
"lint:ws": "pnpm dlx sherif@latest",
2222
"typecheck": "turbo run typecheck",
2323
"ui:ui-add": "turbo -F @hyper/ui ui-add"
2424
},
2525
"devDependencies": {
2626
"@hyper/prettier-config": "workspace:*",
27-
"@turbo/gen": "^2.0.10",
27+
"@turbo/gen": "^2.0.14",
2828
"prettier": "catalog:",
29-
"turbo": "^2.0.10",
29+
"turbo": "^2.0.14",
3030
"typescript": "catalog:"
3131
},
3232
"prettier": "@hyper/prettier-config"

‎packages/api/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"exports": {
77
".": {
88
"types": "./dist/index.d.ts",
9-
"default": "./dist/index.js"
9+
"default": "./src/index.ts"
1010
},
1111
"./client": {
1212
"types": "./dist/client.d.ts",
@@ -16,7 +16,7 @@
1616
"license": "MIT",
1717
"scripts": {
1818
"build": "tsc",
19-
"clean": "rm -rf .turbo dist node_modules",
19+
"clean": "git clean -xdf .cache .turbo dist node_modules",
2020
"dev": "tsc --watch",
2121
"format": "prettier --check . --ignore-path ../../.gitignore",
2222
"lint": "eslint",

‎packages/api/tsconfig.json

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"extends": "@hyper/tsconfig/internal-package.json",
3-
"compilerOptions": {
4-
"outDir": "dist",
5-
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
6-
},
73
"include": ["src"],
84
"exclude": ["node_modules"]
95
}

‎packages/db/eslint.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import baseConfig, { restrictEnvAccess } from "@hyper/eslint-config/base";
1+
import baseConfig from "@hyper/eslint-config/base";
22

33
/** @type {import('typescript-eslint').Config} */
44
export default [
55
{
66
ignores: ["dist/**"],
77
},
88
...baseConfig,
9-
...restrictEnvAccess,
109
];

‎packages/db/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
"exports": {
77
".": {
88
"types": "./dist/index.d.ts",
9-
"default": "./dist/index.js"
9+
"default": "./src/index.ts"
1010
},
1111
"./client": {
1212
"types": "./dist/client.d.ts",
13-
"default": "./dist/client.js"
13+
"default": "./src/client.ts"
1414
},
1515
"./schema": {
1616
"types": "./dist/schema/index.d.ts",
17-
"default": "./dist/schema/index.js"
17+
"default": "./src/schema/index.ts"
1818
}
1919
},
2020
"license": "MIT",
2121
"scripts": {
2222
"build": "tsc",
23-
"clean": "rm -rf .turbo dist node_modules",
23+
"clean": "git clean -xdf .cache .turbo dist node_modules",
2424
"dev": "tsc",
2525
"format": "prettier --check . --ignore-path ../../.gitignore",
2626
"lint": "eslint",
@@ -33,9 +33,9 @@
3333
"with-env": "dotenv -e ../../.env --"
3434
},
3535
"dependencies": {
36-
"@t3-oss/env-core": "^0.11.0",
36+
"@t3-oss/env-core": "^0.11.1",
3737
"@vercel/postgres": "^0.9.0",
38-
"drizzle-orm": "^0.32.1",
38+
"drizzle-orm": "^0.33.0",
3939
"drizzle-zod": "^0.5.1",
4040
"pg": "^8.12.0",
4141
"zod": "catalog:"
@@ -45,10 +45,10 @@
4545
"@hyper/prettier-config": "workspace:*",
4646
"@hyper/tsconfig": "workspace:*",
4747
"dotenv-cli": "^7.4.2",
48-
"drizzle-kit": "^0.23.1",
48+
"drizzle-kit": "^0.24.1",
4949
"eslint": "catalog:",
5050
"prettier": "catalog:",
51-
"tsx": "^4.16.3",
51+
"tsx": "^4.18.0",
5252
"typescript": "catalog:"
5353
},
5454
"prettier": "@hyper/prettier-config"

‎packages/db/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"extends": "@hyper/tsconfig/internal-package.json",
3-
"compilerOptions": {},
43
"include": ["src"],
54
"exclude": ["node_modules"]
65
}

‎packages/ui/eslint.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import reactConfig from "@hyper/eslint-config/react";
44
/** @type {import('typescript-eslint').Config} */
55
export default [
66
{
7-
ignores: [],
7+
ignores: ["dist/**"],
88
},
99
...baseConfig,
1010
...reactConfig,

0 commit comments

Comments
 (0)