From b307dd30d844be89942a427ea734fad4843667f7 Mon Sep 17 00:00:00 2001 From: "Nathan.fooo" <86001920+appflowy@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:46:10 -0800 Subject: [PATCH] chore: fix macos open crash (#4051) * chore: disable native cpu * chore: update client api --- frontend/appflowy_tauri/src-tauri/Cargo.lock | 43 +++++++++++++------- frontend/appflowy_tauri/src-tauri/Cargo.toml | 2 +- frontend/rust-lib/.cargo/config.toml | 5 ++- frontend/rust-lib/Cargo.lock | 41 +++++++++++++------ frontend/rust-lib/Cargo.toml | 2 +- 5 files changed, 62 insertions(+), 31 deletions(-) diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index 0fb9443ea6..fc54e3ee0f 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.lock +++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock @@ -139,7 +139,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "reqwest", @@ -786,7 +786,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "app-error", @@ -1328,7 +1328,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.6", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -1474,7 +1474,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "app-error", @@ -2833,7 +2833,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "futures-util", @@ -2849,7 +2849,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "app-error", @@ -3271,7 +3271,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "reqwest", @@ -3618,9 +3618,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "loom" @@ -4367,6 +4367,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ + "phf_macros 0.11.2", "phf_shared 0.11.2", ] @@ -4458,6 +4459,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "phf_shared" version = "0.8.0" @@ -4699,7 +4713,7 @@ checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" dependencies = [ "bytes", "heck 0.4.1", - "itertools 0.10.5", + "itertools 0.11.0", "log", "multimap", "once_cell", @@ -4720,7 +4734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.32", @@ -5015,7 +5029,7 @@ dependencies = [ [[package]] name = "realtime-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "bincode", @@ -5768,13 +5782,14 @@ dependencies = [ [[package]] name = "shared_entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "app-error", "collab-entity", "database-entity", "gotrue-entity", + "log", "opener", "reqwest", "rust-s3", @@ -7654,7 +7669,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "async-trait", diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index 363fdf42a6..c7f1d39a34 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml @@ -57,7 +57,7 @@ custom-protocol = ["tauri/custom-protocol"] # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "d76a0642e1787dc2d15c1848fa4a245f8922d7ab" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "62abd8abbf4dddb5822842f28d1fba67ccfae6de" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/rust-lib/.cargo/config.toml b/frontend/rust-lib/.cargo/config.toml index fc53147ab5..9a3690f8de 100644 --- a/frontend/rust-lib/.cargo/config.toml +++ b/frontend/rust-lib/.cargo/config.toml @@ -1,5 +1,6 @@ [target.x86_64-apple-darwin] -rustflags = ["-C", "target-cpu=native", "-C", "link-arg=-mmacosx-version-min=11.0"] +#rustflags = ["-C", "target-cpu=native", "-C", "link-arg=-mmacosx-version-min=11.0"] +rustflags = ["-C", "link-arg=-mmacosx-version-min=11.0"] [target.aarch64-apple-darwin] -rustflags = ["-C", "target-cpu=native", "-C", "link-arg=-mmacosx-version-min=11.0"] +rustflags = ["-C", "link-arg=-mmacosx-version-min=11.0"] diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 79341b7bd9..3fee7bdb91 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -125,7 +125,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "reqwest", @@ -667,7 +667,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "app-error", @@ -1152,7 +1152,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -1280,7 +1280,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "app-error", @@ -2474,7 +2474,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "futures-util", @@ -2490,7 +2490,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "app-error", @@ -2851,7 +2851,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "reqwest", @@ -3667,7 +3667,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_macros", + "phf_macros 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", ] @@ -3687,6 +3687,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ + "phf_macros 0.11.2", "phf_shared 0.11.2", ] @@ -3754,6 +3755,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.31", +] + [[package]] name = "phf_shared" version = "0.8.0" @@ -3957,7 +3971,7 @@ checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" dependencies = [ "bytes", "heck 0.4.1", - "itertools 0.10.5", + "itertools 0.11.0", "log", "multimap", "once_cell", @@ -3978,7 +3992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.31", @@ -4317,7 +4331,7 @@ dependencies = [ [[package]] name = "realtime-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "bincode", @@ -4983,13 +4997,14 @@ dependencies = [ [[package]] name = "shared_entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "app-error", "collab-entity", "database-entity", "gotrue-entity", + "log", "opener", "reqwest", "rust-s3", @@ -6320,7 +6335,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d76a0642e1787dc2d15c1848fa4a245f8922d7ab#d76a0642e1787dc2d15c1848fa4a245f8922d7ab" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=62abd8abbf4dddb5822842f28d1fba67ccfae6de#62abd8abbf4dddb5822842f28d1fba67ccfae6de" dependencies = [ "anyhow", "async-trait", diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index d5d256990c..aeb644938e 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -99,7 +99,7 @@ incremental = false # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "d76a0642e1787dc2d15c1848fa4a245f8922d7ab" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "62abd8abbf4dddb5822842f28d1fba67ccfae6de" } # Please use the following script to update collab. # Working directory: frontend #