Upgrade to Tauri 2.0 (#23)

src-tauri/src/plugin.rs

@@ -10,7 +10,8 @@ use boa_runtime::Console;
 use log::{debug, error};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use tauri::AppHandle;
+use tauri::{AppHandle, Manager};
+use tauri::path::BaseDirectory;
 
 use crate::models::{WorkspaceExportResources};
 
@@ -51,7 +52,7 @@ pub async fn run_plugin_import(
     app_handle: &AppHandle,
     plugin_name: &str,
     file_path: &str,
-) -> Option<ImportResult> {
+) -> Result<Option<ImportResult>, String> {
     let file = fs::read_to_string(file_path)
         .unwrap_or_else(|_| panic!("Unable to read file {}", file_path));
     let file_contents = file.as_str();
@@ -63,12 +64,12 @@ pub async fn run_plugin_import(
     );
 
     if result_json.is_null() {
-        return None;
+        return Ok(None);
     }
 
     let resources: ImportResult =
-        serde_json::from_value(result_json).expect("failed to parse result json");
-    Some(resources)
+        serde_json::from_value(result_json).map_err(|e| e.to_string())?;
+    Ok(Some(resources))
 }
 
 fn run_plugin(
@@ -78,8 +79,8 @@ fn run_plugin(
     js_args: &[JsValue],
 ) -> serde_json::Value {
     let plugin_dir = app_handle
-        .path_resolver()
-        .resolve_resource("plugins")
+        .path()
+        .resolve("plugins", BaseDirectory::Resource)
         .expect("failed to resolve plugin directory resource")
         .join(plugin_name);
     let plugin_index_file = plugin_dir.join("index.mjs");