Merge branch 'main' into cut-release-v0.25.0

.github/workflows/build-test-publish-apps.yml

@@ -319,7 +319,7 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload release files to public bucket for tauri
-        uses: google-github-actions/upload-cloud-storage@v2.1.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: "out/tauri/${{ env.VERSION }}" 
           glob: '*/Zoo*'
@@ -327,7 +327,7 @@ jobs:
           destination: ${{ env.BUCKET_DIR_TAURI }}/${{ env.VERSION }}
 
       - name: Upload update endpoint to public bucket for tauri
-        uses: google-github-actions/upload-cloud-storage@v2.1.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: last_update.json
           destination: ${{ env.BUCKET_DIR }}

electron-builder.yml

@@ -11,16 +11,174 @@ mac:
   category: public.app-category.developer-tools
   artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
   target:
-    - target: dmg 
+    - target: dmg
       arch:
         - x64
         - arm64
-    - target: zip 
+    - target: zip
       arch:
         - x64
         - arm64
   notarize:
     teamId: 92H8YB3B95
+  extendInfo:
+    - CFBundleDocumentTypes:
+      - LSItemContentTypes:
+          - dev.zoo.kcl
+        CFBundleTypeName: KCL
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Owner
+      - LSItemContentTypes:
+          - dev.zoo.toml
+        CFBundleTypeName: TOML
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - dev.zoo.gltf
+        CFBundleTypeName: glTF
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - dev.zoo.glb
+        CFBundleTypeName: glb
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - dev.zoo.step
+        CFBundleTypeName: STEP
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - dev.zoo.fbx
+        CFBundleTypeName: FBX
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - dev.zoo.sldprt
+        CFBundleTypeName: Solidworks Part
+        CFBundleTypeRole: Viewer
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - public.geometry-definition-format
+        CFBundleTypeName: OBJ
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - public.polygon-file-format
+        CFBundleTypeName: PLY
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - public.standard-tesselated-geometry-format
+        CFBundleTypeName: STL
+        CFBundleTypeRole: Editor
+        LSTypeIsPackage: false
+        LSHandlerRank: Default
+      - LSItemContentTypes:
+          - public.folder
+        CFBundleTypeName: Folders
+        CFBundleTypeRole: Viewer
+        LSHandlerRank: Alternate
+
+    - UTExportedTypeDeclarations:
+      - UTTypeIdentifier: dev.zoo.kcl
+        UTTypeReferenceURL: https://zoo.dev/docs/kcl
+        UTTypeConformsTo:
+          - public.source-code
+          - public.data
+          - public.text
+          - public.plain-text
+          - public.3d-content
+          - public.script
+        UTTypeDescription: KCL (KittyCAD Language) document
+        UTTypeTagSpecification:
+          public.filename-extension:
+            - kcl
+          public.mime-type:
+            - text/vnd.zoo.kcl
+      - UTTypeIdentifier: dev.zoo.gltf
+        UTTypeReferenceURL: https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html
+        UTTypeConformsTo:
+          - public.data
+          - public.text
+          - public.plain-text
+          - public.3d-content
+          - public.json
+        UTTypeDescription: Graphics Library Transmission Format (glTF)
+        UTTypeTagSpecification:
+          public.filename-extension:
+            - gltf
+          public.mime-type:
+            - model/gltf+json
+      - UTTypeIdentifier: dev.zoo.glb
+        UTTypeReferenceURL: https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html
+        UTTypeConformsTo:
+          - public.data
+          - public.3d-content
+        UTTypeDescription: Graphics Library Transmission Format (glTF) binary
+        UTTypeTagSpecification:
+          public.filename-extension:
+            - glb
+          public.mime-type:
+            - model/gltf-binary
+      - UTTypeIdentifier: dev.zoo.step
+        UTTypeReferenceURL: https://www.loc.gov/preservation/digital/formats/fdd/fdd000448.shtml
+        UTTypeConformsTo:
+          - public.data
+          - public.3d-content
+          - public.text
+          - public.plain-text
+        UTTypeDescription: STEP-file, ISO 10303-21
+        UTTypeTagSpecification:
+          public.filename-extension:
+            - step
+            - stp
+          public.mime-type:
+            - model/step
+      - UTTypeIdentifier: dev.zoo.sldprt
+        UTTypeReferenceURL: https://docs.fileformat.com/cad/sldprt/
+        UTTypeConformsTo:
+          - public.data
+          - public.3d-content
+        UTTypeDescription: Solidworks Part
+        UTTypeTagSpecification:
+          public.filename-extension:
+            - sldprt
+          public.mime-type:
+            - model/vnd.solidworks.sldprt
+      - UTTypeIdentifier: dev.zoo.fbx
+        UTTypeReferenceURL: https://en.wikipedia.org/wiki/FBX
+        UTTypeConformsTo:
+          - public.data
+          - public.3d-content
+        UTTypeDescription: Autodesk Filmbox (FBX) format
+        UTTypeTagSpecification:
+          public.filename-extension:
+            - fbx
+            - fbxb
+          public.mime-type:
+            - model/vnd.autodesk.fbx
+      - UTTypeIdentifier: dev.zoo.toml
+        UTTypeReferenceURL: https://toml.io/en/
+        UTTypeConformsTo:
+          - public.data
+          - public.text
+          - public.plain-text
+        UTTypeDescription: Tom's Obvious Minimal Language
+        UTTypeTagSpecification:
+          public.filename-extension:
+            - kcl
+          public.mime-type:
+            - text/toml
 
 win:
   artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
@@ -38,6 +196,13 @@ win:
   sign: "./sign-win.js"
   publisherName: "KittyCAD Inc"  # needs to be exactly like on Digicert
   icon: "assets/icon.ico"
+  fileAssociations:
+    - ext: kcl
+      name: kcl
+      mimeType: text/vnd.zoo.kcl
+      description: Zoo KCL File
+      icon: "assets/icon.ico"
+      role: Editor
 
 msi:
   oneClick: false
@@ -57,6 +222,13 @@ linux:
       arch:
         - x64
         - arm64
+  fileAssociations:
+    - ext: kcl
+      name: kcl
+      mimeType: text/vnd.zoo.kcl
+      description: Zoo KCL File
+      icon: "assets/icon.ico"
+      role: Editor
 
 publish:
   - provider: generic

package.json

@@ -51,7 +51,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.4.1",
-    "react-hotkeys-hook": "^4.5.0",
+    "react-hotkeys-hook": "^4.5.1",
     "react-json-view": "^1.21.3",
     "react-modal": "^3.16.1",
     "react-modal-promise": "^1.0.2",
@@ -169,7 +169,7 @@
     "eslint": "^8.0.1",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-css-modules": "^2.12.0",
-    "eslint-plugin-import": "^2.25.0",
+    "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-suggest-no-throw": "^1.0.0",
     "happy-dom": "^14.3.10",
     "http-server": "^14.1.1",

yarn.lock

@@ -2314,6 +2314,11 @@
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz#20c09cf44dcb082140cc7f439dd679fe4bba3375"
   integrity sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==
 
+"@rtsao/scc@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
+
 "@rushstack/eslint-patch@^1.1.0":
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.4.tgz#427d5549943a9c6fce808e39ea64dbe60d4047f1"
@@ -3242,7 +3247,7 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-includes@^3.1.6, array-includes@^3.1.7, array-includes@^3.1.8:
+array-includes@^3.1.6, array-includes@^3.1.8:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
   integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
@@ -3271,7 +3276,7 @@ array.prototype.findlast@^1.2.5:
     es-object-atoms "^1.0.0"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.findlastindex@^1.2.3:
+array.prototype.findlastindex@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
   integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
@@ -4943,10 +4948,10 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
-eslint-module-utils@^2.8.0:
+eslint-module-utils@^2.9.0:
-  version "2.8.1"
+  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.9.0.tgz#95d4ac038a68cd3f63482659dffe0883900eb342"
-  integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==
+  integrity sha512-McVbYmwA3NEKwRQY5g4aWMdcZE5xZxV8i8l7CqJSrameuGSQJtSWaL/LxTEzSKKaCcOhlpDR8XEfYXWPrdo/ZQ==
   dependencies:
     debug "^3.2.7"
 
@@ -4966,26 +4971,27 @@ eslint-plugin-flowtype@^8.0.3:
     lodash "^4.17.21"
     string-natural-compare "^3.0.1"
 
-eslint-plugin-import@^2.25.0, eslint-plugin-import@^2.25.3:
+eslint-plugin-import@^2.25.3, eslint-plugin-import@^2.30.0:
-  version "2.29.1"
+  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz#21ceea0fc462657195989dd780e50c92fe95f449"
-  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
+  integrity sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==
   dependencies:
-    array-includes "^3.1.7"
+    "@rtsao/scc" "^1.1.0"
-    array.prototype.findlastindex "^1.2.3"
+    array-includes "^3.1.8"
+    array.prototype.findlastindex "^1.2.5"
     array.prototype.flat "^1.3.2"
     array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.9"
-    eslint-module-utils "^2.8.0"
+    eslint-module-utils "^2.9.0"
-    hasown "^2.0.0"
+    hasown "^2.0.2"
-    is-core-module "^2.13.1"
+    is-core-module "^2.15.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.fromentries "^2.0.7"
+    object.fromentries "^2.0.8"
-    object.groupby "^1.0.1"
+    object.groupby "^1.0.3"
-    object.values "^1.1.7"
+    object.values "^1.2.0"
     semver "^6.3.1"
     tsconfig-paths "^3.15.0"
 
@@ -6266,10 +6272,10 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.13.0, is-core-module@^2.13.1:
+is-core-module@^2.13.0, is-core-module@^2.15.1:
-  version "2.15.0"
+  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
-  integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
+  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
   dependencies:
     hasown "^2.0.2"
 
@@ -7392,7 +7398,7 @@ object.entries@^1.1.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-object.fromentries@^2.0.7, object.fromentries@^2.0.8:
+object.fromentries@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
   integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
@@ -7402,7 +7408,7 @@ object.fromentries@^2.0.7, object.fromentries@^2.0.8:
     es-abstract "^1.23.2"
     es-object-atoms "^1.0.0"
 
-object.groupby@^1.0.1:
+object.groupby@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
   integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
@@ -7411,7 +7417,7 @@ object.groupby@^1.0.1:
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
 
-object.values@^1.1.6, object.values@^1.1.7, object.values@^1.2.0:
+object.values@^1.1.6, object.values@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
   integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
@@ -8053,10 +8059,10 @@ react-hot-toast@^2.4.1:
   dependencies:
     goober "^2.1.10"
 
-react-hotkeys-hook@^4.5.0:
+react-hotkeys-hook@^4.5.1:
-  version "4.5.0"
+  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/react-hotkeys-hook/-/react-hotkeys-hook-4.5.0.tgz#807b389b15256daf6a813a1ec09e6698064fe97f"
+  resolved "https://registry.yarnpkg.com/react-hotkeys-hook/-/react-hotkeys-hook-4.5.1.tgz#990260ecc7e5a431414148a93b02a2f1a9707897"
-  integrity sha512-Samb85GSgAWFQNvVt3PS90LPPGSf9mkH/r4au81ZP1yOIFayLC3QAvqTgGtJ8YEDMXtPmaVBs6NgipHO6h4Mug==
+  integrity sha512-scAEJOh3Irm0g95NIn6+tQVf/OICCjsQsC9NBHfQws/Vxw4sfq1tDQut5fhTEvPraXhu/sHxRd9lOtxzyYuNAg==
 
 react-is@^16.13.1:
   version "16.13.1"