Merge pull request #263 from pacholoamit/chore/upgrade-to-v2

upgrade: v2
pacholoamit · Sep 22, 2024 · 0457139 · 0457139
2 parents c5d8355 + d29c1e0
commit 0457139
Show file tree

Hide file tree

Showing 21 changed files with 6,428 additions and 9,440 deletions.
diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.21.5-62349c1520-8.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.21.5-62349c1520-8.zip
diff --git a/.yarn/cache/@esbuild-win32-x64-npm-0.21.5-eddc2b5ad6-8.zip b/.yarn/cache/@esbuild-win32-x64-npm-0.21.5-eddc2b5ad6-8.zip
diff --git a/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.17.2-aab5f1f21d-8.zip b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.17.2-aab5f1f21d-8.zip
diff --git a/.yarn/cache/@rollup-rollup-win32-x64-msvc-npm-4.17.2-36fa45f655-8.zip b/.yarn/cache/@rollup-rollup-win32-x64-msvc-npm-4.17.2-36fa45f655-8.zip
diff --git a/...win32-x64-msvc-npm-1.5.7-0366b55f8f-8.zip → ...e-darwin-arm64-npm-1.5.7-b66d15b5f5-8.zip b/...win32-x64-msvc-npm-1.5.7-0366b55f8f-8.zip → ...e-darwin-arm64-npm-1.5.7-b66d15b5f5-8.zip
diff --git a/.yarn/cache/@tauri-apps-cli-darwin-arm64-npm-2.0.0-rc.16-c0e570e5fd-8.zip b/.yarn/cache/@tauri-apps-cli-darwin-arm64-npm-2.0.0-rc.16-c0e570e5fd-8.zip
diff --git a/.yarn/cache/@tauri-apps-cli-npm-2.0.0-beta.20-9f35138733-7ad75a62ad.zip b/.yarn/cache/@tauri-apps-cli-npm-2.0.0-beta.20-9f35138733-7ad75a62ad.zip
diff --git a/.yarn/cache/@tauri-apps-cli-npm-2.0.0-rc.16-9f87d0cf2d-fa38580785.zip b/.yarn/cache/@tauri-apps-cli-npm-2.0.0-rc.16-9f87d0cf2d-fa38580785.zip
diff --git a/.yarn/cache/@tauri-apps-cli-win32-x64-msvc-npm-2.0.0-beta.20-6fbf004634-8.zip b/.yarn/cache/@tauri-apps-cli-win32-x64-msvc-npm-2.0.0-beta.20-6fbf004634-8.zip
diff --git a/.yarn/cache/fsevents-patch-21ad2b1333-8.zip b/.yarn/cache/fsevents-patch-21ad2b1333-8.zip
diff --git a/.yarn/cache/fsevents-patch-2882183fbf-8.zip b/.yarn/cache/fsevents-patch-2882183fbf-8.zip
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -15,14 +15,14 @@ members = [
 ]
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta", features = [] }
+tauri-build = { version = "2.0.0-rc.0", features = [] }
 
 [dependencies]
 systemicons = { path = "./ws-systemicons" }
 chrono = { version = "0.4.23", features = ["serde"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "2.0.0-beta", features = ["tray-icon", "devtools"] }
+tauri = { version = "2.0.0-rc.0", features = ["tray-icon", "devtools"] }
 sysinfo = "0.30.12"
 
 
@@ -35,7 +35,7 @@ fs_extra = "1.3.0"
 base64 = "0.22.1"
 # surrealdb = { version = "1.5.2", features = ["kv-speedb"] }
 anyhow = "1.0.86"
-tauri-plugin-os = "2.0.0-beta.6"
+tauri-plugin-os = "2.0.0-rc.0"
 
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
@@ -68,7 +68,7 @@ features = ["winerror"]
 
 [lib]
 name = "app_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
+crate-type = ["staticlib", "cdylib", "rlib", "lib"]
 
 [features]
 default = [ "custom-protocol" ]

diff --git a/src-tauri/capabilities/main.json b/src-tauri/capabilities/main.json
@@ -13,7 +13,7 @@
         "os:allow-hostname",
         "os:allow-os-type",
         "os:allow-platform",
-        "window:allow-start-dragging",
+        "core:window:allow-start-dragging",
         "autostart:allow-enable",
         "autostart:allow-disable",
         "autostart:allow-is-enabled",
@@ -22,8 +22,8 @@
         "log:allow-log",
         "log:default",
         "shell:allow-spawn",
-        "menu:allow-new",
-        "menu:allow-popup",
+        "core:menu:allow-new",
+        "core:menu:allow-popup",
         {
             "identifier": "shell:allow-execute",
             "allow": [

diff --git a/src-tauri/capabilities/migrated.json b/src-tauri/capabilities/migrated.json
@@ -6,12 +6,12 @@
     "main"
   ],
   "permissions": [
-    "path:default",
-    "event:default",
-    "window:default",
-    "app:default",
-    "resources:default",
-    "menu:default",
-    "tray:default"
+    "core:path:default",
+    "core:event:default",
+    "core:window:default",
+    "core:app:default",
+    "core:resources:default",
+    "core:menu:default",
+    "core:tray:default"
   ]
 }
diff --git a/src-tauri/gen/schemas/acl-manifests.json b/src-tauri/gen/schemas/acl-manifests.json
diff --git a/src-tauri/gen/schemas/capabilities.json b/src-tauri/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"main":{"identifier":"main","description":"permissions for pachtop","local":true,"windows":["main"],"permissions":["store:allow-get","store:allow-set","store:allow-save","os:allow-arch","os:allow-hostname","os:allow-os-type","os:allow-platform","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","menu:allow-new","menu:allow-popup",{"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":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default"]}}
+{"main":{"identifier":"main","description":"permissions for pachtop","local":true,"windows":["main"],"permissions":["store:allow-get","store:allow-set","store:allow-save","os:allow-arch","os:allow-hostname","os:allow-os-type","os:allow-platform","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",{"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"]}}
diff --git a/src-tauri/gen/schemas/desktop-schema.json b/src-tauri/gen/schemas/desktop-schema.json
diff --git a/src-tauri/gen/schemas/macOS-schema.json b/src-tauri/gen/schemas/macOS-schema.json
diff --git a/src/providers/platform.provider.tsx b/src/providers/platform.provider.tsx
@@ -1,12 +1,12 @@
-import { createContext, useEffect, useState } from "react";
+import { createContext, useEffect, useState } from 'react';
 
-import ExclusionModal from "@/components/exclusion-modal";
-import useEffectAsync from "@/hooks/useEffectAsync";
-import useIsFirstRun from "@/hooks/useIsFirstRun";
-import { streams } from "@/lib";
-import store from "@/lib/store";
-import { getCurrentWindow as appWindow } from "@tauri-apps/api/window";
-import { Platform, platform as obtainPlatform } from "@tauri-apps/plugin-os";
+import ExclusionModal from '@/components/exclusion-modal';
+import useEffectAsync from '@/hooks/useEffectAsync';
+import useIsFirstRun from '@/hooks/useIsFirstRun';
+import { streams } from '@/lib';
+import store from '@/lib/store';
+import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
+import { Platform, platform as obtainPlatform } from '@tauri-apps/plugin-os';
 
 interface PlatformProviderProps {
   children: React.ReactNode;
@@ -60,7 +60,7 @@ const PlatformProvider: React.FC<PlatformProviderProps> = ({ children }) => {
         paddingLeft: 72,
         paddingTop: 4,
         onHeaderAreaClick: () => {
-          const window = appWindow();
+          const window = getCurrentWebviewWindow();
           window.startDragging();
         },
       });

diff --git a/yarn.lock b/yarn.lock
@@ -3102,90 +3102,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-darwin-arm64@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-darwin-arm64@npm:2.0.0-beta.20"
+"@tauri-apps/cli-darwin-arm64@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-darwin-arm64@npm:2.0.0-rc.16"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-darwin-x64@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-darwin-x64@npm:2.0.0-beta.20"
+"@tauri-apps/cli-darwin-x64@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-darwin-x64@npm:2.0.0-rc.16"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-beta.20"
+"@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-rc.16"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-beta.20"
+"@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-rc.16"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-beta.20"
+"@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-rc.16"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-beta.20"
+"@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-rc.16"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-linux-x64-musl@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-linux-x64-musl@npm:2.0.0-beta.20"
+"@tauri-apps/cli-linux-x64-musl@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-linux-x64-musl@npm:2.0.0-rc.16"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-beta.20"
+"@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-rc.16"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-beta.20"
+"@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-rc.16"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-beta.20":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-beta.20"
+"@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-rc.16":
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-rc.16"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@tauri-apps/cli@npm:next":
-  version: 2.0.0-beta.20
-  resolution: "@tauri-apps/cli@npm:2.0.0-beta.20"
-  dependencies:
-    "@tauri-apps/cli-darwin-arm64": 2.0.0-beta.20
-    "@tauri-apps/cli-darwin-x64": 2.0.0-beta.20
-    "@tauri-apps/cli-linux-arm-gnueabihf": 2.0.0-beta.20
-    "@tauri-apps/cli-linux-arm64-gnu": 2.0.0-beta.20
-    "@tauri-apps/cli-linux-arm64-musl": 2.0.0-beta.20
-    "@tauri-apps/cli-linux-x64-gnu": 2.0.0-beta.20
-    "@tauri-apps/cli-linux-x64-musl": 2.0.0-beta.20
-    "@tauri-apps/cli-win32-arm64-msvc": 2.0.0-beta.20
-    "@tauri-apps/cli-win32-ia32-msvc": 2.0.0-beta.20
-    "@tauri-apps/cli-win32-x64-msvc": 2.0.0-beta.20
+  version: 2.0.0-rc.16
+  resolution: "@tauri-apps/cli@npm:2.0.0-rc.16"
+  dependencies:
+    "@tauri-apps/cli-darwin-arm64": 2.0.0-rc.16
+    "@tauri-apps/cli-darwin-x64": 2.0.0-rc.16
+    "@tauri-apps/cli-linux-arm-gnueabihf": 2.0.0-rc.16
+    "@tauri-apps/cli-linux-arm64-gnu": 2.0.0-rc.16
+    "@tauri-apps/cli-linux-arm64-musl": 2.0.0-rc.16
+    "@tauri-apps/cli-linux-x64-gnu": 2.0.0-rc.16
+    "@tauri-apps/cli-linux-x64-musl": 2.0.0-rc.16
+    "@tauri-apps/cli-win32-arm64-msvc": 2.0.0-rc.16
+    "@tauri-apps/cli-win32-ia32-msvc": 2.0.0-rc.16
+    "@tauri-apps/cli-win32-x64-msvc": 2.0.0-rc.16
   dependenciesMeta:
     "@tauri-apps/cli-darwin-arm64":
       optional: true
@@ -3209,7 +3209,7 @@ __metadata:
       optional: true
   bin:
     tauri: tauri.js
-  checksum: 7ad75a62adf12f0176fe02bef38150a64d8faeee2d242ae39d9b61b69c6c83165716f2b5762dbb343fce5bcdd41f10234ecfe2366928cd8fc53f448a3a6c0c31
+  checksum: fa38580785b08bd83e8c041ddfc04f3fa2e4f5b26913866275cd2c2818df67bbebd69e09b7aefc2106add1af5edc790b4f8af51df136a475703d5c99b118f826
   languageName: node
   linkType: hard
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","os:allow-arch","os:allow-hostname","os:allow-os-type","os:allow-platform","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","menu:allow-new","menu:allow-popup",{"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":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default"]}}
		{"main":{"identifier":"main","description":"permissions for pachtop","local":true,"windows":["main"],"permissions":["store:allow-get","store:allow-set","store:allow-save","os:allow-arch","os:allow-hostname","os:allow-os-type","os:allow-platform","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",{"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"]}}