Skip to content

Commit 873409c

Browse files
authored
Merge pull request #91 from atomly/deps/upgrade-packages-and-install-dependabot
[DEPENDENCIES] Upgrade packages and install dependabot #62 (Part 1)
2 parents 3ce5afe + 4a03a17 commit 873409c

30 files changed

+1866
-2352
lines changed

.env.example

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,33 @@
77
# The database URL is used to connect to your Supabase database.
88
POSTGRES_URL="postgres://postgres.[USERNAME]:[PASSWORD]@aws-0-eu-central-1.pooler.supabase.com:6543/postgres?workaround=supabase-pooler.vercel"
99

10-
# You can generate the secret via 'openssl rand -base64 32' on Unix
10+
# You can generate the secret via 'openssl rand -base64 32' on Unix.
1111
# @see https://www.better-auth.com/docs/installation
1212
AUTH_SECRET='<YOUR_AUTH_SECRET>'
1313

14-
# Pre-configured Discord OAuth provider, works out-of-the-box
14+
# Pre-configured Google OAuth provider, works out-of-the-box.
15+
# @see https://www.better-auth.com/docs/authentication/google
16+
AUTH_GOOGLE_ID='<AUTH_GOOGLE_ID>'
17+
AUTH_GOOGLE_SECRET='<AUTH_GOOGLE_SECRET>'
18+
19+
# Pre-configured Discord OAuth provider, works out-of-the-box.
1520
# @see https://www.better-auth.com/docs/authentication/discord
1621
AUTH_DISCORD_ID='<AUTH_DISCORD_ID>'
1722
AUTH_DISCORD_SECRET='<AUTH_DISCORD_SECRET>'
1823

24+
# Pre-configured GitHub OAuth provider, works out-of-the-box.
25+
# @see https://www.better-auth.com/docs/authentication/github
26+
AUTH_GITHUB_ID='<AUTH_GITHUB_ID>'
27+
AUTH_GITHUB_SECRET='<AUTH_GITHUB_SECRET>'
28+
1929
# Environment variables for the local tunnel that webhooks will be using.
2030
LOCALTUNNEL_PORT='<LOCALTUNNEL_PORT>'
2131
LOCALTUNNEL_SUBDOMAIN='<LOCALTUNNEL_SUBDOMAIN>'
2232

2333
# Supabase secret for webhook signatures.
2434
SUPABASE_SECRET="<YOUR_SUPABASE_SECRET>"
2535

26-
# OpenAI Key for vector embeddings
36+
# OpenAI Key for vector embeddings & editor chat completions.
2737
OPENAI_API_KEY="<OPENAI_API_KEY>"
2838

2939
# Public URL of the web app. In preview URLs it should be `PUBLIC_WEB_URL=https://$NEXT_PUBLIC_VERCEL_URL`.

apps/drizzle-studio/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
},
1010
"devDependencies": {
1111
"@acme/db": "workspace:*",
12-
"dotenv-cli": "^8.0.0"
12+
"dotenv-cli": "~8.0.0"
1313
}
1414
}

apps/localtunnel/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"devDependencies": {
1616
"@acme/db": "workspace:*",
1717
"@acme/tsconfig": "workspace:*",
18-
"@biomejs/biome": "^2.0.6",
19-
"@types/express": "^5.0.3",
20-
"@types/localtunnel": "^2.0.4",
21-
"@types/node": "^22.15.29",
22-
"concurrently": "^9.2.1",
23-
"dotenv-cli": "^8.0.0",
24-
"express": "^5.1.0",
25-
"localtunnel": "^2.0.2",
26-
"tsx": "^4.20.5",
27-
"zod": "^3.25.71"
18+
"@biomejs/biome": "~2.0.6",
19+
"@types/express": "~5.0.3",
20+
"@types/localtunnel": "~2.0.4",
21+
"@types/node": "~22.15.29",
22+
"concurrently": "~9.2.1",
23+
"dotenv-cli": "~8.0.0",
24+
"express": "~5.1.0",
25+
"localtunnel": "~2.0.2",
26+
"tsx": "~4.20.5",
27+
"zod": "~3.25.71"
2828
}
2929
}

apps/stripe/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
},
1212
"devDependencies": {
1313
"@acme/tsconfig": "workspace:*",
14-
"@t3-oss/env-nextjs": "^0.13.6",
15-
"dotenv-cli": "^8.0.0",
16-
"zod": "^3.25.71"
14+
"@t3-oss/env-nextjs": "~0.13.8",
15+
"dotenv-cli": "~8.0.0",
16+
"zod": "~3.25.71"
1717
}
1818
}

apps/web/package.json

Lines changed: 69 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -18,81 +18,79 @@
1818
"@acme/auth": "workspace:*",
1919
"@acme/blocknote": "workspace:*",
2020
"@acme/db": "workspace:*",
21-
"@ai-sdk/openai": "^2.0.27",
22-
"@ai-sdk/provider-utils": "^3.0.9",
21+
"@ai-sdk/openai": "~2.0.32",
22+
"@ai-sdk/provider-utils": "~3.0.9",
2323
"@ai-sdk/react": "2.0.49",
24-
"@assistant-ui/react": "^0.11.15",
25-
"@assistant-ui/react-ai-sdk": "^1.1.0",
26-
"@assistant-ui/react-markdown": "^0.11.0",
27-
"@assistant-ui/styles": "^0.2.1",
28-
"@blocknote/core": "^0.35.0",
29-
"@blocknote/mantine": "^0.35.0",
30-
"@blocknote/react": "^0.35.0",
31-
"@blocknote/server-util": "^0.35.0",
32-
"@blocknote/xl-ai": "^0.35.0",
33-
"@daveyplate/better-auth-ui": "^2.1.11",
34-
"@hookform/resolvers": "^5.0.1",
35-
"@mantine/core": "^8.1.3",
36-
"@mastra/core": "^0.15.2",
37-
"@mastra/libsql": "^0.13.7",
38-
"@mastra/loggers": "^0.10.9",
39-
"@mastra/memory": "^0.14.2",
40-
"@mastra/rag": "^1.2.2",
41-
"@ngrok/ngrok": "^1.5.1",
42-
"@radix-ui/react-avatar": "^1.1.10",
43-
"@radix-ui/react-collapsible": "^1.1.12",
44-
"@radix-ui/react-dialog": "^1.1.14",
45-
"@radix-ui/react-hover-card": "^1.1.15",
46-
"@radix-ui/react-navigation-menu": "^1.2.13",
47-
"@radix-ui/react-scroll-area": "^1.2.9",
48-
"@radix-ui/react-select": "^2.2.6",
49-
"@radix-ui/react-separator": "^1.1.7",
50-
"@radix-ui/react-slot": "^1.2.3",
51-
"@radix-ui/react-tooltip": "^1.2.7",
52-
"@t3-oss/env-nextjs": "^0.13.6",
53-
"@tanstack/react-query": "^5.80.7",
54-
"@tanstack/react-query-devtools": "^5.80.7",
55-
"@tanstack/react-virtual": "^3.13.12",
56-
"@trpc/client": "^11.4.0",
57-
"@trpc/server": "^11.4.0",
58-
"@trpc/tanstack-react-query": "^11.4.0",
59-
"ai": "^5.0.38",
60-
"class-variance-authority": "^0.7.1",
61-
"clsx": "^2.1.1",
62-
"cmdk": "^1.1.1",
63-
"date-fns": "^4.1.0",
64-
"embla-carousel-react": "^8.6.0",
65-
"lucide-react": "^0.475.0",
66-
"next": "^15.4.7",
67-
"next-themes": "^0.4.6",
68-
"radix-ui": "^1.4.2",
69-
"react": "19.1.0",
70-
"react-day-picker": "^9.8.0",
71-
"react-dom": "19.1.0",
72-
"react-hook-form": "^7.57.0",
73-
"react-virtuoso": "^4.13.0",
74-
"remark-gfm": "^4.0.1",
75-
"remove-markdown": "^0.6.2",
76-
"sonner": "^2.0.5",
77-
"stripe": "^18.5.0",
24+
"@assistant-ui/react": "~0.11.15",
25+
"@assistant-ui/react-ai-sdk": "~1.1.0",
26+
"@assistant-ui/react-markdown": "~0.11.0",
27+
"@assistant-ui/styles": "~0.2.1",
28+
"@blocknote/core": "~0.39.1",
29+
"@blocknote/mantine": "~0.39.1",
30+
"@blocknote/react": "~0.39.1",
31+
"@blocknote/server-util": "~0.39.1",
32+
"@blocknote/xl-ai": "~0.39.1",
33+
"@daveyplate/better-auth-ui": "~2.1.11",
34+
"@hookform/resolvers": "~5.0.1",
35+
"@mantine/core": "~8.1.3",
36+
"@mastra/core": "~0.15.2",
37+
"@mastra/libsql": "~0.13.7",
38+
"@mastra/loggers": "~0.10.9",
39+
"@mastra/memory": "~0.14.2",
40+
"@mastra/rag": "~1.2.2",
41+
"@radix-ui/react-avatar": "~1.1.10",
42+
"@radix-ui/react-collapsible": "~1.1.12",
43+
"@radix-ui/react-dialog": "~1.1.14",
44+
"@radix-ui/react-hover-card": "~1.1.15",
45+
"@radix-ui/react-navigation-menu": "~1.2.13",
46+
"@radix-ui/react-scroll-area": "~1.2.9",
47+
"@radix-ui/react-select": "~2.2.6",
48+
"@radix-ui/react-separator": "~1.1.7",
49+
"@radix-ui/react-slot": "~1.2.3",
50+
"@radix-ui/react-tooltip": "~1.2.7",
51+
"@t3-oss/env-nextjs": "~0.13.8",
52+
"@tanstack/react-query": "~5.80.7",
53+
"@tanstack/react-query-devtools": "~5.80.7",
54+
"@tanstack/react-virtual": "~3.13.12",
55+
"@trpc/client": "~11.4.0",
56+
"@trpc/server": "~11.4.0",
57+
"@trpc/tanstack-react-query": "~11.4.0",
58+
"ai": "~5.0.49",
59+
"class-variance-authority": "~0.7.1",
60+
"clsx": "~2.1.1",
61+
"cmdk": "~1.1.1",
62+
"embla-carousel-react": "~8.6.0",
63+
"lucide-react": "~0.475.0",
64+
"next": "~15.4.7",
65+
"next-themes": "~0.4.6",
66+
"radix-ui": "~1.4.2",
67+
"react": "19.1.1",
68+
"react-day-picker": "~9.8.0",
69+
"react-dom": "~19.1.1",
70+
"react-hook-form": "~7.57.0",
71+
"react-virtuoso": "~4.13.0",
72+
"remark-gfm": "~4.0.1",
73+
"remove-markdown": "~0.6.2",
74+
"sonner": "~2.0.5",
75+
"stripe": "~18.5.0",
7876
"superjson": "2.2.2",
79-
"tailwind-merge": "^3.3.0",
80-
"tw-animate-css": "^1.2.4",
81-
"use-debounce": "^10.0.5",
82-
"vaul": "^1.1.2",
83-
"zod": "^3.25.71"
77+
"tailwind-merge": "~3.3.0",
78+
"tw-animate-css": "~1.2.4",
79+
"use-debounce": "~10.0.5",
80+
"vaul": "~1.1.2",
81+
"zod": "~3.25.71"
8482
},
8583
"devDependencies": {
8684
"@acme/tsconfig": "workspace:*",
87-
"@biomejs/biome": "^2.0.6",
88-
"@tailwindcss/postcss": "^4.1.13",
89-
"@types/node": "^22.15.29",
90-
"@types/react": "^19.1.8",
91-
"@types/react-dom": "^19.1.6",
92-
"dotenv-cli": "^8.0.0",
93-
"jiti": "^2.4.2",
94-
"react": "19.1.0",
95-
"react-dom": "19.1.0",
96-
"tailwindcss": "^4.1.13"
85+
"@biomejs/biome": "~2.0.6",
86+
"@tailwindcss/postcss": "~4.1.13",
87+
"@types/node": "~22.15.29",
88+
"@types/react": "~19.1.13",
89+
"@types/react-dom": "~19.1.9",
90+
"dotenv-cli": "~8.0.0",
91+
"jiti": "~2.6.0",
92+
"react": "~19.1.1",
93+
"react-dom": "~19.1.1",
94+
"tailwindcss": "~4.1.13"
9795
}
9896
}

apps/web/src/ai/agents/journl-agent.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ ${
5454
5555
### \`manipulateEditor\`
5656
57-
Modify the content of the target editor (insert/append/prepend/replace text; headings, bullets, and so on).
57+
Modify the content of the target editor.
5858
5959
**Important**: The target editor has to be the ID of one of the active editors, if you don't know which to use, do not call this tool and ask the user to clarify instead.
6060
61-
- The generated \`userPrompt\` for the \`manipulateEditor\` tool MUST include as much detail as possible.
62-
- The prompt will be used by a different agent that will be manipulating the editor client-side, and should be treated as such.
63-
- Any content you generate should be markdown that is immediately usable. Avoid placeholder text.
61+
- Treat the editor as an agent that will be manipulating the editor client-side.
62+
- As such, the \`editorPrompt\` for the \`manipulateEditor\` tool must include as much detail as possible.
63+
- Do not generate markdown, the editor will handle the formatting.
6464
- Do not add titles to the pages because they are handled separately from the editor.
6565
- **No fabrication**. Never invent prior notes, pages, links, or other content.
6666
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import { openai } from "@ai-sdk/openai";
22

33
// ! TODO: Move this to a shared package called `@acme/ai`.
4-
export const model = openai("gpt-4o-mini");
4+
export const model = openai("gpt-5-mini");

apps/web/src/ai/tools/manipulate-editor.client.ts

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,22 @@ export function useManipulateEditorTool() {
3030

3131
const aiExtension = getAIExtension(editor);
3232

33+
let hasScrolledAtLeastOnce = false;
34+
function handleBlockUpdate(block: string) {
35+
const blockElement = document.querySelector(`[data-id="${block}"]`);
36+
if (
37+
blockElement &&
38+
!isElementPartiallyInViewport(blockElement) &&
39+
!hasScrolledAtLeastOnce
40+
) {
41+
blockElement.scrollIntoView({ behavior: "smooth" });
42+
hasScrolledAtLeastOnce = true;
43+
}
44+
}
45+
3346
const response = await aiExtension.callLLM({
34-
onBlockUpdate: (block) => {
35-
const blockElement = document.querySelector(`[data-id="${block}"]`);
36-
if (blockElement && !isElementPartiallyInViewport(blockElement)) {
37-
blockElement.scrollIntoView({ behavior: "smooth" });
38-
}
39-
},
40-
userPrompt: toolCall.input.userPrompt,
47+
onBlockUpdate: handleBlockUpdate,
48+
userPrompt: toolCall.input.editorPrompt,
4149
});
4250

4351
const stream = response?.llmResult.streamObjectResult;

apps/web/src/ai/tools/manipulate-editor.schema.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const zManipulateEditorInput = z.object({
66
.describe(
77
"The target editor to manipulate. It is the date of a journal entry (in YYYY-MM-DD format) or a page ID (UUID format).",
88
),
9-
userPrompt: z
9+
editorPrompt: z
1010
.string()
11-
.describe("The user prompt to use for the editor's LLM call."),
11+
.describe("The prompt to pass to the editor's agent."),
1212
});
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import dynamic from "next/dynamic";
2+
3+
export const DynamicAppSidebarDevtools = dynamic(() =>
4+
import("./app-sidebar-devtools").then((mod) => mod.AppSidebarDevtools),
5+
);

0 commit comments

Comments
 (0)