Skip to content

migrate to tiptap v3 #1384

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.

Sign up for GitHub

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

Merged
yujonglee merged 2 commits into from
Aug 22, 2025
Merged

migrate to tiptap v3 #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7ec215
done
yujonglee Aug 22, 2025
d41e62a
done
yujonglee Aug 22, 2025
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
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ tauri-plugin-fs = "2.4"
tauri-plugin-http = { version = "2.5", features = ["unsafe-headers"] }
tauri-plugin-keygen = { git = "https://github.com/bagindo/tauri-plugin-keygen", branch = "v2" }
tauri-plugin-machine-uid = "0.1.1"
tauri-plugin-opener = "2.4"
tauri-plugin-opener = "2.5"
tauri-plugin-shell = "2.3"
tauri-plugin-store = "2.3"
tauri-plugin-store = "2.4"

tauri-plugin-analytics = { path = "plugins/analytics" }
tauri-plugin-apple-calendar = { path = "plugins/apple-calendar" }
Expand Down
2 changes: 1 addition & 1 deletion admin/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@hono/zod-validator": "^0.7.2",
"@t3-oss/env-core": "^0.13.8",
"better-auth": "^1.3.7",
"hono": "^4.9.2",
"hono": "^4.9.4",
"qs": "^6.14.0",
"zod": "^4.0.17"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"start": "node .output/server/index.mjs"
},
"dependencies": {
"@ai-sdk/openai": "^2.0.16",
"@ai-sdk/openai": "^2.0.19",
"@cerbos/grpc": "^0.22.1",
"@libsql/client": "^0.15.12",
"@mantine/core": "^8.2.5",
Expand All @@ -28,7 +28,7 @@
"@tanstack/react-router": "^1.131.27",
"@tanstack/react-router-with-query": "^1.130.17",
"@tanstack/react-start": "^1.131.27",
"ai": "^5.0.18",
"ai": "^5.0.21",
"better-auth": "^1.3.7",
"clsx": "^2.1.1",
"drizzle-kit": "^0.31.4",
Expand All @@ -37,7 +37,7 @@
"lucide-react": "^0.525.0",
"mantine-form-zod-resolver": "^1.3.0",
"openid-client": "^6.6.4",
"posthog-js": "^1.260.1",
"posthog-js": "^1.260.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwind-preset-mantine": "^2.1.0",
Expand Down
12 changes: 6 additions & 6 deletions apps/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
"@tanstack/zod-adapter": "^1.131.27",
"@tauri-apps/api": "^2.8.0",
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
"@tauri-apps/plugin-dialog": "^2.3.2",
"@tauri-apps/plugin-fs": "^2.4.1",
"@tauri-apps/plugin-http": "^2.5.1",
"@tauri-apps/plugin-opener": "^2.4.0",
"@tauri-apps/plugin-os": "^2.3.0",
"@tauri-apps/plugin-dialog": "^2.3.3",
"@tauri-apps/plugin-fs": "^2.4.2",
"@tauri-apps/plugin-http": "^2.5.2",
"@tauri-apps/plugin-opener": "^2.5.0",
"@tauri-apps/plugin-os": "^2.3.1",
"@tauri-apps/plugin-process": "^2.3.0",
"@tauri-apps/plugin-shell": "^2.3.0",
"@tauri-apps/plugin-store": "^2.3.0",
"@tauri-apps/plugin-store": "^2.4.0",
"@tauri-apps/plugin-updater": "^2.9.0",
Comment on lines +61 to 69
Copy link
Contributor

@coderabbitai coderabbitai bot Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Tauri plugin bumps: verify Rust-side plugin crate versions and capabilities.

JS plugin versions typically need compatible Rust crates in src-tauri/Cargo.toml and correct permissions in tauri.conf.json/capabilities. Validate both.

Run:

If Rust crates lag behind or capability keys changed between minor versions, align them to avoid runtime errors.

🏁 Script executed:

#!/bin/bash
# Inspect Rust plugin crate versions
rg -nP '^(tauri|@tauri)-apps|plugin' src-tauri/Cargo.toml -n -C2 || true
cat src-tauri/Cargo.toml 2>/dev/null | sed -n '1,200p'

# Check for capability/permission config usage for updated plugins
rg -nP '"plugins"\s*:\s*\{' -g 'src-tauri/tauri.conf.json*' -C3 || true

Length of output: 399

🏁 Script executed:

#!/bin/bash
# Locate all Cargo.toml files in the repository
fd --hidden --max-depth 4 Cargo.toml

# Locate all tauri.conf.json files
fd --hidden --max-depth 4 tauri.conf.json

# For each found Cargo.toml, show plugin crate versions
for f in $(fd --hidden --max-depth 4 Cargo.toml); do
  echo "===== $f ====="
  rg -nP '(plugin-)' "$f" -C2 || true
done

# For each found tauri.conf.json, show the plugins configuration block
for f in $(fd --hidden --max-depth 4 tauri.conf.json); do
  echo "===== $f ====="
  rg -nP '"plugins"\s*:\s*\{' -n -C3 "$f" || true
done

Length of output: 34291

Fix Rust plugin crate versions to match JS bumps and verify plugin configurations

  • In the root Cargo.toml (around lines 97–99):
    • Update
      tauri-plugin-opener = "2.4" → tauri-plugin-opener = "2.5"
      tauri-plugin-store = "2.3" → tauri-plugin-store = "2.4"
  • In apps/desktop/src-tauri/Cargo.toml (currently using { workspace = true } for these crates on lines 45 and 70), either:
    • Keep { workspace = true } and bump the workspace members for tauri-plugin-opener and tauri-plugin-store to the new versions, or
    • Switch to explicit versions: 
      tauri-plugin-opener = "2.5"
tauri-plugin-store   = "2.4"
  • Double-check that every JS plugin in apps/desktop/package.json (e.g. plugin-dialog, plugin-fs, plugin-http, etc.) has a matching Rust crate version in your Cargo.toml.
  • Inspect apps/desktop/src-tauri/tauri.conf.json under the "plugins" block and add configuration or allowlist entries for any newly bumped plugins (for example, FS scopes, HTTP allowlist, opener schemes, etc.) so that permissions align with the plugin versions and capabilities.

These updates will keep your JS and Rust sides in sync and prevent build or runtime errors when loading the updated Tauri plugins.

🤖 Prompt for AI Agents 
In apps/desktop/package.json around lines 61–69, the JS Tauri plugin versions
were bumped but the Rust crates are out of sync; update the root Cargo.toml
(around lines 97–99) to set tauri-plugin-opener = "2.5" and tauri-plugin-store =
"2.4", then in apps/desktop/src-tauri/Cargo.toml (lines ~45 and ~70) either keep
{ workspace = true } and bump those workspace members to the matching versions
or replace with explicit entries tauri-plugin-opener = "2.5" and
tauri-plugin-store = "2.4"; confirm every JS plugin listed in
apps/desktop/package.json has a corresponding Rust crate entry in Cargo.toml
with the same major/minor version, and update
apps/desktop/src-tauri/tauri.conf.json plugin allowlist/config blocks to include
any new scopes or settings required by the bumped plugins (FS, HTTP, opener
schemes, etc.).

"@types/lodash-es": "^4.17.12",
"beautiful-react-hooks": "^5.0.3",
Expand Down
80 changes: 40 additions & 40 deletions apps/desktop/src/locales/en/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,14 @@ msgstr "(Optional for localhost)"
msgid "(Optional)"
msgstr "(Optional)"

#. placeholder {0}: isViewingTemplate ? "Back" : "Save and close"
#. placeholder {0}: isCompact ? "Go" : "Resume"
#. placeholder {0}: disabled ? "Wait..." : "Play again"
#. placeholder {0}: disabled ? "Wait..." : "Play video"
#. placeholder {0}: disabled ? "Wait..." : isHovered ? (isCompact ? "Go" : "Resume") : (isCompact ? "End" : "Ended")
#: src/components/settings/views/templates.tsx:217
#: src/components/editor-area/note-header/listen-button.tsx:153
#: src/components/editor-area/note-header/listen-button.tsx:231
#: src/components/editor-area/note-header/listen-button.tsx:253
#: src/components/editor-area/note-header/listen-button.tsx:273
#: src/components/settings/views/templates.tsx:217
msgid "{0}"
msgstr "{0}"

Expand All @@ -280,8 +280,8 @@ msgstr "{0}"
msgid "{0} calendars selected"
msgstr "{0} calendars selected"

#: src/components/welcome-modal/audio-permissions-view.tsx:82
#: src/components/settings/views/sound.tsx:64
#: src/components/welcome-modal/audio-permissions-view.tsx:82
msgid "{buttonText}"
msgstr "{buttonText}"

Expand Down Expand Up @@ -318,9 +318,9 @@ msgstr "<0>Create Note</0>"
msgid "Access granted"
msgstr "Access granted"

#: src/components/welcome-modal/calendar-permissions-view.tsx:50
#: src/components/welcome-modal/audio-permissions-view.tsx:58
#: src/components/settings/views/sound.tsx:44
#: src/components/welcome-modal/audio-permissions-view.tsx:58
#: src/components/welcome-modal/calendar-permissions-view.tsx:50
msgid "Access Granted"
msgstr "Access Granted"

Expand Down Expand Up @@ -398,29 +398,29 @@ msgstr "and {0} more members"
msgid "Anyone with the link can view this page"
msgstr "Anyone with the link can view this page"

#: src/components/welcome-modal/custom-endpoint-view.tsx:498
#: src/components/settings/components/ai/llm-custom-view.tsx:603
#: src/components/welcome-modal/custom-endpoint-view.tsx:498
msgid "API Base URL"
msgstr "API Base URL"

#: src/components/welcome-modal/custom-endpoint-view.tsx:294
#: src/components/welcome-modal/custom-endpoint-view.tsx:361
#: src/components/welcome-modal/custom-endpoint-view.tsx:438
#: src/components/welcome-modal/custom-endpoint-view.tsx:518
#: src/components/settings/views/integrations.tsx:203
#: src/components/settings/components/ai/llm-custom-view.tsx:314
#: src/components/settings/components/ai/llm-custom-view.tsx:409
#: src/components/settings/components/ai/llm-custom-view.tsx:514
#: src/components/settings/components/ai/llm-custom-view.tsx:625
#: src/components/settings/views/integrations.tsx:203
#: src/components/welcome-modal/custom-endpoint-view.tsx:294
#: src/components/welcome-modal/custom-endpoint-view.tsx:361
#: src/components/welcome-modal/custom-endpoint-view.tsx:438
#: src/components/welcome-modal/custom-endpoint-view.tsx:518
msgid "API Key"
msgstr "API Key"

#: src/components/settings/views/profile.tsx:168
msgid "Apple"
msgstr "Apple"

#: src/components/toolbar/buttons/delete-note-button.tsx:43
#: src/components/left-sidebar/notes-list.tsx:269
#: src/components/toolbar/buttons/delete-note-button.tsx:43
msgid "Are you sure you want to delete this note?"
msgstr "Are you sure you want to delete this note?"

Expand Down Expand Up @@ -464,8 +464,8 @@ msgstr "Base URL"
#~ msgid "Billing features are currently under development and will be available in a future update."
#~ msgstr "Billing features are currently under development and will be available in a future update."

#: src/components/settings/views/templates.tsx:319
#: src/components/settings/components/templates-sidebar.tsx:68
#: src/components/settings/views/templates.tsx:319
msgid "Built-in Templates"
msgstr "Built-in Templates"

Expand Down Expand Up @@ -601,12 +601,12 @@ msgstr "Connect your Obsidian vault to export notes"
msgid "Contacts Access"
msgstr "Contacts Access"

#: src/components/welcome-modal/model-selection-view.tsx:94
#: src/components/welcome-modal/llm-selection-view.tsx:94
#: src/components/welcome-modal/download-progress-view.tsx:255
#: src/components/welcome-modal/custom-endpoint-view.tsx:595
#: src/components/welcome-modal/calendar-permissions-view.tsx:153
#: src/components/welcome-modal/audio-permissions-view.tsx:189
#: src/components/welcome-modal/calendar-permissions-view.tsx:153
#: src/components/welcome-modal/custom-endpoint-view.tsx:595
#: src/components/welcome-modal/download-progress-view.tsx:255
#: src/components/welcome-modal/llm-selection-view.tsx:94
#: src/components/welcome-modal/model-selection-view.tsx:94
msgid "Continue"
msgstr "Continue"

Expand All @@ -630,8 +630,8 @@ msgstr "Control how autonomous the AI enhancement should be."
#~ msgid "Control how creative the AI enhancement should be"
#~ msgstr "Control how creative the AI enhancement should be"

#: src/routes/app.human.$id.tsx:535
#: src/components/editor-area/note-header/chips/participants-chip.tsx:518
#: src/routes/app.human.$id.tsx:535
msgid "Create"
msgstr "Create"

Expand Down Expand Up @@ -659,8 +659,8 @@ msgstr "Create your first template to get started"
#~ msgid "Current Plan"
#~ msgstr "Current Plan"

#: src/components/settings/views/ai-stt.tsx:66
#: src/components/settings/views/ai-llm.tsx:671
#: src/components/settings/views/ai-stt.tsx:66
msgid "Custom"
msgstr "Custom"

Expand All @@ -676,18 +676,18 @@ msgstr "Custom"
msgid "Custom Vocabulary"
msgstr "Custom Vocabulary"

#: src/components/settings/views/ai-stt.tsx:63
#: src/components/settings/views/ai-llm.tsx:668
#: src/components/settings/views/ai-stt.tsx:63
msgid "Default"
msgstr "Default"

#: src/components/settings/components/ai/llm-view.tsx:149
#~ msgid "Default (llama-3.2-3b-q4)"
#~ msgstr "Default (llama-3.2-3b-q4)"

#: src/components/settings/views/template.tsx:218
#: src/components/settings/views/team.tsx:165
#: src/components/left-sidebar/notes-list.tsx:336
#: src/components/settings/views/team.tsx:165
#: src/components/settings/views/template.tsx:218
msgid "Delete"
msgstr "Delete"

Expand Down Expand Up @@ -873,10 +873,10 @@ msgstr "Grant both permissions to continue"
#~ msgid "Help us improve the Hyprnote experience by providing feedback."
#~ msgstr "Help us improve the Hyprnote experience by providing feedback."

#: src/components/individualization-modal/role-view.tsx:24
#: src/components/individualization-modal/org-size-view.tsx:24
#: src/components/individualization-modal/industry-view.tsx:63
#: src/components/individualization-modal/how-heard-view.tsx:33
#: src/components/individualization-modal/industry-view.tsx:63
#: src/components/individualization-modal/org-size-view.tsx:24
#: src/components/individualization-modal/role-view.tsx:24
msgid "Help us tailor your Hyprnote experience"
msgstr "Help us tailor your Hyprnote experience"

Expand Down Expand Up @@ -904,8 +904,8 @@ msgstr "Important Q&As"
#~ msgid "Integration with other apps like Notion and Google Calendar"
#~ msgstr "Integration with other apps like Notion and Google Calendar"

#: src/routes/app.settings.tsx:67
#: src/components/settings/views/integrations.tsx:124
#: src/routes/app.settings.tsx:67
msgid "Integrations"
msgstr "Integrations"

Expand Down Expand Up @@ -1047,22 +1047,22 @@ msgstr "Member"
msgid "Members"
msgstr "Members"

#: src/components/welcome-modal/audio-permissions-view.tsx:165
#: src/components/settings/views/sound.tsx:127
#: src/components/welcome-modal/audio-permissions-view.tsx:165
msgid "Microphone Access"
msgstr "Microphone Access"

#: src/components/welcome-modal/custom-endpoint-view.tsx:315
#: src/components/welcome-modal/custom-endpoint-view.tsx:382
#: src/components/welcome-modal/custom-endpoint-view.tsx:459
#: src/components/settings/components/ai/llm-custom-view.tsx:334
#: src/components/settings/components/ai/llm-custom-view.tsx:429
#: src/components/settings/components/ai/llm-custom-view.tsx:534
#: src/components/welcome-modal/custom-endpoint-view.tsx:315
#: src/components/welcome-modal/custom-endpoint-view.tsx:382
#: src/components/welcome-modal/custom-endpoint-view.tsx:459
msgid "Model"
msgstr "Model"

#: src/components/welcome-modal/custom-endpoint-view.tsx:544
#: src/components/settings/components/ai/llm-custom-view.tsx:650
#: src/components/welcome-modal/custom-endpoint-view.tsx:544
msgid "Model Name"
msgstr "Model Name"

Expand Down Expand Up @@ -1090,8 +1090,8 @@ msgstr "My Templates"
msgid "New note"
msgstr "New note"

#: src/components/left-sidebar/notes-list.tsx:313
#: src/components/left-sidebar/events-list.tsx:181
#: src/components/left-sidebar/notes-list.tsx:313
msgid "New window"
msgstr "New window"

Expand Down Expand Up @@ -1187,9 +1187,9 @@ msgstr "Only works with Custom Endpoints. Please configure one of the above firs
msgid "Open finder view"
msgstr "Open finder view"

#: src/components/toolbar/buttons/new-window-button.tsx:35
#: src/components/left-sidebar/search-list.tsx:298
#: src/components/left-sidebar/search-list.tsx:368
#: src/components/toolbar/buttons/new-window-button.tsx:35
msgid "Open in new window"
msgstr "Open in new window"

Expand Down Expand Up @@ -1288,8 +1288,8 @@ msgstr "Recent Notes"
#~ msgid "Remove {0} from list"
#~ msgstr "Remove {0} from list"

#: src/components/welcome-modal/audio-permissions-view.tsx:79
#: src/components/settings/views/sound.tsx:61
#: src/components/welcome-modal/audio-permissions-view.tsx:79
msgid "Requesting..."
msgstr "Requesting..."

Expand Down Expand Up @@ -1343,8 +1343,8 @@ msgstr "Saving..."
msgid "Search names or emails"
msgstr "Search names or emails"

#: src/components/settings/components/templates-sidebar.tsx:33
#: src/components/settings/components/template-list.tsx:43
#: src/components/settings/components/templates-sidebar.tsx:33
msgid "Search templates..."
msgstr "Search templates..."

Expand Down Expand Up @@ -1488,8 +1488,8 @@ msgstr "Summary language"
#~ msgid "Synchronization across multiple devices"
#~ msgstr "Synchronization across multiple devices"

#: src/components/welcome-modal/audio-permissions-view.tsx:175
#: src/components/settings/views/sound.tsx:137
#: src/components/welcome-modal/audio-permissions-view.tsx:175
msgid "System Audio Access"
msgstr "System Audio Access"

Expand Down Expand Up @@ -1653,8 +1653,8 @@ msgstr "Vault Name"
msgid "View calendar"
msgstr "View calendar"

#: src/components/left-sidebar/events-list.tsx:193
#: src/components/editor-area/note-header/chips/event-chip.tsx:209
#: src/components/left-sidebar/events-list.tsx:193
msgid "View in calendar"
msgstr "View in calendar"

Expand Down Expand Up @@ -1726,7 +1726,7 @@ msgstr "Your LinkedIn username (the part after linkedin.com/in/)"
msgid "Your Name"
msgstr "Your Name"

#: src/components/settings/views/templates.tsx:255
#: src/components/settings/components/templates-sidebar.tsx:45
#: src/components/settings/views/templates.tsx:255
msgid "Your Templates"
msgstr "Your Templates"
Loading
Loading