Cut release v0.20.1 (#2292 )

bump jsons Signed-off-by: Jess Frazelle <github@jessfraz.com>
switch to new sketch mode api (#2295 )
2024-05-03 15:18:10 -07:00 · 2024-05-03 14:45:39 -07:00 · 2024-05-03 13:49:26 -07:00 · 2024-05-03 05:37:27 -04:00
24 changed files with 332 additions and 59 deletions
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@ -17,11 +17,11 @@ jobs:
        name: Read Cut release PR info and create release
        with:
          script: |
-            const { owner, repo, sha } = context.repo
+            const { owner, repo } = context.repo
            const pulls = await github.rest.repos.listPullRequestsAssociatedWithCommit({
              owner,
              repo,
-              commit_sha: sha,
+              commit_sha: context.sha,
            })
            const { title, body } = pulls.data[0]
            const version = title.split('Cut release ')[1]
--- a/docs/kcl/arc.md
+++ b/docs/kcl/arc.md
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "untitled-app",
-  "version": "0.20.0",
+  "version": "0.20.1",
  "private": true,
  "dependencies": {
    "@codemirror/autocomplete": "^6.16.0",
@ -10,7 +10,7 @@
    "@fortawesome/react-fontawesome": "^0.2.0",
    "@headlessui/react": "^1.7.19",
    "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.58",
+    "@kittycad/lib": "^0.0.60",
    "@lezer/javascript": "^1.4.9",
    "@open-rpc/client-js": "^1.8.1",
    "@react-hook/resize-observer": "^1.2.6",
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@ -38,6 +38,17 @@ dependencies = [
 "cpufeatures",
 ]

+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.14",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "ahash"
 version = "0.8.11"
@ -81,6 +92,24 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"

+[[package]]
+name = "android_log-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
+
+[[package]]
+name = "android_logger"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f"
+dependencies = [
+ "android_log-sys",
+ "env_logger",
+ "log",
+ "once_cell",
+]
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@ -154,6 +183,7 @@ dependencies = [
 "anyhow",
 "kcl-lib",
 "kittycad",
+ "log",
 "oauth2",
 "serde_json",
 "tauri",
@ -163,6 +193,7 @@ dependencies = [
 "tauri-plugin-dialog",
 "tauri-plugin-fs",
 "tauri-plugin-http",
+ "tauri-plugin-log",
 "tauri-plugin-os",
 "tauri-plugin-process",
 "tauri-plugin-shell",
@ -181,6 +212,12 @@ dependencies = [
 "num-traits",
 ]

+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
 [[package]]
 name = "ashpd"
 version = "0.8.1"
@ -507,6 +544,30 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "borsh"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases 0.1.1",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "syn_derive",
+]
+
 [[package]]
 name = "brotli"
 version = "3.5.0"
@ -534,7 +595,7 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d43b38e074cc0de2957f10947e376a1d88b9c4dbab340b590800cc1b2e066b2"
 dependencies = [
- "ahash",
+ "ahash 0.8.11",
 "base64 0.13.1",
 "bitvec",
 "chrono",
@ -556,6 +617,39 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

+[[package]]
+name = "byte-unit"
+version = "5.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e"
+dependencies = [
+ "rust_decimal",
+ "serde",
+ "utf8-width",
+]
+
+[[package]]
+name = "bytecheck"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "bytemuck"
 version = "1.15.0"
@ -1294,6 +1388,16 @@ dependencies = [
 "syn 2.0.60",
 ]

+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@ -1367,6 +1471,15 @@ dependencies = [
 "simd-adler32",
 ]

+[[package]]
+name = "fern"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "field-offset"
 version = "0.3.6"
@ -1964,6 +2077,9 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.8",
+]

 [[package]]
 name = "hashbrown"
@ -2420,7 +2536,7 @@ dependencies = [

 [[package]]
 name = "kcl-lib"
-version = "0.1.53"
+version = "0.1.54"
 dependencies = [
 "anyhow",
 "approx",
@ -2479,9 +2595,9 @@ dependencies = [

 [[package]]
 name = "kittycad"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc922f0da3abc22661bf49423c9bfcc02ce6ae92dae007ede6990874789545b"
+checksum = "2c6e12eb45fd9a28c8e99dbdef54556246b39acee14e4aa6f0fc43636caa62d9"
 dependencies = [
 "anyhow",
 "async-trait",
@ -2658,6 +2774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
 "serde",
+ "value-bag",
 ]

 [[package]]
@ -2970,6 +3087,15 @@ dependencies = [
 "syn 1.0.109",
 ]

+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "oauth2"
 version = "4.4.2"
@ -3619,6 +3745,26 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "quick-xml"
 version = "0.31.0"
@ -3836,6 +3982,15 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"

+[[package]]
+name = "rend"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
+dependencies = [
+ "bytecheck",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.11.27"
@ -4044,6 +4199,35 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

+[[package]]
+name = "rkyv"
+version = "0.7.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "bytes",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "ropey"
 version = "1.6.1"
@ -4054,6 +4238,22 @@ dependencies = [
 "str_indices",
 ]

+[[package]]
+name = "rust_decimal"
+version = "1.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
+dependencies = [
+ "arrayvec",
+ "borsh",
+ "bytes",
+ "num-traits",
+ "rand 0.8.5",
+ "rkyv",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@ -4249,6 +4449,12 @@ dependencies = [
 "untrusted",
 ]

+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
 [[package]]
 name = "security-framework"
 version = "2.10.0"
@ -4537,6 +4743,12 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"

+[[package]]
+name = "simdutf8"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@ -4794,6 +5006,18 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@ -4938,9 +5162,9 @@ dependencies = [

 [[package]]
 name = "tauri"
-version = "2.0.0-beta.16"
+version = "2.0.0-beta.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d411ebb670bbe5cf948f6c24978632937329748b499de1619ab55ad31512652"
+checksum = "5fedd5490eddf117253945f0baedafded43474c971cba546a818f527d5c26266"
 dependencies = [
 "anyhow",
 "bytes",
@ -4952,7 +5176,7 @@ dependencies = [
 "getrandom 0.2.14",
 "glob",
 "gtk",
- "heck 0.4.1",
+ "heck 0.5.0",
 "http 1.1.0",
 "jni",
 "libc",
@ -5153,6 +5377,27 @@ dependencies = [
 "urlpattern",
 ]

+[[package]]
+name = "tauri-plugin-log"
+version = "2.0.0-beta.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97718db0d981b03b7b1257c22f699ff46639220c5acb4510ac9696437afc93f8"
+dependencies = [
+ "android_logger",
+ "byte-unit",
+ "cocoa",
+ "fern",
+ "log",
+ "objc",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "swift-rs",
+ "tauri",
+ "tauri-plugin",
+ "time",
+]
+
 [[package]]
 name = "tauri-plugin-os"
 version = "2.0.0-beta.3"
@ -5231,9 +5476,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7439729d0107c9797764919c39c4a4cc3af64306faaa48271da50d8eb4c0283"
+checksum = "148b6e6aff8e63fe5d4ae1d50159d50cfc0b4309abdeca64833c887c6b5631ef"
 dependencies = [
 "dpi",
 "gtk",
@ -5250,9 +5495,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c38dcfa7f8c2b2e344c7401972e0ddaaec4fa655666788d94b1852d6c4a7fe8"
+checksum = "398d065c6e0fbf3c4304583759b6e153bc1e0daeb033bede6834ebe4df371fc3"
 dependencies = [
 "cocoa",
 "gtk",
@ -5393,7 +5638,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
 "deranged",
 "itoa 1.0.11",
+ "libc",
 "num-conv",
+ "num_threads",
 "powerfmt",
 "serde",
 "time-core",
@ -5963,6 +6210,12 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"

+[[package]]
+name = "utf8-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@ -6017,6 +6270,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"

+[[package]]
+name = "value-bag"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@ -17,6 +17,7 @@ tauri-build = { version = "2.0.0-beta.13", features = [] }
 anyhow = "1"
 kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
 kittycad = "0.3.0"
+log = "0.4.21"
 oauth2 = "4.4.2"
 serde_json = "1.0"
 tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
@ -25,6 +26,7 @@ tauri-plugin-deep-link = { version = "2.0.0-beta.3" }
 tauri-plugin-dialog = { version = "2.0.0-beta.6" }
 tauri-plugin-fs = { version = "2.0.0-beta.6" }
 tauri-plugin-http = { version = "2.0.0-beta.6" }
+tauri-plugin-log = { version = "2.0.0-beta.4" }
 tauri-plugin-os = { version = "2.0.0-beta.2" }
 tauri-plugin-process = { version = "2.0.0-beta.2" }
 tauri-plugin-shell = { version = "2.0.0-beta.2" }
--- a/src-tauri/capabilities/desktop.json
+++ b/src-tauri/capabilities/desktop.json
@ -9,6 +9,7 @@
  "permissions": [
    "cli:default",
    "deep-link:default",
+    "log:default",
    "path:default",
    "event:default",
    "window:default",
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@ -226,7 +226,7 @@ async fn read_dir_recursive(path: &str) -> Result<FileEntry, InvokeError> {
 /// The string returned from this method is the access token.
 #[tauri::command]
 async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError> {
-    println!("Logging in...");
+    log::debug!("Logging in...");
    // Do an OAuth 2.0 Device Authorization Grant dance to get a token.
    let device_auth_url = oauth2::DeviceAuthorizationUrl::new(format!("{host}/oauth2/device/auth"))
        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
@ -265,7 +265,7 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
    // and bypass the shell::open call as it fails on GitHub Actions.
    let e2e_tauri_enabled = env::var("E2E_TAURI_ENABLED").is_ok();
    if e2e_tauri_enabled {
-        println!("E2E_TAURI_ENABLED is set, won't open {} externally", auth_uri.secret());
+        log::warn!("E2E_TAURI_ENABLED is set, won't open {} externally", auth_uri.secret());
        tokio::fs::write("/tmp/kittycad_user_code", details.user_code().secret())
            .await
            .map_err(|e| InvokeError::from_anyhow(e.into()))?;
@ -308,7 +308,7 @@ async fn get_user(token: &str, hostname: &str) -> Result<kittycad::types::User,
            baseurl = format!("http://{host}")
        }
    }
-    println!("Getting user info...");
+    log::debug!("Getting user info...");

    // use kittycad library to fetch the user info from /user/me
    let mut client = kittycad::Client::new(token);
@ -352,10 +352,12 @@ fn show_in_folder(path: &str) -> Result<(), InvokeError> {

 #[allow(dead_code)]
 fn open_url_sync(app: &tauri::AppHandle, url: &url::Url) {
-    println!("Opening URL: {:?}", url);
+    log::debug!("Opening URL: {:?}", url);
    let cloned_url = url.clone();
    let runner: tauri::async_runtime::JoinHandle<Result<ProjectState>> = tauri::async_runtime::spawn(async move {
-        let url_str = cloned_url.to_string();
+        let url_str = cloned_url.path().to_string();
+
+        log::debug!("Opening URL path : {}", url_str);
        let path = Path::new(url_str.as_str());
        ProjectState::new_from_path(path.to_path_buf()).await
    });
@ -367,10 +369,10 @@ fn open_url_sync(app: &tauri::AppHandle, url: &url::Url) {
            app.manage(state::Store::new(store));
        }
        Err(e) => {
-            println!("Error opening URL:{} {:?}", url, e);
+            log::warn!("Error opening URL:{} {:?}", url, e);
        }
        Ok(Err(e)) => {
-            println!("Error opening URL:{} {:?}", url, e);
+            log::warn!("Error opening URL:{} {:?}", url, e);
        }
    }
 }
@ -400,6 +402,15 @@ fn main() -> Result<()> {
        .plugin(tauri_plugin_dialog::init())
        .plugin(tauri_plugin_fs::init())
        .plugin(tauri_plugin_http::init())
+        .plugin(
+            tauri_plugin_log::Builder::new()
+                .targets([
+                    tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::Stdout),
+                    tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::LogDir { file_name: None }),
+                ])
+                .level(log::LevelFilter::Debug)
+                .build(),
+        )
        .plugin(tauri_plugin_os::init())
        .plugin(tauri_plugin_process::init())
        .plugin(tauri_plugin_shell::init())
@ -435,7 +446,7 @@ fn main() -> Result<()> {
                    if let Some(source_arg) = matches.args.get("source") {
                        // We don't do an else here because this can be null.
                        if let Some(value) = source_arg.value.as_str() {
-                            println!("Got path in cli argument: {}", value);
+                            log::info!("Got path in cli argument: {}", value);
                            source_path = Some(Path::new(value).to_path_buf());
                        }
                    }
@ -446,7 +457,7 @@ fn main() -> Result<()> {
            }

            if verbose {
-                println!("Verbose mode enabled.");
+                log::debug!("Verbose mode enabled.");
            }

            // If we have a source path to open, make sure it exists.
@ -476,7 +487,7 @@ fn main() -> Result<()> {

            // Listen on the deep links.
            app.listen("deep-link://new-url", |event| {
-                println!("got deep-link url: {:?}", event);
+                log::info!("got deep-link url: {:?}", event);
                // TODO: open_url_sync(app.handle(), event.url);
            });

@ -488,10 +499,7 @@ fn main() -> Result<()> {
            |app, event| {
                #[cfg(any(target_os = "macos", target_os = "ios"))]
                if let tauri::RunEvent::Opened { urls } = event {
-                    if let Some(w) = app.get_webview_window("main") {
-                        let _ = w.eval(&format!("console.log(`[tauri] Opened URLs: {:?}`)", urls));
-                    }
-                    println!("Opened URLs: {:?}", urls);
+                    log::info!("Opened URLs: {:?}", urls);

                    // Handle the first URL.
                    // TODO: do we want to handle more than one URL?
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@ -37,8 +37,7 @@
      }
    },
    "longDescription": "",
-    "macOS": {
-    },
+    "macOS": {},
    "resources": [],
    "shortDescription": "",
    "targets": "all"
@ -75,5 +74,5 @@
    }
  },
  "productName": "Zoo Modeling App",
-  "version": "0.20.0"
+  "version": "0.20.1"
 }
--- a/src/machines/modelingMachine.ts
+++ b/src/machines/modelingMachine.ts
@ -873,7 +873,7 @@ export const modelingMachine = createMachine(
            type: 'modeling_cmd_req',
            cmd_id: uuidv4(),
            cmd: {
-              type: 'default_camera_disable_sketch_mode',
+              type: 'sketch_mode_disable',
            },
          })
          .then(async () => {
--- a/src/wasm-lib/Cargo.lock
+++ b/src/wasm-lib/Cargo.lock
@ -1895,7 +1895,7 @@ dependencies = [

 [[package]]
 name = "kcl-lib"
-version = "0.1.53"
+version = "0.1.54"
 dependencies = [
 "anyhow",
 "approx 0.5.1",
@ -1964,9 +1964,9 @@ dependencies = [

 [[package]]
 name = "kittycad"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc922f0da3abc22661bf49423c9bfcc02ce6ae92dae007ede6990874789545b"
+checksum = "2c6e12eb45fd9a28c8e99dbdef54556246b39acee14e4aa6f0fc43636caa62d9"
 dependencies = [
 "anyhow",
 "async-trait",
@ -2003,9 +2003,9 @@ dependencies = [

 [[package]]
 name = "kittycad-execution-plan"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae99665cd699f8800da8ea4b01889c0c9c61619d2a9dc62d1d5028f1b21110bd"
+checksum = "0936396491f132c163e9411a3dd699e5b2daa49c19436691c5153f7ad2d4953d"
 dependencies = [
 "bytes",
 "gltf-json",
@ -2048,9 +2048,9 @@ dependencies = [

 [[package]]
 name = "kittycad-modeling-cmds"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6326553271cfb08d0143d9329f38cde162d5a0dcba1bd717c763d5361700d7"
+checksum = "1c1f8bdab7f09b4f4a954dafe0694e96f6f2b73733cf7cddccc42ee493e2c1e9"
 dependencies = [
 "anyhow",
 "chrono",
--- a/src/wasm-lib/Cargo.toml
+++ b/src/wasm-lib/Cargo.toml
@ -62,11 +62,11 @@ members = [
 ]

 [workspace.dependencies]
-kittycad = { version = "0.3.0", default-features = false, features = ["js", "requests"] }
-kittycad-execution-plan = "0.1.5"
+kittycad = { version = "0.3.1", default-features = false, features = ["js", "requests"] }
+kittycad-execution-plan = "0.1.6"
 kittycad-execution-plan-macros = "0.1.9"
 kittycad-execution-plan-traits = "0.1.14"
-kittycad-modeling-cmds = "0.2.22"
+kittycad-modeling-cmds = "0.2.23"
 kittycad-modeling-session = "0.1.4"

 [[test]]
--- a/src/wasm-lib/grackle/fixtures/cube_lineTo.png
+++ b/src/wasm-lib/grackle/fixtures/cube_lineTo.png
--- a/src/wasm-lib/grackle/fixtures/cube_tangentialArcTo.png
+++ b/src/wasm-lib/grackle/fixtures/cube_tangentialArcTo.png
--- a/src/wasm-lib/grackle/fixtures/cube_xyLine.png
+++ b/src/wasm-lib/grackle/fixtures/cube_xyLine.png
--- a/src/wasm-lib/grackle/src/native_functions/sketch/stdlib_functions.rs
+++ b/src/wasm-lib/grackle/src/native_functions/sketch/stdlib_functions.rs
@ -642,14 +642,15 @@ impl Callable for StartSketchAt {
        // Next, enter sketch mode.
        stack_api_call(
            &mut instructions,
-            ModelingCmdEndpoint::SketchModeEnable,
+            ModelingCmdEndpoint::EnableSketchMode,
            None,
            Uuid::new_v4().into(),
            [
                Some(axes.z).into_parts(),
-                vec![false.into()], // animated
-                vec![false.into()], // ortho mode
-                vec![plane_id.into()],
+                vec![false.into()],    // adjust camera
+                vec![false.into()],    // animated
+                vec![false.into()],    // ortho mode
+                vec![plane_id.into()], // entity id (plane in this case)
            ],
        );

--- a/src/wasm-lib/kcl/Cargo.toml
+++ b/src/wasm-lib/kcl/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.1.53"
+version = "0.1.54"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
--- a/src/wasm-lib/kcl/src/std/sketch.rs
+++ b/src/wasm-lib/kcl/src/std/sketch.rs
@ -947,6 +947,7 @@ async fn start_sketch_on_face(
            ortho: false,
            entity_id: extrude_plane_id,
            adjust_camera: false,
+            planar_normal: None,
        },
    )
    .await?;
@ -1005,12 +1006,13 @@ async fn start_sketch_on_plane(data: PlaneData, args: Args) -> Result<Box<Plane>
    // Enter sketch mode on the plane.
    args.send_modeling_cmd(
        uuid::Uuid::new_v4(),
-        ModelingCmd::SketchModeEnable {
+        ModelingCmd::EnableSketchMode {
            animated: false,
            ortho: false,
-            plane_id: plane.id,
+            entity_id: plane.id,
            // We pass in the normal for the plane here.
-            disable_camera_with_plane: Some(plane.z_axis.clone().into()),
+            planar_normal: Some(plane.z_axis.clone().into()),
+            adjust_camera: false,
        },
    )
    .await?;
--- a/src/wasm-lib/kcl/tests/outputs/serial_test_example_arc0.png
+++ b/src/wasm-lib/kcl/tests/outputs/serial_test_example_arc0.png
--- a/src/wasm-lib/tests/executor/outputs/member_expression_in_params.png
+++ b/src/wasm-lib/tests/executor/outputs/member_expression_in_params.png
--- a/src/wasm-lib/tests/executor/outputs/tangential_arc.png
+++ b/src/wasm-lib/tests/executor/outputs/tangential_arc.png
--- a/src/wasm-lib/tests/executor/outputs/tangential_arc_to.png
+++ b/src/wasm-lib/tests/executor/outputs/tangential_arc_to.png
--- a/src/wasm-lib/tests/executor/outputs/tangential_arc_with_point.png
+++ b/src/wasm-lib/tests/executor/outputs/tangential_arc_with_point.png
--- a/src/wasm-lib/tests/modify/main.rs
+++ b/src/wasm-lib/tests/modify/main.rs
@ -67,11 +67,12 @@ async fn setup(code: &str, name: &str) -> Result<(ExecutorContext, Program, uuid
        .send_modeling_cmd(
            uuid::Uuid::new_v4(),
            SourceRange::default(),
-            ModelingCmd::SketchModeEnable {
+            ModelingCmd::EnableSketchMode {
                animated: false,
                ortho: true,
-                plane_id,
-                disable_camera_with_plane: Some(Point3D { x: 0.0, y: 0.0, z: 1.0 }),
+                entity_id: plane_id,
+                planar_normal: Some(Point3D { x: 0.0, y: 0.0, z: 1.0 }),
+                adjust_camera: false,
            },
        )
        .await?;
--- a/yarn.lock
+++ b/yarn.lock
@ -1831,10 +1831,10 @@
  resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
  integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==

-"@kittycad/lib@^0.0.58":
-  version "0.0.58"
-  resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-0.0.58.tgz#4b47a295d8238e64d30d855336e4bcc4aab380f9"
-  integrity sha512-iSkJNXumtlEjey/K1Lsl/j1aVlcjcPONW7+6YwqccioKJ6zwSCgXF4AFB3oxVmM27Gm8YjEmaHxbcOhGP02X9g==
+"@kittycad/lib@^0.0.60":
+  version "0.0.60"
+  resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-0.0.60.tgz#478aa1f750ab05cd4e67503de96f2f3bbc075329"
+  integrity sha512-LW9NFy2gv0pm1GJyquMXPiFKOBSdJJxYGkmacDton6jluGhAa8Qtcuj3O5vqUEeq9ObSM1Jt8gp39P9nvXG9yg==
  dependencies:
    node-fetch "3.3.2"
    openapi-types "^12.0.0"
Author	SHA1	Message	Date
Jess Frazelle	6959036688	Cut release v0.20.1 (#2292 ) bump jsons Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-03 15:18:10 -07:00
Jess Frazelle	570d0473c6	switch to new sketch mode api (#2295 ) * swtch to new api Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix ts Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * small changes Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-03 14:45:39 -07:00
Jess Frazelle	44f0d7c25c	turn on tauri app logging (#2296 ) * turn on tauri app logging Signed-off-by: Jess Frazelle <github@jessfraz.com> * fixups Signed-off-by: Jess Frazelle <github@jessfraz.com> * switch everything to logs; Signed-off-by: Jess Frazelle <github@jessfraz.com> * remove other shit logs Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix macos open Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-03 13:49:26 -07:00
Pierre Jacquier	3ccb04c4e7	Fix Create Release commit sha (#2293 )	2024-05-03 05:37:27 -04:00