Skip to content

Commit

Permalink
chore: Update plugin versions and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
pacholoamit committed Oct 14, 2024
1 parent 4ad4325 commit aaa24ca
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 43 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@
"@mantine/notifications": "^6.0.22",
"@tabler/icons-react": "^2.47.0",
"@tauri-apps/api": "^2.0.2",
"@tauri-apps/plugin-autostart": "~2",
"@tauri-apps/plugin-fs": "^2.0.0",
"@tauri-apps/plugin-log": "^2.0.0",
"@tauri-apps/plugin-log": "~2",
"@tauri-apps/plugin-os": "~2.0.0",
"@tauri-apps/plugin-process": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.0",
"@tauri-apps/plugin-store": "~2",
"@tauri-apps/plugin-updater": "^2.0.0",
"ag-grid-react": "^32.2.2",
"classnames": "^2.5.1",
"highcharts": "^11.4.8",
"highcharts": "^11.4.6",
"highcharts-react-official": "^3.2.1",
"immer": "^10.1.1",
"non.geist": "^1.0.4",
Expand All @@ -43,8 +44,6 @@
"react-router-dom": "^6.27.0",
"react-text-gradients": "^1.0.2",
"styled-components": "^6.1.13",
"tauri-plugin-autostart-api": "https://github.com/tauri-apps/tauri-plugin-autostart#v2",
"tauri-plugin-log-api": "https://github.com/tauri-apps/tauri-plugin-log#v2",
"zustand": "^4.5.5"
},
"devDependencies": {
Expand Down
6 changes: 4 additions & 2 deletions src-tauri/Cargo.lock

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

9 changes: 5 additions & 4 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,19 @@ base64 = "0.22.1"
anyhow = "1.0.86"
tauri-plugin-decorum = "1.1.1"
tauri-plugin-os = "2"
tauri-plugin-store = "2"

[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }

tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }

[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-store = "2"
tauri-plugin-log = "2"
tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-autostart = "2"


[target.'cfg(target_os = "macos")'.dependencies]
Expand Down
11 changes: 11 additions & 0 deletions src-tauri/capabilities/desktop.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"identifier": "desktop-capability",
"platforms": [
"macOS",
"windows",
"linux"
],
"permissions": [
"autostart:default"
]
}
2 changes: 1 addition & 1 deletion src-tauri/gen/schemas/capabilities.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"main":{"identifier":"main","description":"permissions for pachtop","local":true,"windows":["main"],"permissions":["store:allow-get","store:allow-set","store:allow-save","store:default","store:allow-create-store","store:allow-clear","store:allow-delete","store:allow-entries","os:default","os:allow-arch","os:allow-hostname","os:allow-exe-extension","os:allow-family","os:allow-os-type","os:allow-platform","os:allow-version","core:window:allow-start-dragging","autostart:allow-enable","autostart:allow-disable","autostart:allow-is-enabled","updater:allow-check","updater:default","log:allow-log","log:default","shell:allow-spawn","core:menu:allow-new","core:menu:allow-popup","core:window:allow-close","core:window:allow-center","core:window:allow-minimize","core:window:allow-maximize","core:window:allow-set-size","core:window:allow-set-focus","core:window:allow-is-maximized","core:window:allow-start-dragging","core:window:allow-toggle-maximize","decorum:allow-show-snap-overlay",{"identifier":"shell:allow-execute","allow":[{"args":true,"cmd":"powershell","name":"powershell"}]},"fs:read-all","fs:read-files","fs:read-meta"]},"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default"]}}
{"desktop-capability":{"identifier":"desktop-capability","description":"","local":true,"permissions":["autostart:default"],"platforms":["macOS","windows","linux"]},"main":{"identifier":"main","description":"permissions for pachtop","local":true,"windows":["main"],"permissions":["store:allow-get","store:allow-set","store:allow-save","store:default","store:allow-create-store","store:allow-clear","store:allow-delete","store:allow-entries","os:default","os:allow-arch","os:allow-hostname","os:allow-exe-extension","os:allow-family","os:allow-os-type","os:allow-platform","os:allow-version","core:window:allow-start-dragging","autostart:allow-enable","autostart:allow-disable","autostart:allow-is-enabled","updater:allow-check","updater:default","log:allow-log","log:default","shell:allow-spawn","core:menu:allow-new","core:menu:allow-popup","core:window:allow-close","core:window:allow-center","core:window:allow-minimize","core:window:allow-maximize","core:window:allow-set-size","core:window:allow-set-focus","core:window:allow-is-maximized","core:window:allow-start-dragging","core:window:allow-toggle-maximize","decorum:allow-show-snap-overlay",{"identifier":"shell:allow-execute","allow":[{"args":true,"cmd":"powershell","name":"powershell"}]},"fs:read-all","fs:read-files","fs:read-meta"]},"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default"]}}
2 changes: 2 additions & 0 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ use std::time::Duration;

fn build_and_run_app(app: AppState) {
tauri::Builder::default()
.plugin(tauri_plugin_log::Builder::new().build())
.plugin(tauri_plugin_autostart::init())
.plugin(tauri_plugin_store::Builder::new().build())
.plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_updater::Builder::new().build())
Expand Down
2 changes: 1 addition & 1 deletion src/lib/autostart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { disable, enable, isEnabled } from 'tauri-plugin-autostart-api';
import { disable, enable, isEnabled } from '@tauri-apps/plugin-autostart';

export const enableAutostart = async () => {
if (await isEnabled()) {
Expand Down
45 changes: 14 additions & 31 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3107,13 +3107,6 @@ __metadata:
languageName: node
linkType: hard

"@tauri-apps/api@npm:2.0.0-beta.13":
version: 2.0.0-beta.13
resolution: "@tauri-apps/api@npm:2.0.0-beta.13"
checksum: 2716878dedbae061740bde23b5ee9f5e8fffc6e4bf26d0b0babb3412a83ff295fe2fe4e22b4505de7ef845a0745d679bf15d7078b3dc26784002bd638abacff0
languageName: node
linkType: hard

"@tauri-apps/api@npm:^2.0.0, @tauri-apps/api@npm:^2.0.2":
version: 2.0.2
resolution: "@tauri-apps/api@npm:2.0.2"
Expand Down Expand Up @@ -3232,6 +3225,15 @@ __metadata:
languageName: node
linkType: hard

"@tauri-apps/plugin-autostart@npm:~2":
version: 2.0.0
resolution: "@tauri-apps/plugin-autostart@npm:2.0.0"
dependencies:
"@tauri-apps/api": ^2.0.0
checksum: 9cdbe185e8da83e3831c31d016a0f65088fb32e93c809631088a051ac8f1c0c4a19f3bd06da062a145e5d734f69aa198cab5f222c5284e23e80014a7d17d8af4
languageName: node
linkType: hard

"@tauri-apps/plugin-fs@npm:^2.0.0":
version: 2.0.0
resolution: "@tauri-apps/plugin-fs@npm:2.0.0"
Expand All @@ -3241,7 +3243,7 @@ __metadata:
languageName: node
linkType: hard

"@tauri-apps/plugin-log@npm:^2.0.0":
"@tauri-apps/plugin-log@npm:~2":
version: 2.0.0
resolution: "@tauri-apps/plugin-log@npm:2.0.0"
dependencies:
Expand Down Expand Up @@ -5799,7 +5801,7 @@ __metadata:
languageName: node
linkType: hard

"highcharts@npm:^11.4.8":
"highcharts@npm:^11.4.6":
version: 11.4.8
resolution: "highcharts@npm:11.4.8"
checksum: 92d3563573502dbb3f6facef5608590e8f32dd839106febfb62635851bbbc8e66ba88bcc4c90b497a2150d268aa735d5549da7bf8f2a621394171f3d396777c5
Expand Down Expand Up @@ -6881,8 +6883,9 @@ __metadata:
"@tabler/icons-react": ^2.47.0
"@tauri-apps/api": ^2.0.2
"@tauri-apps/cli": 2.0.3
"@tauri-apps/plugin-autostart": ~2
"@tauri-apps/plugin-fs": ^2.0.0
"@tauri-apps/plugin-log": ^2.0.0
"@tauri-apps/plugin-log": ~2
"@tauri-apps/plugin-os": ~2.0.0
"@tauri-apps/plugin-process": ^2.0.0
"@tauri-apps/plugin-shell": ^2.0.0
Expand All @@ -6902,7 +6905,7 @@ __metadata:
eslint-plugin-react: ^7.37.1
eslint-plugin-unused-imports: ^4.1.4
globals: ^15.11.0
highcharts: ^11.4.8
highcharts: ^11.4.6
highcharts-react-official: ^3.2.1
husky: ^9.1.6
immer: ^10.1.1
Expand All @@ -6916,8 +6919,6 @@ __metadata:
react-router-dom: ^6.27.0
react-text-gradients: ^1.0.2
styled-components: ^6.1.13
tauri-plugin-autostart-api: "https://github.com/tauri-apps/tauri-plugin-autostart#v2"
tauri-plugin-log-api: "https://github.com/tauri-apps/tauri-plugin-log#v2"
typescript: ^5.6.3
typescript-eslint: ^7.18.0
vite: ^5.4.8
Expand Down Expand Up @@ -8060,24 +8061,6 @@ __metadata:
languageName: node
linkType: hard

"tauri-plugin-autostart-api@https://github.com/tauri-apps/tauri-plugin-autostart#v2":
version: 2.0.0-beta.5
resolution: "tauri-plugin-autostart-api@https://github.com/tauri-apps/tauri-plugin-autostart.git#commit=41d58532b5741ebb0d155dd3a1bd276910cb20d1"
dependencies:
"@tauri-apps/api": 2.0.0-beta.13
checksum: fc149788844a88c2a70cce8735757a538202f80941b4f9d8f8ab93a06c5df4058d43aeb1487c5a03a8ce712fb9fe26d0ce90f640c863551cf5ba5b0715c70d4f
languageName: node
linkType: hard

"tauri-plugin-log-api@https://github.com/tauri-apps/tauri-plugin-log#v2":
version: 2.0.0-beta.6
resolution: "tauri-plugin-log-api@https://github.com/tauri-apps/tauri-plugin-log.git#commit=ed1570339878d2fc8d36729dc581f3a18f8db3c3"
dependencies:
"@tauri-apps/api": 2.0.0-beta.13
checksum: bd78b4b4474e058e6e1b7b3df4be68446c11fddcfdf416800551918017da164f2b126569321def825f99b420884f9dcb8e6d086cb86b099ba97ef66f02adbe39
languageName: node
linkType: hard

"text-table@npm:^0.2.0":
version: 0.2.0
resolution: "text-table@npm:0.2.0"
Expand Down

0 comments on commit aaa24ca

Please sign in to comment.