Skip to content

Commit

Permalink
Update Dependencies (#758)
Browse files Browse the repository at this point in the history
I tried to upgrade `ts-rs` to v8, but the new export mechanism is extremely confusing, and `TS_RS_EXPORT_DIR` does not seem to be respected (types should be outputted in the TS codebase, not the rust codebase).
  • Loading branch information
martpie authored Mar 20, 2024
1 parent de9e36b commit 5ca4449
Show file tree
Hide file tree
Showing 5 changed files with 116 additions and 98 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"@radix-ui/react-progress": "^1.0.3",
"@radix-ui/react-slider": "^1.1.2",
"@tanstack/react-query": "^5.28.4",
"@tanstack/react-virtual": "3.1.3",
"@tauri-apps/api": "^2.0.0-beta.5",
"@tanstack/react-virtual": "3.2.0",
"@tauri-apps/api": "^2.0.0-beta.6",
"@tauri-apps/plugin-dialog": "^2.0.0-beta.2",
"@tauri-apps/plugin-log": "^2.0.0-beta.2",
"@tauri-apps/plugin-notification": "^2.0.0-beta.2",
Expand All @@ -62,22 +62,22 @@
"devDependencies": {
"@tauri-apps/cli": "^2.0.0-beta.9",
"@types/lodash": "^4.17.0",
"@types/react": "^18.2.66",
"@types/react": "^18.2.67",
"@types/react-dom": "^18.2.22",
"@types/semver": "^7.5.8",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@typescript-eslint/eslint-plugin": "^7.3.0",
"@typescript-eslint/parser": "^7.3.0",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.4.18",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"normalize.css": "^8.0.1",
"postcss": "^8.4.35",
"postcss": "^8.4.36",
"postcss-import": "^16.0.1",
"postcss-nested": "^6.0.1",
"postcss-scss": "^4.0.9",
Expand Down
36 changes: 18 additions & 18 deletions src-tauri/Cargo.lock

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

4 changes: 2 additions & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ repository = "https://github.com/martpie/museeks"
edition = "2021"

[build-dependencies]
tauri-build = { version = "2.0.0-beta.9", features = ["codegen"] }
tauri-build = { version = "2.0.0-beta.10", features = ["codegen"] }
[dependencies]
tauri = { version = "2.0.0-beta.11", features = ["protocol-asset", "image-png"] }
tauri = { version = "2.0.0-beta.12", features = ["protocol-asset", "image-png"] }
tauri-plugin-dialog = "2.0.0-beta.2"
tauri-plugin-notification = "2.0.0-beta.2"
tauri-plugin-os = "2.0.0-beta.2"
Expand Down
4 changes: 4 additions & 0 deletions src-tauri/build.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
fn main() {
// Set the export path for ts-rs
std::env::set_var("TS_RS_EXPORT_DIR", "../bindings2");

// Build the app
tauri_build::try_build(
tauri_build::Attributes::new()
.codegen(tauri_build::CodegenContext::new())
Expand Down
Loading

0 comments on commit 5ca4449

Please sign in to comment.