Merge remote-tracking branch 'origin' into lf94/tauri-to-electron

KittyCAD · Aug 15, 2024 · 4b54af7 · 4b54af7
2 parents 5f16505 + a7a88bd
commit 4b54af7
Show file tree

Hide file tree

Showing 336 changed files with 2,488 additions and 251 deletions.
diff --git a/README.md b/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
 ```

diff --git a/docs/kcl/abs.md b/docs/kcl/abs.md
diff --git a/docs/kcl/acos.md b/docs/kcl/acos.md
diff --git a/docs/kcl/angleToMatchLengthX.md b/docs/kcl/angleToMatchLengthX.md
diff --git a/docs/kcl/angleToMatchLengthY.md b/docs/kcl/angleToMatchLengthY.md
diff --git a/docs/kcl/angledLine.md b/docs/kcl/angledLine.md
diff --git a/docs/kcl/angledLineOfXLength.md b/docs/kcl/angledLineOfXLength.md
diff --git a/docs/kcl/angledLineOfYLength.md b/docs/kcl/angledLineOfYLength.md
diff --git a/docs/kcl/angledLineThatIntersects.md b/docs/kcl/angledLineThatIntersects.md
diff --git a/docs/kcl/angledLineToX.md b/docs/kcl/angledLineToX.md
diff --git a/docs/kcl/angledLineToY.md b/docs/kcl/angledLineToY.md
diff --git a/docs/kcl/arc.md b/docs/kcl/arc.md
diff --git a/docs/kcl/asin.md b/docs/kcl/asin.md
diff --git a/docs/kcl/assert.md b/docs/kcl/assert.md
diff --git a/docs/kcl/assertEqual.md b/docs/kcl/assertEqual.md
diff --git a/docs/kcl/assertGreaterThan.md b/docs/kcl/assertGreaterThan.md
diff --git a/docs/kcl/assertGreaterThanOrEq.md b/docs/kcl/assertGreaterThanOrEq.md
diff --git a/docs/kcl/assertLessThan.md b/docs/kcl/assertLessThan.md
diff --git a/docs/kcl/assertLessThanOrEq.md b/docs/kcl/assertLessThanOrEq.md
diff --git a/docs/kcl/atan.md b/docs/kcl/atan.md
diff --git a/docs/kcl/bezierCurve.md b/docs/kcl/bezierCurve.md
diff --git a/docs/kcl/ceil.md b/docs/kcl/ceil.md
diff --git a/docs/kcl/chamfer.md b/docs/kcl/chamfer.md
diff --git a/docs/kcl/circle.md b/docs/kcl/circle.md
diff --git a/docs/kcl/close.md b/docs/kcl/close.md
diff --git a/docs/kcl/cos.md b/docs/kcl/cos.md
diff --git a/docs/kcl/e.md b/docs/kcl/e.md
diff --git a/docs/kcl/extrude.md b/docs/kcl/extrude.md
diff --git a/docs/kcl/fillet.md b/docs/kcl/fillet.md
diff --git a/docs/kcl/floor.md b/docs/kcl/floor.md
diff --git a/docs/kcl/getNextAdjacentEdge.md b/docs/kcl/getNextAdjacentEdge.md
diff --git a/docs/kcl/getOppositeEdge.md b/docs/kcl/getOppositeEdge.md
diff --git a/docs/kcl/getPreviousAdjacentEdge.md b/docs/kcl/getPreviousAdjacentEdge.md
diff --git a/docs/kcl/helix.md b/docs/kcl/helix.md
diff --git a/docs/kcl/hole.md b/docs/kcl/hole.md
diff --git a/docs/kcl/import.md b/docs/kcl/import.md
diff --git a/docs/kcl/int.md b/docs/kcl/int.md
diff --git a/docs/kcl/lastSegX.md b/docs/kcl/lastSegX.md
diff --git a/docs/kcl/lastSegY.md b/docs/kcl/lastSegY.md
diff --git a/docs/kcl/line.md b/docs/kcl/line.md
diff --git a/docs/kcl/lineTo.md b/docs/kcl/lineTo.md
diff --git a/docs/kcl/ln.md b/docs/kcl/ln.md
diff --git a/docs/kcl/log.md b/docs/kcl/log.md
diff --git a/docs/kcl/log10.md b/docs/kcl/log10.md
diff --git a/docs/kcl/log2.md b/docs/kcl/log2.md
diff --git a/docs/kcl/max.md b/docs/kcl/max.md
diff --git a/docs/kcl/min.md b/docs/kcl/min.md
diff --git a/docs/kcl/patternCircular2d.md b/docs/kcl/patternCircular2d.md
diff --git a/docs/kcl/patternCircular3d.md b/docs/kcl/patternCircular3d.md
diff --git a/docs/kcl/patternLinear2d.md b/docs/kcl/patternLinear2d.md
diff --git a/docs/kcl/patternLinear3d.md b/docs/kcl/patternLinear3d.md
diff --git a/docs/kcl/patternTransform.md b/docs/kcl/patternTransform.md
diff --git a/docs/kcl/pi.md b/docs/kcl/pi.md
diff --git a/docs/kcl/polar.md b/docs/kcl/polar.md
diff --git a/docs/kcl/pow.md b/docs/kcl/pow.md
diff --git a/docs/kcl/profileStart.md b/docs/kcl/profileStart.md
diff --git a/docs/kcl/profileStartX.md b/docs/kcl/profileStartX.md
diff --git a/docs/kcl/profileStartY.md b/docs/kcl/profileStartY.md
diff --git a/docs/kcl/revolve.md b/docs/kcl/revolve.md
diff --git a/docs/kcl/segAng.md b/docs/kcl/segAng.md
diff --git a/docs/kcl/segEndX.md b/docs/kcl/segEndX.md
diff --git a/docs/kcl/segEndY.md b/docs/kcl/segEndY.md
diff --git a/docs/kcl/segLen.md b/docs/kcl/segLen.md
diff --git a/docs/kcl/shell.md b/docs/kcl/shell.md
diff --git a/docs/kcl/sin.md b/docs/kcl/sin.md
diff --git a/docs/kcl/sqrt.md b/docs/kcl/sqrt.md
diff --git a/docs/kcl/startProfileAt.md b/docs/kcl/startProfileAt.md
diff --git a/docs/kcl/startSketchAt.md b/docs/kcl/startSketchAt.md
diff --git a/docs/kcl/startSketchOn.md b/docs/kcl/startSketchOn.md
diff --git a/docs/kcl/tan.md b/docs/kcl/tan.md
diff --git a/docs/kcl/tangentialArc.md b/docs/kcl/tangentialArc.md
diff --git a/docs/kcl/tangentialArcTo.md b/docs/kcl/tangentialArcTo.md
diff --git a/docs/kcl/tau.md b/docs/kcl/tau.md
diff --git a/docs/kcl/toDegrees.md b/docs/kcl/toDegrees.md
diff --git a/docs/kcl/toRadians.md b/docs/kcl/toRadians.md
diff --git a/docs/kcl/xLine.md b/docs/kcl/xLine.md
diff --git a/docs/kcl/xLineTo.md b/docs/kcl/xLineTo.md
diff --git a/docs/kcl/yLine.md b/docs/kcl/yLine.md
diff --git a/docs/kcl/yLineTo.md b/docs/kcl/yLineTo.md
diff --git a/e2e/playwright/export-snapshots/gltf-binary.png b/e2e/playwright/export-snapshots/gltf-binary.png
diff --git a/e2e/playwright/export-snapshots/gltf-embedded.png b/e2e/playwright/export-snapshots/gltf-embedded.png
diff --git a/e2e/playwright/export-snapshots/gltf-standard.png b/e2e/playwright/export-snapshots/gltf-standard.png
diff --git a/e2e/playwright/export-snapshots/obj-.png b/e2e/playwright/export-snapshots/obj-.png
diff --git a/e2e/playwright/export-snapshots/ply-ascii.png b/e2e/playwright/export-snapshots/ply-ascii.png
diff --git a/e2e/playwright/export-snapshots/ply-binary_big_endian.png b/e2e/playwright/export-snapshots/ply-binary_big_endian.png
diff --git a/e2e/playwright/export-snapshots/ply-binary_little_endian.png b/e2e/playwright/export-snapshots/ply-binary_little_endian.png
diff --git a/e2e/playwright/export-snapshots/step-.png b/e2e/playwright/export-snapshots/step-.png
diff --git a/e2e/playwright/export-snapshots/stl-ascii.png b/e2e/playwright/export-snapshots/stl-ascii.png
diff --git a/e2e/playwright/export-snapshots/stl-binary.png b/e2e/playwright/export-snapshots/stl-binary.png
diff --git a/e2e/playwright/regression-tests.spec.ts b/e2e/playwright/regression-tests.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '@playwright/test'
+import { test, expect, Page } from '@playwright/test'
 
 import { getUtils, setup, tearDown } from './test-utils'
 import { TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR } from './storageStates'
@@ -346,55 +346,24 @@ const sketch001 = startSketchAt([-0, -0])
     // 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()
-
-    // Click the export button
-    exportButton.click()
-
-    // Click the stl.
-    const stlOption = page.getByText('glTF')
-    await expect(stlOption).toBeVisible()
-
-    await page.keyboard.press('Enter')
-
-    // Click the checkbox
-    const submitButton = page.getByText('Confirm Export')
-    await expect(submitButton).toBeVisible()
-
-    await page.keyboard.press('Enter')
-
-    // Find the toast.
-    // Look out for the toast message
-    const exportingToastMessage = page.getByText(`Exporting...`)
-    await expect(exportingToastMessage).toBeVisible()
-
     const errorToastMessage = page.getByText(`Error while exporting`)
-
+    const exportingToastMessage = page.getByText(`Exporting...`)
     const engineErrorToastMessage = page.getByText(`Nothing to export`)
-
     const alreadyExportingToastMessage = page.getByText(`Already exporting`)
 
-    // Try exporting again.
-    // Click the export button
-    exportButton.click()
-
-    // Click the stl.
-    await expect(stlOption).toBeVisible()
-
-    await page.keyboard.press('Enter')
+    await clickExportButton(page)
 
-    // Click the checkbox
-    await expect(submitButton).toBeVisible()
+    await expect(exportingToastMessage).toBeVisible()
 
-    await page.keyboard.press('Enter')
+    await clickExportButton(page)
 
     // Find the toast.
     // Look out for the toast message
     await expect(exportingToastMessage).toBeVisible()
     await expect(alreadyExportingToastMessage).toBeVisible()
 
+    await page.waitForTimeout(1000)
+
     // Expect it to succeed.
     await expect(exportingToastMessage).not.toBeVisible()
     await expect(errorToastMessage).not.toBeVisible()
@@ -406,18 +375,7 @@ const sketch001 = startSketchAt([-0, -0])
     await expect(alreadyExportingToastMessage).not.toBeVisible()
 
     // Try exporting again.
-    // Click the export button
-    exportButton.click()
-
-    // Click the stl.
-    await expect(stlOption).toBeVisible()
-
-    await page.keyboard.press('Enter')
-
-    // Click the checkbox
-    await expect(submitButton).toBeVisible()
-
-    await page.keyboard.press('Enter')
+    await clickExportButton(page)
 
     // Find the toast.
     // Look out for the toast message
@@ -432,3 +390,24 @@ const sketch001 = startSketchAt([-0, -0])
     await expect(successToastMessage).toBeVisible()
   })
 })
+
+async function clickExportButton(page: Page) {
+  // export the model
+  const exportButton = page.getByTestId('export-pane-button')
+  await expect(exportButton).toBeVisible()
+
+  // Click the export button
+  exportButton.click()
+
+  // Click the stl.
+  const gltfOption = page.getByText('glTF')
+  await expect(gltfOption).toBeVisible()
+
+  await page.keyboard.press('Enter')
+
+  // Click the checkbox
+  const submitButton = page.getByText('Confirm Export')
+  await expect(submitButton).toBeVisible()
+
+  await page.keyboard.press('Enter')
+}
diff --git a/e2e/playwright/test-utils.ts b/e2e/playwright/test-utils.ts
@@ -15,8 +15,7 @@ import pixelMatch from 'pixelmatch'
 import { PNG } from 'pngjs'
 import { Protocol } from 'playwright-core/types/protocol'
 import type { Models } from '@kittycad/lib'
-import { APP_NAME, TEST_SETTINGS_FILE_KEY } from 'lib/constants'
-import waitOn from 'wait-on'
+import { APP_NAME, COOKIE_NAME } from 'lib/constants'
 import { secrets } from './secrets'
 import { TEST_SETTINGS_KEY, TEST_SETTINGS } from './storageStates'
 import * as TOML from '@iarna/toml'
@@ -650,6 +649,16 @@ export async function setup(context: BrowserContext, page: Page) {
       } as Partial<SaveSettingsPayload>),
     }
   )
+
+  await context.addCookies([
+    {
+      name: COOKIE_NAME,
+      value: secrets.token,
+      path: '/',
+      domain: 'localhost',
+      secure: true,
+    },
+  ])
   // kill animations, speeds up tests and reduced flakiness
   await page.emulateMedia({ reducedMotion: 'reduce' })
 }