Fmt

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
 ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast,ue,afterall
-skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,.yarn.lock,**/yarn.lock
+skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,./src-tauri/gen/schemas,.yarn.lock,**/yarn.lock

.eslintrc

@@ -26,8 +26,7 @@
         "rules": {
           "@typescript-eslint/no-floating-promises": "warn",
           "suggest-no-throw/suggest-no-throw": "off",
-          "testing-library/prefer-screen-queries": "off",
-          "jest/valid-expect": "off"
+          "testing-library/prefer-screen-queries": "off"
         }
       },
       {

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

@@ -1,4 +1,4 @@
-name: build-publish-apps
+name: build-test-publish-apps
 
 on:
   pull_request:
@@ -21,7 +21,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  prepare-files:
+  prepare-json-files:
     runs-on: ubuntu-22.04  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
     outputs:
       version: ${{ steps.export_version.outputs.version }}
@@ -33,19 +33,6 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install
-
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './src/wasm-lib'
-
-      # TODO: see if we can fetch from main instead if no diff at src/wasm-lib
-      - name: Run build:wasm
-        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
-
       - name: Set nightly version
         if: github.event_name == 'schedule'
         run: |
@@ -55,50 +42,36 @@ jobs:
       # TODO: see if we ned to add updater test URL here https://dl.zoo.dev/releases/modeling-app/updater-test/last_update.json
 
       - uses: actions/upload-artifact@v3
+        if: ${{ github.event_name == 'schedule' || env.CUT_RELEASE_PR == 'true' }}
         with:
-          name: prepared-files
           path: |
             package.json
-            src/wasm-lib/pkg/wasm_lib*
 
       - id: export_version
         run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
 
 
-  build-apps:
-    needs: [prepare-files]
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-14, windows-2022, ubuntu-22.04]
-    runs-on: ${{ matrix.os }}
+  build-test-app-macos:
+    needs: [prepare-json-files]
+    runs-on: macos-14
     env:
       APPLE_ID: ${{ secrets.APPLE_ID }}
       APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-      APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
       APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-      CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-      CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-      CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-      CSC_FOR_PULL_REQUEST: true
-      TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
-      TAURI_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
-      VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
-      VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
-      WINDOWS_CERTIFICATE_THUMBPRINT: F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D
+      APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+      APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
-        name: prepared-files
+        if: github.event_name == 'schedule'
 
-      - name: Copy prepared files
+      - name: Copy updated .json files
+        if: github.event_name == 'schedule'
         run: |
-          ls -R prepared-files
-          cp prepared-files/package.json package.json
-          cp prepared-files/src/wasm-lib/pkg/wasm_lib_bg.wasm public
-          mkdir src/wasm-lib/pkg
-          cp prepared-files/src/wasm-lib/pkg/wasm_lib* src/wasm-lib/pkg
+          ls -l artifact
+          cp artifact/package.json package.json
 
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
@@ -108,10 +81,79 @@ jobs:
 
       - run: yarn install
 
-      - run: yarn tronb:vite
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: './src/wasm-lib'
+
+      - name: Run build:wasm
+        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
+
+      # TODO: sign the app (and updater bundle potentially)
+      - name: Add signing certificate
+        if: ${{ env.BUILD_RELEASE == 'true' }}
+        run: chmod +x add-osx-cert.sh && ./add-osx-cert.sh
+
+      - name: Build the app for arm64
+        run: "yarn electron-forge make"
+
+      - name: Build the app for x64
+        run: "yarn electron-forge make --arch x64"
+
+      - name: List artifacts
+        run: "ls -R out/make"
+
+      # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: "out/make/*/*/*/*"
+
+
+  build-test-app-windows:
+    needs: [prepare-json-files]
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v3
+
+      - name: Copy updated .json files
+        if: github.event_name == 'schedule'
+        run: |
+          ls -l artifact
+          cp artifact/package.json package.json
+
+      - name: Sync node version and setup cache
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn' # Set this to npm, yarn or pnpm.
+
+      - run: yarn install
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: './src/wasm-lib'
+
+      - name: Run build:wasm manually
+        shell: bash
+        env:
+          MODE: ${{ env.BUILD_RELEASE == 'true' && '--release' || '--debug' }}
+        run: |
+          mkdir src/wasm-lib/pkg; cd src/wasm-lib
+          echo "building with ${{ env.MODE }}"
+          npx wasm-pack build --target web --out-dir pkg ${{ env.MODE }}
+          cd ../../
+          cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
 
       - name: Prepare certificate and variables (Windows only)
-        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }}
+        if: ${{ env.BUILD_RELEASE == 'true' }}
         run: |
           echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
           cat /d/Certificate_pkcs12.p12
@@ -126,7 +168,7 @@ jobs:
         shell: bash
 
       - name: Setup certicate with SSM KSP (Windows only)
-        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }}
+        if: ${{ env.BUILD_RELEASE == 'true' }}
         run: |
           curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
           msiexec /i smtools-windows-x64.msi /quiet /qn
@@ -136,47 +178,83 @@ jobs:
           smksp_cert_sync.exe
         shell: cmd
 
-      - name: Build the app
-        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
+      - name: Build the app for x64
+        run: "yarn electron-forge make --arch x64"
 
-      - name: List artifacts in out/
-        run: ls -R out
+      - name: Build the app for arm64
+        run: "yarn electron-forge make --arch arm64"
 
-      - name: Prepare the tauri update bundles (macOS)
-        if: ${{ env.BUILD_RELEASE && matrix.os == 'macos-14' }}
+      - name: List artifacts
+        run: "ls -R out/make"
+
+      - name: Sign using Signtool
+        if: ${{ env.BUILD_RELEASE == 'true' }}
+        env:
+          THUMBPRINT: "F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D"
+          X64_FILE: "D:\\a\\modeling-app\\modeling-app\\out\\make\\squirrel.windows\\x64\\Zoo Modeling App-*Setup.exe"
+          ARM64_FILE: "D:\\a\\modeling-app\\modeling-app\\out\\make\\squirrel.windows\\arm64\\Zoo Modeling App-*Setup.exe"
         run: |
-          for ARCH in arm64 x64; do
-            TAURI_DIR=out/tauri/$VERSION/macos
-            TEMP_DIR=temp/$ARCH
-            mkdir -p $TAURI_DIR
-            mkdir -p $TEMP_DIR
-            unzip out/*-$ARCH-mac.zip -d $TEMP_DIR
-            tar -czvf "$TAURI_DIR/Zoo Modeling App-$ARCH.app.tar.gz" -C $TEMP_DIR "Zoo Modeling App.app" 
-            yarn tauri signer sign "$TAURI_DIR/Zoo Modeling App-$ARCH.app.tar.gz"
-          done
-          ls -R out
-
-      - name: Prepare the tauri update bundles (Windows)
-        if: ${{ env.BUILD_RELEASE && matrix.os == 'windows-2022' }}
-        run: |
-          $env:TAURI_DIR="out/tauri/${env:VERSION}/nsis"
-          mkdir -p ${env:TAURI_DIR}
-          $env:OUT_FILE="${env:TAURI_DIR}/Zoo Modeling App_${env:VERSION_NO_V}_x64-setup.nsis.zip"
-          7z a -mm=Copy "${env:OUT_FILE}" ./out/*-x64-win.exe
-          yarn tauri signer sign "${env:OUT_FILE}"
-          ls -R out
+          signtool.exe sign /sha1 ${{ env.THUMBPRINT }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "${{ env.X64_FILE }}"
+          signtool.exe verify /v /pa "${{ env.X64_FILE }}"
+          signtool.exe sign /sha1 ${{ env.THUMBPRINT }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "${{ env.ARM64_FILE }}"
+          signtool.exe verify /v /pa "${{ env.ARM64_FILE }}"
 
       - uses: actions/upload-artifact@v3
         with:
-          name: out-${{ matrix.os }}
-          path: |
-            out/Zoo*.*
-            out/latest*.yml
-            out/tauri
+          path: "out/make/*/*/*"
+
+      # TODO: Run e2e tests
+
+
+  build-test-app-ubuntu:
+    needs: [prepare-json-files]
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v3
+        if: github.event_name == 'schedule'
+
+      - name: Copy updated .json files
+        if: github.event_name == 'schedule'
+        run: |
+          ls -l artifact
+          cp artifact/package.json package.json
+
+      - name: Sync node version and setup cache
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn' # Set this to npm, yarn or pnpm.
+
+      - run: yarn install
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: './src/wasm-lib'
+
+      - name: Run build:wasm
+        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
+
+      - name: Build the app for arm64
+        run: "yarn electron-forge make --arch arm64"
+
+      - name: Build the app for x64
+        run: "yarn electron-forge make --arch x64"
+
+      - name: List artifacts
+        run: "ls -R out/make"
 
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
-      # TODO: add the updater tests back
+      # TODO: sign the app (and updater bundle potentially)
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: "out/make/*/*/*"
 
 
   publish-apps-release:
@@ -184,161 +262,123 @@ jobs:
     permissions:
       contents: write
     if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
-    needs: [prepare-files, build-apps]
+    needs: [prepare-json-files, build-test-app-macos, build-test-app-windows, build-test-app-ubuntu]
     env:
-      VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
-      VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
+      VERSION_NO_V: ${{ needs.prepare-json-files.outputs.version }}
+      VERSION: ${{ github.event_name == 'release' && format('v{0}', needs.prepare-json-files.outputs.version) || needs.prepare-json-files.outputs.version }}
       PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }}
-      NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
-      BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }}
-      WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
-      BUCKET_DIR_TAURI: 'dl.kittycad.io/releases/modeling-app/tauri-compat'
-      WEBSITE_DIR_TAURI: 'dl.zoo.dev/releases/modeling-app/tauri-compat'
+      NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Nightly build, commit {0}', github.sha) }}
+      BUCKET_DIR: ${{ github.event_name == 'release' && 'dl.kittycad.io/releases/modeling-app' || 'dl.kittycad.io/releases/modeling-app/nightly' }}
+      WEBSITE_DIR: ${{ github.event_name == 'release' && 'dl.zoo.dev/releases/modeling-app' || 'dl.zoo.dev/releases/modeling-app/nightly' }}
       URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
     steps:
-      - uses: actions/checkout@v4
-
       - uses: actions/download-artifact@v3
-        with:
-          name: out-windows-2022
-          path: out
 
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-macos-14
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-ubuntu-22.04
-          path: out
-      
-      - name: Generate the download static endpoint
+      - name: Generate the update static endpoint
         run: |
-          RELEASE_DIR=https://${WEBSITE_DIR}
+          ls -l artifact/*/*oo*
+          DARWIN_SIG=`cat artifact/macos/*.app.tar.gz.sig`
+          WINDOWS_X86_64_SIG=`cat artifact/msi/*x64*.msi.zip.sig`
+          WINDOWS_AARCH64_SIG=`cat artifact/msi/*arm64*.msi.zip.sig`
+          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
           jq --null-input \
             --arg version "${VERSION}" \
             --arg pub_date "${PUB_DATE}" \
             --arg notes "${NOTES}" \
-            --arg mac_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-mac.dmg" \
-            --arg mac_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-mac.dmg" \
-            --arg windows_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-win.msi" \
-            --arg windows_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-win.msi" \
-            '{
-              "version": $version,
-              "pub_date": $pub_date,
-              "notes": $notes,
-              "platforms": {
-                "dmg-arm64": {
-                  "url": $mac_arm64_url
-                },
-                "dmg-x64": {
-                  "url": $mac_x64_url
-                },
-                "msi-arm64": {
-                  "url": $windows_arm64_url
-                },
-                "msi-x64": {
-                  "url": $windows_x64_url
-                }
-              }
-            }' > last_download.json
-            cat last_download.json
-
-      - name: Generate the update static endpoint for tauri
-        run: |
-          TAURI_DIR=out/tauri/$VERSION
-          MAC_ARM64_SIG=`cat $TAURI_DIR/macos/*-arm64.app.tar.gz.sig`
-          MAC_X64_SIG=`cat $TAURI_DIR/macos/*-x64.app.tar.gz.sig`
-          WINDOWS_SIG=`cat $TAURI_DIR/nsis/*.nsis.zip.sig`
-          RELEASE_DIR=https://${WEBSITE_DIR_TAURI}/${VERSION}
-          jq --null-input \
-            --arg version "${VERSION}" \
-            --arg pub_date "${PUB_DATE}" \
-            --arg notes "${NOTES}" \
-            --arg mac_arm64_sig "$MAC_ARM64_SIG" \
-            --arg mac_arm64_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}-arm64.app.tar.gz" \
-            --arg mac_x64_sig "$MAC_X64_SIG" \
-            --arg mac_x64_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}-x64.app.tar.gz" \
-            --arg windows_sig "$WINDOWS_SIG" \
-            --arg windows_url "$RELEASE_DIR/nsis/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64-setup.nsis.zip" \
+            --arg darwin_sig "$DARWIN_SIG" \
+            --arg darwin_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}.app.tar.gz" \
+            --arg windows_x86_64_sig "$WINDOWS_X86_64_SIG" \
+            --arg windows_x86_64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64_en-US.msi.zip" \
+            --arg windows_aarch64_sig "$WINDOWS_AARCH64_SIG" \
+            --arg windows_aarch64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_arm64_en-US.msi.zip" \
             '{
               "version": $version,
               "pub_date": $pub_date,
               "notes": $notes,
               "platforms": {
                 "darwin-x86_64": {
-                  "signature": $mac_x64_sig,
-                  "url": $mac_x64_url
+                  "signature": $darwin_sig,
+                  "url": $darwin_url
                 },
                 "darwin-aarch64": {
-                  "signature": $mac_arm64_sig,
-                  "url": $mac_arm64_url
+                  "signature": $darwin_sig,
+                  "url": $darwin_url
                 },
                 "windows-x86_64": {
-                  "signature": $windows_sig,
-                  "url": $windows_url
+                  "signature": $windows_x86_64_sig,
+                  "url": $windows_x86_64_url
+                },
+                "windows-aarch64": {
+                  "signature": $windows_aarch64_sig,
+                  "url": $windows_aarch64_url
                 }
               }
             }' > last_update.json
             cat last_update.json
 
-      - name: List artifacts
-        run: "ls -R out"
+      - name: Generate the download static endpoint
+        run: |
+          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
+          jq --null-input \
+            --arg version "${VERSION}" \
+            --arg pub_date "${PUB_DATE}" \
+            --arg notes "${NOTES}" \
+            --arg darwin_url "$RELEASE_DIR/dmg/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_universal.dmg" \
+            --arg windows_x86_64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64_en-US.msi" \
+            --arg windows_aarch64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_arm64_en-US.msi" \
+            '{
+              "version": $version,
+              "pub_date": $pub_date,
+              "notes": $notes,
+              "platforms": {
+                "dmg-universal": {
+                  "url": $darwin_url
+                },
+                "msi-x86_64": {
+                  "url": $windows_x86_64_url
+                },
+                "msi-aarch64": {
+                  "url": $windows_aarch64_url
+                }
+              }
+            }' > last_download.json
+            cat last_download.json
 
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.1.5'
+        uses: 'google-github-actions/auth@v2.1.3'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
         uses: google-github-actions/setup-gcloud@v2.1.0
         with:
-          project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
+          project_id: kittycadapi
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.3
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
-          path: out
-          glob: 'Zoo*'
-          parent: false
-          destination: ${{ env.BUCKET_DIR }}
-
-      - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.3
-        with:
-          path: out
-          glob: 'latest*'
-          parent: false
-          destination: ${{ env.BUCKET_DIR }} 
-
-      - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.3
-        with:
-          path: last_download.json
-          destination: ${{ env.BUCKET_DIR }}
-
-      - name: Upload release files to public bucket for tauri
-        uses: google-github-actions/upload-cloud-storage@v2.1.1
-        with:
-          path: "out/tauri/${{ env.VERSION }}" 
+          path: artifact
           glob: '*/Zoo*'
           parent: false
-          destination: ${{ env.BUCKET_DIR_TAURI }}/${{ env.VERSION }}
+          destination: ${{ env.BUCKET_DIR }}/${{ env.VERSION }}
 
-      - name: Upload update endpoint to public bucket for tauri
-        uses: google-github-actions/upload-cloud-storage@v2.1.1
+      - name: Upload update endpoint to public bucket
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
           path: last_update.json
           destination: ${{ env.BUCKET_DIR }}
 
+      - name: Upload download endpoint to public bucket
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
+        with:
+          path: last_download.json
+          destination: ${{ env.BUCKET_DIR }}
+
       - name: Upload release files to Github
         if: ${{ github.event_name == 'release' }}
         uses: softprops/action-gh-release@v2
         with:
-          files: 'out/Zoo*'
-
-      # TODO: Add GitHub publisher
+          files: 'artifact/*/Zoo*'
 
   announce_release:
     needs: [publish-apps-release]

.github/workflows/cargo-check.yml

@@ -37,4 +37,4 @@ jobs:
           # We specifically want to test the disable-println feature
           # Since it is not enabled by default, we need to specify it
           # This is used in kcl-lsp
-          cargo check --all --features disable-println --features pyo3 --features cli
+          cargo check --all --features disable-println --features pyo3

.github/workflows/cargo-test.yml

@@ -7,7 +7,6 @@ on:
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'
-      - 'src/wasm-lib/**.kcl'
       - .github/workflows/cargo-test.yml
 
   pull_request:
@@ -16,7 +15,6 @@ on:
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'
-      - 'src/wasm-lib/**.kcl'
       - .github/workflows/cargo-test.yml
   workflow_dispatch:
 permissions: read-all
@@ -38,6 +36,11 @@ jobs:
         with:
           toolchain: stable
           override: true
+      - name: install dependencies
+        if: matrix.dir ==  'src-tauri'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
       - name: Install vector
         run: |
           curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh

.github/workflows/label-issues.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Check if issue opener is ZooSpiritWolf
         id: check_opener
-        uses: actions/github-script@v7
+        uses: actions/github-script@v4
         with:
           script: |
             const issueOpener = context.payload.issue.user.login;
@@ -20,7 +20,7 @@ jobs:
 
       - name: Add labels
         if: steps.check_opener.outputs.result == 'true'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v4
         with:
           script: |
             github.issues.addLabels({

.github/workflows/playwright.yml

@@ -139,7 +139,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       with:
-        name: playwright-report-${{ matrix.os }}-snapshot-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-ubuntu-snapshot-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
         overwrite: true
@@ -174,14 +174,14 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: steps.git-check.outputs.modified == 'true'
       with:
-        name: playwright-report-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
     - uses: actions/download-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true
       with:
-        name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
     - name: Run playwright/chrome flow (with retries)
       id: retry
@@ -244,14 +244,14 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
         retention-days: 30
         overwrite: true
     - uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: playwright-report-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
         overwrite: true
@@ -351,7 +351,7 @@ jobs:
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true
       with:
-        name: test-results-${{ matrix.os }}-${{ github.sha }}
+        name: test-results-ubuntu-${{ github.sha }}
         path: test-results/
     - name: Run electron tests (with retries)
       id: retry
@@ -423,14 +423,14 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       with:
-        name: test-results-electron-${{ matrix.os }}-${{ github.sha }}
+        name: test-results-electron-${{ github.sha }}
         path: test-results/
         retention-days: 30
         overwrite: true
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       with:
-        name: playwright-report-electron-${{ matrix.os }}-${{ github.sha }}
+        name: playwright-report-electron-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
         overwrite: true

.gitignore

@@ -54,15 +54,19 @@ e2e/playwright/export-snapshots/*
 
 ## generated files
 src/**/*.typegen.ts
+src-tauri/gen
 
 src/wasm-lib/grackle/stdlib_cube_partial.json
 Mac_App_Distribution.provisionprofile
 
 *.tsbuildinfo
-src/wasm-lib/pkg
 
 venv
 .vite/
 
 # electron
 out/
+
+src-tauri/target
+electron-test-projects-dir
+electron-test-projects-dir-2

Info.plist

@@ -1,344 +0,0 @@
-<?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>CFBundleDocumentTypes</key>
-        <array>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.kcl</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>KCL</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Owner</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.toml</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>TOML</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.gltf</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>glTF</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.glb</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>glb</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.step</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>STEP</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.fbx</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>FBX</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.sldprt</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>Solidworks Part</string>
-                <key>CFBundleTypeRole</key>
-                <string>Viewer</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.geometry-definition-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>OBJ</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.polygon-file-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>PLY</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.standard-tesselated-geometry-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>STL</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.folder</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>Folders</string>
-                <key>CFBundleTypeRole</key>
-                <string>Viewer</string>
-                <key>LSHandlerRank</key>
-                <string>Alternate</string>
-            </dict>
-        </array>
-        <key>UTExportedTypeDeclarations</key>
-        <array>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.kcl</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://zoo.dev/docs/kcl</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.source-code</string>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                    <string>public.3d-content</string>
-                    <string>public.script</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>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.gltf</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                    <string>public.3d-content</string>
-                    <string>public.json</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Graphics Library Transmission Format (glTF)</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>gltf</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/gltf+json</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.glb</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Graphics Library Transmission Format (glTF) binary</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>glb</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/gltf-binary</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.step</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://www.loc.gov/preservation/digital/formats/fdd/fdd000448.shtml</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>STEP-file, ISO 10303-21</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>step</string>
-                        <string>stp</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/step</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.sldprt</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://docs.fileformat.com/cad/sldprt/</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Solidworks Part</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>sldprt</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/vnd.solidworks.sldprt</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.fbx</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://en.wikipedia.org/wiki/FBX</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Autodesk Filmbox (FBX) format</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>fbx</string>
-                        <string>fbxb</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/vnd.autodesk.fbx</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.toml</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://toml.io/en/</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Tom's Obvious Minimal Language</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>kcl</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>text/toml</string>
-                    </array>
-                </dict>
-            </dict>
-        </array>
-    </dict>
-</plist>

README.md

@@ -110,6 +110,7 @@ Which commands from setup are one off vs need to be run every time?
 The following will need to be run when checking out a new commit and guarantees the build is not stale:
 ```bash
 yarn install
+yarn wasm-prep
 yarn build:wasm-dev # or yarn build:wasm for slower but more production-like build
 yarn start # or yarn build:local && yarn serve for slower but more production-like build
 ```
@@ -188,22 +189,12 @@ For more information on fuzzing you can check out
 
 ### Playwright tests
 
-You will need a `./e2e/playwright/playwright-secrets.env` file:
-
-```bash
-$ touch ./e2e/playwright/playwright-secrets.env
-$ cat ./e2e/playwright/playwright-secrets.env
-token=<dev.zoo.dev/account/api-tokens>
-snapshottoken=<your-snapshot-token>
-```
-
 For a portable way to run Playwright you'll need Docker.
 
-#### Generic example
 After that, open a terminal and run:
 
 ```bash
-docker run --network host  --rm --init -it playwright/chrome:playwright-x.xx.x
+docker run --network host  --rm --init -it playwright/chrome:playwright-1.43.1
 ```
 
 and in another terminal, run:
@@ -212,27 +203,21 @@ and in another terminal, run:
 PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
 ```
 
+An example of a `<test suite>` is: `e2e/playwright/flow-tests.spec.ts`
 
-#### Specific example
+YOU WILL NEED A PLAYWRIGHT-SECRETS.ENV FILE:
 
-open a terminal and run:
 
 ```bash
-docker run --network host  --rm --init -it playwright/chrome:playwright-1.46.0
-```
-
-and in another terminal, run:
-
-```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
+# ./e2e/playwright/playwright-secrets.env
+token=<your-token>
+snapshottoken=<your-snapshot-token>
 ```
+then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
 
 run a specific test change the test from `test('...` to `test.only('...`
 (note if you commit this, the tests will instantly fail without running any of the tests)
 
-
-**Gotcha**: running the docker container with a mismatched image against your `./node_modules/playwright` will cause a failure. Make sure the versions are matched and up to date.
-
 run headed
 
 ```

add-osx-cert.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+# From https://dev.to/rwwagner90/signing-electron-apps-with-github-actions-4cof
+
+KEY_CHAIN=build.keychain
+CERTIFICATE_P12=certificate.p12
+
+# Recreate the certificate from the secure environment variable
+echo $APPLE_CERTIFICATE | base64 --decode > $CERTIFICATE_P12
+
+#create a keychain
+security create-keychain -p actions $KEY_CHAIN
+
+# Make the keychain the default so identities are found
+security default-keychain -s $KEY_CHAIN
+
+# Unlock the keychain
+security unlock-keychain -p actions $KEY_CHAIN
+
+security import $CERTIFICATE_P12 -k $KEY_CHAIN -P $APPLE_CERTIFICATE_PASSWORD -T /usr/bin/codesign;
+
+security set-key-partition-list -S apple-tool:,apple: -s -k actions $KEY_CHAIN
+
+# remove certs
+rm -fr *.p12

docs/kcl/index.md

@@ -32,21 +32,17 @@ layout: manual
 * [`chamfer`](kcl/chamfer)
 * [`circle`](kcl/circle)
 * [`close`](kcl/close)
-* [`cm`](kcl/cm)
 * [`cos`](kcl/cos)
 * [`e`](kcl/e)
 * [`extrude`](kcl/extrude)
 * [`fillet`](kcl/fillet)
 * [`floor`](kcl/floor)
-* [`ft`](kcl/ft)
 * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
 * [`getOppositeEdge`](kcl/getOppositeEdge)
 * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
 * [`helix`](kcl/helix)
 * [`hole`](kcl/hole)
-* [`hollow`](kcl/hollow)
 * [`import`](kcl/import)
-* [`inch`](kcl/inch)
 * [`int`](kcl/int)
 * [`lastSegX`](kcl/lastSegX)
 * [`lastSegY`](kcl/lastSegY)
@@ -59,10 +55,8 @@ layout: manual
 * [`log`](kcl/log)
 * [`log10`](kcl/log10)
 * [`log2`](kcl/log2)
-* [`m`](kcl/m)
 * [`max`](kcl/max)
 * [`min`](kcl/min)
-* [`mm`](kcl/mm)
 * [`patternCircular2d`](kcl/patternCircular2d)
 * [`patternCircular3d`](kcl/patternCircular3d)
 * [`patternLinear2d`](kcl/patternLinear2d)
@@ -88,7 +82,6 @@ layout: manual
 * [`tan`](kcl/tan)
 * [`tangentialArc`](kcl/tangentialArc)
 * [`tangentialArcTo`](kcl/tangentialArcTo)
-* [`tangentialArcToRelative`](kcl/tangentialArcToRelative)
 * [`tau`](kcl/tau)
 * [`toDegrees`](kcl/toDegrees)
 * [`toRadians`](kcl/toRadians)
@@ -96,4 +89,3 @@ layout: manual
 * [`xLineTo`](kcl/xLineTo)
 * [`yLine`](kcl/yLine)
 * [`yLineTo`](kcl/yLineTo)
-* [`yd`](kcl/yd)

e2e/playwright/app-header-tests.spec.ts

@@ -1,66 +0,0 @@
-import { test, expect } from '@playwright/test'
-
-import { setupElectron, tearDown } from './test-utils'
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
-test.describe('Electron app header tests', () => {
-  test(
-    'Open Command Palette button has correct shortcut',
-    { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-
-      // No space before the shortcut since it checks textContent.
-      let text
-      switch (process.platform) {
-        case 'darwin':
-          text = 'Commands⌘K'
-          break
-        case 'win32':
-          text = 'CommandsCtrl+K'
-          break
-        default: // 'linux' etc.
-          text = 'CommandsCtrl+K'
-          break
-      }
-      const commandsButton = page.getByRole('button', { name: 'Commands' })
-      await expect(commandsButton).toBeVisible()
-      await expect(commandsButton).toHaveText(text)
-
-      await electronApp.close()
-    }
-  )
-
-  test(
-    'User settings has correct shortcut',
-    { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-
-      // Open the user sidebar menu.
-      await page.getByTestId('user-sidebar-toggle').click()
-
-      // No space after "User settings" since it's textContent.
-      const text =
-        process.platform === 'darwin' ? 'User settings⌘,' : 'User settingsCtrl,'
-      const userSettingsButton = page.getByTestId('user-settings')
-      await expect(userSettingsButton).toBeVisible()
-      await expect(userSettingsButton).toHaveText(text)
-
-      await electronApp.close()
-    }
-  )
-})

e2e/playwright/basic-sketch.spec.ts

@@ -96,49 +96,33 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   }
 
   // deselect line tool
-  const btnLine = page.getByTestId('line')
-  const btnLineAriaPressed = await btnLine.getAttribute('aria-pressed')
-  if (btnLineAriaPressed === 'true') {
-    await btnLine.click()
-  }
-
-  await page.waitForTimeout(100)
+  await page.getByTestId('line').click()
 
   const line1 = await u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`, 0)
   if (openPanes.includes('code')) {
     await expect
       .poll(async () => u.getGreatestPixDiff(line1, TEST_COLORS.WHITE))
       .toBeLessThan(3)
-    await page.waitForTimeout(100)
     await expect
-      .poll(async () => u.getGreatestPixDiff(line1, [249, 249, 249]))
+      .poll(() => u.getGreatestPixDiff(line1, [249, 249, 249]))
       .toBeLessThan(3)
-    await page.waitForTimeout(100)
   }
-
   // click between first two clicks to get center of the line
   await page.mouse.click(startXPx + PUR * 15, 500 - PUR * 10)
   await page.waitForTimeout(100)
-
   if (openPanes.includes('code')) {
-    await expect(
-      await u.getGreatestPixDiff(line1, TEST_COLORS.BLUE)
-    ).toBeLessThan(3)
+    expect(await u.getGreatestPixDiff(line1, TEST_COLORS.BLUE)).toBeLessThan(3)
     await expect(await u.getGreatestPixDiff(line1, [0, 0, 255])).toBeLessThan(3)
   }
 
   // hold down shift
   await page.keyboard.down('Shift')
-  await page.waitForTimeout(100)
-
   // click between the latest two clicks to get center of the line
   await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 20)
-  await page.waitForTimeout(100)
 
   // selected two lines therefore there should be two cursors
   if (openPanes.includes('code')) {
     await expect(page.locator('.cm-cursor')).toHaveCount(2)
-    await page.waitForTimeout(100)
   }
 
   await page.getByRole('button', { name: 'Length: open menu' }).click()

e2e/playwright/code-pane-and-errors.spec.ts

@@ -1,16 +1,8 @@
 import { test, expect } from '@playwright/test'
 
-import {
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-} from './test-utils'
-import { join } from 'path'
+import { getUtils, setup, tearDown } from './test-utils'
 import { bracket } from 'lib/exampleKcl'
 import { TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW } from './storageStates'
-import fsp from 'fs/promises'
 
 test.beforeEach(async ({ context, page }) => {
   await setup(context, page)
@@ -91,7 +83,7 @@ test.describe('Code pane and errors', () => {
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
-    await expect(page.getByText('Unexpected token: |').first()).toBeVisible()
+    await expect(page.getByText('Unexpected token').first()).toBeVisible()
 
     // Close the code pane
     await codePaneButton.click()
@@ -114,7 +106,7 @@ test.describe('Code pane and errors', () => {
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
-    await expect(page.getByText('Unexpected token: |').first()).toBeVisible()
+    await expect(page.getByText('Unexpected token').first()).toBeVisible()
   })
 
   test('When error is not in view you can click the badge to scroll to it', async ({
@@ -225,91 +217,3 @@ test.describe('Code pane and errors', () => {
     ).toBeVisible()
   })
 })
-
-test(
-  'Opening multiple panes persists when switching projects',
-  { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
-    // Setup multiple projects.
-    const { electronApp, page } = await setupElectron({
-      testInfo,
-      folderSetupFn: async (dir) => {
-        const routerTemplateDir = join(dir, 'router-template-slate')
-        const bracketDir = join(dir, 'bracket')
-        await Promise.all([
-          fsp.mkdir(routerTemplateDir, { recursive: true }),
-          fsp.mkdir(bracketDir, { recursive: true }),
-        ])
-        await Promise.all([
-          fsp.copyFile(
-            executorInputPath('router-template-slate.kcl'),
-            join(routerTemplateDir, 'main.kcl')
-          ),
-          fsp.copyFile(
-            executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-            join(bracketDir, 'main.kcl')
-          ),
-        ])
-      },
-    })
-
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await test.step('Opening the bracket project should load', async () => {
-      await expect(page.getByText('bracket')).toBeVisible()
-
-      await page.getByText('bracket').click()
-
-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-    })
-
-    // If they're open by default, we're not actually testing anything.
-    await test.step('Pre-condition: panes are not already visible', async () => {
-      await expect(page.locator('#variables-pane')).not.toBeVisible()
-      await expect(page.locator('#logs-pane')).not.toBeVisible()
-    })
-
-    await test.step('Open multiple panes', async () => {
-      await u.openKclCodePanel()
-      await u.openVariablesPane()
-      await u.openLogsPane()
-    })
-
-    await test.step('Clicking the logo takes us back to the projects page / home', async () => {
-      await page.getByTestId('app-logo').click()
-
-      await expect(page.getByRole('link', { name: 'bracket' })).toBeVisible()
-      await expect(page.getByText('router-template-slate')).toBeVisible()
-      await expect(page.getByText('New Project')).toBeVisible()
-    })
-
-    await test.step('Opening the router-template project should load', async () => {
-      await expect(page.getByText('router-template-slate')).toBeVisible()
-
-      await page.getByText('router-template-slate').click()
-
-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-
-      await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
-      ).toBeEnabled({
-        timeout: 20_000,
-      })
-    })
-
-    await test.step('All panes opened before should be visible', async () => {
-      await expect(page.locator('#code-pane')).toBeVisible()
-      await expect(page.locator('#variables-pane')).toBeVisible()
-      await expect(page.locator('#logs-pane')).toBeVisible()
-    })
-
-    await electronApp.close()
-  }
-)

e2e/playwright/command-bar-tests.spec.ts

@@ -12,47 +12,50 @@ test.afterEach(async ({ page }, testInfo) => {
 })
 
 test.describe('Command bar tests', () => {
-  test('Extrude from command bar selects extrude line after', async ({
-    page,
-  }) => {
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `const sketch001 = startSketchOn('XY')
+  // TODO fixme: enter is not working in the command bar
+  test.fixme(
+    'Extrude from command bar selects extrude line after',
+    async ({ page }) => {
+      await page.addInitScript(async () => {
+        localStorage.setItem(
+          'persistCode',
+          `const sketch001 = startSketchOn('XY')
     |> startProfileAt([-10, -10], %)
     |> line([20, 0], %)
     |> line([0, 20], %)
     |> xLine(-20, %)
     |> close(%)
       `
+        )
+      })
+
+      const u = await getUtils(page)
+      await page.setViewportSize({ width: 1200, height: 500 })
+
+      await u.waitForAuthSkipAppStart()
+
+      await u.openDebugPanel()
+      await u.expectCmdLog('[data-message-type="execution-done"]')
+      await u.closeDebugPanel()
+
+      // Click the line of code for xLine.
+      await page.getByText(`close(%)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
+      await page.waitForTimeout(100)
+
+      await page.getByRole('button', { name: 'Extrude' }).click()
+      await page.waitForTimeout(200)
+      await page.keyboard.press('Enter')
+      await page.waitForTimeout(200)
+      await page.keyboard.press('Enter')
+      await page.waitForTimeout(200)
+      await expect(page.locator('.cm-activeLine')).toHaveText(
+        `const extrude001 = extrude(${KCL_DEFAULT_LENGTH}, sketch001)`
       )
-    })
+    }
+  )
 
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    // Click the line of code for xLine.
-    await page.getByText(`close(%)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-    await page.waitForTimeout(100)
-
-    await page.getByRole('button', { name: 'Extrude' }).click()
-    await page.waitForTimeout(200)
-    await page.keyboard.press('Enter')
-    await page.waitForTimeout(200)
-    await page.keyboard.press('Enter')
-    await page.waitForTimeout(200)
-    await expect(page.locator('.cm-activeLine')).toHaveText(
-      `const extrude001 = extrude(${KCL_DEFAULT_LENGTH}, sketch001)`
-    )
-  })
-
-  test('Fillet from command bar', async ({ page }) => {
+  // TODO fixme: enter is not working in the command bar
+  test.fixme('Fillet from command bar', async ({ page }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -124,7 +127,7 @@ const extrude001 = extrude(-10, sketch001)`
     await expect(cmdSearchBar).not.toBeVisible()
 
     // Now try the same, but with the keyboard shortcut, check focus
-    await page.keyboard.press('ControlOrMeta+K')
+    await page.keyboard.press('Meta+K')
     await expect(cmdSearchBar).toBeVisible()
     await expect(cmdSearchBar).toBeFocused()
 
@@ -185,7 +188,7 @@ const extrude001 = extrude(-10, sketch001)`
     await page.locator('.cm-content').click()
 
     // Now try the same, but with the keyboard shortcut, check focus
-    await page.keyboard.press('ControlOrMeta+K')
+    await page.keyboard.press('Meta+K')
 
     let cmdSearchBar = page.getByPlaceholder('Search commands')
     await expect(cmdSearchBar).toBeVisible()
@@ -250,7 +253,7 @@ const extrude001 = extrude(-10, sketch001)`
     await page.getByRole('button', { name: 'Extrude' }).isEnabled()
 
     let cmdSearchBar = page.getByPlaceholder('Search commands')
-    await page.keyboard.press('ControlOrMeta+K')
+    await page.keyboard.press('Meta+K')
     await expect(cmdSearchBar).toBeVisible()
 
     // Search for extrude command and choose it

e2e/playwright/copilot-ghost-test.spec.ts

@@ -332,6 +332,7 @@ test.describe('Copilot ghost text', () => {
     await page.setViewportSize({ width: 1200, height: 500 })
 
     await u.waitForAuthSkipAppStart()
+    const CtrlKey = process.platform === 'darwin' ? 'Meta' : 'Control'
 
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -348,10 +349,10 @@ test.describe('Copilot ghost text', () => {
     )
 
     // Going elsewhere in the code should hide the ghost text.
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.down('Shift')
     await page.keyboard.press('KeyZ')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
     await page.keyboard.up('Shift')
     await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
 
@@ -367,6 +368,8 @@ test.describe('Copilot ghost text', () => {
 
     await u.waitForAuthSkipAppStart()
 
+    const CtrlKey = process.platform === 'darwin' ? 'Meta' : 'Control'
+
     await page.waitForTimeout(800)
     await u.codeLocator.click()
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -379,17 +382,17 @@ test.describe('Copilot ghost text', () => {
     await page.waitForTimeout(800)
 
     // Ctrl+z
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('KeyZ')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     await expect(page.locator('.cm-content')).toHaveText(``)
 
     // Ctrl+shift+z
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.down('Shift')
     await page.keyboard.press('KeyZ')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
     await page.keyboard.up('Shift')
 
     await expect(page.locator('.cm-content')).toHaveText(`{thing: "blah"}`)
@@ -408,14 +411,14 @@ test.describe('Copilot ghost text', () => {
     )
 
     // Once for the enter.
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('KeyZ')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     // Once for the text.
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('KeyZ')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
 

e2e/playwright/desktop-export.spec.ts

@@ -1,11 +1,5 @@
 import { test, expect } from '@playwright/test'
-import { join } from 'path'
-import {
-  getUtils,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-} from './test-utils'
+import { getUtils, setupElectron, tearDown } from './test-utils'
 import fsp from 'fs/promises'
 
 test.afterEach(async ({ page }, testInfo) => {
@@ -16,19 +10,22 @@ test(
   'export works on the first try',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
+    test.skip(
+      process.platform === 'win32',
+      'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
+    )
     const { electronApp, page } = await setupElectron({
       testInfo,
       folderSetupFn: async (dir) => {
-        const bracketDir = join(dir, 'bracket')
-        await Promise.all([fsp.mkdir(bracketDir, { recursive: true })])
+        await Promise.all([fsp.mkdir(`${dir}/bracket`, { recursive: true })])
         await Promise.all([
           fsp.copyFile(
-            executorInputPath('router-template-slate.kcl'),
-            join(bracketDir, 'other.kcl')
+            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+            `${dir}/bracket/other.kcl`
           ),
           fsp.copyFile(
-            executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-            join(bracketDir, 'main.kcl')
+            'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
+            `${dir}/bracket/main.kcl`
           ),
         ])
       },

e2e/playwright/editor-tests.spec.ts

@@ -16,6 +16,7 @@ test.describe('Editor tests', () => {
     await page.setViewportSize({ width: 1000, height: 500 })
 
     await u.waitForAuthSkipAppStart()
+    const CtrlKey = process.platform === 'darwin' ? 'Meta' : 'Control'
 
     // check no error to begin with
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -28,9 +29,9 @@ test.describe('Editor tests', () => {
   |> line([-20, 0], %)
   |> close(%)`)
 
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('/')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`const sketch001 = startSketchOn('XY')
@@ -41,9 +42,9 @@ test.describe('Editor tests', () => {
     // |> close(%)`)
 
     // uncomment the code
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('/')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`const sketch001 = startSketchOn('XY')
@@ -84,63 +85,6 @@ test.describe('Editor tests', () => {
     |> close(%)`)
   })
 
-  test('if you click the format button it formats your code and executes so lints are still there', async ({
-    page,
-  }) => {
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
-
-    // check no error to begin with
-    await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-    await u.codeLocator.click()
-    await page.keyboard.type(`const sketch_001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  |> close(%)`)
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    // error in guter
-    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
-
-    // error text on hover
-    await page.hover('.cm-lint-marker-info')
-    await expect(
-      page.getByText('Identifiers must be lowerCamelCase').first()
-    ).toBeVisible()
-
-    await page.locator('#code-pane button:first-child').click()
-    await page.locator('button:has-text("Format code")').click()
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    await expect(page.locator('.cm-content'))
-      .toHaveText(`const sketch_001 = startSketchOn('XY')
-    |> startProfileAt([-10, -10], %)
-    |> line([20, 0], %)
-    |> line([0, 20], %)
-    |> line([-20, 0], %)
-    |> close(%)`)
-
-    // error in guter
-    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
-
-    // error text on hover
-    await page.hover('.cm-lint-marker-info')
-    await expect(
-      page.getByText('Identifiers must be lowerCamelCase').first()
-    ).toBeVisible()
-  })
-
   test('fold gutters work', async ({ page }) => {
     const u = await getUtils(page)
 
@@ -204,7 +148,9 @@ test.describe('Editor tests', () => {
     // Delete all the code.
     await page.locator('.cm-content').click()
     // Select all
-    await page.keyboard.press('ControlOrMeta+A')
+    await page.keyboard.press('Control+A')
+    await page.keyboard.press('Backspace')
+    await page.keyboard.press('Meta+A')
     await page.keyboard.press('Backspace')
 
     await expect(page.locator('.cm-content')).toHaveText(``)
@@ -298,67 +244,6 @@ test.describe('Editor tests', () => {
     |> close(%)`)
   })
 
-  test('if you use the format keyboard binding it formats your code and executes so lints are shown', async ({
-    page,
-  }) => {
-    const u = await getUtils(page)
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `const sketch_001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  |> close(%)`
-      )
-      localStorage.setItem('disableAxis', 'true')
-    })
-    await page.setViewportSize({ width: 1000, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    // error in guter
-    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
-
-    // error text on hover
-    await page.hover('.cm-lint-marker-info')
-    await expect(
-      page.getByText('Identifiers must be lowerCamelCase').first()
-    ).toBeVisible()
-
-    // focus the editor
-    await u.codeLocator.click()
-
-    // Hit alt+shift+f to format the code
-    await page.keyboard.press('Alt+Shift+KeyF')
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    await expect(page.locator('.cm-content'))
-      .toHaveText(`const sketch_001 = startSketchOn('XY')
-    |> startProfileAt([-10, -10], %)
-    |> line([20, 0], %)
-    |> line([0, 20], %)
-    |> line([-20, 0], %)
-    |> close(%)`)
-
-    // error in guter
-    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
-
-    // error text on hover
-    await page.hover('.cm-lint-marker-info')
-    await expect(
-      page.getByText('Identifiers must be lowerCamelCase').first()
-    ).toBeVisible()
-  })
-
   test('if you write kcl with lint errors you get lints', async ({ page }) => {
     const u = await getUtils(page)
     await page.setViewportSize({ width: 1000, height: 500 })
@@ -469,7 +354,7 @@ test.describe('Editor tests', () => {
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
-    await expect(page.getByText('Unexpected token: $').first()).toBeVisible()
+    await expect(page.getByText('Unexpected token').first()).toBeVisible()
 
     // select the line that's causing the error and delete it
     await page.getByText('$ error').click()
@@ -517,7 +402,7 @@ test.describe('Editor tests', () => {
   const width = 0.500
   const height = 0.500
   const dia = 4
-
+  
   fn squareHole = (l, w) => {
     const squareHoleSketch = startSketchOn('XY')
     |> startProfileAt([-width / 2, -length / 2], %)

e2e/playwright/file-tree.spec.ts

@@ -1,204 +0,0 @@
-import { test, expect } from '@playwright/test'
-import * as fsp from 'fs/promises'
-import { getUtils, setup, setupElectron, tearDown } from './test-utils'
-
-test.beforeEach(async ({ context, page }) => {
-  await setup(context, page)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
-test.describe('when using the file tree to', () => {
-  const fromFile = 'main.kcl'
-  const toFile = 'hello.kcl'
-
-  test(
-    `rename ${fromFile} to ${toFile}, and doesn't crash on reload and settings load`,
-    { tag: '@electron' },
-    async ({ browser: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      const {
-        panesOpen,
-        createAndSelectProject,
-        pasteCodeInEditor,
-        renameFile,
-        editorTextMatches,
-      } = await getUtils(page, test)
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-      page.on('console', console.log)
-
-      await panesOpen(['files', 'code'])
-
-      await createAndSelectProject('project-000')
-
-      // File the main.kcl with contents
-      const kclCube = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cube.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclCube)
-
-      await renameFile(fromFile, toFile)
-      await page.reload()
-
-      await test.step('Postcondition: editor has same content as before the rename', async () => {
-        await editorTextMatches(kclCube)
-      })
-
-      await test.step('Postcondition: opening and closing settings works', async () => {
-        const settingsOpenButton = page.getByRole('link', {
-          name: 'settings Settings',
-        })
-        const settingsCloseButton = page.getByTestId('settings-close-button')
-        await settingsOpenButton.click()
-        await settingsCloseButton.click()
-      })
-
-      await electronApp.close()
-    }
-  )
-
-  test(
-    `create many new untitled files they increment their names`,
-    { tag: '@electron' },
-    async ({ browser: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      const { panesOpen, createAndSelectProject, createNewFile } =
-        await getUtils(page, test)
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-      page.on('console', console.log)
-
-      await panesOpen(['files'])
-
-      await createAndSelectProject('project-000')
-
-      await createNewFile('')
-      await createNewFile('')
-      await createNewFile('')
-      await createNewFile('')
-      await createNewFile('')
-
-      await test.step('Postcondition: there are 5 new Untitled-*.kcl files', async () => {
-        await expect(
-          page
-            .locator('[data-testid="file-pane-scroll-container"] button')
-            .filter({ hasText: /Untitled[-]?[0-5]?/ })
-        ).toHaveCount(5)
-      })
-
-      await electronApp.close()
-    }
-  )
-
-  test(
-    'create a new file with the same name as an existing file cancels the operation',
-    { tag: '@electron' },
-    async ({ browser: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      const {
-        panesOpen,
-        createAndSelectProject,
-        pasteCodeInEditor,
-        createNewFileAndSelect,
-        renameFile,
-        selectFile,
-        editorTextMatches,
-      } = await getUtils(page, test)
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-      page.on('console', console.log)
-
-      await panesOpen(['files', 'code'])
-
-      await createAndSelectProject('project-000')
-      // File the main.kcl with contents
-      const kclCube = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cube.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclCube)
-
-      const kcl1 = 'main.kcl'
-      const kcl2 = '2.kcl'
-
-      await createNewFileAndSelect(kcl2)
-      const kclCylinder = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cylinder.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclCylinder)
-
-      await renameFile(kcl2, kcl1)
-
-      await test.step(`Postcondition: ${kcl1} still has the original content`, async () => {
-        await selectFile(kcl1)
-        await editorTextMatches(kclCube)
-      })
-
-      await test.step(`Postcondition: ${kcl2} still exists with the original content`, async () => {
-        await selectFile(kcl2)
-        await editorTextMatches(kclCylinder)
-      })
-
-      await electronApp.close()
-    }
-  )
-
-  test(
-    'deleting all files recreates a default main.kcl with no code',
-    { tag: '@electron' },
-    async ({ browser: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      const {
-        panesOpen,
-        createAndSelectProject,
-        pasteCodeInEditor,
-        deleteFile,
-        editorTextMatches,
-      } = await getUtils(page, test)
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-      page.on('console', console.log)
-
-      await panesOpen(['files', 'code'])
-
-      await createAndSelectProject('project-000')
-      // File the main.kcl with contents
-      const kclCube = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cube.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclCube)
-
-      const kcl1 = 'main.kcl'
-
-      await deleteFile(kcl1)
-
-      await test.step(`Postcondition: ${kcl1} is recreated but has no content`, async () => {
-        await editorTextMatches('')
-      })
-
-      await electronApp.close()
-    }
-  )
-})

e2e/playwright/machines.spec.ts

@@ -1,6 +1,5 @@
 import { test, expect } from '@playwright/test'
-import { setupElectron, tearDown, executorInputPath } from './test-utils'
-import { join } from 'path'
+import { setupElectron, tearDown } from './test-utils'
 import fsp from 'fs/promises'
 
 test.afterEach(async ({ page }, testInfo) => {
@@ -11,14 +10,17 @@ test(
   'When machine-api server not found butt is disabled and shows the reason',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
+    test.skip(
+      process.platform === 'win32',
+      'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
+    )
     const { electronApp, page } = await setupElectron({
       testInfo,
       folderSetupFn: async (dir) => {
-        const bracketDir = join(dir, 'bracket')
-        await fsp.mkdir(bracketDir, { recursive: true })
+        await fsp.mkdir(`${dir}/bracket`, { recursive: true })
         await fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          join(bracketDir, 'main.kcl')
+          'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
+          `${dir}/bracket/main.kcl`
         )
       },
     })
@@ -56,14 +58,17 @@ test(
   'When machine-api server not found home screen & project status shows the reason',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
+    test.skip(
+      process.platform === 'win32',
+      'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
+    )
     const { electronApp, page } = await setupElectron({
       testInfo,
       folderSetupFn: async (dir) => {
-        const bracketDir = join(dir, 'bracket')
-        await fsp.mkdir(bracketDir, { recursive: true })
+        await fsp.mkdir(`${dir}/bracket`, { recursive: true })
         await fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          join(bracketDir, 'main.kcl')
+          'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
+          `${dir}/bracket/main.kcl`
         )
       },
     })

e2e/playwright/onboarding-tests.spec.ts

@@ -1,13 +1,6 @@
 import { test, expect } from '@playwright/test'
-import { join } from 'path'
 import fsp from 'fs/promises'
-import {
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-} from './test-utils'
+import { getUtils, setup, setupElectron, tearDown } from './test-utils'
 import { bracket } from 'lib/exampleKcl'
 import { onboardingPaths } from 'routes/Onboarding/paths'
 import {
@@ -354,14 +347,17 @@ test(
   'Restarting onboarding on desktop takes one attempt',
   { tag: '@electron' },
   async ({ browser: _ }, testInfo) => {
+    test.skip(
+      process.platform === 'win32',
+      'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
+    )
     const { electronApp, page } = await setupElectron({
       testInfo,
       folderSetupFn: async (dir) => {
-        const routerTemplateDir = join(dir, 'router-template-slate')
-        await fsp.mkdir(routerTemplateDir, { recursive: true })
+        await fsp.mkdir(`${dir}/router-template-slate`, { recursive: true })
         await fsp.copyFile(
-          executorInputPath('router-template-slate.kcl'),
-          join(routerTemplateDir, 'main.kcl')
+          'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+          `${dir}/router-template-slate/main.kcl`
         )
       },
     })

e2e/playwright/regression-tests.spec.ts

@@ -1,13 +1,6 @@
 import { test, expect, Page } from '@playwright/test'
-import { join } from 'path'
 import * as fsp from 'fs/promises'
-import {
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-} from './test-utils'
+import { getUtils, setup, setupElectron, tearDown } from './test-utils'
 import { TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR } from './storageStates'
 import { bracket } from 'lib/exampleKcl'
 
@@ -201,7 +194,7 @@ const sketch001 = startSketchAt([-0, -0])
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
-    await expect(page.getByText('Unexpected token: |').first()).toBeVisible()
+    await expect(page.getByText('Unexpected token').first()).toBeVisible()
 
     // Okay execution finished, let's start editing text below the error.
     await u.codeLocator.click()
@@ -432,14 +425,17 @@ const sketch001 = startSketchAt([-0, -0])
     `Network health indicator only appears in modeling view`,
     { tag: '@electron' },
     async ({ browserName: _ }, testInfo) => {
+      test.skip(
+        process.platform === 'win32',
+        'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
+      )
       const { electronApp, page } = await setupElectron({
         testInfo,
         folderSetupFn: async (dir) => {
-          const bracketDir = join(dir, 'bracket')
-          await fsp.mkdir(bracketDir, { recursive: true })
+          await fsp.mkdir(`${dir}/bracket`, { recursive: true })
           await fsp.copyFile(
-            executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-            join(bracketDir, 'main.kcl')
+            'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
+            `${dir}/bracket/main.kcl`
           )
         },
       })

e2e/playwright/snapshot-tests.spec.ts

@@ -964,69 +964,3 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
     })
   })
 })
-
-test('theme persists', async ({ page, context }) => {
-  const u = await getUtils(page)
-  await context.addInitScript(async () => {
-    localStorage.setItem(
-      'persistCode',
-      `const part001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> line([-20, 0], %)
-  |> close(%)
-  |> extrude(10, %)
-`
-    )
-  }, KCL_DEFAULT_LENGTH)
-
-  await page.setViewportSize({ width: 1200, height: 500 })
-
-  await u.waitForAuthSkipAppStart()
-  await page.waitForTimeout(500)
-
-  // await page.getByRole('link', { name: 'Settings Settings (tooltip)' }).click()
-  await expect(page.getByTestId('settings-link')).toBeVisible()
-  await page.getByTestId('settings-link').click()
-
-  // open user settingns
-  await page.getByRole('radio', { name: 'person User' }).click()
-
-  await page.getByTestId('app-theme').selectOption('light')
-
-  await page.getByTestId('settings-close-button').click()
-
-  const networkToggle = page.getByTestId('network-toggle')
-
-  // simulate network down
-  await u.emulateNetworkConditions({
-    offline: true,
-    // values of 0 remove any active throttling. crbug.com/456324#c9
-    latency: 0,
-    downloadThroughput: -1,
-    uploadThroughput: -1,
-  })
-
-  // Disconnect and reconnect to check the theme persists through a reload
-
-  // Expect the network to be down
-  await expect(networkToggle).toContainText('Offline')
-
-  // simulate network up
-  await u.emulateNetworkConditions({
-    offline: false,
-    // values of 0 remove any active throttling. crbug.com/456324#c9
-    latency: 0,
-    downloadThroughput: -1,
-    uploadThroughput: -1,
-  })
-
-  await expect(networkToggle).toContainText('Connected')
-
-  await expect(page.getByText('building scene')).not.toBeVisible()
-
-  await expect(page, 'expect screenshot to have light theme').toHaveScreenshot({
-    maxDiffPixels: 100,
-  })
-})

e2e/playwright/test-utils.ts

@@ -2,13 +2,13 @@ import {
   expect,
   Page,
   Download,
-  BrowserContext,
   TestInfo,
+  BrowserContext,
   _electron as electron,
   Locator,
-  test,
 } from '@playwright/test'
 import { EngineCommand } from 'lang/std/artifactGraph'
+import os from 'os'
 import fsp from 'fs/promises'
 import fsSync from 'fs'
 import { join } from 'path'
@@ -26,7 +26,6 @@ import {
 import * as TOML from '@iarna/toml'
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { SETTINGS_FILE_NAME } from 'lib/constants'
-import { isArray } from 'lib/utils'
 
 type TestColor = [number, number, number]
 export const TEST_COLORS = {
@@ -45,9 +44,6 @@ export const commonPoints = {
   num2: 14.44,
 }
 
-export const editorSelector = '[role="textbox"][data-language="kcl"]'
-type PaneId = 'variables' | 'code' | 'files' | 'logs'
-
 async function waitForPageLoadWithRetry(page: Page) {
   await expect(async () => {
     await page.goto('/')
@@ -77,10 +73,11 @@ async function waitForPageLoad(page: Page) {
 }
 
 async function removeCurrentCode(page: Page) {
+  const hotkey = process.platform === 'darwin' ? 'Meta' : 'Control'
   await page.locator('.cm-content').click()
-  await page.keyboard.down('ControlOrMeta')
+  await page.keyboard.down(hotkey)
   await page.keyboard.press('a')
-  await page.keyboard.up('ControlOrMeta')
+  await page.keyboard.up(hotkey)
   await page.keyboard.press('Backspace')
   await expect(page.locator('.cm-content')).toHaveText('')
 }
@@ -108,21 +105,17 @@ async function waitForDefaultPlanesToBeVisible(page: Page) {
   )
 }
 
-async function openPane(page: Page, testId: string) {
-  const locator = page.getByTestId(testId)
-  await expect(locator).toBeVisible()
-  const isOpen = (await locator?.getAttribute('aria-pressed')) === 'true'
+async function openKclCodePanel(page: Page) {
+  const paneLocator = page.getByTestId('code-pane-button')
+  const ariaSelected = await paneLocator?.getAttribute('aria-pressed')
+  const isOpen = ariaSelected === 'true'
 
   if (!isOpen) {
-    await locator.click()
-    await expect(locator).toHaveAttribute('aria-pressed', 'true')
+    await paneLocator.click()
+    await expect(paneLocator).toHaveAttribute('aria-pressed', 'true')
   }
 }
 
-async function openKclCodePanel(page: Page) {
-  await openPane(page, 'code-pane-button')
-}
-
 async function closeKclCodePanel(page: Page) {
   const paneLocator = page.getByTestId('code-pane-button')
   const ariaSelected = await paneLocator?.getAttribute('aria-pressed')
@@ -135,7 +128,14 @@ async function closeKclCodePanel(page: Page) {
 }
 
 async function openDebugPanel(page: Page) {
-  await openPane(page, 'debug-pane-button')
+  const debugLocator = page.getByTestId('debug-pane-button')
+  await expect(debugLocator).toBeVisible()
+  const isOpen = (await debugLocator?.getAttribute('aria-pressed')) === 'true'
+
+  if (!isOpen) {
+    await debugLocator.click()
+    await expect(debugLocator).toHaveAttribute('aria-pressed', 'true')
+  }
 }
 
 async function closeDebugPanel(page: Page) {
@@ -149,7 +149,14 @@ async function closeDebugPanel(page: Page) {
 }
 
 async function openFilePanel(page: Page) {
-  await openPane(page, 'files-pane-button')
+  const fileLocator = page.getByTestId('files-pane-button')
+  await expect(fileLocator).toBeVisible()
+  const isOpen = (await fileLocator?.getAttribute('aria-pressed')) === 'true'
+
+  if (!isOpen) {
+    await fileLocator.click()
+    await expect(fileLocator).toHaveAttribute('aria-pressed', 'true')
+  }
 }
 
 async function closeFilePanel(page: Page) {
@@ -162,14 +169,6 @@ async function closeFilePanel(page: Page) {
   }
 }
 
-async function openVariablesPane(page: Page) {
-  await openPane(page, 'variables-pane-button')
-}
-
-async function openLogsPane(page: Page) {
-  await openPane(page, 'logs-pane-button')
-}
-
 async function waitForCmdReceive(page: Page, commandType: string) {
   return page
     .locator(`[data-receive-command-type="${commandType}"]`)
@@ -208,7 +207,7 @@ export const wiggleMove = async (
 }
 
 export const circleMove = async (
-  page: Page,
+  page: any,
   x: number,
   y: number,
   steps: number,
@@ -314,19 +313,13 @@ export function normaliseKclNumbers(code: string, ignoreZero = true): string {
   return replaceNumbers(code)
 }
 
-export async function getUtils(page: Page, test_?: typeof test) {
-  if (!test) {
-    console.warn(
-      'Some methods in getUtils requires test object as second argument'
-    )
-  }
-
+export async function getUtils(page: Page) {
   // Chrome devtools protocol session only works in Chromium
   const browserType = page.context().browser()?.browserType().name()
   const cdpSession =
     browserType !== 'chromium' ? null : await page.context().newCDPSession(page)
 
-  const util = {
+  return {
     waitForAuthSkipAppStart: () => waitForAuthAndLsp(page),
     waitForPageLoad: () => waitForPageLoad(page),
     waitForPageLoadWithRetry: () => waitForPageLoadWithRetry(page),
@@ -351,8 +344,6 @@ export async function getUtils(page: Page, test_?: typeof test) {
     closeDebugPanel: () => closeDebugPanel(page),
     openFilePanel: () => openFilePanel(page),
     closeFilePanel: () => closeFilePanel(page),
-    openVariablesPane: () => openVariablesPane(page),
-    openLogsPane: () => openLogsPane(page),
     openAndClearDebugPanel: async () => {
       await openDebugPanel(page)
       return clearCommandLogs(page)
@@ -493,115 +484,7 @@ export async function getUtils(page: Page, test_?: typeof test) {
         networkOptions
       )
     },
-
-    toNormalizedCode: (text: string) => {
-      return text.replace(/\s+/g, '')
-    },
-
-    createAndSelectProject: async (hasText: string) => {
-      return test_?.step(
-        `Create and select project with text "${hasText}"`,
-        async () => {
-          await page.getByTestId('home-new-file').click()
-          const projectLinksPost = page.getByTestId('project-link')
-          await projectLinksPost.filter({ hasText }).click()
-        }
-      )
-    },
-
-    editorTextMatches: async (code: string) => {
-      const editor = page.locator(editorSelector)
-      return expect(editor).toHaveText(code, { useInnerText: true })
-    },
-
-    pasteCodeInEditor: async (code: string) => {
-      return test?.step('Paste in KCL code', async () => {
-        const editor = page.locator(editorSelector)
-        await editor.fill(code)
-        await util.editorTextMatches(code)
-      })
-    },
-
-    clickPane: async (paneId: PaneId) => {
-      return test?.step(`Open ${paneId} pane`, async () => {
-        await page.getByTestId(paneId + '-pane-button').click()
-        await expect(page.locator('#' + paneId + '-pane')).toBeVisible()
-      })
-    },
-
-    createNewFile: async (name: string) => {
-      return test?.step(`Create a file named ${name}`, async () => {
-        await page.getByTestId('create-file-button').click()
-        await page.getByTestId('file-rename-field').fill(name)
-        await page.keyboard.press('Enter')
-      })
-    },
-
-    selectFile: async (name: string) => {
-      return test?.step(`Select ${name}`, async () => {
-        await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
-          .filter({ hasText: name })
-          .click()
-      })
-    },
-
-    createNewFileAndSelect: async (name: string) => {
-      return test?.step(`Create a file named ${name}, select it`, async () => {
-        await page.getByTestId('create-file-button').click()
-        await page.getByTestId('file-rename-field').fill(name)
-        await page.keyboard.press('Enter')
-        await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
-          .filter({ hasText: name })
-          .click()
-      })
-    },
-
-    renameFile: async (fromName: string, toName: string) => {
-      return test?.step(`Rename ${fromName} to ${toName}`, async () => {
-        await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
-          .filter({ hasText: fromName })
-          .click({ button: 'right' })
-        await page.getByTestId('context-menu-rename').click()
-        await page.getByTestId('file-rename-field').fill(toName)
-        await page.keyboard.press('Enter')
-        await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
-          .filter({ hasText: toName })
-          .click()
-      })
-    },
-
-    deleteFile: async (name: string) => {
-      return test?.step(`Delete ${name}`, async () => {
-        await page
-          .locator('[data-testid="file-pane-scroll-container"] button')
-          .filter({ hasText: name })
-          .click({ button: 'right' })
-        await page.getByTestId('context-menu-delete').click()
-        await page.getByTestId('delete-confirmation').click()
-      })
-    },
-
-    panesOpen: async (paneIds: PaneId[]) => {
-      return test?.step(`Setting ${paneIds} panes to be open`, async () => {
-        await page.addInitScript(
-          ({ PERSIST_MODELING_CONTEXT, paneIds }) => {
-            localStorage.setItem(
-              PERSIST_MODELING_CONTEXT,
-              JSON.stringify({ openPanes: paneIds })
-            )
-          },
-          { PERSIST_MODELING_CONTEXT, paneIds }
-        )
-        await page.reload()
-      })
-    },
   }
-
-  return util
 }
 
 type TemplateOptions = Array<number | Array<number>>
@@ -622,7 +505,7 @@ const _makeTemplate = (
   templateParts: TemplateStringsArray,
   ...options: TemplateOptions
 ) => {
-  const length = Math.max(...options.map((a) => (isArray(a) ? a[0] : 0)))
+  const length = Math.max(...options.map((a) => (Array.isArray(a) ? a[0] : 0)))
   let reExpTemplate = ''
   for (let i = 0; i < length; i++) {
     const currentStr = templateParts.map((str, index) => {
@@ -630,7 +513,7 @@ const _makeTemplate = (
       return (
         escapeRegExp(str) +
         String(
-          isArray(currentOptions)
+          Array.isArray(currentOptions)
             ? currentOptions[i]
             : typeof currentOptions === 'number'
             ? currentOptions
@@ -686,34 +569,17 @@ export interface Paths {
 export const doExport = async (
   output: Models['OutputFormat_type'],
   page: Page,
-  exportFrom: 'dropdown' | 'sidebarButton' | 'commandBar' = 'dropdown'
+  isElectron = false
 ): Promise<Paths> => {
-  if (exportFrom === 'dropdown') {
+  if (!isElectron) {
     await page.getByRole('button', { name: APP_NAME }).click()
     const exportMenuButton = page.getByRole('button', {
       name: 'Export current part',
     })
     await expect(exportMenuButton).toBeVisible()
     await exportMenuButton.click()
-  } else if (exportFrom === 'sidebarButton') {
-    await expect(page.getByTestId('export-pane-button')).toBeVisible()
+  } else {
     await page.getByTestId('export-pane-button').click()
-  } else if (exportFrom === 'commandBar') {
-    const commandBarButton = page.getByRole('button', { name: 'Commands' })
-    await expect(commandBarButton).toBeVisible()
-    // Click the command bar button
-    await commandBarButton.click()
-
-    // Wait for the command bar to appear
-    const cmdSearchBar = page.getByPlaceholder('Search commands')
-    await expect(cmdSearchBar).toBeVisible()
-
-    const textToCadCommand = page.getByRole('option', {
-      name: 'floppy disk arrow Export',
-    })
-    await expect(textToCadCommand.first()).toBeVisible()
-    // Click the Text-to-CAD command
-    await textToCadCommand.first().click()
   }
   await expect(page.getByTestId('command-bar')).toBeVisible()
 
@@ -741,7 +607,7 @@ export const doExport = async (
   const [downloadPromise1, downloadResolve1] = getPromiseAndResolve()
   let downloadCnt = 0
 
-  if (exportFrom === 'dropdown')
+  if (!isElectron)
     page.on('download', async (download) => {
       if (downloadCnt === 0) {
         downloadResolve1(download)
@@ -749,7 +615,7 @@ export const doExport = async (
       downloadCnt++
     })
   await page.getByRole('button', { name: 'Submit command' }).click()
-  if (exportFrom === 'sidebarButton' || exportFrom === 'commandBar') {
+  if (isElectron) {
     return {
       modelPath: '',
       imagePath: '',
@@ -784,6 +650,11 @@ export const doExport = async (
   }
 }
 
+/**
+ * Gets the appropriate modifier key for the platform.
+ */
+export const metaModifier = os.platform() === 'darwin' ? 'Meta' : 'Control'
+
 export async function tearDown(page: Page, testInfo: TestInfo) {
   if (testInfo.status === 'skipped') return
   if (testInfo.status === 'failed') return
@@ -808,11 +679,11 @@ export async function tearDown(page: Page, testInfo: TestInfo) {
 export async function setup(context: BrowserContext, page: Page) {
   await context.addInitScript(
     async ({ token, settingsKey, settings, IS_PLAYWRIGHT_KEY }) => {
-      localStorage.clear()
       localStorage.setItem('TOKEN_PERSIST_KEY', token)
       localStorage.setItem('persistCode', ``)
       localStorage.setItem(settingsKey, settings)
       localStorage.setItem(IS_PLAYWRIGHT_KEY, 'true')
+      console.log('TEST_SETTINGS.projects', settings)
     },
     {
       token: secrets.token,
@@ -843,9 +714,6 @@ export async function setup(context: BrowserContext, page: Page) {
   ])
   // kill animations, speeds up tests and reduced flakiness
   await page.emulateMedia({ reducedMotion: 'reduce' })
-
-  // Trigger a navigation, since loading file:// doesn't.
-  await page.reload()
 }
 
 export async function setupElectron({
@@ -905,7 +773,7 @@ export async function setupElectron({
 
   await setup(context, page)
 
-  return { electronApp, page, dir: projectDirName }
+  return { electronApp, page }
 }
 
 export async function isOutOfViewInScrollContainer(
@@ -926,33 +794,3 @@ export async function isOutOfViewInScrollContainer(
 
   return isOutOfView
 }
-
-export async function createProjectAndRenameIt({
-  name,
-  page,
-}: {
-  name: string
-  page: Page
-}) {
-  await page.getByRole('button', { name: 'New project' }).click()
-  await expect(page.getByText('Successfully created')).toBeVisible()
-  await expect(page.getByText('Successfully created')).not.toBeVisible()
-
-  await expect(page.getByText(`project-000`)).toBeVisible()
-  await page.getByText(`project-000`).hover()
-  await page.getByText(`project-000`).focus()
-
-  await page.getByLabel('sketch').first().click()
-
-  await page.waitForTimeout(100)
-
-  // type the name passed in
-  await page.keyboard.press('Backspace')
-  await page.keyboard.type(name)
-
-  await page.getByLabel('checkmark').last().click()
-}
-
-export function executorInputPath(fileName: string): string {
-  return join('src', 'wasm-lib', 'tests', 'executor', 'inputs', fileName)
-}

e2e/playwright/testing-camera-movement.spec.ts

@@ -174,166 +174,168 @@ test.describe('Testing Camera Movement', () => {
     }, [0, -85, -85])
   })
 
-  test('Zoom should be consistent when exiting or entering sketches', async ({
-    page,
-  }) => {
-    // start new sketch pan and zoom before exiting, when exiting the sketch should stay in the same place
-    // than zoom and pan outside of sketch mode and enter again and it should not change from where it is
-    // than again for sketching
+  // TODO fixme something is wrong with sketch here
+  test.fixme(
+    'Zoom should be consistent when exiting or entering sketches',
+    async ({ page }) => {
+      // start new sketch pan and zoom before exiting, when exiting the sketch should stay in the same place
+      // than zoom and pan outside of sketch mode and enter again and it should not change from where it is
+      // than again for sketching
 
-    test.skip(process.platform !== 'darwin', 'Zoom should be consistent')
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+      test.skip(process.platform !== 'darwin', 'Zoom should be consistent')
+      const u = await getUtils(page)
+      await page.setViewportSize({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
-    await u.openDebugPanel()
+      await u.waitForAuthSkipAppStart()
+      await u.openDebugPanel()
 
-    await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
-    ).not.toBeDisabled()
-    await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
-    ).toBeVisible()
+      await expect(
+        page.getByRole('button', { name: 'Start Sketch' })
+      ).not.toBeDisabled()
+      await expect(
+        page.getByRole('button', { name: 'Start Sketch' })
+      ).toBeVisible()
 
-    // click on "Start Sketch" button
-    await u.clearCommandLogs()
-    await page.getByRole('button', { name: 'Start Sketch' }).click()
-    await page.waitForTimeout(100)
-
-    // select a plane
-    await page.mouse.click(700, 325)
-
-    let code = `const sketch001 = startSketchOn('XY')`
-    await expect(u.codeLocator).toHaveText(code)
-    await u.closeDebugPanel()
-
-    await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
-
-    // move the camera slightly
-    await page.keyboard.down('Shift')
-    await page.mouse.move(700, 300)
-    await page.mouse.down({ button: 'right' })
-    await page.mouse.move(800, 200)
-    await page.mouse.up({ button: 'right' })
-    await page.keyboard.up('Shift')
-
-    let y = 350,
-      x = 948
-
-    await u.canvasLocator.click({ position: { x: 783, y } })
-    code += `\n  |> startProfileAt([8.12, -12.98], %)`
-    // await expect(u.codeLocator).toHaveText(code)
-    await u.canvasLocator.click({ position: { x, y } })
-    code += `\n  |> line([11.18, 0], %)`
-    // await expect(u.codeLocator).toHaveText(code)
-    await u.canvasLocator.click({ position: { x, y: 275 } })
-    code += `\n  |> line([0, 6.99], %)`
-    // await expect(u.codeLocator).toHaveText(code)
-
-    // click the line button
-    await page.getByRole('button', { name: 'line Line', exact: true }).click()
-
-    const hoverOverNothing = async () => {
-      // await u.canvasLocator.hover({position: {x: 700, y: 325}})
-      await page.mouse.move(700, 325)
+      // click on "Start Sketch" button
+      await u.clearCommandLogs()
+      await page.getByRole('button', { name: 'Start Sketch' }).click()
       await page.waitForTimeout(100)
-      await expect(page.getByTestId('hover-highlight')).not.toBeVisible({
+
+      // select a plane
+      await page.mouse.click(700, 325)
+
+      let code = `const sketch001 = startSketchOn('XY')`
+      await expect(u.codeLocator).toHaveText(code)
+      await u.closeDebugPanel()
+
+      await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
+
+      // move the camera slightly
+      await page.keyboard.down('Shift')
+      await page.mouse.move(700, 300)
+      await page.mouse.down({ button: 'right' })
+      await page.mouse.move(800, 200)
+      await page.mouse.up({ button: 'right' })
+      await page.keyboard.up('Shift')
+
+      let y = 350,
+        x = 948
+
+      await u.canvasLocator.click({ position: { x: 783, y } })
+      code += `\n  |> startProfileAt([8.12, -12.98], %)`
+      // await expect(u.codeLocator).toHaveText(code)
+      await u.canvasLocator.click({ position: { x, y } })
+      code += `\n  |> line([11.18, 0], %)`
+      // await expect(u.codeLocator).toHaveText(code)
+      await u.canvasLocator.click({ position: { x, y: 275 } })
+      code += `\n  |> line([0, 6.99], %)`
+      // await expect(u.codeLocator).toHaveText(code)
+
+      // click the line button
+      await page.getByRole('button', { name: 'line Line', exact: true }).click()
+
+      const hoverOverNothing = async () => {
+        // await u.canvasLocator.hover({position: {x: 700, y: 325}})
+        await page.mouse.move(700, 325)
+        await page.waitForTimeout(100)
+        await expect(page.getByTestId('hover-highlight')).not.toBeVisible({
+          timeout: 10_000,
+        })
+      }
+
+      await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
+
+      await page.waitForTimeout(200)
+      // hover over horizontal line
+      await u.canvasLocator.hover({ position: { x: 800, y } })
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
+        timeout: 10_000,
+      })
+      await page.waitForTimeout(200)
+
+      await hoverOverNothing()
+      await page.waitForTimeout(200)
+      // hover over vertical line
+      await u.canvasLocator.hover({ position: { x, y: 325 } })
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
+        timeout: 10_000,
+      })
+
+      await hoverOverNothing()
+
+      // click exit sketch
+      await page.getByRole('button', { name: 'Exit Sketch' }).click()
+      await page.waitForTimeout(400)
+
+      await hoverOverNothing()
+      await page.waitForTimeout(200)
+      // hover over horizontal line
+      await page.mouse.move(858, y, { steps: 5 })
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
+        timeout: 10_000,
+      })
+
+      await hoverOverNothing()
+
+      // hover over vertical line
+      await page.mouse.move(x, 325)
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
+        timeout: 10_000,
+      })
+
+      await hoverOverNothing()
+
+      // hover over vertical line
+      await page.mouse.move(857, y)
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
+        timeout: 10_000,
+      })
+      // now click it
+      await page.mouse.click(857, y)
+
+      await expect(
+        page.getByRole('button', { name: 'Edit Sketch' })
+      ).toBeVisible()
+      await page.getByRole('button', { name: 'Edit Sketch' }).click()
+
+      await page.waitForTimeout(400)
+
+      await hoverOverNothing()
+      x = 975
+      y = 468
+
+      await page.waitForTimeout(100)
+      await page.mouse.move(x, 419, { steps: 5 })
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
+        timeout: 10_000,
+      })
+
+      await hoverOverNothing()
+
+      await page.mouse.move(855, y)
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
+        timeout: 10_000,
+      })
+
+      await hoverOverNothing()
+
+      await page.getByRole('button', { name: 'Exit Sketch' }).click()
+      await page.waitForTimeout(200)
+
+      await hoverOverNothing()
+      await page.waitForTimeout(200)
+
+      await page.mouse.move(x, 419)
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
+        timeout: 10_000,
+      })
+
+      await hoverOverNothing()
+
+      await page.mouse.move(855, y)
+      await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
         timeout: 10_000,
       })
     }
-
-    await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
-
-    await page.waitForTimeout(200)
-    // hover over horizontal line
-    await u.canvasLocator.hover({ position: { x: 800, y } })
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-    await page.waitForTimeout(200)
-
-    await hoverOverNothing()
-    await page.waitForTimeout(200)
-    // hover over vertical line
-    await u.canvasLocator.hover({ position: { x, y: 325 } })
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-
-    await hoverOverNothing()
-
-    // click exit sketch
-    await page.getByRole('button', { name: 'Exit Sketch' }).click()
-    await page.waitForTimeout(400)
-
-    await hoverOverNothing()
-    await page.waitForTimeout(200)
-    // hover over horizontal line
-    await page.mouse.move(858, y, { steps: 5 })
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-
-    await hoverOverNothing()
-
-    // hover over vertical line
-    await page.mouse.move(x, 325)
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-
-    await hoverOverNothing()
-
-    // hover over vertical line
-    await page.mouse.move(857, y)
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-    // now click it
-    await page.mouse.click(857, y)
-
-    await expect(
-      page.getByRole('button', { name: 'Edit Sketch' })
-    ).toBeVisible()
-    await page.getByRole('button', { name: 'Edit Sketch' }).click()
-
-    await page.waitForTimeout(400)
-
-    await hoverOverNothing()
-    x = 975
-    y = 468
-
-    await page.waitForTimeout(100)
-    await page.mouse.move(x, 419, { steps: 5 })
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-
-    await hoverOverNothing()
-
-    await page.mouse.move(855, y)
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-
-    await hoverOverNothing()
-
-    await page.getByRole('button', { name: 'Exit Sketch' }).click()
-    await page.waitForTimeout(200)
-
-    await hoverOverNothing()
-    await page.waitForTimeout(200)
-
-    await page.mouse.move(x, 419)
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-
-    await hoverOverNothing()
-
-    await page.mouse.move(855, y)
-    await expect(page.getByTestId('hover-highlight').first()).toBeVisible({
-      timeout: 10_000,
-    })
-  })
+  )
 })

e2e/playwright/testing-selections.spec.ts

@@ -773,9 +773,9 @@ const extrude001 = extrude(50, sketch001)
 
     await page.waitForTimeout(1000)
 
-    let noHoverColor: [number, number, number] = [92, 92, 92]
-    let hoverColor: [number, number, number] = [127, 127, 127]
-    let selectColor: [number, number, number] = [155, 155, 105]
+    let noHoverColor: [number, number, number] = [82, 82, 82]
+    let hoverColor: [number, number, number] = [116, 116, 116]
+    let selectColor: [number, number, number] = [144, 148, 97]
 
     const extrudeWall = { x: 670, y: 275 }
     const extrudeText = `line([170.36, -121.61], %, $seg01)`
@@ -816,9 +816,9 @@ const extrude001 = extrude(50, sketch001)
     await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
 
     // because of shading, color is not exact everywhere on the face
-    noHoverColor = [115, 115, 115]
-    hoverColor = [145, 145, 145]
-    selectColor = [168, 168, 120]
+    noHoverColor = [104, 104, 104]
+    hoverColor = [134, 134, 134]
+    selectColor = [158, 162, 110]
 
     await expect(await u.getGreatestPixDiff(cap, noHoverColor)).toBeLessThan(6)
     await page.mouse.move(cap.x, cap.y)

e2e/playwright/testing-settings.spec.ts

@@ -1,13 +1,6 @@
 import { test, expect } from '@playwright/test'
 import * as fsp from 'fs/promises'
-import { join } from 'path'
-import {
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-  executorInputPath,
-} from './test-utils'
+import { getUtils, setup, setupElectron, tearDown } from './test-utils'
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { TEST_SETTINGS_KEY, TEST_SETTINGS_CORRUPTED } from './storageStates'
 import * as TOML from '@iarna/toml'
@@ -79,7 +72,7 @@ test.describe('Testing settings', () => {
     const inputLocator = page.locator('input[name="modeling-showDebugPanel"]')
 
     // Open the settings modal with the browser keyboard shortcut
-    await page.keyboard.press('ControlOrMeta+Shift+,')
+    await page.keyboard.press('Meta+Shift+,')
 
     await expect(headingLocator).toBeVisible()
     await page.locator('#showDebugPanel').getByText('OffOn').click()
@@ -89,7 +82,7 @@ test.describe('Testing settings', () => {
     await test.step('Open settings with keyboard shortcut', async () => {
       await page.getByTestId('settings-close-button').click()
       await page.locator('.cm-content').click()
-      await page.keyboard.press('ControlOrMeta+Shift+,')
+      await page.keyboard.press('Meta+Shift+,')
       await expect(headingLocator).toBeVisible()
     })
 
@@ -122,37 +115,8 @@ test.describe('Testing settings', () => {
     ).not.toBeChecked()
   })
 
-  test('Keybindings display the correct hotkey for Command Palette', async ({
-    page,
-  }) => {
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
-
-    await test.step('Open keybindings settings', async () => {
-      // Open the settings modal with the browser keyboard shortcut
-      await page.keyboard.press('ControlOrMeta+Shift+,')
-
-      // Go to Keybindings tab.
-      const keybindingsTab = page.getByRole('radio', { name: 'Keybindings' })
-      await keybindingsTab.click()
-    })
-
-    // Go to the hotkey for Command Palette.
-    const commandPalette = page.getByText('Toggle Command Palette')
-    await commandPalette.scrollIntoViewIfNeeded()
-
-    // The heading is above it and should be in view now.
-    const commandPaletteHeading = page.getByRole('heading', {
-      name: 'Command Palette',
-    })
-    // The hotkey is in a kbd element next to the heading.
-    const hotkey = commandPaletteHeading.locator('+ div kbd')
-    const text = process.platform === 'darwin' ? 'Command+K' : 'Control+K'
-    await expect(hotkey).toHaveText(text)
-  })
-
-  test('Project and user settings can be reset', async ({ page }) => {
+  // TODO fixme reset doesn't seem to work for color setting
+  test.fixme('Project and user settings can be reset', async ({ page }) => {
     const u = await getUtils(page)
     await page.setViewportSize({ width: 1200, height: 500 })
     await u.waitForAuthSkipAppStart()
@@ -197,11 +161,6 @@ test.describe('Testing settings', () => {
       // Click the reset settings button.
       await resetButton.click()
 
-      await expect(page.getByText('Settings restored to default')).toBeVisible()
-      await expect(
-        page.getByText('Settings restored to default')
-      ).not.toBeVisible()
-
       // Verify it is now set to the inherited user value
       await expect(themeColorSetting).toHaveValue(settingValues.default)
 
@@ -240,11 +199,10 @@ test.describe('Testing settings', () => {
       const { electronApp, page } = await setupElectron({
         testInfo,
         folderSetupFn: async (dir) => {
-          const bracketDir = join(dir, 'bracket')
-          await fsp.mkdir(bracketDir, { recursive: true })
+          await fsp.mkdir(`${dir}/bracket`, { recursive: true })
           await fsp.copyFile(
-            executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-            join(bracketDir, 'main.kcl')
+            'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
+            `${dir}/bracket/main.kcl`
           )
         },
       })
@@ -302,195 +260,4 @@ test.describe('Testing settings', () => {
       await electronApp.close()
     }
   )
-
-  test(
-    `Closing settings modal should go back to the original file being viewed`,
-    { tag: '@electron' },
-    async ({ browser: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async () => {},
-      })
-
-      const {
-        panesOpen,
-        createAndSelectProject,
-        pasteCodeInEditor,
-        clickPane,
-        createNewFileAndSelect,
-        editorTextMatches,
-      } = await getUtils(page, test)
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-      page.on('console', console.log)
-
-      await panesOpen([])
-
-      await test.step('Precondition: No projects exist', async () => {
-        await expect(page.getByTestId('home-section')).toBeVisible()
-        const projectLinksPre = page.getByTestId('project-link')
-        await expect(projectLinksPre).toHaveCount(0)
-      })
-
-      await createAndSelectProject('project-000')
-
-      await clickPane('code')
-      const kclCube = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cube.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclCube)
-
-      await clickPane('files')
-      await createNewFileAndSelect('2.kcl')
-
-      const kclCylinder = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cylinder.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclCylinder)
-
-      const settingsOpenButton = page.getByRole('link', {
-        name: 'settings Settings',
-      })
-      const settingsCloseButton = page.getByTestId('settings-close-button')
-
-      await test.step('Open and close settings', async () => {
-        await settingsOpenButton.click()
-        await settingsCloseButton.click()
-      })
-
-      await test.step('Postcondition: Same file content is in editor as before settings opened', async () => {
-        await editorTextMatches(kclCylinder)
-      })
-
-      await electronApp.close()
-    }
-  )
-
-  test('Changing modeling default unit', async ({ page }) => {
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
-    await page
-      .getByRole('button', { name: 'Start Sketch' })
-      .waitFor({ state: 'visible' })
-
-    const userSettingsTab = page.getByRole('radio', { name: 'User' })
-
-    // Open the settings modal with lower-right button
-    await page.getByRole('link', { name: 'Settings' }).last().click()
-    await expect(
-      page.getByRole('heading', { name: 'Settings', exact: true })
-    ).toBeVisible()
-
-    const resetButton = page.getByRole('button', {
-      name: 'Restore default settings',
-    })
-    // Default unit should be mm
-    await resetButton.click()
-
-    await test.step('Change modeling default unit within project tab', async () => {
-      const changeUnitOfMeasureInProjectTab = async (unitOfMeasure: string) => {
-        await test.step(`Set modeling default unit to ${unitOfMeasure}`, async () => {
-          await page
-            .getByTestId('modeling-defaultUnit')
-            .selectOption(`${unitOfMeasure}`)
-          const toastMessage = page.getByText(
-            `Set default unit to "${unitOfMeasure}" for this project`
-          )
-          await expect(toastMessage).toBeVisible()
-        })
-      }
-      await changeUnitOfMeasureInProjectTab('in')
-      await changeUnitOfMeasureInProjectTab('ft')
-      await changeUnitOfMeasureInProjectTab('yd')
-      await changeUnitOfMeasureInProjectTab('mm')
-      await changeUnitOfMeasureInProjectTab('cm')
-      await changeUnitOfMeasureInProjectTab('m')
-    })
-
-    // Go to the user tab
-    await userSettingsTab.click()
-    await test.step('Change modeling default unit within user tab', async () => {
-      const changeUnitOfMeasureInUserTab = async (unitOfMeasure: string) => {
-        await test.step(`Set modeling default unit to ${unitOfMeasure}`, async () => {
-          await page
-            .getByTestId('modeling-defaultUnit')
-            .selectOption(`${unitOfMeasure}`)
-          const toastMessage = page.getByText(
-            `Set default unit to "${unitOfMeasure}" as a user default`
-          )
-          await expect(toastMessage).toBeVisible()
-        })
-      }
-      await changeUnitOfMeasureInUserTab('in')
-      await changeUnitOfMeasureInUserTab('ft')
-      await changeUnitOfMeasureInUserTab('yd')
-      await changeUnitOfMeasureInUserTab('mm')
-      await changeUnitOfMeasureInUserTab('cm')
-      await changeUnitOfMeasureInUserTab('m')
-    })
-
-    // Close settings
-    const settingsCloseButton = page.getByTestId('settings-close-button')
-    await settingsCloseButton.click()
-
-    await test.step('Change modeling default unit within command bar', async () => {
-      const commands = page.getByRole('button', { name: 'Commands' })
-      const changeUnitOfMeasureInCommandBar = async (unitOfMeasure: string) => {
-        // Open command bar
-        await commands.click()
-        const settingsModelingDefaultUnitCommand = page.getByText(
-          'Settings · modeling · default unit'
-        )
-        await settingsModelingDefaultUnitCommand.click()
-
-        const commandOption = page.getByRole('option', {
-          name: unitOfMeasure,
-          exact: true,
-        })
-        await commandOption.click()
-
-        const toastMessage = page.getByText(
-          `Set default unit to "${unitOfMeasure}" for this project`
-        )
-        await expect(toastMessage).toBeVisible()
-      }
-      await changeUnitOfMeasureInCommandBar('in')
-      await changeUnitOfMeasureInCommandBar('ft')
-      await changeUnitOfMeasureInCommandBar('yd')
-      await changeUnitOfMeasureInCommandBar('mm')
-      await changeUnitOfMeasureInCommandBar('cm')
-      await changeUnitOfMeasureInCommandBar('m')
-    })
-
-    await test.step('Change modeling default unit within gizmo', async () => {
-      const changeUnitOfMeasureInGizmo = async (
-        unitOfMeasure: string,
-        copy: string
-      ) => {
-        const gizmo = page.getByRole('button', {
-          name: 'Current units are: ',
-        })
-        await gizmo.click()
-        const button = page.getByRole('button', {
-          name: copy,
-          exact: true,
-        })
-        await button.click()
-        const toastMessage = page.getByText(
-          `Set default unit to "${unitOfMeasure}" for this project`
-        )
-        await expect(toastMessage).toBeVisible()
-      }
-
-      await changeUnitOfMeasureInGizmo('in', 'Inches')
-      await changeUnitOfMeasureInGizmo('ft', 'Feet')
-      await changeUnitOfMeasureInGizmo('yd', 'Yards')
-      await changeUnitOfMeasureInGizmo('mm', 'Millimeters')
-      await changeUnitOfMeasureInGizmo('cm', 'Centimeters')
-      await changeUnitOfMeasureInGizmo('m', 'Meters')
-    })
-  })
 })

e2e/playwright/text-to-cad-tests.spec.ts

@@ -1,7 +1,5 @@
 import { test, expect, Page } from '@playwright/test'
-import { getUtils, setup, tearDown, setupElectron } from './test-utils'
-import { join } from 'path'
-import fs from 'fs'
+import { getUtils, setup, tearDown } from './test-utils'
 
 test.beforeEach(async ({ context, page }) => {
   await setup(context, page)
@@ -11,6 +9,8 @@ test.afterEach(async ({ page }, testInfo) => {
   await tearDown(page, testInfo)
 })
 
+const CtrlKey = process.platform === 'darwin' ? 'Meta' : 'Control'
+
 test.describe('Text-to-CAD tests', () => {
   test('basic lego happy case', async ({ page }) => {
     const u = await getUtils(page)
@@ -190,8 +190,7 @@ test.describe('Text-to-CAD tests', () => {
     await expect(prompt.first()).toBeVisible()
 
     // Type the prompt.
-    const randomPrompt = `aslkdfja;` + Date.now() + `FFFFEIWJF`
-    await page.keyboard.type(randomPrompt)
+    await page.keyboard.type('akjsndladf ghgsssswefiuwq22262664')
     await page.waitForTimeout(1000)
     await page.keyboard.press('Enter')
 
@@ -298,9 +297,9 @@ test.describe('Text-to-CAD tests', () => {
     await expect(page.locator('textarea')).toContainText(badPrompt)
 
     // Select all and start a new prompt.
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('KeyA')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
     await page.keyboard.type('a 2x4 lego')
 
     // Submit the new prompt.
@@ -520,9 +519,9 @@ test.describe('Text-to-CAD tests', () => {
     await page.locator('.cm-content').click({ position: { x: 10, y: 10 } })
 
     // Paste the code.
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('KeyV')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     // Expect the code to be pasted.
     await expect(page.locator('.cm-content')).toContainText(`2x8`)
@@ -549,13 +548,13 @@ test.describe('Text-to-CAD tests', () => {
     await page.locator('.cm-content').click({ position: { x: 10, y: 10 } })
 
     // Paste the code.
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('KeyA')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
     await page.keyboard.press('Backspace')
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('KeyV')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     // Expect the code to be pasted.
     await expect(page.locator('.cm-content')).toContainText(`2x4`)
@@ -636,9 +635,9 @@ test.describe('Text-to-CAD tests', () => {
     await page.locator('.cm-content').click({ position: { x: 10, y: 10 } })
 
     // Paste the code.
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('KeyV')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     // Expect the code to be pasted.
     await expect(page.locator('.cm-content')).toContainText(`2x4`)
@@ -685,60 +684,3 @@ async function sendPromptFromCommandBar(page: Page, promptStr: string) {
     await page.keyboard.press('Enter')
   })
 }
-
-test(
-  'Text-to-CAD functionality',
-  { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
-    const { electronApp, page, dir } = await setupElectron({ testInfo })
-    const fileExists = () =>
-      fs.existsSync(join(dir, 'project-000', 'lego-2x4.kcl'))
-
-    const { createAndSelectProject, panesOpen } = await getUtils(page, test)
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await panesOpen(['code', 'files'])
-
-    // Create and navigate to the project
-    await createAndSelectProject('project-000')
-
-    // Wait for Start Sketch otherwise you will not have access Text-to-CAD command
-    await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
-    ).toBeEnabled({
-      timeout: 20_000,
-    })
-
-    await test.step(`Test file creation`, async () => {
-      await sendPromptFromCommandBar(page, 'lego 2x4')
-      // File is considered created if it shows up in the Project Files pane
-      const file = page.getByRole('button', { name: 'lego-2x4.kcl' })
-      await expect(file).toBeVisible({ timeout: 20_000 })
-      expect(fileExists()).toBeTruthy()
-    })
-
-    await test.step(`Test file navigation`, async () => {
-      const file = page.getByRole('button', { name: 'lego-2x4.kcl' })
-      await file.click()
-      const kclComment = page.getByText('Lego 2x4 Brick')
-      // File can be navigated and loaded assuming a specific KCL comment is loaded into the KCL code pane
-      await expect(kclComment).toBeVisible({ timeout: 20_000 })
-    })
-
-    await test.step(`Test file deletion on rejection`, async () => {
-      const rejectButton = page.getByRole('button', { name: 'Reject' })
-      // A file is created and can be navigated to while this prompt is still opened
-      // Click the "Reject" button within the prompt and it will delete the file.
-      await rejectButton.click()
-
-      const submittingToastMessage = page.getByText(
-        `Successfully deleted file "lego-2x4.kcl"`
-      )
-      await expect(submittingToastMessage).toBeVisible()
-      expect(fileExists()).toBeFalsy()
-    })
-
-    await electronApp.close()
-  }
-)

e2e/playwright/various.spec.ts

@@ -1,6 +1,13 @@
 import { test, expect } from '@playwright/test'
 
-import { doExport, getUtils, makeTemplate, setup, tearDown } from './test-utils'
+import {
+  doExport,
+  getUtils,
+  makeTemplate,
+  metaModifier,
+  setup,
+  tearDown,
+} from './test-utils'
 
 test.beforeEach(async ({ context, page }) => {
   await setup(context, page)
@@ -10,6 +17,8 @@ test.afterEach(async ({ page }, testInfo) => {
   await tearDown(page, testInfo)
 })
 
+const CtrlKey = process.platform === 'darwin' ? 'Meta' : 'Control'
+
 test('Units menu', async ({ page }) => {
   const u = await getUtils(page)
   await page.setViewportSize({ width: 1200, height: 500 })
@@ -148,7 +157,7 @@ test('Paste should not work unless an input is focused', async ({
 
   // Paste without the code pane focused
   await codeEditorText.blur()
-  await page.keyboard.press('ControlOrMeta+KeyV')
+  await page.keyboard.press(`${metaModifier}+KeyV`)
 
   // Show that the paste didn't work but typing did
   await expect(codeEditorText).not.toContainText(pasteContent)
@@ -157,7 +166,7 @@ test('Paste should not work unless an input is focused', async ({
   // Paste with the code editor focused
   // Following this guidance: https://github.com/microsoft/playwright/issues/8114
   await codeEditorText.focus()
-  await page.keyboard.press('ControlOrMeta+KeyV')
+  await page.keyboard.press(`${metaModifier}+KeyV`)
   await expect(
     await page.evaluate(
       () => document.querySelector('.cm-content')?.textContent
@@ -371,9 +380,9 @@ test('Basic default modeling and sketch hotkeys work', async ({ page }) => {
   await test.step(`Type code with sketch hotkeys, shouldn't fire`, async () => {
     // Since there's code now, we have to get to the end of the line
     await page.locator('.cm-line').last().click()
-    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.down(CtrlKey)
     await page.keyboard.press('ArrowRight')
-    await page.keyboard.up('ControlOrMeta')
+    await page.keyboard.up(CtrlKey)
 
     await page.keyboard.press('Enter')
     await page.keyboard.type('//')

electron-builder.yml

@@ -1,65 +0,0 @@
-appId: dev.zoo.modeling-app
-
-directories:
-  output: out
-  buildResources: assets
-
-files:
-  - .vite/**
-
-mac:
-  category: public.app-category.developer-tools
-  artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
-  target:
-    - target: dmg 
-      arch:
-        - x64
-        - arm64
-    - target: zip 
-      arch:
-        - x64
-        - arm64
-  notarize:
-    teamId: 92H8YB3B95
-
-win:
-  artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
-  target:
-    - target: nsis
-      arch:
-        - x64
-        - arm64
-    - target: msi
-      arch:
-        - x64
-        - arm64
-  signingHashAlgorithms:
-    - sha256
-  sign: "./sign-win.js"
-  publisherName: "KittyCAD Inc"  # needs to be exactly like on Digicert
-  icon: "assets/icon.ico"
-
-msi:
-  oneClick: false
-  perMachine: true
-
-nsis:
-  oneClick: false
-  perMachine: true
-  allowElevation: true
-  license: "LICENSE"
-  installerIcon: "assets/icon.ico"
-  include: "./installer.nsh"
-
-linux:
-  artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
-  target:
-    - target: appImage
-      arch:
-        - x64
-        - arm64
-
-publish:
-  - provider: generic
-    url: https://dl.zoo.dev/releases/modeling-app/test/electron-builder
-    channel: latest

forge.config.ts

@@ -4,18 +4,8 @@ import { MakerZIP } from '@electron-forge/maker-zip'
 import { MakerDeb } from '@electron-forge/maker-deb'
 import { MakerRpm } from '@electron-forge/maker-rpm'
 import { VitePlugin } from '@electron-forge/plugin-vite'
-import { MakerWix, MakerWixConfig } from '@electron-forge/maker-wix'
 import { FusesPlugin } from '@electron-forge/plugin-fuses'
 import { FuseV1Options, FuseVersion } from '@electron/fuses'
-import path from 'path'
-
-interface ExtendedMakerWixConfig extends MakerWixConfig {
-  // see https://github.com/electron/forge/issues/3673
-  // this is an undocumented property of electron-wix-msi
-  associateExtensions?: string
-}
-
-const rootDir = process.cwd()
 
 const config: ForgeConfig = {
   packagerConfig: {
@@ -29,35 +19,13 @@ const config: ForgeConfig = {
       }) ||
       undefined,
     executableName: 'zoo-modeling-app',
-    icon: path.resolve(rootDir, 'assets', 'icon'),
-    protocols: [
-      {
-        name: 'Zoo Studio',
-        schemes: ['zoo-studio'],
-      },
-    ],
-    extendInfo: 'Info.plist', // Information for file associations.
   },
   rebuildConfig: {},
   makers: [
-    new MakerSquirrel({
-      setupIcon: path.resolve(rootDir, 'assets', 'icon.ico'),
-    }),
-    new MakerWix({
-      icon: path.resolve(rootDir, 'assets', 'icon.ico'),
-      associateExtensions: 'kcl',
-    } as ExtendedMakerWixConfig),
+    new MakerSquirrel({}),
     new MakerZIP({}, ['darwin']),
-    new MakerRpm({
-      options: {
-        icon: path.resolve(rootDir, 'assets', 'icon.png'),
-      },
-    }),
-    new MakerDeb({
-      options: {
-        icon: path.resolve(rootDir, 'assets', 'icon.png'),
-      },
-    }),
+    new MakerRpm({}),
+    new MakerDeb({}),
   ],
   plugins: [
     new VitePlugin({