diff --git a/.env.development b/.env.development index 7b474799a..132d4fd8a 100644 --- a/.env.development +++ b/.env.development @@ -3,17 +3,17 @@ NODE_ENV=development DEV=true +# App VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands -VITE_KC_API_BASE_URL=https://api.dev.zoo.dev +VITE_KITTYCAD_API_BASE_URL=https://api.dev.zoo.dev VITE_KC_SITE_BASE_URL=https://dev.zoo.dev VITE_KC_SITE_APP_URL=https://app.dev.zoo.dev VITE_KC_CONNECTION_TIMEOUT_MS=5000 -#VITE_WASM_URL="optional way of overriding the wasm url, particular for unit tests which need this if you running not on the default 3000 port" -#VITE_KC_DEV_TOKEN="optional token to skip auth in the app" -#token="required token for playwright. TODO: clean up env vars in #3973" +#VITE_WASM_URL="optional override of Wasm URL if not on default port 3000" +#VITE_KITTYCAD_API_TOKEN="required for testing, optional to skip auth in the app" +FAIL_ON_CONSOLE_ERRORS=true +# KCL RUST_BACKTRACE=1 PYO3_PYTHON=/usr/local/bin/python3 -#KITTYCAD_API_TOKEN="required token for engine testing" - -FAIL_ON_CONSOLE_ERRORS=true +#KITTYCAD_API_TOKEN=$VITE_KITTYCAD_API_TOKEN diff --git a/.env.production b/.env.production index 49aee03e9..c82236ed9 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,8 @@ NODE_ENV=production + +# App VITE_KC_API_WS_MODELING_URL=wss://api.zoo.dev/ws/modeling/commands -VITE_KC_API_BASE_URL=https://api.zoo.dev +VITE_KITTYCAD_API_BASE_URL=https://api.zoo.dev VITE_KC_SITE_BASE_URL=https://zoo.dev VITE_KC_SITE_APP_URL=https://app.zoo.dev VITE_KC_CONNECTION_TIMEOUT_MS=15000 diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index b173db5db..f9e95fbb4 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -157,7 +157,7 @@ jobs: timeout_minutes: 5 max_attempts: 5 env: - token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} + VITE_KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} TAB_API_URL: ${{ secrets.TAB_API_URL }} TAB_API_KEY: ${{ secrets.TAB_API_KEY }} CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }} @@ -169,7 +169,7 @@ jobs: if: always() run: npm run test:snapshots -- --last-failed --update-snapshots env: - token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} + VITE_KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} TAB_API_URL: ${{ secrets.TAB_API_URL }} TAB_API_KEY: ${{ secrets.TAB_API_KEY }} CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }} @@ -284,7 +284,7 @@ jobs: timeout_minutes: 5 max_attempts: 5 env: - token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} + VITE_KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} TAB_API_URL: ${{ secrets.TAB_API_URL }} TAB_API_KEY: ${{ secrets.TAB_API_KEY }} CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }} @@ -410,7 +410,7 @@ jobs: max_attempts: 9 env: FAIL_ON_CONSOLE_ERRORS: true - token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} + VITE_KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} TAB_API_URL: ${{ secrets.TAB_API_URL }} TAB_API_KEY: ${{ secrets.TAB_API_KEY }} CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 2998b4519..8bd8aaefa 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -62,7 +62,7 @@ jobs: if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }} run: xvfb-run -a npm run test:unit env: - VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} + VITE_KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }} - name: Check for changes if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d124a1bf1..e010df06c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -65,7 +65,7 @@ If you're not a Zoo employee you won't be able to access the dev environment, yo ### Development environment variables -The Copilot LSP plugin in the editor requires a Zoo API token to run. In production, we authenticate this with a token via cookie in the browser and device auth token in the desktop environment, but this token is inaccessible in the dev browser version because the cookie is considered "cross-site" (from `localhost` to `zoo.dev`). There is an optional environment variable called `VITE_KC_DEV_TOKEN` that you can populate with a dev token in a `.env.development.local` file to not check it into Git, which will use that token instead of other methods for the LSP service. +The Copilot LSP plugin in the editor requires a Zoo API token to run. In production, we authenticate this with a token via cookie in the browser and device auth token in the desktop environment, but this token is inaccessible in the dev browser version because the cookie is considered "cross-site" (from `localhost` to `zoo.dev`). There is an optional environment variable called `VITE_KITTYCAD_API_TOKEN` that you can populate with a dev token in a `.env.development.local` file to not check it into Git, which will use that token instead of other methods for the LSP service. ### Developing in Chrome @@ -96,7 +96,7 @@ To package the app for your platform with electron-builder, run `npm run tronb:p Prepare these system dependencies: -- Set $token from https://zoo.dev/account/api-tokens +- Set `$VITE_KITTYCAD_API_TOKEN` from https://zoo.dev/account/api-tokens #### Snapshot tests (Google Chrome on Ubuntu only) @@ -259,7 +259,7 @@ If the application needs to overwrite the known file on disk use this pattern. T - `npm run circular-deps:overwrite` - `npm run url-checker:overwrite` -#### Diff baseline and current +#### Diff baseline and current These commands will write a /tmp/ file on disk and compare it to the known file in the repository. This command will also be used in the CI CD pipeline for automated checks diff --git a/Makefile b/Makefile index f43129162..ea769e525 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ RUST_SOURCES := $(wildcard rust/**/*.rs) REACT_SOURCES := $(wildcard src/*.tsx) $(wildcard src/**/*.tsx) TYPESCRIPT_SOURCES := tsconfig.* $(wildcard src/*.ts) $(wildcard src/**/*.ts) -VITE_SOURCES := $(wildcard vite.*) $(wildcard vite/**/*.tsx) +VITE_SOURCES := $(wildcard vite.*) $(wildcard vite/**/*.tsx) .env* .PHONY: build build: install public/kcl_wasm_lib_bg.wasm public/kcl-samples/manifest.json .vite/build/main.js diff --git a/e2e/playwright/auth.spec.ts b/e2e/playwright/auth.spec.ts index c60f465ad..ade64824f 100644 --- a/e2e/playwright/auth.spec.ts +++ b/e2e/playwright/auth.spec.ts @@ -1,6 +1,5 @@ import { expect, test } from '@e2e/playwright/zoo-test' -// test file is for testing auth functionality test.describe('Authentication tests', () => { test( `The user can sign out and back in`, @@ -13,22 +12,12 @@ test.describe('Authentication tests', () => { await page.setBodyDimensions({ width: 1000, height: 500 }) await homePage.projectSection.waitFor() - // This is only needed as an override to test-utils' setup() for this test - await page.addInitScript(() => { - localStorage.setItem('TOKEN_PERSIST_KEY', '') - }) - await test.step('Click on sign out and expect sign in page', async () => { await toolbar.userSidebarButton.click() await toolbar.signOutButton.click() await expect(signInPage.signInButton).toBeVisible() }) - await test.step("Refresh doesn't log the user back in", async () => { - await page.reload() - await expect(signInPage.signInButton).toBeVisible() - }) - await test.step('Click on sign in and cancel, click again and expect different code', async () => { await signInPage.signInButton.click() await expect(signInPage.userCode).toBeVisible() diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png index 26956ddbc..7959c3385 100644 Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png differ diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png index 5f741433b..f7b70a8fe 100644 Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png differ diff --git a/e2e/playwright/test-utils.ts b/e2e/playwright/test-utils.ts index e613c4f5b..859f118a8 100644 --- a/e2e/playwright/test-utils.ts +++ b/e2e/playwright/test-utils.ts @@ -17,7 +17,7 @@ import dotenv from 'dotenv' const NODE_ENV = process.env.NODE_ENV || 'development' dotenv.config({ path: [`.env.${NODE_ENV}.local`, `.env.${NODE_ENV}`] }) -export const token = process.env.token || '' +export const token = process.env.VITE_KITTYCAD_API_TOKEN || '' import type { ProjectConfiguration } from '@rust/kcl-lib/bindings/ProjectConfiguration' diff --git a/interface.d.ts b/interface.d.ts index 272da2054..cd627de39 100644 --- a/interface.d.ts +++ b/interface.d.ts @@ -73,13 +73,12 @@ export interface IElectronAPI { process: { env: { IS_PLAYWRIGHT: string - VITE_KC_DEV_TOKEN: string + VITE_KITTYCAD_API_TOKEN: string VITE_KC_API_WS_MODELING_URL: string - VITE_KC_API_BASE_URL: string + VITE_KITTYCAD_API_BASE_URL: string VITE_KC_SITE_BASE_URL: string VITE_KC_SITE_APP_URL: string VITE_KC_CONNECTION_TIMEOUT_MS: string - VITE_KC_DEV_TOKEN: string NODE_ENV: string PROD: string DEV: string diff --git a/package-lock.json b/package-lock.json index f8ae0ebee..08d265b90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -149,7 +149,7 @@ "ts-node": "^10.0.0", "typescript": "^5.8.3", "typescript-eslint": "^8.30.1", - "vite": "^5.4.18", + "vite": "^5.4.19", "vite-plugin-package-version": "^1.1.0", "vite-plugin-top-level-await": "^1.5.0", "vite-tsconfig-paths": "^4.3.2", @@ -3652,9 +3652,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.3.tgz", - "integrity": "sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz", + "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==", "cpu": [ "ppc64" ], @@ -3668,9 +3668,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.3.tgz", - "integrity": "sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz", + "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==", "cpu": [ "arm" ], @@ -3684,9 +3684,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.3.tgz", - "integrity": "sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz", + "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==", "cpu": [ "arm64" ], @@ -3700,9 +3700,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.3.tgz", - "integrity": "sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz", + "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==", "cpu": [ "x64" ], @@ -3716,9 +3716,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.3.tgz", - "integrity": "sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz", + "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==", "cpu": [ "arm64" ], @@ -3732,9 +3732,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.3.tgz", - "integrity": "sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz", + "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==", "cpu": [ "x64" ], @@ -3748,9 +3748,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.3.tgz", - "integrity": "sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz", + "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==", "cpu": [ "arm64" ], @@ -3764,9 +3764,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.3.tgz", - "integrity": "sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz", + "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==", "cpu": [ "x64" ], @@ -3780,9 +3780,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.3.tgz", - "integrity": "sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz", + "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==", "cpu": [ "arm" ], @@ -3796,9 +3796,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.3.tgz", - "integrity": "sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz", + "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==", "cpu": [ "arm64" ], @@ -3812,9 +3812,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.3.tgz", - "integrity": "sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz", + "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==", "cpu": [ "ia32" ], @@ -3828,9 +3828,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.3.tgz", - "integrity": "sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz", + "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==", "cpu": [ "loong64" ], @@ -3844,9 +3844,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.3.tgz", - "integrity": "sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz", + "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==", "cpu": [ "mips64el" ], @@ -3860,9 +3860,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.3.tgz", - "integrity": "sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz", + "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==", "cpu": [ "ppc64" ], @@ -3876,9 +3876,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.3.tgz", - "integrity": "sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz", + "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==", "cpu": [ "riscv64" ], @@ -3892,9 +3892,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.3.tgz", - "integrity": "sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz", + "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==", "cpu": [ "s390x" ], @@ -3908,9 +3908,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.3.tgz", - "integrity": "sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz", + "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==", "cpu": [ "x64" ], @@ -3924,9 +3924,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.3.tgz", - "integrity": "sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz", + "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==", "cpu": [ "arm64" ], @@ -3940,9 +3940,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.3.tgz", - "integrity": "sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz", + "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==", "cpu": [ "x64" ], @@ -3956,9 +3956,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.3.tgz", - "integrity": "sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz", + "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==", "cpu": [ "arm64" ], @@ -3972,9 +3972,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.3.tgz", - "integrity": "sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz", + "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==", "cpu": [ "x64" ], @@ -3988,9 +3988,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.3.tgz", - "integrity": "sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz", + "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==", "cpu": [ "x64" ], @@ -4004,9 +4004,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.3.tgz", - "integrity": "sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz", + "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==", "cpu": [ "arm64" ], @@ -4020,9 +4020,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.3.tgz", - "integrity": "sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz", + "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==", "cpu": [ "ia32" ], @@ -4036,9 +4036,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.3.tgz", - "integrity": "sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz", + "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==", "cpu": [ "x64" ], @@ -13219,9 +13219,9 @@ "optional": true }, "node_modules/esbuild": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz", - "integrity": "sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz", + "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==", "dev": true, "hasInstallScript": true, "bin": { @@ -13231,31 +13231,31 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.3", - "@esbuild/android-arm": "0.25.3", - "@esbuild/android-arm64": "0.25.3", - "@esbuild/android-x64": "0.25.3", - "@esbuild/darwin-arm64": "0.25.3", - "@esbuild/darwin-x64": "0.25.3", - "@esbuild/freebsd-arm64": "0.25.3", - "@esbuild/freebsd-x64": "0.25.3", - "@esbuild/linux-arm": "0.25.3", - "@esbuild/linux-arm64": "0.25.3", - "@esbuild/linux-ia32": "0.25.3", - "@esbuild/linux-loong64": "0.25.3", - "@esbuild/linux-mips64el": "0.25.3", - "@esbuild/linux-ppc64": "0.25.3", - "@esbuild/linux-riscv64": "0.25.3", - "@esbuild/linux-s390x": "0.25.3", - "@esbuild/linux-x64": "0.25.3", - "@esbuild/netbsd-arm64": "0.25.3", - "@esbuild/netbsd-x64": "0.25.3", - "@esbuild/openbsd-arm64": "0.25.3", - "@esbuild/openbsd-x64": "0.25.3", - "@esbuild/sunos-x64": "0.25.3", - "@esbuild/win32-arm64": "0.25.3", - "@esbuild/win32-ia32": "0.25.3", - "@esbuild/win32-x64": "0.25.3" + "@esbuild/aix-ppc64": "0.25.4", + "@esbuild/android-arm": "0.25.4", + "@esbuild/android-arm64": "0.25.4", + "@esbuild/android-x64": "0.25.4", + "@esbuild/darwin-arm64": "0.25.4", + "@esbuild/darwin-x64": "0.25.4", + "@esbuild/freebsd-arm64": "0.25.4", + "@esbuild/freebsd-x64": "0.25.4", + "@esbuild/linux-arm": "0.25.4", + "@esbuild/linux-arm64": "0.25.4", + "@esbuild/linux-ia32": "0.25.4", + "@esbuild/linux-loong64": "0.25.4", + "@esbuild/linux-mips64el": "0.25.4", + "@esbuild/linux-ppc64": "0.25.4", + "@esbuild/linux-riscv64": "0.25.4", + "@esbuild/linux-s390x": "0.25.4", + "@esbuild/linux-x64": "0.25.4", + "@esbuild/netbsd-arm64": "0.25.4", + "@esbuild/netbsd-x64": "0.25.4", + "@esbuild/openbsd-arm64": "0.25.4", + "@esbuild/openbsd-x64": "0.25.4", + "@esbuild/sunos-x64": "0.25.4", + "@esbuild/win32-arm64": "0.25.4", + "@esbuild/win32-ia32": "0.25.4", + "@esbuild/win32-x64": "0.25.4" } }, "node_modules/escalade": { @@ -25132,11 +25132,10 @@ "optional": true }, "node_modules/vite": { - "version": "5.4.18", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.18.tgz", - "integrity": "sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==", + "version": "5.4.19", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz", + "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", @@ -26649,7 +26648,6 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.10.tgz", "integrity": "sha512-ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA==", "dev": true, - "license": "MIT", "dependencies": { "undici-types": "~7.8.0" } @@ -26658,8 +26656,7 @@ "version": "7.8.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz", "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==", - "dev": true, - "license": "MIT" + "dev": true }, "rust/kcl-language-server": { "version": "0.0.0", @@ -26678,7 +26675,7 @@ "@vscode/test-electron": "^2.4.1", "@vscode/vsce": "^3.3.2", "cross-env": "^7.0.3", - "esbuild": "^0.25.3", + "esbuild": "^0.25.4", "glob": "^11.0.1", "mocha": "^11.1.0", "typescript": "^5.8.3" diff --git a/package.json b/package.json index 07ebc3da8..afa209826 100644 --- a/package.json +++ b/package.json @@ -227,7 +227,7 @@ "ts-node": "^10.0.0", "typescript": "^5.8.3", "typescript-eslint": "^8.30.1", - "vite": "^5.4.18", + "vite": "^5.4.19", "vite-plugin-package-version": "^1.1.0", "vite-plugin-top-level-await": "^1.5.0", "vite-tsconfig-paths": "^4.3.2", diff --git a/rust/kcl-language-server/package.json b/rust/kcl-language-server/package.json index a67c5769e..bb74167a0 100644 --- a/rust/kcl-language-server/package.json +++ b/rust/kcl-language-server/package.json @@ -123,7 +123,7 @@ "@vscode/test-electron": "^2.4.1", "@vscode/vsce": "^3.3.2", "cross-env": "^7.0.3", - "esbuild": "^0.25.3", + "esbuild": "^0.25.4", "glob": "^11.0.1", "mocha": "^11.1.0", "typescript": "^5.8.3" diff --git a/src/env.ts b/src/env.ts index f3f0af864..354246daa 100644 --- a/src/env.ts +++ b/src/env.ts @@ -8,12 +8,14 @@ export const NODE_ENV = env.NODE_ENV as string | undefined export const VITE_KC_API_WS_MODELING_URL = env.VITE_KC_API_WS_MODELING_URL as | string | undefined -export const VITE_KC_API_BASE_URL = env.VITE_KC_API_BASE_URL +export const VITE_KITTYCAD_API_BASE_URL = env.VITE_KITTYCAD_API_BASE_URL export const VITE_KC_SITE_BASE_URL = env.VITE_KC_SITE_BASE_URL export const VITE_KC_SITE_APP_URL = env.VITE_KC_SITE_APP_URL export const VITE_KC_CONNECTION_TIMEOUT_MS = env.VITE_KC_CONNECTION_TIMEOUT_MS as string | undefined -export const VITE_KC_DEV_TOKEN = env.VITE_KC_DEV_TOKEN as string | undefined +export const VITE_KITTYCAD_API_TOKEN = env.VITE_KITTYCAD_API_TOKEN as + | string + | undefined export const PROD = env.PROD as string | undefined export const TEST = env.TEST as string | undefined export const DEV = env.DEV as string | undefined diff --git a/src/lang/modifyAst/addEdgeTreatment.test.ts b/src/lang/modifyAst/addEdgeTreatment.test.ts index 7c987592a..d9cc01d50 100644 --- a/src/lang/modifyAst/addEdgeTreatment.test.ts +++ b/src/lang/modifyAst/addEdgeTreatment.test.ts @@ -1,4 +1,4 @@ -import { VITE_KC_DEV_TOKEN } from '@src/env' +import { VITE_KITTYCAD_API_TOKEN } from '@src/env' import { createLiteral } from '@src/lang/create' import type { @@ -40,10 +40,9 @@ import { isOverlap } from '@src/lib/utils' beforeAll(async () => { await initPromise - // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local await new Promise((resolve) => { engineCommandManager.start({ - token: VITE_KC_DEV_TOKEN, + token: VITE_KITTYCAD_API_TOKEN, width: 256, height: 256, setMediaStream: () => {}, diff --git a/src/lang/modifyAst/tagManagement.test.ts b/src/lang/modifyAst/tagManagement.test.ts index ee6f9876a..c6b265bc2 100644 --- a/src/lang/modifyAst/tagManagement.test.ts +++ b/src/lang/modifyAst/tagManagement.test.ts @@ -4,16 +4,15 @@ import { initPromise } from '@src/lang/wasmUtils' import { err } from '@src/lib/trap' import type { Selection } from '@src/lib/selections' import { engineCommandManager, kclManager } from '@src/lib/singletons' -import { VITE_KC_DEV_TOKEN } from '@src/env' +import { VITE_KITTYCAD_API_TOKEN } from '@src/env' import { modifyAstWithTagsForSelection } from '@src/lang/modifyAst/tagManagement' beforeAll(async () => { await initPromise - // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local await new Promise((resolve) => { engineCommandManager.start({ - token: VITE_KC_DEV_TOKEN, + token: VITE_KITTYCAD_API_TOKEN, width: 256, height: 256, setMediaStream: () => {}, diff --git a/src/lang/std/engineConnection.ts b/src/lang/std/engineConnection.ts index ac01c4aed..51b806ec1 100644 --- a/src/lang/std/engineConnection.ts +++ b/src/lang/std/engineConnection.ts @@ -1,5 +1,5 @@ import type { Models } from '@kittycad/lib' -import { VITE_KC_API_WS_MODELING_URL, VITE_KC_DEV_TOKEN } from '@src/env' +import { VITE_KC_API_WS_MODELING_URL, VITE_KITTYCAD_API_TOKEN } from '@src/env' import { jsAppSettings } from '@src/lib/settings/settingsUtils' import { BSON } from 'bson' @@ -400,7 +400,7 @@ class EngineConnection extends EventTarget { this.send({ type: 'headers', headers: { - Authorization: `Bearer ${VITE_KC_DEV_TOKEN}`, + Authorization: `Bearer ${VITE_KITTYCAD_API_TOKEN}`, }, }) } diff --git a/src/lib/withBaseURL.ts b/src/lib/withBaseURL.ts index 5eccdff66..bd2560a90 100644 --- a/src/lib/withBaseURL.ts +++ b/src/lib/withBaseURL.ts @@ -1,5 +1,5 @@ -import { VITE_KC_API_BASE_URL } from '@src/env' +import { VITE_KITTYCAD_API_BASE_URL } from '@src/env' export function withAPIBaseURL(path: string): string { - return VITE_KC_API_BASE_URL + path + return VITE_KITTYCAD_API_BASE_URL + path } diff --git a/src/machines/authMachine.ts b/src/machines/authMachine.ts index fcc8c3486..881e19565 100644 --- a/src/machines/authMachine.ts +++ b/src/machines/authMachine.ts @@ -1,5 +1,5 @@ import type { Models } from '@kittycad/lib' -import { VITE_KC_DEV_TOKEN } from '@src/env' +import { VITE_KITTYCAD_API_TOKEN } from '@src/env' import { assign, fromPromise, setup } from 'xstate' import { COOKIE_NAME, OAUTH2_DEVICE_CLIENT_ID } from '@src/lib/constants' @@ -34,7 +34,7 @@ export const TOKEN_PERSIST_KEY = 'TOKEN_PERSIST_KEY' */ const persistedCookie = getCookie(COOKIE_NAME) const persistedLocalStorage = localStorage?.getItem(TOKEN_PERSIST_KEY) || '' -const persistedDevToken = VITE_KC_DEV_TOKEN +const persistedDevToken = VITE_KITTYCAD_API_TOKEN export const persistedToken = persistedDevToken || persistedCookie || persistedLocalStorage console.log('Initial persisted token') @@ -197,10 +197,10 @@ async function getAndSyncStoredToken(input: { token?: string }): Promise { // dev mode - if (VITE_KC_DEV_TOKEN) { + if (VITE_KITTYCAD_API_TOKEN) { console.log('Token used for authentication') - console.table([['api token', !!VITE_KC_DEV_TOKEN]]) - return VITE_KC_DEV_TOKEN + console.table([['api token', !!VITE_KITTYCAD_API_TOKEN]]) + return VITE_KITTYCAD_API_TOKEN } const inputToken = input.token && input.token !== '' ? input.token : '' @@ -213,7 +213,7 @@ async function getAndSyncStoredToken(input: { ['persisted token', !!inputToken], ['cookie', !!cookieToken], ['local storage', !!localStorageToken], - ['api token', !!VITE_KC_DEV_TOKEN], + ['api token', !!VITE_KITTYCAD_API_TOKEN], ]) if (token) { // has just logged in, update storage diff --git a/src/machines/modelingMachine.test.ts b/src/machines/modelingMachine.test.ts index 2181d30d8..bb52194b4 100644 --- a/src/machines/modelingMachine.test.ts +++ b/src/machines/modelingMachine.test.ts @@ -11,7 +11,7 @@ import { engineCommandManager, kclManager, } from '@src/lib/singletons' -import { VITE_KC_DEV_TOKEN } from '@src/env' +import { VITE_KITTYCAD_API_TOKEN } from '@src/env' import { getConstraintInfoKw } from '@src/lang/std/sketch' import { getNodeFromPath } from '@src/lang/queryAst' import type { Node } from '@rust/kcl-lib/bindings/Node' @@ -29,10 +29,9 @@ import { removeSingleConstraintInfo } from '@src/lang/modifyAst' beforeAll(async () => { await initPromise - // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local await new Promise((resolve) => { engineCommandManager.start({ - token: VITE_KC_DEV_TOKEN, + token: VITE_KITTYCAD_API_TOKEN, width: 256, height: 256, setMediaStream: () => {}, diff --git a/src/machines/modifyWithTTC.test.ts b/src/machines/modifyWithTTC.test.ts index dd4fd0841..2762915b8 100644 --- a/src/machines/modifyWithTTC.test.ts +++ b/src/machines/modifyWithTTC.test.ts @@ -1,5 +1,5 @@ import { engineCommandManager, kclManager } from '@src/lib/singletons' -import { VITE_KC_DEV_TOKEN } from '@src/env' +import { VITE_KITTYCAD_API_TOKEN } from '@src/env' import { getModuleIdByFileName, isArray } from '@src/lib/utils' import { vi, inject } from 'vitest' import { assertParse } from '@src/lang/wasm' @@ -355,10 +355,9 @@ cases.push( beforeAll(async () => { await initPromise - // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local await new Promise((resolve) => { engineCommandManager.start({ - token: VITE_KC_DEV_TOKEN, + token: VITE_KITTYCAD_API_TOKEN, width: 256, height: 256, setMediaStream: () => {}, diff --git a/src/main.ts b/src/main.ts index cf3533f0f..b9116a6a9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -71,7 +71,7 @@ dotenv.config({ path: [`.env.${NODE_ENV}.local`, `.env.${NODE_ENV}`] }) // default vite values based on mode process.env.NODE_ENV ??= viteEnv.MODE process.env.VITE_KC_API_WS_MODELING_URL ??= viteEnv.VITE_KC_API_WS_MODELING_URL -process.env.VITE_KC_API_BASE_URL ??= viteEnv.VITE_KC_API_BASE_URL +process.env.VITE_KITTYCAD_API_BASE_URL ??= viteEnv.VITE_KITTYCAD_API_BASE_URL process.env.VITE_KC_SITE_BASE_URL ??= viteEnv.VITE_KC_SITE_BASE_URL process.env.VITE_KC_SITE_APP_URL ??= viteEnv.VITE_KC_SITE_APP_URL process.env.VITE_KC_CONNECTION_TIMEOUT_MS ??= diff --git a/src/preload.ts b/src/preload.ts index 4eb8036f7..59a305178 100644 --- a/src/preload.ts +++ b/src/preload.ts @@ -289,11 +289,11 @@ contextBridge.exposeInMainWorld('electron', { exposeProcessEnvs([ 'NODE_ENV', 'VITE_KC_API_WS_MODELING_URL', - 'VITE_KC_API_BASE_URL', + 'VITE_KITTYCAD_API_BASE_URL', 'VITE_KC_SITE_BASE_URL', 'VITE_KC_SITE_APP_URL', 'VITE_KC_CONNECTION_TIMEOUT_MS', - 'VITE_KC_DEV_TOKEN', + 'VITE_KITTYCAD_API_TOKEN', 'IS_PLAYWRIGHT',