Skip to content

Tauri v2 merged #326

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
merged 14 commits into from
Nov 8, 2024
Merged

Tauri v2 merged #326

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c3c90f2
WIP - can run v2 without any plugin
PatrickDinh Aug 23, 2024
1388c7b
can run and build with plugins, but they don't work
PatrickDinh Aug 23, 2024
e948b7f
fix app name
PatrickDinh Aug 23, 2024
4e8854d
wip - deep link works again on Windows
PatrickDinh Aug 25, 2024
26167a1
clean up a bit
PatrickDinh Aug 25, 2024
bfb17fd
wip
PatrickDinh Aug 26, 2024
32a4ea3
Updated tauri packages to latest v2
lempira Oct 23, 2024
20c5fc3
Updated tests
lempira Nov 7, 2024
83d0fef
Merge branch 'main' into tauri-v2
PatrickDinh Nov 7, 2024
11022cf
chore: poc of fixing test
neilcampbell Nov 7, 2024
e1fcc7a
chore: update lock and add mock back in
neilcampbell Nov 7, 2024
183b740
chore: fix snapshots
neilcampbell Nov 7, 2024
b13f7e0
Added note to remove tauri-deep-link file in the future
lempira Nov 7, 2024
bcdad26
chore: tauri description tweak
neilcampbell Nov 8, 2024
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: 3 additions & 1 deletion .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"bradlc.vscode-tailwindcss",
"vitest.explorer"
"vitest.explorer",
"tauri-apps.tauri-vscode",
"rust-lang.rust-analyzer"
]
}
148 changes: 85 additions & 63 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-tooltip": "^1.0.7",
"@tanstack/react-table": "^8.16.0",
"@tauri-apps/api": "^1.5.3",
"@tauri-apps/api": "^2.0.0",
"@tauri-apps/plugin-cli": "^2.0.0",
"@tauri-apps/plugin-deep-link": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.0",
"@txnlab/use-wallet": "2.8.2",
"@xstate/react": "^4.1.1",
"algosdk": "2.9.0",
Expand Down Expand Up @@ -93,7 +96,7 @@
"@makerx/prettier-config": "^2.0.0",
"@makerx/ts-config": "^1.0.1",
"@makerx/ts-dossier": "^3.0.0",
"@tauri-apps/cli": "^1.5.11",
"@tauri-apps/cli": "^2.0.0",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^14.2.2",
"@testing-library/user-event": "^14.5.2",
Expand Down
3 changes: 3 additions & 0 deletions src-tauri/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
# will have compiled files and executables
/target/

# Generated by Tauri
# will have schema files for capabilities auto-completion
/gen/schemas
Loading
Loading