Skip to content

Commit 9a80dd3

Browse files
authored
Merge pull request #36 from get-convex/mikec/update-versionns
Mikec/update versionns
2 parents 3fbb67f + abb3723 commit 9a80dd3

File tree

14 files changed

+3052
-2073
lines changed

14 files changed

+3052
-2073
lines changed

apps/native/package.json

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,45 @@
77
"start": "expo start",
88
"android": "expo start --android",
99
"ios": "expo start --ios",
10-
"web": "expo start --web"
10+
"web": "expo start --web",
11+
"typecheck": "tsc --noEmit"
1112
},
1213
"dependencies": {
13-
"@clerk/clerk-expo": "^2.13.2",
14-
"@expo/vector-icons": "^14.1.0",
14+
"@clerk/clerk-expo": "^2.19.6",
15+
"@expo/vector-icons": "^15.0.3",
1516
"@packages/backend": "*",
16-
"@react-native/virtualized-lists": "^0.80.0",
17-
"@react-navigation/bottom-tabs": "^7.4.2",
18-
"@react-navigation/native": "^7.1.14",
19-
"@react-navigation/native-stack": "^7.3.21",
20-
"expo": "~53.0.12",
21-
"expo-asset": "~11.1.5",
22-
"expo-auth-session": "~6.2.0",
23-
"expo-font": "~13.3.1",
24-
"expo-system-ui": "~5.0.9",
25-
"expo-web-browser": "~14.2.0",
17+
"@react-native/virtualized-lists": "^0.82.1",
18+
"@react-navigation/bottom-tabs": "^7.8.11",
19+
"@react-navigation/native": "^7.1.24",
20+
"@react-navigation/native-stack": "^7.8.5",
21+
"expo": "~54.0.25",
22+
"expo-asset": "~12.0.10",
23+
"expo-auth-session": "~7.0.9",
24+
"expo-font": "~14.0.9",
25+
"expo-system-ui": "~6.0.8",
26+
"expo-web-browser": "~15.0.9",
2627
"react": "19.2.1",
2728
"react-dom": "19.2.1",
28-
"react-native": "0.79.4",
29-
"react-native-gesture-handler": "~2.24.0",
29+
"react-native": "0.82.1",
30+
"react-native-gesture-handler": "~2.29.1",
3031
"react-native-keyboard-aware-scroll-view": "^0.9.5",
31-
"react-native-reanimated": "~3.17.4",
32+
"react-native-reanimated": "~4.1.5",
3233
"react-native-responsive-fontsize": "^0.5.1",
33-
"react-native-safe-area-context": "5.4.0",
34-
"react-native-screens": "~4.11.1",
35-
"react-native-web": "~0.20.0",
36-
"react-native-webview": "13.13.5",
37-
"use-sync-external-store": "^1.2.2"
34+
"react-native-safe-area-context": "5.6.2",
35+
"react-native-screens": "~4.18.0",
36+
"react-native-web": "~0.21.2",
37+
"react-native-webview": "13.16.0",
38+
"use-sync-external-store": "^1.6.0"
3839
},
3940
"devDependencies": {
40-
"@babel/core": "7.27.1",
41-
"@types/jest": "29.5.14",
42-
"@types/react": "19.0.14",
43-
"@types/react-test-renderer": "18.3.1",
44-
"jest": "29.7.0",
45-
"jest-expo": "53.0.7",
46-
"react-test-renderer": "19.1.0",
47-
"typescript": "5.8.3"
41+
"@babel/core": "7.28.5",
42+
"@types/jest": "30.0.0",
43+
"@types/react": "^19.2.7",
44+
"@types/react-test-renderer": "19.1.0",
45+
"jest": "30.2.0",
46+
"jest-expo": "54.0.13",
47+
"react-test-renderer": "19.2.1",
48+
"typescript": "5.9.3"
4849
},
4950
"private": true
5051
}

apps/native/src/screens/CreateNoteScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ export default function CreateNoteScreen({ navigation }) {
167167
]}
168168
>
169169
<TouchableOpacity onPress={createUserNote} style={styles.newNoteButton}>
170-
<AntDesign name="pluscircle" size={20} color="#fff" />
170+
<AntDesign name="plus-circle" size={20} color="#fff" />
171171
<Text style={styles.newNoteButtonText}>Create a New Note</Text>
172172
</TouchableOpacity>
173173
</Animated.View>

apps/native/src/screens/LoginScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const LoginScreen = ({ navigation }) => {
5858
style={styles.buttonApple}
5959
onPress={() => onPress("apple")}
6060
>
61-
<AntDesign name="apple1" size={24} color="black" />
61+
<AntDesign name="apple" size={24} color="black" />
6262
<Text
6363
style={{ ...styles.buttonText, color: "#344054", marginLeft: 12 }}
6464
>

apps/native/src/screens/NotesDashboardScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ const NotesDashboardScreen = ({ navigation }) => {
102102
onPress={() => navigation.navigate("CreateNoteScreen")}
103103
style={styles.newNoteButton}
104104
>
105-
<AntDesign name="pluscircle" size={20} color="#fff" />
105+
<AntDesign name="plus-circle" size={20} color="#fff" />
106106
<Text style={styles.newNoteButtonText}>Create a New Note</Text>
107107
</TouchableOpacity>
108108
</View>

apps/web/package.json

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,36 @@
66
"dev": "next dev",
77
"build": "next build",
88
"start": "next start",
9-
"lint": "next lint"
9+
"lint": "next lint",
10+
"typecheck": "tsc --noEmit"
1011
},
1112
"dependencies": {
12-
"@clerk/clerk-react": "^5.32.1",
13-
"@clerk/nextjs": "^6.23.0",
14-
"@headlessui/react": "^2.0.3",
15-
"@heroicons/react": "^2.1.3",
13+
"@clerk/clerk-react": "^5.57.1",
14+
"@clerk/nextjs": "^6.35.6",
15+
"@headlessui/react": "^2.2.9",
16+
"@heroicons/react": "^2.2.0",
1617
"@packages/backend": "*",
17-
"@radix-ui/react-avatar": "^1.0.4",
18-
"@radix-ui/react-dropdown-menu": "^2.0.6",
19-
"@radix-ui/react-slot": "^1.0.2",
18+
"@radix-ui/react-avatar": "^1.1.11",
19+
"@radix-ui/react-dropdown-menu": "^2.1.16",
20+
"@radix-ui/react-slot": "^1.2.4",
2021
"class-variance-authority": "^0.7.0",
21-
"convex": "^1.13.0",
22-
"lucide-react": "^0.378.0",
23-
"next": "^15.5.7",
22+
"convex": "^1.29.3",
23+
"lucide-react": "^0.555.0",
24+
"next": "^16.0.7",
2425
"react": "^19.2.1",
2526
"react-dom": "^19.2.1",
26-
"tailwind-merge": "^2.3.0"
27+
"tailwind-merge": "^3.4.0"
2728
},
2829
"devDependencies": {
2930
"@tailwindcss/forms": "0.5.10",
30-
"@tailwindcss/postcss": "4.1.10",
31-
"@types/node": "20.17.32",
32-
"@types/react": "19.1.8",
33-
"@types/react-dom": "19.1.6",
34-
"eslint": "8.57.1",
35-
"eslint-config-next": "15.3.4",
36-
"postcss": "8.5.3",
37-
"tailwindcss": "4.1.10",
38-
"typescript": "5.8.3"
31+
"@tailwindcss/postcss": "4.1.17",
32+
"@types/node": "^24.10.1",
33+
"@types/react": "^19.2.7",
34+
"@types/react-dom": "^19.2.3",
35+
"eslint": "^9.39.1",
36+
"eslint-config-next": "16.0.7",
37+
"postcss": "8.5.6",
38+
"tailwindcss": "4.1.17",
39+
"typescript": "5.9.3"
3940
}
4041
}

apps/web/tsconfig.json

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"compilerOptions": {
33
"target": "es5",
4-
"lib": ["dom", "dom.iterable", "esnext"],
4+
"lib": [
5+
"dom",
6+
"dom.iterable",
7+
"esnext"
8+
],
59
"allowJs": true,
610
"skipLibCheck": true,
711
"strict": true,
@@ -11,17 +15,27 @@
1115
"moduleResolution": "bundler",
1216
"resolveJsonModule": true,
1317
"isolatedModules": true,
14-
"jsx": "preserve",
18+
"jsx": "react-jsx",
1519
"incremental": true,
1620
"plugins": [
1721
{
1822
"name": "next"
1923
}
2024
],
2125
"paths": {
22-
"@/*": ["./src/*"]
26+
"@/*": [
27+
"./src/*"
28+
]
2329
}
2430
},
25-
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
26-
"exclude": ["node_modules"]
31+
"include": [
32+
"next-env.d.ts",
33+
"**/*.ts",
34+
"**/*.tsx",
35+
".next/types/**/*.ts",
36+
".next/dev/types/**/*.ts"
37+
],
38+
"exclude": [
39+
"node_modules"
40+
]
2741
}

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
"scripts": {
55
"dev": "turbo run dev",
66
"build": "turbo run build",
7+
"typecheck": "turbo run typecheck",
78
"clean": "turbo run clean && rm -rf node_modules",
89
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\" --ignore-path .gitignore"
910
},
1011
"devDependencies": {
11-
"prettier": "3.5.3",
12-
"turbo": "2.5.2"
12+
"prettier": "3.7.4",
13+
"turbo": "2.6.2"
1314
},
1415
"engines": {
1516
"node": ">=18.8.0"
@@ -18,5 +19,5 @@
1819
"apps/*",
1920
"packages/*"
2021
],
21-
"packageManager": "[email protected].19"
22+
"packageManager": "[email protected].22"
2223
}

packages/backend/convex/_generated/api.d.ts

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,46 @@
88
* @module
99
*/
1010

11+
import type * as notes from "../notes.js";
12+
import type * as openai from "../openai.js";
13+
import type * as utils from "../utils.js";
14+
1115
import type {
1216
ApiFromModules,
1317
FilterApi,
1418
FunctionReference,
1519
} from "convex/server";
16-
import type * as notes from "../notes.js";
17-
import type * as openai from "../openai.js";
18-
import type * as utils from "../utils.js";
20+
21+
declare const fullApi: ApiFromModules<{
22+
notes: typeof notes;
23+
openai: typeof openai;
24+
utils: typeof utils;
25+
}>;
1926

2027
/**
21-
* A utility for referencing Convex functions in your app's API.
28+
* A utility for referencing Convex functions in your app's public API.
2229
*
2330
* Usage:
2431
* ```js
2532
* const myFunctionReference = api.myModule.myFunction;
2633
* ```
2734
*/
28-
declare const fullApi: ApiFromModules<{
29-
notes: typeof notes;
30-
openai: typeof openai;
31-
utils: typeof utils;
32-
}>;
3335
export declare const api: FilterApi<
3436
typeof fullApi,
3537
FunctionReference<any, "public">
3638
>;
39+
40+
/**
41+
* A utility for referencing Convex functions in your app's internal API.
42+
*
43+
* Usage:
44+
* ```js
45+
* const myFunctionReference = internal.myModule.myFunction;
46+
* ```
47+
*/
3748
export declare const internal: FilterApi<
3849
typeof fullApi,
3950
FunctionReference<any, "internal">
4051
>;
52+
53+
export declare const components: {};

packages/backend/convex/_generated/api.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @module
99
*/
1010

11-
import { anyApi } from "convex/server";
11+
import { anyApi, componentsGeneric } from "convex/server";
1212

1313
/**
1414
* A utility for referencing Convex functions in your app's API.
@@ -20,3 +20,4 @@ import { anyApi } from "convex/server";
2020
*/
2121
export const api = anyApi;
2222
export const internal = anyApi;
23+
export const components = componentsGeneric();

packages/backend/convex/_generated/server.d.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,12 @@ export declare const internalAction: ActionBuilder<DataModel, "internal">;
8585
/**
8686
* Define an HTTP action.
8787
*
88-
* This function will be used to respond to HTTP requests received by a Convex
89-
* deployment if the requests matches the path and method where this action
90-
* is routed. Be sure to route your action in `convex/http.js`.
88+
* The wrapped function will be used to respond to HTTP requests received
89+
* by a Convex deployment if the requests matches the path and method where
90+
* this action is routed. Be sure to route your httpAction in `convex/http.js`.
9191
*
92-
* @param func - The function. It receives an {@link ActionCtx} as its first argument.
92+
* @param func - The function. It receives an {@link ActionCtx} as its first argument
93+
* and a Fetch API `Request` object as its second.
9394
* @returns The wrapped function. Import this function from `convex/http.js` and route it to hook it up.
9495
*/
9596
export declare const httpAction: HttpActionBuilder;

0 commit comments

Comments
 (0)