Update exampleKcl.ts

* WIP: automate release, get PR info from commit

* Get version from PR title in script

* Add create release script call under comment, will wait for next release to test

* Test with v0.19.0

* Change to draft

* Clean up after v0.19.0 test

* Test for v0.19.1

* Clean up after test

---------

Co-authored-by: Jess Frazelle <jessfraz@users.noreply.github.com>

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
   # Will checkout the last commit from the default branch (main as of 2023-10-04)
 
 env:
-  BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && contains(github.event.pull_request.title, 'Cut release v') }}
+  BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -237,6 +237,83 @@ jobs:
           includeDebug: true
           args: "${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}"
 
+
+      - name: Mac App Store
+        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'macos-14' }}
+        run: |
+          unset APPLE_SIGNING_IDENTITY
+          unset APPLE_CERTIFICATE
+          sign_app="3rd Party Mac Developer Application: KittyCAD Inc (${APPLE_TEAM_ID})"
+          sign_install="3rd Party Mac Developer Installer: KittyCAD Inc (${APPLE_TEAM_ID})"
+          profile="src-tauri/entitlements/Mac_App_Distribution.provisionprofile"
+
+          mkdir -p src-tauri/entitlements
+          echo "${APPLE_STORE_PROVISIONING_PROFILE}" | base64 --decode > "${profile}"
+
+          echo "${APPLE_STORE_DISTRIBUTION_CERT}" | base64 --decode > "dist.cer"
+          echo "${APPLE_STORE_INSTALLER_CERT}" | base64 --decode > "installer.cer"
+
+          # load the certificates into the keychain
+          # Create a custom keychain
+          security create-keychain -p gh_actions refine-build.keychain
+
+          # Make the custom keychain default, so xcodebuild will use it for signing
+          security default-keychain -s refine-build.keychain
+
+          # Unlock the keychain
+          security unlock-keychain -p gh_actions refine-build.keychain
+
+          # Set keychain timeout to 1 hour for long builds
+          security set-keychain-settings -t 3600 -l ~/Library/Keychains/refine-build.keychain
+
+          # Add certificates to keychain and allow codesign to access them
+          security import "dist.cer" -k ~/Library/Keychains/refine-build.keychain -T /usr/bin/codesign
+          security import "installer.cer" -k ~/Library/Keychains/refine-build.keychain -T /usr/bin/codesign
+
+          security set-key-partition-list -S apple-tool:,apple: -s -k gh_actions refine-build.keychain
+
+          target="universal-apple-darwin"
+
+          # Turn off the default target
+          sed -i "s/default =/# default =/" src-tauri/Cargo.toml
+          yarn tauri build --target "${target}" --verbose
+
+          ls -l src-tauri/target/${target}
+          ls -l src-tauri/target
+          ls -l src-tauri/target/${target}/release/bundle/macos
+          ls -l src-tauri/entitlements
+
+          app_path="src-tauri/target/${target}/release/bundle/macos/Zoo Modeling App.app"
+          build_name="src-tauri/target/${target}/release/bundle/macos/Zoo Modeling App.pkg"
+          cp_dir="src-tauri/target/${target}/release/bundle/macos/Zoo Modeling App.app/Contents/embedded.provisionprofile"
+          entitlements="src-tauri/entitlements/Zoo Modeling App.entitlements"
+
+          cp "${profile}" "${cp_dir}"
+
+          codesign --deep --force -s "${sign_app}" --entitlements "${entitlements}" "${app_path}"
+
+          productbuild --component "${app_path}" /Applications/ --sign "${sign_install}" "${build_name}"
+
+          # Undo the changes to the Cargo.toml
+          git checkout src-tauri/Cargo.toml
+        env:
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_STORE_PROVISIONING_PROFILE: ${{ secrets.APPLE_STORE_PROVISIONING_PROFILE }}
+          APPLE_STORE_DISTRIBUTION_CERT: ${{ secrets.APPLE_STORE_DISTRIBUTION_CERT }}
+          APPLE_STORE_INSTALLER_CERT: ${{ secrets.APPLE_STORE_INSTALLER_CERT }}
+
+      - name: 'Upload app to TestFlight'
+        uses: apple-actions/upload-testflight-build@v1
+        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'macos-14' }}
+        with:
+          app-path: 'src-tauri/target/universal-apple-darwin/release/bundle/macos/Zoo Modeling App.pkg'
+          issuer-id: ${{ secrets.APPLE_STORE_ISSUER_ID }}
+          api-key-id: ${{ secrets.APPLE_STORE_API_KEY_ID }}
+          api-private-key: ${{ secrets.APPLE_STORE_API_PRIVATE_KEY }}
+
+      # We do this after the apple store because the apple store build is
+      # specific and we want to overwrite it with the this new build after and
+      # not upload the apple store build to the public bucket
       - name: Build the app (release) and sign
         uses: tauri-apps/tauri-action@v0
         if: ${{ env.BUILD_RELEASE == 'true' }}

.github/workflows/create-release.yml

@@ -0,0 +1,37 @@
+name: Create Release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: read
+    if: contains(github.event.head_commit.message, 'Cut release v')
+    steps:
+      - uses: actions/github-script@v7
+        name: Read Cut release PR info and create release
+        with:
+          script: |
+            const { owner, repo, sha } = context.repo
+            const pulls = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+              owner,
+              repo,
+              commit_sha: sha,
+            })
+            const { title, body } = pulls.data[0]
+            const version = title.split('Cut release ')[1]
+
+            const result = await github.rest.repos.createRelease({
+              owner,
+              repo,
+              body,
+              tag_name: version,
+              name: version,
+              draft: true,
+            })
+            console.log(result)

.gitignore

@@ -54,3 +54,4 @@ src/**/*.typegen.ts
 src-tauri/gen
 
 src/wasm-lib/grackle/stdlib_cube_partial.json
+Mac_App_Distribution.provisionprofile

public/.well-known/apple-app-site-association

@@ -0,0 +1,15 @@
+{
+  "applinks": {
+    "details": [
+      {
+        "appIDs": ["92H8YB3B95.dev.zoo.modeling-app"],
+        "components": [
+          {
+            "/": "/file/*",
+            "comment": "Matches any URL whose path starts with /file/"
+          }
+        ]
+      }
+    ]
+  }
+}

src-tauri/Cargo.lock

@@ -159,6 +159,7 @@ dependencies = [
  "tauri",
  "tauri-build",
  "tauri-plugin-cli",
+ "tauri-plugin-deep-link",
  "tauri-plugin-dialog",
  "tauri-plugin-fs",
  "tauri-plugin-http",
@@ -5078,6 +5079,21 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "tauri-plugin-deep-link"
+version = "2.0.0-beta.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1aee2af6aec05ace816d46da0b0c0bdb4fcd0c985c0f14634a50c860824435"
+dependencies = [
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+ "url",
+]
+
 [[package]]
 name = "tauri-plugin-dialog"
 version = "2.0.0-beta.6"

src-tauri/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "app"
 version = "0.1.0"
-description = "A Tauri App"
+description = "The Zoo Modeling App"
-authors = ["you"]
+authors = ["Zoo Engineers <eng@zoo.dev>"]
 license = ""
 repository = "https://github.com/KittyCAD/modeling-app"
 default-run = "app"
@@ -21,6 +21,7 @@ oauth2 = "4.4.2"
 serde_json = "1.0"
 tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
 tauri-plugin-cli = { version = "2.0.0-beta.3" }
+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" }
@@ -28,11 +29,13 @@ 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" }
 tauri-plugin-updater = { version = "2.0.0-beta.4" }
-tokio = { version = "1.37.0", features = ["time", "fs"] }
+tokio = { version = "1.37.0", features = ["time", "fs", "process"] }
 toml = "0.8.2"
 
 [features]
+default = ["updater"]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
+updater = []

src-tauri/Info.plist

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>CFBundleURLTypes</key>
+        <array>
+            <dict>
+                <key>CFBundleURLName</key>
+                <string>dev.zoo.modeling-app</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>zoo-modeling-app</string>
+                    <string>zoo</string>
+                </array>
+            </dict>
+        </array>
+        <key>UTExportedTypeDeclarations</key>
+        <array>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>dev.zoo.kcl</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.source-code</string>
+                </array>
+                <key>UTTypeDescription</key>
+                <string>KCL (KittyCAD Language) document</string>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>kcl</string>
+                    </array>
+                    <key>public.mime-type</key>
+                    <array>
+                        <string>text/vnd.zoo.kcl</string>
+                    </array>
+                </dict>
+            </dict>
+        </array>
+    </dict>
+</plist>

src-tauri/capabilities/desktop.json

@@ -8,6 +8,7 @@
   ],
   "permissions": [
     "cli:default",
+    "deep-link:default",
     "path:default",
     "event:default",
     "window:default",

src-tauri/entitlements/Zoo Modeling App.entitlements

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <key>com.apple.security.network.client</key>
+        <true/>
+        <key>com.apple.security.network.server</key>
+        <true/>
+        <key>com.apple.security.files.user-selected.read-write</key>
+        <true/>
+        <key>com.apple.security.files.downloads.read-write</key>
+        <true/>
+        <key>com.apple.application-identifier</key>
+        <string>92H8YB3B95.dev.zoo.modeling-app</string>
+        <key>com.apple.developer.team-identifier</key>
+        <string>92H8YB3B95</string>
+        <key>com.apple.developer.associated-domains</key>
+        <array>
+            <string>applinks:app.zoo.dev</string>
+        </array>
+    </dict>
+</plist>

src-tauri/src/main.rs

@@ -6,7 +6,6 @@ pub(crate) mod state;
 use std::{
     env,
     path::{Path, PathBuf},
-    process::Command,
 };
 
 use anyhow::Result;
@@ -19,6 +18,7 @@ use oauth2::TokenResponse;
 use tauri::{ipc::InvokeError, Manager};
 use tauri_plugin_cli::CliExt;
 use tauri_plugin_shell::ShellExt;
+use tokio::process::Command;
 
 const DEFAULT_HOST: &str = "https://api.zoo.dev";
 const SETTINGS_FILE_NAME: &str = "settings.toml";
@@ -371,6 +371,13 @@ fn main() -> Result<()> {
             write_project_settings_file,
         ])
         .plugin(tauri_plugin_cli::init())
+        .plugin(tauri_plugin_deep_link::init())
+        .plugin(tauri_plugin_dialog::init())
+        .plugin(tauri_plugin_fs::init())
+        .plugin(tauri_plugin_http::init())
+        .plugin(tauri_plugin_os::init())
+        .plugin(tauri_plugin_process::init())
+        .plugin(tauri_plugin_shell::init())
         .setup(|app| {
             // Do update things.
             #[cfg(debug_assertions)]
@@ -378,6 +385,7 @@ fn main() -> Result<()> {
                 app.get_webview("main").unwrap().open_devtools();
             }
             #[cfg(not(debug_assertions))]
+            #[cfg(feature = "updater")]
             {
                 app.handle().plugin(tauri_plugin_updater::Builder::new().build())?;
             }
@@ -503,14 +511,13 @@ fn main() -> Result<()> {
             // Create a state object to hold the project.
             app.manage(state::Store::new(store));
 
+            // Listen on the deep links.
+            app.listen("deep-link://new-url", |url| {
+                dbg!(url);
+            });
+
             Ok(())
         })
-        .plugin(tauri_plugin_dialog::init())
-        .plugin(tauri_plugin_fs::init())
-        .plugin(tauri_plugin_http::init())
-        .plugin(tauri_plugin_os::init())
-        .plugin(tauri_plugin_process::init())
-        .plugin(tauri_plugin_shell::init())
         .run(tauri::generate_context!())?;
 
     Ok(())

src-tauri/tauri.conf.json

@@ -38,11 +38,7 @@
     },
     "longDescription": "",
     "macOS": {
-      "entitlements": null,
+      "entitlements": "entitlements/Zoo Modeling App.entitlements"
-      "exceptionDomain": "",
-      "frameworks": [],
-      "providerShortName": null,
-      "signingIdentity": null
     },
     "resources": [],
     "shortDescription": "",
@@ -66,6 +62,11 @@
       ],
       "subcommands": {}
     },
+    "deep-link": {
+      "domains": [
+        { "host": "app.zoo.dev" }
+      ]
+    },
     "shell": {
       "open": true
     }

src/lang/std/engineConnection.ts

@@ -974,7 +974,7 @@ export class EngineCommandManager {
     }
 
     const additionalSettings = settings.enableSSAO ? '&post_effect=ssao' : ''
-    const pool = this.pool == undefined ? '' : `&pool=${this.pool}`
+    const pool = this.pool === undefined ? '' : `&pool=${this.pool}`
     const url = `${VITE_KC_API_WS_MODELING_URL}?video_res_width=${width}&video_res_height=${height}${additionalSettings}${pool}`
     this.engineConnection = new EngineConnection({
       engineCommandManager: this,

src/lib/exampleKcl.ts

@@ -5,7 +5,7 @@ const sigmaAllow = 35000 // psi
 const width = 6 // inch
 const p = 300 // Force on shelf - lbs
 const distance = 12 // inches
-const M = 12 * 300 / 2 // Moment experienced at fixed end of bracket
+const M = distance * p / 2 // Moment experienced at fixed end of bracket
 const FOS = 2 // Factor of safety of 2
 const shelfMountL = 8 // The length of the bracket holding up the shelf is 6 inches
 const wallMountL = 8 // the length of the bracket

src/wasm-lib/Cargo.lock

@@ -240,9 +240,9 @@ dependencies = [
 
 [[package]]
 name = "async-recursion"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",

src/wasm-lib/kcl/Cargo.toml

@@ -12,7 +12,7 @@ keywords = ["kcl", "KittyCAD", "CAD"]
 
 [dependencies]
 anyhow = { version = "1.0.82", features = ["backtrace"] }
-async-recursion = "1.1.0"
+async-recursion = "1.1.1"
 async-trait = "0.1.80"
 base64 = "0.22.0"
 chrono = "0.4.38"