WIP: Start using the recursion crate

.eslintrc

@@ -25,9 +25,7 @@
         "files": ["e2e/**/*.ts"], // Update the pattern based on your file structure
         "rules": {
           "@typescript-eslint/no-floating-promises": "warn",
-          "suggest-no-throw/suggest-no-throw": "off",
+          "testing-library/prefer-screen-queries": "off"
-          "testing-library/prefer-screen-queries": "off",
-          "jest/valid-expect": "off"
         }
       },
       {

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

@@ -345,7 +345,7 @@ jobs:
             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 }}'
 
@@ -355,7 +355,7 @@ jobs:
           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: artifact
           glob: '*/Zoo*'
@@ -363,13 +363,13 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}/${{ env.VERSION }}
 
       - name: Upload update endpoint 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: last_update.json
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload download endpoint 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: last_download.json
           destination: ${{ env.BUCKET_DIR }}

.github/workflows/build-test-web.yml

@@ -44,8 +44,6 @@ jobs:
       - run: yarn build:wasm
       - run: yarn xstate:typegen
       - run: yarn tsc
-      - name: Lint
-        run: yarn eslint --max-warnings 0 src e2e
 
 
   check-typos:

.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

.github/workflows/label-issues.yml

@@ -1,31 +0,0 @@
-name: Label Issues
-
-on:
-  issues:
-    types: [opened]
-permissions:
-  issues: write
-jobs:
-  label:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check if issue opener is ZooSpiritWolf
-        id: check_opener
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const issueOpener = context.payload.issue.user.login;
-            return issueOpener === 'ZooSpiritWolf';
-
-      - name: Add labels
-        if: steps.check_opener.outputs.result == 'true'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            github.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.issue.number,
-              labels: ['bug', 'regression', 'high-priority']
-            });

.github/workflows/playwright.yml

@@ -346,7 +346,7 @@ jobs:
       run: yarn build:wasm
     - name: build electron
       shell: bash
-      run: yarn tron:package
+      run: yarn electron:package
     - uses: actions/download-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true

README.md

@@ -101,7 +101,7 @@ This will start the application and hot-reload on changed.
 
 Devtools can be opened with the usual Cmd/Ctrl-Shift-I.
 
-To build, run `yarn tron:package`.
+To build, run `yarn electron:package`.
 
 ## Checking out commits / Bisecting
 

docs/kcl/index.md

@@ -32,20 +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)
 * [`import`](kcl/import)
-* [`inch`](kcl/inch)
 * [`int`](kcl/int)
 * [`lastSegX`](kcl/lastSegX)
 * [`lastSegY`](kcl/lastSegY)
@@ -58,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)
@@ -94,4 +89,3 @@ layout: manual
 * [`xLineTo`](kcl/xLineTo)
 * [`yLine`](kcl/yLine)
 * [`yLineTo`](kcl/yLineTo)
-* [`yd`](kcl/yd)

docs/kcl/std.json

@@ -55356,7 +55356,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "let n = 1.0285\nlet o = 1.0286\nassertEqual(n, o, 0.01, \"n is within the given tolerance for o\")"
+      "let n = 1.0285\nlet m = 1.0286\nassertEqual(n, m, 0.01, \"n is within the given tolerance for m\")"
     ]
   },
   {
@@ -82255,29 +82255,6 @@
       "const exampleSketch = startSketchOn('-XZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 0], %)\n  |> line([0, 10], %)\n  |> close(%)\n\nconst example = extrude(10, exampleSketch)"
     ]
   },
-  {
-    "name": "cm",
-    "summary": "Centimeters conversion factor for current projects units.",
-    "description": "No matter what units the current project uses, this function will always return the conversion factor to centimeters.\nFor example, if the current project uses inches, this function will return `0.393701`. If the current project uses millimeters, this function will return `10`. If the current project uses centimeters, this function will return `1`.\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\nWe merely provide these functions for convenience and readability, as `10 * cm()` is more readable that your intent is \"I want 10 centimeters\" than `10 * 10`, if the project settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "args": [],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "type": "number",
-        "format": "double"
-      },
-      "required": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "const totalWidth = 10 * cm()"
-    ]
-  },
   {
     "name": "cos",
     "summary": "Compute the cosine of a number (in radians).",
@@ -98161,29 +98138,6 @@
       "const sketch001 = startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> lineTo([12, 10], %)\n  |> line([floor(7.02986), 0], %)\n  |> yLineTo(0, %)\n  |> close(%)\n\nconst extrude001 = extrude(5, sketch001)"
     ]
   },
-  {
-    "name": "ft",
-    "summary": "Feet conversion factor for current projects units.",
-    "description": "No matter what units the current project uses, this function will always return the conversion factor to feet.\nFor example, if the current project uses inches, this function will return `12`. If the current project uses millimeters, this function will return `304.8`. If the current project uses feet, this function will return `1`.\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\nWe merely provide these functions for convenience and readability, as `10 * ft()` is more readable that your intent is \"I want 10 feet\" than `10 * 304.8`, if the project settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "args": [],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "type": "number",
-        "format": "double"
-      },
-      "required": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "const totalWidth = 10 * ft()"
-    ]
-  },
   {
     "name": "getNextAdjacentEdge",
     "summary": "Get the next adjacent edge to the edge given.",
@@ -117545,29 +117499,6 @@
       "const model = import(\"tests/inputs/cube.step\")"
     ]
   },
-  {
-    "name": "inch",
-    "summary": "Inches conversion factor for current projects units.",
-    "description": "No matter what units the current project uses, this function will always return the conversion factor to inches.\nFor example, if the current project uses inches, this function will return `1`. If the current project uses millimeters, this function will return `25.4`.\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\nWe merely provide these functions for convenience and readability, as `10 * inch()` is more readable that your intent is \"I want 10 inches\" than `10 * 25.4`, if the project settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "args": [],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "type": "number",
-        "format": "double"
-      },
-      "required": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "const totalWidth = 10 * inch()"
-    ]
-  },
   {
     "name": "int",
     "summary": "Convert a number to an integer.",
@@ -137955,29 +137886,6 @@
       "const exampleSketch = startSketchOn(\"XZ\")\n  |> startProfileAt([0, 0], %)\n  |> line([log2(100), 0], %)\n  |> line([5, 8], %)\n  |> line([-10, 0], %)\n  |> close(%)\n\nconst example = extrude(5, exampleSketch)"
     ]
   },
-  {
-    "name": "m",
-    "summary": "Meters conversion factor for current projects units.",
-    "description": "No matter what units the current project uses, this function will always return the conversion factor to meters.\nFor example, if the current project uses inches, this function will return `39.3701`. If the current project uses millimeters, this function will return `1000`. If the current project uses meters, this function will return `1`.\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\nWe merely provide these functions for convenience and readability, as `10 * m()` is more readable that your intent is \"I want 10 meters\" than `10 * 1000`, if the project settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "args": [],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "type": "number",
-        "format": "double"
-      },
-      "required": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "const totalWidth = 10 * m()"
-    ]
-  },
   {
     "name": "max",
     "summary": "Compute the maximum of the given arguments.",
@@ -138050,29 +137958,6 @@
       "const exampleSketch = startSketchOn(\"XZ\")\n  |> startProfileAt([0, 0], %)\n  |> angledLine({\n       angle: 70,\n       length: min(15, 31, 4, 13, 22)\n     }, %)\n  |> line([20, 0], %)\n  |> close(%)\n\nconst example = extrude(5, exampleSketch)"
     ]
   },
-  {
-    "name": "mm",
-    "summary": "Millimeters conversion factor for current projects units.",
-    "description": "No matter what units the current project uses, this function will always return the conversion factor to millimeters.\nFor example, if the current project uses inches, this function will return `(1/25.4)`. If the current project uses millimeters, this function will return `1`.\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\nWe merely provide these functions for convenience and readability, as `10 * mm()` is more readable that your intent is \"I want 10 millimeters\" than `10 * (1/25.4)`, if the project settings are in inches.",
-    "tags": [
-      "units"
-    ],
-    "args": [],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "type": "number",
-        "format": "double"
-      },
-      "required": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "const totalWidth = 10 * mm()"
-    ]
-  },
   {
     "name": "patternCircular2d",
     "summary": "Repeat a 2-dimensional sketch some number of times along a partial or",
@@ -252285,28 +252170,5 @@
     "examples": [
       "const exampleSketch = startSketchOn(\"XZ\")\n  |> startProfileAt([0, 0], %)\n  |> angledLine({ angle: 50, length: 45 }, %)\n  |> yLineTo(0, %)\n  |> close(%)\n\nconst example = extrude(5, exampleSketch)"
     ]
-  },
-  {
-    "name": "yd",
-    "summary": "Yards conversion factor for current projects units.",
-    "description": "No matter what units the current project uses, this function will always return the conversion factor to yards.\nFor example, if the current project uses inches, this function will return `36`. If the current project uses millimeters, this function will return `914.4`. If the current project uses yards, this function will return `1`.\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\nWe merely provide these functions for convenience and readability, as `10 * yd()` is more readable that your intent is \"I want 10 yards\" than `10 * 914.4`, if the project settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "args": [],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "type": "number",
-        "format": "double"
-      },
-      "required": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "const totalWidth = 10 * yd()"
-    ]
   }
 ]

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

@@ -1,9 +1,8 @@
 import { test, expect } from '@playwright/test'
 
-import { getUtils, setup, setupElectron, tearDown } from './test-utils'
+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)
@@ -84,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()
@@ -107,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 ({
@@ -218,93 +217,3 @@ test.describe('Code pane and errors', () => {
     ).toBeVisible()
   })
 })
-
-test(
-  'Opening multiple panes persists when switching projects',
-  { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
-    test.skip(
-      process.platform === 'win32',
-      'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
-    )
-    // Setup multiple projects.
-    const { electronApp, page } = await setupElectron({
-      testInfo,
-      folderSetupFn: async (dir) => {
-        await Promise.all([
-          fsp.mkdir(`${dir}/router-template-slate`, { recursive: true }),
-          fsp.mkdir(`${dir}/bracket`, { recursive: true }),
-        ])
-        await Promise.all([
-          fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/router-template-slate/main.kcl`
-          ),
-          fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
-            `${dir}/bracket/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 ({
+  // TODO fixme: enter is not working in the command bar
-    page,
+  test.fixme(
-  }) => {
+    'Extrude from command bar selects extrude line after',
-    await page.addInitScript(async () => {
+    async ({ page }) => {
-      localStorage.setItem(
+      await page.addInitScript(async () => {
-        'persistCode',
+        localStorage.setItem(
-        `const sketch001 = startSketchOn('XY')
+          '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)
+  // TODO fixme: enter is not working in the command bar
-    await page.setViewportSize({ width: 1200, height: 500 })
+  test.fixme('Fillet from command bar', async ({ page }) => {
-
-    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 }) => {
     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

@@ -9,7 +9,6 @@ test.afterEach(async ({ page }, testInfo) => {
   await tearDown(page, testInfo)
 })
 test.describe('Copilot ghost text', () => {
-  // eslint-disable-next-line jest/valid-title
   test.skip(true, 'Needs to get covered again')
 
   test('completes code in empty file', async ({ page }) => {
@@ -332,6 +331,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 +348,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 +367,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 +381,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 +410,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,188 +0,0 @@
-import { test, expect } from '@playwright/test'
-import { getUtils, setupElectron, tearDown } from './test-utils'
-import fsp from 'fs/promises'
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
-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) => {
-        await Promise.all([fsp.mkdir(`${dir}/bracket`, { recursive: true })])
-        await Promise.all([
-          fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/bracket/other.kcl`
-          ),
-          fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
-            `${dir}/bracket/main.kcl`
-          ),
-        ])
-      },
-    })
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    page.on('console', console.log)
-
-    await test.step('on open of project', async () => {
-      await expect(page.getByText(`bracket`)).toBeVisible()
-
-      // open the project
-      await page.getByText(`bracket`).click()
-
-      // wait for the project to load
-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-
-      // expect zero errors in guter
-      await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-      // export the model
-      const exportButton = page.getByTestId('export-pane-button')
-      await expect(exportButton).toBeVisible()
-
-      const gltfOption = page.getByText('glTF')
-      const submitButton = page.getByText('Confirm Export')
-      const exportingToastMessage = page.getByText(`Exporting...`)
-      const errorToastMessage = page.getByText(`Error while exporting`)
-      const engineErrorToastMessage = page.getByText(`Nothing to export`)
-      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
-
-      // Click the export button
-      await exportButton.click()
-
-      await expect(gltfOption).toBeVisible()
-      await expect(page.getByText('STL')).toBeVisible()
-
-      await page.keyboard.press('Enter')
-
-      // Click the checkbox
-      await expect(submitButton).toBeVisible()
-
-      await page.waitForTimeout(500)
-
-      await page.keyboard.press('Enter')
-
-      // Find the toast.
-      // Look out for the toast message
-      await expect(exportingToastMessage).toBeVisible()
-      await expect(alreadyExportingToastMessage).not.toBeVisible()
-
-      // Expect it to succeed.
-      await expect(errorToastMessage).not.toBeVisible()
-      await expect(engineErrorToastMessage).not.toBeVisible()
-
-      const successToastMessage = page.getByText(`Exported successfully`)
-      await expect(successToastMessage).toBeVisible()
-      await expect(exportingToastMessage).not.toBeVisible()
-
-      await test.step('Check the export size', async () => {
-        await expect
-          .poll(
-            async () => {
-              try {
-                const outputGltf = await fsp.readFile('output.gltf')
-                return outputGltf.byteLength
-              } catch (e) {
-                return 0
-              }
-            },
-            { timeout: 15_000 }
-          )
-          .toBe(477327)
-
-        // clean up output.gltf
-        await fsp.rm('output.gltf')
-      })
-    })
-
-    await test.step('on open of file in file pane', async () => {
-      const u = await getUtils(page)
-      await u.openFilePanel()
-
-      const otherKclButton = page.getByRole('button', { name: 'other.kcl' })
-
-      // Click the file
-      await otherKclButton.click()
-
-      // Close the file pane
-      await u.closeFilePanel()
-
-      // wait for it to finish executing (todo: make this more robust)
-      await page.waitForTimeout(1000)
-      // expect zero errors in guter
-      await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-      // export the model
-      const exportButton = page.getByTestId('export-pane-button')
-      await expect(exportButton).toBeVisible()
-
-      const gltfOption = page.getByText('glTF')
-      const submitButton = page.getByText('Confirm Export')
-      const exportingToastMessage = page.getByText(`Exporting...`)
-      const errorToastMessage = page.getByText(`Error while exporting`)
-      const engineErrorToastMessage = page.getByText(`Nothing to export`)
-      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
-
-      // Click the export button
-      await exportButton.click()
-
-      await expect(gltfOption).toBeVisible()
-      await expect(page.getByText('STL')).toBeVisible()
-
-      await page.keyboard.press('Enter')
-
-      // Click the checkbox
-      await expect(submitButton).toBeVisible()
-
-      await page.keyboard.press('Enter')
-
-      // Find the toast.
-      // Look out for the toast message
-      await expect(exportingToastMessage).toBeVisible()
-      await expect(alreadyExportingToastMessage).not.toBeVisible()
-
-      // Expect it to succeed.
-      await expect(errorToastMessage).not.toBeVisible()
-      await expect(engineErrorToastMessage).not.toBeVisible()
-
-      const successToastMessage = page.getByText(`Exported successfully`)
-      await expect(successToastMessage).toBeVisible()
-      await expect(exportingToastMessage).not.toBeVisible()
-
-      await test.step('Check the export size', async () => {
-        await expect
-          .poll(
-            async () => {
-              try {
-                const outputGltf = await fsp.readFile('output.gltf')
-                return outputGltf.byteLength
-              } catch (e) {
-                return 0
-              }
-            },
-            { timeout: 15_000 }
-          )
-          .toBe(105022)
-
-        // clean up output.gltf
-        await fsp.rm('output.gltf')
-      })
-      await electronApp.close()
-    })
-
-    await electronApp.close()
-  }
-)

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')
@@ -147,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(``)
@@ -351,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()
@@ -711,15 +714,17 @@ test.describe('Editor tests', () => {
     |> close(%)`)
   })
 
-  test('Can undo a sketch modification with ctrl+z', async ({ page }) => {
+  // failing for the same reason as "Can edit a sketch that has been extruded in the same pipe"
+  // please fix together
+  test.fixme('Can undo a sketch modification with ctrl+z', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `const sketch001 = startSketchOn('XZ')
-    |> startProfileAt([4.61, -10.01], %)
+    |> startProfileAt([4.61, -14.01], %)
     |> line([12.73, -0.09], %)
-    |> tangentialArcTo([24.95, -0.38], %)
+    |> tangentialArcTo([24.95, -5.38], %)
     |> close(%)
     |> extrude(5, %)`
       )
@@ -754,11 +759,11 @@ test.describe('Editor tests', () => {
     })
     await page.waitForTimeout(100)
 
-    const startPX = [665, 397]
+    const startPX = [665, 458]
 
     const dragPX = 40
 
-    await page.getByText('startProfileAt([4.61, -10.01], %)').click()
+    await page.getByText('startProfileAt([4.61, -14.01], %)').click()
     await expect(
       page.getByRole('button', { name: 'Edit Sketch' })
     ).toBeVisible()
@@ -796,7 +801,7 @@ test.describe('Editor tests', () => {
     // drag tangentialArcTo handle
     const tangentEnd = await u.getBoundingBox('[data-overlay-index="1"]')
     await page.dragAndDrop('#stream', '#stream', {
-      sourcePosition: { x: tangentEnd.x + 10, y: tangentEnd.y - 5 },
+      sourcePosition: { x: tangentEnd.x, y: tangentEnd.y - 5 },
       targetPosition: {
         x: tangentEnd.x + dragPX,
         y: tangentEnd.y + dragPX,
@@ -808,12 +813,12 @@ test.describe('Editor tests', () => {
     // expect the code to have changed
     await expect(page.locator('.cm-content'))
       .toHaveText(`const sketch001 = startSketchOn('XZ')
-  |> startProfileAt([7.12, -12.68], %)
+    |> startProfileAt([7.12, -16.82], %)
-  |> line([15.39, -2.78], %)
+    |> line([15.4, -2.74], %)
-  |> tangentialArcTo([27.6, -3.05], %)
+    |> tangentialArcTo([24.95, -5.38], %)
-  |> close(%)
+    |> line([2.65, -2.69], %)
-  |> extrude(5, %)
+    |> close(%)
-`)
+    |> extrude(5, %)`)
 
     // Hit undo
     await page.keyboard.down('Control')
@@ -822,11 +827,11 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`const sketch001 = startSketchOn('XZ')
-  |> startProfileAt([7.12, -12.68], %)
+    |> startProfileAt([7.12, -16.82], %)
-  |> line([15.39, -2.78], %)
+    |> line([15.4, -2.74], %)
-  |> tangentialArcTo([24.95, -0.38], %)
+    |> tangentialArcTo([24.95, -5.38], %)
-  |> close(%)
+    |> close(%)
-  |> extrude(5, %)`)
+    |> extrude(5, %)`)
 
     // Hit undo again.
     await page.keyboard.down('Control')
@@ -835,12 +840,11 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`const sketch001 = startSketchOn('XZ')
-  |> startProfileAt([7.12, -12.68], %)
+    |> startProfileAt([7.12, -16.82], %)
-  |> line([12.73, -0.09], %)
+    |> line([12.73, -0.09], %)
-  |> tangentialArcTo([24.95, -0.38], %)
+    |> tangentialArcTo([24.95, -5.38], %)
-  |> close(%)
+    |> close(%)
-  |> extrude(5, %)
+    |> extrude(5, %)`)
-`)
 
     // Hit undo again.
     await page.keyboard.down('Control')
@@ -850,9 +854,9 @@ test.describe('Editor tests', () => {
     await page.waitForTimeout(100)
     await expect(page.locator('.cm-content'))
       .toHaveText(`const sketch001 = startSketchOn('XZ')
-    |> startProfileAt([4.61, -10.01], %)
+    |> startProfileAt([4.61, -14.01], %)
     |> line([12.73, -0.09], %)
-    |> tangentialArcTo([24.95, -0.38], %)
+    |> tangentialArcTo([24.95, -5.38], %)
     |> close(%)
     |> extrude(5, %)`)
   })

e2e/playwright/machines.spec.ts

@@ -1,102 +0,0 @@
-import { test, expect } from '@playwright/test'
-import { setupElectron, tearDown } from './test-utils'
-import fsp from 'fs/promises'
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
-
-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) => {
-        await fsp.mkdir(`${dir}/bracket`, { recursive: true })
-        await fsp.copyFile(
-          'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
-          `${dir}/bracket/main.kcl`
-        )
-      },
-    })
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    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,
-    })
-
-    const notFoundText = 'Machine API server was not discovered'
-    await expect(page.getByText(notFoundText).first()).not.toBeVisible()
-
-    // Find the make button
-    const makeButton = page.getByRole('button', { name: 'Make' })
-    // Make sure the button is visible but disabled
-    await expect(makeButton).toBeVisible()
-    await expect(makeButton).toBeDisabled()
-
-    // When you hover over the button, the tooltip should show
-    // that the machine-api server is not found
-    await makeButton.hover()
-    await expect(page.getByText(notFoundText).first()).toBeVisible()
-
-    await electronApp.close()
-  }
-)
-
-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) => {
-        await fsp.mkdir(`${dir}/bracket`, { recursive: true })
-        await fsp.copyFile(
-          'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
-          `${dir}/bracket/main.kcl`
-        )
-      },
-    })
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    const notFoundText = 'Machine API server was not discovered'
-
-    await expect(page.getByText(notFoundText)).not.toBeVisible()
-
-    const networkMachineToggle = page.getByTestId('network-machine-toggle')
-    await networkMachineToggle.hover()
-    await expect(page.getByText(notFoundText)).toBeVisible()
-
-    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,
-    })
-
-    await expect(page.getByText(notFoundText).nth(1)).not.toBeVisible()
-
-    await networkMachineToggle.hover()
-    await expect(page.getByText(notFoundText).nth(1)).toBeVisible()
-
-    await electronApp.close()
-  }
-)

e2e/playwright/onboarding-tests.spec.ts

@@ -347,10 +347,6 @@ 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) => {

e2e/playwright/regression-tests.spec.ts

@@ -194,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()
@@ -236,13 +236,9 @@ const sketch001 = startSketchAt([-0, -0])
     page,
   }) => {
     const u = await getUtils(page)
-    await page.addInitScript(
+    await page.addInitScript(async (code) => {
-      async ({ code }) => {
+      localStorage.setItem('persistCode', code)
-        localStorage.setItem('persistCode', code)
+    }, TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR)
-        ;(window as any).playwrightSkipFilePicker = true
-      },
-      { code: TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR }
-    )
 
     await page.setViewportSize({ width: 1000, height: 500 })
 
@@ -329,7 +325,7 @@ const sketch001 = startSketchAt([-0, -0])
     await expect(exportingToastMessage).toBeVisible()
 
     // Expect it to succeed.
-    await expect(exportingToastMessage).not.toBeVisible({ timeout: 15_000 })
+    await expect(exportingToastMessage).not.toBeVisible()
     await expect(errorToastMessage).not.toBeVisible()
     await expect(engineErrorToastMessage).not.toBeVisible()
 
@@ -341,7 +337,6 @@ const sketch001 = startSketchAt([-0, -0])
   }) => {
     // This is being weird on ubuntu and windows.
     test.skip(
-      // eslint-disable-next-line jest/valid-title
       process.platform === 'linux' || process.platform === 'win32',
       'This test is being weird on ubuntu'
     )
@@ -425,10 +420,6 @@ 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) => {
@@ -481,7 +472,7 @@ async function clickExportButton(page: Page) {
     // Click the export button
     await exportButton.click()
 
-    // Click the gltf.
+    // Click the stl.
     const gltfOption = page.getByRole('option', { name: 'glTF' })
     await expect(gltfOption).toBeVisible()
 

e2e/playwright/sketch-tests.spec.ts

@@ -344,108 +344,111 @@ test.describe('Sketch tests', () => {
     })
   })
 
-  test('Can edit a sketch that has been extruded in the same pipe', async ({
+  // failing for the same reason as "Can undo a sketch modification with ctrl+z"
-    page,
+  // please fix together
-  }) => {
+  test.fixme(
-    const u = await getUtils(page)
+    'Can edit a sketch that has been extruded in the same pipe',
-    await page.addInitScript(async () => {
+    async ({ page }) => {
-      localStorage.setItem(
+      const u = await getUtils(page)
-        'persistCode',
+      await page.addInitScript(async () => {
-        `const sketch001 = startSketchOn('XZ')
+        localStorage.setItem(
-    |> startProfileAt([4.61, -10.01], %)
+          'persistCode',
+          `const sketch001 = startSketchOn('XZ')
+    |> startProfileAt([4.61, -14.01], %)
     |> line([12.73, -0.09], %)
-    |> tangentialArcTo([24.95, -0.38], %)
+    |> tangentialArcTo([24.95, -5.38], %)
     |> close(%)
     |> extrude(5, %)`
-      )
+        )
-    })
+      })
 
-    await page.setViewportSize({ width: 1200, height: 500 })
+      await page.setViewportSize({ width: 1200, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+      await u.waitForAuthSkipAppStart()
-    await expect(
+      await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
+        page.getByRole('button', { name: 'Start Sketch' })
-    ).not.toBeDisabled()
+      ).not.toBeDisabled()
 
-    await page.waitForTimeout(100)
+      await page.waitForTimeout(100)
-    await u.openAndClearDebugPanel()
+      await u.openAndClearDebugPanel()
-    await u.sendCustomCmd({
+      await u.sendCustomCmd({
-      type: 'modeling_cmd_req',
+        type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
+        cmd_id: uuidv4(),
-      cmd: {
+        cmd: {
-        type: 'default_camera_look_at',
+          type: 'default_camera_look_at',
-        vantage: { x: 0, y: -1250, z: 580 },
+          vantage: { x: 0, y: -1250, z: 580 },
-        center: { x: 0, y: 0, z: 0 },
+          center: { x: 0, y: 0, z: 0 },
-        up: { x: 0, y: 0, z: 1 },
+          up: { x: 0, y: 0, z: 1 },
-      },
+        },
-    })
+      })
-    await page.waitForTimeout(100)
+      await page.waitForTimeout(100)
-    await u.sendCustomCmd({
+      await u.sendCustomCmd({
-      type: 'modeling_cmd_req',
+        type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
+        cmd_id: uuidv4(),
-      cmd: {
+        cmd: {
-        type: 'default_camera_get_settings',
+          type: 'default_camera_get_settings',
-      },
+        },
-    })
+      })
-    await page.waitForTimeout(100)
+      await page.waitForTimeout(100)
 
-    const startPX = [665, 397]
+      const startPX = [665, 458]
 
-    const dragPX = 40
+      const dragPX = 40
 
-    await page.getByText('startProfileAt([4.61, -10.01], %)').click()
+      await page.getByText('startProfileAt([4.61, -14.01], %)').click()
-    await expect(
+      await expect(
-      page.getByRole('button', { name: 'Edit Sketch' })
+        page.getByRole('button', { name: 'Edit Sketch' })
-    ).toBeVisible()
+      ).toBeVisible()
-    await page.getByRole('button', { name: 'Edit Sketch' }).click()
+      await page.getByRole('button', { name: 'Edit Sketch' }).click()
-    await page.waitForTimeout(400)
+      await page.waitForTimeout(400)
-    let prevContent = await page.locator('.cm-content').innerText()
+      let prevContent = await page.locator('.cm-content').innerText()
 
-    await expect(page.getByTestId('segment-overlay')).toHaveCount(2)
+      await expect(page.getByTestId('segment-overlay')).toHaveCount(2)
 
-    // drag startProfieAt handle
+      // drag startProfieAt handle
-    await page.dragAndDrop('#stream', '#stream', {
+      await page.dragAndDrop('#stream', '#stream', {
-      sourcePosition: { x: startPX[0], y: startPX[1] },
+        sourcePosition: { x: startPX[0], y: startPX[1] },
-      targetPosition: { x: startPX[0] + dragPX, y: startPX[1] + dragPX },
+        targetPosition: { x: startPX[0] + dragPX, y: startPX[1] + dragPX },
-    })
+      })
-    await page.waitForTimeout(100)
+      await page.waitForTimeout(100)
-    await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+      await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-    prevContent = await page.locator('.cm-content').innerText()
+      prevContent = await page.locator('.cm-content').innerText()
 
-    // drag line handle
+      // drag line handle
-    await page.waitForTimeout(100)
+      await page.waitForTimeout(100)
 
-    const lineEnd = await u.getBoundingBox('[data-overlay-index="0"]')
+      const lineEnd = await u.getBoundingBox('[data-overlay-index="0"]')
-    await page.waitForTimeout(100)
+      await page.waitForTimeout(100)
-    await page.dragAndDrop('#stream', '#stream', {
+      await page.dragAndDrop('#stream', '#stream', {
-      sourcePosition: { x: lineEnd.x - 5, y: lineEnd.y },
+        sourcePosition: { x: lineEnd.x - 5, y: lineEnd.y },
-      targetPosition: { x: lineEnd.x + dragPX, y: lineEnd.y + dragPX },
+        targetPosition: { x: lineEnd.x + dragPX, y: lineEnd.y + dragPX },
-    })
+      })
-    await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+      await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-    prevContent = await page.locator('.cm-content').innerText()
+      prevContent = await page.locator('.cm-content').innerText()
 
-    // drag tangentialArcTo handle
+      // drag tangentialArcTo handle
-    const tangentEnd = await u.getBoundingBox('[data-overlay-index="1"]')
+      const tangentEnd = await u.getBoundingBox('[data-overlay-index="1"]')
-    await page.dragAndDrop('#stream', '#stream', {
+      await page.dragAndDrop('#stream', '#stream', {
-      sourcePosition: { x: tangentEnd.x + 10, y: tangentEnd.y - 5 },
+        sourcePosition: { x: tangentEnd.x, y: tangentEnd.y - 5 },
-      targetPosition: {
+        targetPosition: {
-        x: tangentEnd.x + dragPX,
+          x: tangentEnd.x + dragPX,
-        y: tangentEnd.y + dragPX,
+          y: tangentEnd.y + dragPX,
-      },
+        },
-    })
+      })
-    await page.waitForTimeout(100)
+      await page.waitForTimeout(100)
-    await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+      await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
 
-    // expect the code to have changed
+      // expect the code to have changed
-    await expect(page.locator('.cm-content'))
+      await expect(page.locator('.cm-content'))
-      .toHaveText(`const sketch001 = startSketchOn('XZ')
+        .toHaveText(`const sketch001 = startSketchOn('XZ')
-  |> startProfileAt([7.12, -12.68], %)
+    |> startProfileAt([7.12, -16.82], %)
-  |> line([15.39, -2.78], %)
+    |> line([15.4, -2.74], %)
-  |> tangentialArcTo([27.6, -3.05], %)
+    |> tangentialArcTo([24.95, -5.38], %)
-  |> close(%)
+    |> line([2.65, -2.69], %)
-  |> extrude(5, %)
+    |> close(%)
-`)
+    |> extrude(5, %)`)
-  })
+    }
+  )
 
   test('Can edit a sketch that has been revolved in the same pipe', async ({
     page,
@@ -599,7 +602,7 @@ test.describe('Sketch tests', () => {
     await expect(u.codeLocator).toHaveText(codeStr)
 
     // exit the sketch, reset relative clicker
-    await click00r(undefined, undefined)
+    click00r(undefined, undefined)
     await u.openAndClearDebugPanel()
     await page.getByRole('button', { name: 'Exit Sketch' }).click()
     await u.expectCmdLog('[data-message-type="execution-done"]')

e2e/playwright/snapshot-tests.spec.ts

@@ -53,7 +53,6 @@ test(
   async ({ page, context }) => {
     // skip on macos and windows.
     test.skip(
-      // eslint-disable-next-line jest/valid-title
       process.platform === 'darwin' || process.platform === 'win32',
       'Skip on macos and windows'
     )
@@ -964,69 +963,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,12 @@ 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 +25,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 +43,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 +72,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('')
 }
@@ -98,8 +94,6 @@ async function expectCmdLog(page: Page, locatorStr: string, timeout = 5000) {
   await expect(page.locator(locatorStr).last()).toBeVisible({ timeout })
 }
 
-// Ignoring the lint since I assume someone will want to use this for a test.
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function waitForDefaultPlanesToBeVisible(page: Page) {
   await page.waitForFunction(
     () =>
@@ -108,21 +102,17 @@ async function waitForDefaultPlanesToBeVisible(page: Page) {
   )
 }
 
-async function openPane(page: Page, testId: string) {
+async function openKclCodePanel(page: Page) {
-  const locator = page.getByTestId(testId)
+  const paneLocator = page.getByTestId('code-pane-button')
-  await expect(locator).toBeVisible()
+  const ariaSelected = await paneLocator?.getAttribute('aria-pressed')
-  const isOpen = (await locator?.getAttribute('aria-pressed')) === 'true'
+  const isOpen = ariaSelected === 'true'
 
   if (!isOpen) {
-    await locator.click()
+    await paneLocator.click()
-    await expect(locator).toHaveAttribute('aria-pressed', 'true')
+    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 +125,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) {
@@ -148,28 +145,6 @@ async function closeDebugPanel(page: Page) {
   }
 }
 
-async function openFilePanel(page: Page) {
-  await openPane(page, 'files-pane-button')
-}
-
-async function closeFilePanel(page: Page) {
-  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).not.toHaveAttribute('aria-pressed', 'true')
-  }
-}
-
-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}"]`)
@@ -196,8 +171,7 @@ export const wiggleMove = async (
       const isElVis = await page.locator(locator).isVisible()
       if (isElVis) return
     }
-    // x1 is 0.
+    const [x1, y1] = [0, Math.sin((tau / steps) * j * freq) * amplitude]
-    const y1 = Math.sin((tau / steps) * j * freq) * amplitude
     const [x2, y2] = [
       Math.cos(-ang * deg) * i - Math.sin(-ang * deg) * y1,
       Math.sin(-ang * deg) * i + Math.cos(-ang * deg) * y1,
@@ -208,7 +182,7 @@ export const wiggleMove = async (
 }
 
 export const circleMove = async (
-  page: Page,
+  page: any,
   x: number,
   y: number,
   steps: number,
@@ -314,19 +288,13 @@ export function normaliseKclNumbers(code: string, ignoreZero = true): string {
   return replaceNumbers(code)
 }
 
-export async function getUtils(page: Page, test_?: typeof test) {
+export async function getUtils(page: Page) {
-  if (!test) {
-    console.warn(
-      'Some methods in getUtils requires test object as second argument'
-    )
-  }
-
   // 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),
@@ -349,10 +317,6 @@ export async function getUtils(page: Page, test_?: typeof test) {
     closeKclCodePanel: () => closeKclCodePanel(page),
     openDebugPanel: () => openDebugPanel(page),
     closeDebugPanel: () => closeDebugPanel(page),
-    openFilePanel: () => openFilePanel(page),
-    closeFilePanel: () => closeFilePanel(page),
-    openVariablesPane: () => openVariablesPane(page),
-    openLogsPane: () => openLogsPane(page),
     openAndClearDebugPanel: async () => {
       await openDebugPanel(page)
       return clearCommandLogs(page)
@@ -488,79 +452,9 @@ export async function getUtils(page: Page, test_?: typeof test) {
         return page.evaluate('window.tearDown()')
       }
 
-      return cdpSession?.send(
+      cdpSession?.send('Network.emulateNetworkConditions', networkOptions)
-        'Network.emulateNetworkConditions',
-        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)
-      const editorText = await editor.textContent()
-      return expect(util.toNormalizedCode(editorText || '')).toBe(
-        util.toNormalizedCode(code)
-      )
-    },
-
-    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()
-      })
-    },
-
-    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
-          .getByTestId('file-pane-scroll-container')
-          .filter({ hasText: name })
-          .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>>
@@ -581,7 +475,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) => {
@@ -589,7 +483,7 @@ const _makeTemplate = (
       return (
         escapeRegExp(str) +
         String(
-          isArray(currentOptions)
+          Array.isArray(currentOptions)
             ? currentOptions[i]
             : typeof currentOptions === 'number'
             ? currentOptions
@@ -645,34 +539,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') {
+  } else {
-    await expect(page.getByTestId('export-pane-button')).toBeVisible()
     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()
 
@@ -700,7 +577,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)
@@ -708,7 +585,7 @@ export const doExport = async (
       downloadCnt++
     })
   await page.getByRole('button', { name: 'Submit command' }).click()
-  if (exportFrom === 'sidebarButton' || exportFrom === 'commandBar') {
+  if (isElectron) {
     return {
       modelPath: '',
       imagePath: '',
@@ -743,6 +620,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
@@ -767,7 +649,6 @@ 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)
@@ -803,9 +684,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({
@@ -865,50 +743,5 @@ export async function setupElectron({
 
   await setup(context, page)
 
-  return { electronApp, page, dir: projectDirName }
+  return { electronApp, page }
-}
-
-export async function isOutOfViewInScrollContainer(
-  element: Locator,
-  container: Locator
-): Promise<boolean> {
-  const elementBox = await element.boundingBox({ timeout: 5_000 })
-  const containerBox = await container.boundingBox({ timeout: 5_000 })
-
-  let isOutOfView = false
-  if (elementBox && containerBox)
-    return (
-      elementBox.y + elementBox.height > containerBox.y + containerBox.height ||
-      elementBox.y < containerBox.y ||
-      elementBox.x + elementBox.width > containerBox.x + containerBox.width ||
-      elementBox.x < containerBox.x
-    )
-
-  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()
 }

e2e/playwright/testing-constraints.spec.ts

@@ -72,7 +72,7 @@ test.describe('Testing constraints', () => {
       page.getByRole('button', { name: 'Exit Sketch' })
     ).not.toBeVisible()
   })
-  test(`Remove constraints`, async ({ page }) => {
+  test(`Test remove constraints`, async ({ page }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',

e2e/playwright/testing-segment-overlays.spec.ts

@@ -977,6 +977,10 @@ const part001 = startSketchOn('XZ')
       const hoverPos = { x: segmentToDelete.x, y: segmentToDelete.y }
       await page.mouse.move(0, 0)
       await page.waitForTimeout(1000)
+      let x = 0,
+        y = 0
+      x = hoverPos.x + Math.cos(ang * deg) * 32
+      y = hoverPos.y - Math.sin(ang * deg) * 32
       await page.mouse.move(hoverPos.x, hoverPos.y)
       await wiggleMove(
         page,

e2e/playwright/testing-settings.spec.ts

@@ -4,6 +4,7 @@ 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'
+import { APP_NAME } from 'lib/constants'
 
 test.beforeEach(async ({ context, page }) => {
   await setup(context, page)
@@ -72,7 +73,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()
@@ -82,7 +83,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()
     })
 
@@ -115,7 +116,8 @@ test.describe('Testing settings', () => {
     ).not.toBeChecked()
   })
 
-  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()
@@ -160,11 +162,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)
 
@@ -196,10 +193,6 @@ test.describe('Testing settings', () => {
     `Project settings override user settings on desktop`,
     { 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) => {
@@ -212,6 +205,7 @@ test.describe('Testing settings', () => {
       })
 
       await page.setViewportSize({ width: 1200, height: 500 })
+      const u = await getUtils(page)
 
       page.on('console', console.log)
 
@@ -264,69 +258,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()
-    }
-  )
 })

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

@@ -1,5 +1,7 @@
 import { test, expect, Page } from '@playwright/test'
-import { getUtils, setup, tearDown } from './test-utils'
+import * as fsp from 'fs/promises'
+import { getUtils, setup, setupElectron, tearDown } from './test-utils'
+import { join } from 'path'
 
 test.beforeEach(async ({ context, page }) => {
   await setup(context, page)
@@ -9,6 +11,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)
@@ -188,8 +192,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('akjsndladf ghgsssswefiuwq22262664')
-    await page.keyboard.type(randomPrompt)
     await page.waitForTimeout(1000)
     await page.keyboard.press('Enter')
 
@@ -296,9 +299,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.
@@ -518,9 +521,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`)
@@ -547,13 +550,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`)
@@ -634,9 +637,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`)

e2e/playwright/user-sidebar-menu-tests.spec.ts

@@ -1,34 +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 user sidebar menu tests', () => {
-  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/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('//')

forge.config.ts

@@ -6,9 +6,6 @@ import { MakerRpm } from '@electron-forge/maker-rpm'
 import { VitePlugin } from '@electron-forge/plugin-vite'
 import { FusesPlugin } from '@electron-forge/plugin-fuses'
 import { FuseV1Options, FuseVersion } from '@electron/fuses'
-import path from 'path'
-
-const rootDir = process.cwd()
 
 const config: ForgeConfig = {
   packagerConfig: {
@@ -22,24 +19,13 @@ const config: ForgeConfig = {
       }) ||
       undefined,
     executableName: 'zoo-modeling-app',
-    icon: path.resolve(rootDir, 'assets', 'icon'),
   },
   rebuildConfig: {},
   makers: [
-    new MakerSquirrel({
+    new MakerSquirrel({}),
-      setupIcon: path.resolve(rootDir, 'assets', 'icon.ico'),
-    }),
     new MakerZIP({}, ['darwin']),
-    new MakerRpm({
+    new MakerRpm({}),
-      options: {
+    new MakerDeb({}),
-        icon: path.resolve(rootDir, 'assets', 'icon.png'),
-      },
-    }),
-    new MakerDeb({
-      options: {
-        icon: path.resolve(rootDir, 'assets', 'icon.png'),
-      },
-    }),
   ],
   plugins: [
     new VitePlugin({

openapi/machine-api.json

@@ -631,7 +631,6 @@
               "errorno": {
                 "description": "The error number.",
                 "format": "int64",
-                "nullable": true,
                 "type": "integer"
               },
               "reason": {
@@ -662,7 +661,6 @@
               "tar_temp": {
                 "description": "The target temperature.",
                 "format": "int64",
-                "nullable": true,
                 "type": "integer"
               },
               "target": {
@@ -673,8 +671,10 @@
             },
             "required": [
               "command",
+              "errorno",
               "result",
               "sequence_id",
+              "tar_temp",
               "target"
             ],
             "type": "object"
@@ -1155,59 +1155,6 @@
             ],
             "type": "object"
           },
-          {
-            "additionalProperties": true,
-            "description": "A gcode file.",
-            "properties": {
-              "command": {
-                "enum": [
-                  "gcode_file"
-                ],
-                "type": "string"
-              },
-              "param": {
-                "description": "The param.",
-                "nullable": true,
-                "type": "string"
-              },
-              "print_type": {
-                "description": "The print type.",
-                "nullable": true,
-                "type": "string"
-              },
-              "reason": {
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/Reason"
-                  }
-                ],
-                "description": "The reason for the message."
-              },
-              "result": {
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/Result"
-                  }
-                ],
-                "description": "The result of the command."
-              },
-              "sequence_id": {
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/SequenceId"
-                  }
-                ],
-                "description": "The sequence id."
-              }
-            },
-            "required": [
-              "command",
-              "reason",
-              "result",
-              "sequence_id"
-            ],
-            "type": "object"
-          },
           {
             "additionalProperties": true,
             "description": "Project file.",

package.json

@@ -19,7 +19,7 @@
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/theme-one-dark": "^6.1.2",
-    "@csstools/postcss-oklab-function": "^4.0.2",
+    "@csstools/postcss-oklab-function": "^3.0.16",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-brands-svg-icons": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
@@ -53,7 +53,7 @@
     "react-json-view": "^1.21.3",
     "react-modal": "^3.16.1",
     "react-modal-promise": "^1.0.2",
-    "react-router-dom": "^6.26.1",
+    "react-router-dom": "^6.23.1",
     "sketch-helpers": "^0.0.4",
     "three": "^0.166.1",
     "ua-parser-js": "^1.0.37",
@@ -81,23 +81,22 @@
     "fmt": "prettier --write ./src *.ts *.json *.js ./e2e ./packages",
     "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e ./packages",
     "fetch:wasm": "./get-latest-wasm-bundle.sh",
-    "isomorphic-copy-wasm": "(copy src/wasm-lib/pkg/wasm_lib_bg.wasm public || cp src/wasm-lib/pkg/wasm_lib_bg.wasm public)",
+    "build:wasm-dev": "(cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
-    "build:wasm-dev": "(cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
+    "build:wasm": "(cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
-    "build:wasm": "cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings && cd ../.. && yarn isomorphic-copy-wasm && yarn fmt",
     "build:wasm-clean": "yarn wasm-prep && yarn build:wasm",
     "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\" || echo \"sed for both mac and linux\"",
     "wasm-prep": "rm -rf src/wasm-lib/pkg && mkdir src/wasm-lib/pkg && rm -rf src/wasm-lib/kcl/bindings",
-    "lint": "eslint --fix src e2e",
+    "lint": "eslint --fix src",
     "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json && echo \"$(jq --arg v \"$VERSION\" '.version=$v' src-tauri/tauri.conf.json --indent 2)\" > src-tauri/tauri.conf.json",
     "postinstall": "yarn xstate:typegen",
     "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\"",
     "make:dev": "make dev",
     "generate:machine-api": "npx openapi-typescript ./openapi/machine-api.json -o src/lib/machine-api.d.ts",
-    "tron:start": "electron-forge start",
+    "electron:start": "electron-forge start",
-    "tron:package": "electron-forge package",
+    "electron:package": "electron-forge package",
-    "tron:make": "electron-forge make",
+    "electron:make": "electron-forge make",
-    "tron:publish": "electron-forge publish",
+    "electron:publish": "electron-forge publish",
-    "tron:test": "NODE_ENV=development yarn playwright test --config=playwright.electron.config.ts --grep=@electron"
+    "electron:e2e:local": "NODE_ENV=development yarn playwright test --config=playwright.electron.config.ts --grep=@electron"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -131,17 +130,17 @@
     "@electron/fuses": "^1.8.0",
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.1",
-    "@playwright/test": "^1.46.1",
+    "@playwright/test": "^1.45.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^15.0.2",
     "@types/d3-force": "^3.0.10",
     "@types/electron": "^1.6.10",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.5.0",
+    "@types/node": "^18.19.31",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.4",
-    "@types/react": "^18.3.4",
+    "@types/react": "^18.3.2",
     "@types/react-dom": "^18.2.25",
     "@types/react-modal": "^3.16.3",
     "@types/three": "^0.163.0",
@@ -157,7 +156,7 @@
     "@xstate/cli": "^0.5.17",
     "autoprefixer": "^10.4.19",
     "d3-force": "^3.0.0",
-    "electron": "^32.0.1",
+    "electron": "^31.2.1",
     "eslint": "^8.0.1",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-css-modules": "^2.12.0",
@@ -165,7 +164,7 @@
     "eslint-plugin-suggest-no-throw": "^1.0.0",
     "happy-dom": "^14.3.10",
     "http-server": "^14.1.1",
-    "husky": "^9.1.5",
+    "husky": "^9.0.11",
     "node-fetch": "^3.3.2",
     "pixelmatch": "^5.3.0",
     "pngjs": "^7.0.0",
@@ -176,7 +175,7 @@
     "tailwindcss": "^3.4.1",
     "ts-node": "^10.0.0",
     "typescript": "^5.0.0",
-    "vite": "^5.4.2",
+    "vite": "^5.0.12",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-package-version": "^1.1.0",
     "vite-tsconfig-paths": "^4.3.2",

playwright.ci.config.ts

@@ -17,7 +17,6 @@ export default defineConfig({
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: [
     ['dot'],
-    ['list'],
     ['json', { outputFile: './test-results/report.json' }],
     ['html'],
   ],

playwright.electron.config.ts

@@ -1,4 +1,4 @@
-import { defineConfig, devices } from '@playwright/test'
+import { defineConfig } from '@playwright/test'
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -30,24 +30,4 @@ export default defineConfig({
     actionTimeout: 15_000,
     screenshot: 'only-on-failure',
   },
-  projects: [
-    {
-      name: 'Google Chrome',
-      use: {
-        ...devices['Desktop Chrome'],
-        channel: 'chrome',
-        contextOptions: {
-          /* Chromium is the only one with these permission types */
-          permissions: ['clipboard-write', 'clipboard-read'],
-        },
-        launchOptions: {
-          ...(process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH
-            ? {
-                executablePath: process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH,
-              }
-            : {}),
-        },
-      }, // or 'chrome-beta'
-    },
-  ],
 })