Bläddra i källkod

chore: add tauri build config (#1717)

Co-authored-by: nathan <[email protected]>
Nathan.fooo 2 år sedan
förälder
incheckning
ceb39a4fd9

+ 42 - 28
frontend/.vscode/launch.json

@@ -5,43 +5,36 @@
     "version": "0.2.0",
     "configurations": [
         {
-            // This task builds the Rust and Dart code of AppFlowy.
-            "name": "AF: Build All",
+            //  This task only builds the Dart code of AppFlowy.
+            "name": "AF-desktop: Build Dart Only",
             "request": "launch",
             "program": "./lib/main.dart",
             "type": "dart",
-            "preLaunchTask": "AF: build_flowy_sdk",
             "env": {
-                "RUST_LOG": "info"
+                "RUST_LOG": "debug"
             },
             "cwd": "${workspaceRoot}/app_flowy"
         },
         {
-            // This task builds the Rust and Dart code of AppFlowy for android.
-            "name": "AF: Run Android",
+            // This task builds the Rust and Dart code of AppFlowy.
+            "name": "AF-desktop: Build All",
             "request": "launch",
             "program": "./lib/main.dart",
             "type": "dart",
-            "preLaunchTask": "AF: build_mobile_sdk",
+            "preLaunchTask": "AF: build_flowy_sdk",
             "env": {
                 "RUST_LOG": "info"
             },
             "cwd": "${workspaceRoot}/app_flowy"
         },
         {
-            "name": "AF: Debug Rust",
-            "request": "attach",
-            "type": "lldb",
-            "pid": "${command:pickMyProcess}"
-        },
-        {
-            //  This task only builds the Dart code of AppFlowy.
-            "name": "AF: Build Dart Only",
+            "name": "AF-desktop: Build All (rustlog: trace)",
             "request": "launch",
             "program": "./lib/main.dart",
             "type": "dart",
+            "preLaunchTask": "AF: build_flowy_sdk",
             "env": {
-                "RUST_LOG": "debug"
+                "RUST_LOG": "trace"
             },
             "cwd": "${workspaceRoot}/app_flowy"
         },
@@ -50,7 +43,7 @@
             // - call the clean task,
             // - rebuild all the generated Files (including freeze and language files)
             // - rebuild the the Rust and Dart code of AppFlowy.
-            "name": "AF: Clean + Rebuild All",
+            "name": "AF-desktop: Clean + Rebuild All",
             "request": "launch",
             "program": "./lib/main.dart",
             "type": "dart",
@@ -61,42 +54,63 @@
             "cwd": "${workspaceRoot}/app_flowy"
         },
         {
-            // This task builds will:
-            // - call the clean task,
-            // - rebuild all the generated Files (including freeze and language files)
-            // - rebuild the the Rust and Dart code of AppFlowy.
-            "name": "AF: Clean + Rebuild All (Android)",
+            // This task builds the Rust and Dart code of AppFlowy for android.
+            "name": "AF-android: Build All",
             "request": "launch",
             "program": "./lib/main.dart",
             "type": "dart",
-            "preLaunchTask": "AF: Clean + Rebuild All (Android)",
+            "preLaunchTask": "AF: build_mobile_sdk",
             "env": {
                 "RUST_LOG": "info"
             },
             "cwd": "${workspaceRoot}/app_flowy"
         },
         {
-            "name": "AF: Build All (rustlog: trace)",
+            "name": "AF-android: Build All (rustlog: trace)",
             "request": "launch",
             "program": "./lib/main.dart",
             "type": "dart",
-            "preLaunchTask": "AF: build_flowy_sdk",
+            "preLaunchTask": "AF: build_mobile_sdk",
             "env": {
                 "RUST_LOG": "trace"
             },
             "cwd": "${workspaceRoot}/app_flowy"
         },
         {
-            "name": "AF: Build All Android (rustlog: trace)",
+            // This task builds will:
+            // - call the clean task,
+            // - rebuild all the generated Files (including freeze and language files)
+            // - rebuild the the Rust and Dart code of AppFlowy.
+            "name": "AF-android: Clean + Rebuild All",
             "request": "launch",
             "program": "./lib/main.dart",
             "type": "dart",
-            "preLaunchTask": "AF: build_mobile_sdk",
+            "preLaunchTask": "AF: Clean + Rebuild All (Android)",
             "env": {
-                "RUST_LOG": "trace"
+                "RUST_LOG": "info"
             },
             "cwd": "${workspaceRoot}/app_flowy"
         },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "AF: Tauri dev",
+            "cargo": {
+                "args": [
+                    "build",
+                    "--manifest-path=./appflowy_tauri/src-tauri/Cargo.toml",
+                    "--no-default-features"
+                ]
+            },
+            "preLaunchTask": "tauri:dev",
+            "cwd": "${workspaceRoot}/appflowy_tauri/"
+        },
+        {
+            "name": "AF: Debug Rust",
+            "request": "attach",
+            "type": "lldb",
+            "pid": "${command:pickMyProcess}"
+        },
         {
             "name": "AF: app_flowy (profile mode)",
             "request": "launch",

+ 12 - 2
frontend/.vscode/tasks.json

@@ -168,7 +168,7 @@
 		{
 			"label": "AF: Rust Clean",
 			"type": "shell",
-			"command": "cargo make af_dart_clean",
+			"command": "cargo make dart_clean",
 			"group": "build",
 			"options": {
 				"cwd": "${workspaceFolder}"
@@ -185,6 +185,16 @@
 			"group": "build",
 			"problemMatcher": [],
 			"detail": "app_flowy"
-		}
+		},
+		{
+			"label": "tauri:dev",
+			"type": "shell",
+			"isBackground": true,
+			"command": "npm run dev",
+			"problemMatcher": [],
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_tauri"
+			}
+		},
 	]
 }

+ 1 - 2
frontend/appflowy_tauri/src-tauri/src/main.rs

@@ -8,10 +8,9 @@ mod init;
 mod request;
 
 use event::*;
-use flowy_core::FlowySDK;
 use init::*;
 use request::*;
-use tauri::{Manager, State};
+use tauri::Manager;
 
 fn main() {
     let sdk = init_flowy_core();

+ 1 - 1
frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs

@@ -120,7 +120,7 @@ mod tests {
     #[test]
     fn utc_to_native_test() {
         let native_timestamp = 1647251762;
-        let native = NaiveDateTime::from_timestamp(native_timestamp, 0);
+        let native = NaiveDateTime::from_timestamp_opt(native_timestamp, 0).unwrap();
 
         let utc = chrono::DateTime::<chrono::Utc>::from_utc(native, chrono::Utc);
         // utc_timestamp doesn't  carry timezone

+ 1 - 1
frontend/scripts/makefile/desktop.toml

@@ -230,7 +230,7 @@ script = [
     cd rust-lib/
     rustup show
     echo cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
-    cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
+    RUST_LOG=${TEST_RUST_LOG} cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
     cd ../
   """,
 ]