Merge branch 'develop' into next

darksoil-studio · Oct 7, 2024 · 1422339 · 1422339
2 parents 6052da8 + 074e876
commit 1422339
Show file tree

Hide file tree

Showing 29 changed files with 5,971 additions and 4,597 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/hc-pilot/Cargo.toml b/crates/hc-pilot/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tauri = "2.0.0-rc"
-tauri-plugin-log = "2.0.0-rc"
+tauri = "2.0.0"
+tauri-plugin-log = "2.0.0"
 
 tauri-plugin-holochain = { path = "../tauri-plugin-holochain" }
 holochain_types = "0.4.0-dev"
@@ -21,5 +21,5 @@ anyhow = "1"
 tempdir = "0.3.7"
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-rc", default-features = false, features = [
+tauri-build = { version = "2.0.0", default-features = false, features = [
 ] }
diff --git a/crates/hc-pilot/default.nix b/crates/hc-pilot/default.nix
@@ -3,7 +3,8 @@
 {
   perSystem = { inputs', self', pkgs, system, lib, ... }: {
     packages.hc-pilot = let
-      craneLib = inputs.crane.mkLib pkgs;
+      rust = inputs'.holonix.packages.rust;
+      craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rust;
 
       cratePath = ./.;
 

diff --git a/crates/hc-pilot/gen/schemas/acl-manifests.json b/crates/hc-pilot/gen/schemas/acl-manifests.json
diff --git a/crates/hc-pilot/gen/schemas/desktop-schema.json b/crates/hc-pilot/gen/schemas/desktop-schema.json
@@ -206,6 +206,11 @@
           "type": "string",
           "const": "core:app:allow-name"
         },
+        {
+          "description": "Enables the set_app_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-set-app-theme"
+        },
         {
           "description": "Enables the tauri_version command without any pre-configured scope.",
           "type": "string",
@@ -236,6 +241,11 @@
           "type": "string",
           "const": "core:app:deny-name"
         },
+        {
+          "description": "Denies the set_app_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-set-app-theme"
+        },
         {
           "description": "Denies the tauri_version command without any pre-configured scope.",
           "type": "string",
@@ -791,6 +801,11 @@
           "type": "string",
           "const": "core:webview:default"
         },
+        {
+          "description": "Enables the clear_all_browsing_data command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-clear-all-browsing-data"
+        },
         {
           "description": "Enables the create_webview command without any pre-configured scope.",
           "type": "string",
@@ -846,16 +861,31 @@
           "type": "string",
           "const": "core:webview:allow-webview-close"
         },
+        {
+          "description": "Enables the webview_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-hide"
+        },
         {
           "description": "Enables the webview_position command without any pre-configured scope.",
           "type": "string",
           "const": "core:webview:allow-webview-position"
         },
+        {
+          "description": "Enables the webview_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-show"
+        },
         {
           "description": "Enables the webview_size command without any pre-configured scope.",
           "type": "string",
           "const": "core:webview:allow-webview-size"
         },
+        {
+          "description": "Denies the clear_all_browsing_data command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-clear-all-browsing-data"
+        },
         {
           "description": "Denies the create_webview command without any pre-configured scope.",
           "type": "string",
@@ -911,11 +941,21 @@
           "type": "string",
           "const": "core:webview:deny-webview-close"
         },
+        {
+          "description": "Denies the webview_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-hide"
+        },
         {
           "description": "Denies the webview_position command without any pre-configured scope.",
           "type": "string",
           "const": "core:webview:deny-webview-position"
         },
+        {
+          "description": "Denies the webview_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-show"
+        },
         {
           "description": "Denies the webview_size command without any pre-configured scope.",
           "type": "string",
@@ -996,6 +1036,11 @@
           "type": "string",
           "const": "core:window:allow-is-decorated"
         },
+        {
+          "description": "Enables the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-enabled"
+        },
         {
           "description": "Enables the is_focused command without any pre-configured scope.",
           "type": "string",
@@ -1126,6 +1171,11 @@
           "type": "string",
           "const": "core:window:allow-set-effects"
         },
+        {
+          "description": "Enables the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-enabled"
+        },
         {
           "description": "Enables the set_focus command without any pre-configured scope.",
           "type": "string",
@@ -1201,6 +1251,11 @@
           "type": "string",
           "const": "core:window:allow-set-skip-taskbar"
         },
+        {
+          "description": "Enables the set_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-theme"
+        },
         {
           "description": "Enables the set_title command without any pre-configured scope.",
           "type": "string",
@@ -1326,6 +1381,11 @@
           "type": "string",
           "const": "core:window:deny-is-decorated"
         },
+        {
+          "description": "Denies the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-enabled"
+        },
         {
           "description": "Denies the is_focused command without any pre-configured scope.",
           "type": "string",
@@ -1456,6 +1516,11 @@
           "type": "string",
           "const": "core:window:deny-set-effects"
         },
+        {
+          "description": "Denies the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-enabled"
+        },
         {
           "description": "Denies the set_focus command without any pre-configured scope.",
           "type": "string",
@@ -1531,6 +1596,11 @@
           "type": "string",
           "const": "core:window:deny-set-skip-taskbar"
         },
+        {
+          "description": "Denies the set_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-theme"
+        },
         {
           "description": "Denies the set_title command without any pre-configured scope.",
           "type": "string",

diff --git a/crates/hc-pilot/gen/schemas/linux-schema.json b/crates/hc-pilot/gen/schemas/linux-schema.json
@@ -206,6 +206,11 @@
           "type": "string",
           "const": "core:app:allow-name"
         },
+        {
+          "description": "Enables the set_app_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-set-app-theme"
+        },
         {
           "description": "Enables the tauri_version command without any pre-configured scope.",
           "type": "string",
@@ -236,6 +241,11 @@
           "type": "string",
           "const": "core:app:deny-name"
         },
+        {
+          "description": "Denies the set_app_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-set-app-theme"
+        },
         {
           "description": "Denies the tauri_version command without any pre-configured scope.",
           "type": "string",
@@ -791,6 +801,11 @@
           "type": "string",
           "const": "core:webview:default"
         },
+        {
+          "description": "Enables the clear_all_browsing_data command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-clear-all-browsing-data"
+        },
         {
           "description": "Enables the create_webview command without any pre-configured scope.",
           "type": "string",
@@ -846,16 +861,31 @@
           "type": "string",
           "const": "core:webview:allow-webview-close"
         },
+        {
+          "description": "Enables the webview_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-hide"
+        },
         {
           "description": "Enables the webview_position command without any pre-configured scope.",
           "type": "string",
           "const": "core:webview:allow-webview-position"
         },
+        {
+          "description": "Enables the webview_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-show"
+        },
         {
           "description": "Enables the webview_size command without any pre-configured scope.",
           "type": "string",
           "const": "core:webview:allow-webview-size"
         },
+        {
+          "description": "Denies the clear_all_browsing_data command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-clear-all-browsing-data"
+        },
         {
           "description": "Denies the create_webview command without any pre-configured scope.",
           "type": "string",
@@ -911,11 +941,21 @@
           "type": "string",
           "const": "core:webview:deny-webview-close"
         },
+        {
+          "description": "Denies the webview_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-hide"
+        },
         {
           "description": "Denies the webview_position command without any pre-configured scope.",
           "type": "string",
           "const": "core:webview:deny-webview-position"
         },
+        {
+          "description": "Denies the webview_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-show"
+        },
         {
           "description": "Denies the webview_size command without any pre-configured scope.",
           "type": "string",
@@ -996,6 +1036,11 @@
           "type": "string",
           "const": "core:window:allow-is-decorated"
         },
+        {
+          "description": "Enables the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-enabled"
+        },
         {
           "description": "Enables the is_focused command without any pre-configured scope.",
           "type": "string",
@@ -1126,6 +1171,11 @@
           "type": "string",
           "const": "core:window:allow-set-effects"
         },
+        {
+          "description": "Enables the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-enabled"
+        },
         {
           "description": "Enables the set_focus command without any pre-configured scope.",
           "type": "string",
@@ -1201,6 +1251,11 @@
           "type": "string",
           "const": "core:window:allow-set-skip-taskbar"
         },
+        {
+          "description": "Enables the set_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-theme"
+        },
         {
           "description": "Enables the set_title command without any pre-configured scope.",
           "type": "string",
@@ -1326,6 +1381,11 @@
           "type": "string",
           "const": "core:window:deny-is-decorated"
         },
+        {
+          "description": "Denies the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-enabled"
+        },
         {
           "description": "Denies the is_focused command without any pre-configured scope.",
           "type": "string",
@@ -1456,6 +1516,11 @@
           "type": "string",
           "const": "core:window:deny-set-effects"
         },
+        {
+          "description": "Denies the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-enabled"
+        },
         {
           "description": "Denies the set_focus command without any pre-configured scope.",
           "type": "string",
@@ -1531,6 +1596,11 @@
           "type": "string",
           "const": "core:window:deny-set-skip-taskbar"
         },
+        {
+          "description": "Denies the set_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-theme"
+        },
         {
           "description": "Denies the set_title command without any pre-configured scope.",
           "type": "string",

diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/package.json.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/package.json.hbs
@@ -15,11 +15,11 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc",
-    "@tauri-apps/plugin-shell": ">=2.0.0-rc"
+    "@tauri-apps/api": "^2.0.0",
+    "@tauri-apps/plugin-shell": ">=2.0.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^2.0.0-rc",
+    "@tauri-apps/cli": "^2.0.0",
     "internal-ip": "^7.0.0",
     "internal-ip-cli": "^2.0.0",
     "new-port-cli": "^1.0.0",

diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/Cargo.toml.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/Cargo.toml.hbs
@@ -15,16 +15,16 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-rc", default-features = false , features = [] }
+tauri-build = { version = "2.0.0", default-features = false , features = [] }
 
 [dependencies]
-tauri = { version = "2.0.0-rc", features = [] }
+tauri = { version = "2.0.0", features = [] }
 tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "main" }
 holochain_types = { version = "0.4.0-dev" }
 lair_keystore = { version = "0.5" }
 holochain_client = { version = "0.6.0-dev" }
 log = "0.4"
-tauri-plugin-log = "2.0.0-rc"
+tauri-plugin-log = "2.0.0"
 url2 = "0.0.6"
 app_dirs2 = "2.5.5"
 tempdir = "0.3.7"