Remove checks for the undefined TEST environment variable (#7779)

* Remove unused TEST environment variable

* Use the long form of mode flag for clarity

Author: jacebrowning

interface.d.ts

@@ -72,13 +72,12 @@ export interface IElectronAPI {
   }
   process: {
     env: {
+      NODE_ENV: string
       VITE_KITTYCAD_API_BASE_URL: string
       VITE_KITTYCAD_API_WEBSOCKET_URL: string
       VITE_KITTYCAD_API_TOKEN: string
       VITE_KITTYCAD_SITE_BASE_URL: string
       VITE_KITTYCAD_SITE_APP_URL: string
-      NODE_ENV: string
-      TEST: string
     }
   }
   kittycad: (access: string, args: any) => any

package.json

@@ -126,15 +126,15 @@
     "postinstall": "electron-rebuild",
     "generate:machine-api": "npx openapi-typescript ./openapi/machine-api.json -o src/lib/machine-api.d.ts",
     "tron:start": "electron-forge start",
-    "tronb:vite:dev": "vite build -c vite.main.config.ts -m development && vite build -c vite.preload.config.ts -m development && vite build -c vite.renderer.config.ts -m development",
+    "tronb:vite:dev": "vite build -c vite.main.config.ts --mode=development && vite build -c vite.preload.config.ts --mode=development && vite build -c vite.renderer.config.ts --mode=development",
     "tronb:vite:prod": "vite build -c vite.main.config.ts && vite build -c vite.preload.config.ts && vite build -c vite.renderer.config.ts",
     "tronb:package:dev": "npm run tronb:vite:dev && electron-builder --config electron-builder.yml",
     "tronb:package:prod": "npm run tronb:vite:prod && electron-builder --config electron-builder.yml --publish always",
     "test-setup": "npm install && npm run build:wasm",
-    "test": "vitest --mode development",
+    "test": "vitest --mode=development",
     "test:rust": "(cd rust && just test && just lint)",
     "test:snapshots": "cross-env TARGET=web NODE_ENV=development playwright test --config=playwright.config.ts --grep=@snapshot --trace=on",
-    "test:unit": "vitest run --mode development --exclude **/jest-component-unit-tests/*",
+    "test:unit": "vitest run --mode=development --exclude **/jest-component-unit-tests/*",
     "test:unit:components": "jest -c jest-component-unit-tests/jest.config.ts --rootDir jest-component-unit-tests/",
     "test:e2e:web": "cross-env TARGET=web NODE_ENV=development playwright test --config=playwright.config.ts --project=\"Google Chrome\" --grep=@web",
     "test:e2e:desktop": "cross-env TARGET=desktop playwright test --config=playwright.electron.config.ts --grep-invert=\"@snapshot|@web\"",

src/components/LspProvider.tsx

@@ -7,7 +7,6 @@ import {
   LanguageServerClient,
   LspWorkerEventType,
 } from '@kittycad/codemirror-lsp-client'
-import env from '@src/env'
 import React, { createContext, useContext, useMemo, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import type * as LSP from 'vscode-languageserver-protocol'
@@ -78,7 +77,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
   // But the server happens async so we break this into two parts.
   // Below is the client and server promise.
   const { lspClient: kclLspClient } = useMemo(() => {
-    if (!token || token === '' || env().TEST) {
+    if (!token || token === '') {
       return { lspClient: null }
     }
 
@@ -137,7 +136,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
   // We do not want to restart the server, its just wasteful.
   const kclLSP = useMemo(() => {
     let plugin = null
-    if (isKclLspReady && !env().TEST && kclLspClient) {
+    if (isKclLspReady && kclLspClient) {
       // Set up the lsp plugin.
       const lsp = kcl({
         documentUri: `file:///${PROJECT_ENTRYPOINT}`,
@@ -171,7 +170,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
   }, [kclLspClient, isKclLspReady])
 
   const { lspClient: copilotLspClient } = useMemo(() => {
-    if (!token || token === '' || env().TEST) {
+    if (!token || token === '') {
       return { lspClient: null }
     }
 
@@ -213,7 +212,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
   // We do not want to restart the server, its just wasteful.
   const copilotLSP = useMemo(() => {
     let plugin = null
-    if (isCopilotLspReady && !env().TEST && copilotLspClient) {
+    if (isCopilotLspReady && copilotLspClient) {
       // Set up the lsp plugin.
       const lsp = copilotPlugin({
         documentUri: `file:///${PROJECT_ENTRYPOINT}`,

src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx

@@ -35,7 +35,6 @@ import {
   rectangularSelection,
 } from '@codemirror/view'
 import interact from '@replit/codemirror-interact'
-import env from '@src/env'
 import { useSelector } from '@xstate/react'
 import { useEffect, useMemo, useRef } from 'react'
 
@@ -148,43 +147,40 @@ export const KclEditorPane = () => {
     if (kclLSP) extensions.push(Prec.highest(kclLSP))
     if (copilotLSP) extensions.push(copilotLSP)
 
-    // These extensions have proven to mess with vitest
-    if (!env().TEST) {
-      extensions.push(
-        lintGutter(),
-        lineNumbers(),
-        highlightActiveLineGutter(),
-        highlightSpecialChars(),
-        foldGutter(),
-        EditorState.allowMultipleSelections.of(true),
-        indentOnInput(),
-        bracketMatching(),
-        closeBrackets(),
-        highlightActiveLine(),
-        highlightSelectionMatches(),
-        syntaxHighlighting(defaultHighlightStyle, {
-          fallback: true,
-        }),
-        rectangularSelection(),
-        dropCursor(),
-        interact({
-          rules: [
-            // a rule for a number dragger
-            {
-              // the regexp matching the value
-              regexp: onMouseDragRegex,
-              // set cursor to "ew-resize" on hover
-              cursor: 'ew-resize',
-              // change number value based on mouse X movement on drag
-              onDrag: (text, setText, e) => {
-                onMouseDragMakeANewNumber(text, setText, e)
-              },
+    extensions.push(
+      lintGutter(),
+      lineNumbers(),
+      highlightActiveLineGutter(),
+      highlightSpecialChars(),
+      foldGutter(),
+      EditorState.allowMultipleSelections.of(true),
+      indentOnInput(),
+      bracketMatching(),
+      closeBrackets(),
+      highlightActiveLine(),
+      highlightSelectionMatches(),
+      syntaxHighlighting(defaultHighlightStyle, {
+        fallback: true,
+      }),
+      rectangularSelection(),
+      dropCursor(),
+      interact({
+        rules: [
+          // a rule for a number dragger
+          {
+            // the regexp matching the value
+            regexp: onMouseDragRegex,
+            // set cursor to "ew-resize" on hover
+            cursor: 'ew-resize',
+            // change number value based on mouse X movement on drag
+            onDrag: (text, setText, e) => {
+              onMouseDragMakeANewNumber(text, setText, e)
             },
-          ],
-        })
-      )
-      if (textWrapping.current) extensions.push(EditorView.lineWrapping)
-    }
+          },
+        ],
+      })
+    )
+    if (textWrapping.current) extensions.push(EditorView.lineWrapping)
 
     return extensions
   }, [kclLSP, copilotLSP, textWrapping.current, cursorBlinking.current])

src/env.test.ts

@@ -14,7 +14,6 @@ describe('@src/env', () => {
         VITE_KITTYCAD_API_TOKEN: 'redacted',
         VITE_KITTYCAD_SITE_BASE_URL: 'https://dev.zoo.dev',
         VITE_KITTYCAD_SITE_APP_URL: 'https://app.dev.zoo.dev',
-        TEST: 'true',
       }
       const actual = env()
       expect(typeof actual.VITE_KITTYCAD_API_TOKEN).toBe('string')
@@ -34,7 +33,6 @@ describe('@src/env', () => {
       expect(typeof actual.VITE_KITTYCAD_API_TOKEN).toBe('string')
       expect(typeof actual.VITE_KITTYCAD_SITE_BASE_URL).toBe('string')
       expect(typeof actual.VITE_KITTYCAD_SITE_APP_URL).toBe('string')
-      expect(typeof actual.TEST).toBe('string')
     })
   })
   describe('windowElectronProcessEnv', () => {
@@ -55,7 +53,6 @@ describe('@src/env', () => {
               VITE_KITTYCAD_API_TOKEN: 'redacted',
               VITE_KITTYCAD_SITE_BASE_URL: 'https://dev.zoo.dev',
               VITE_KITTYCAD_SITE_APP_URL: 'https://app.dev.zoo.dev',
-              TEST: 'true',
             },
           },
         })
@@ -67,7 +64,6 @@ describe('@src/env', () => {
           VITE_KITTYCAD_API_TOKEN: 'redacted',
           VITE_KITTYCAD_SITE_BASE_URL: 'https://dev.zoo.dev',
           VITE_KITTYCAD_SITE_APP_URL: 'https://app.dev.zoo.dev',
-          TEST: 'true',
         }
         const actual = windowElectronProcessEnv()
         expect(actual).toStrictEqual(expected)
@@ -94,7 +90,6 @@ describe('@src/env', () => {
       expect(typeof actual?.VITE_KITTYCAD_API_TOKEN).toBe('string')
       expect(typeof actual?.VITE_KITTYCAD_SITE_BASE_URL).toBe('string')
       expect(typeof actual?.VITE_KITTYCAD_SITE_APP_URL).toBe('string')
-      expect(typeof actual?.TEST).toBe('string')
     })
   })
 })

src/env.ts

@@ -5,7 +5,6 @@ type EnvironmentVariables = {
   readonly VITE_KITTYCAD_API_TOKEN: string | undefined
   readonly VITE_KITTYCAD_SITE_BASE_URL: string | undefined
   readonly VITE_KITTYCAD_SITE_APP_URL: string | undefined
-  readonly TEST: string | undefined
 }
 
 export const viteEnv = () => {
@@ -26,16 +25,7 @@ export const processEnv = () => {
   if (typeof process === 'undefined') {
     // Web, no window.process or process
     return undefined
-  } else if (
-    typeof process !== 'undefined' &&
-    typeof window !== 'undefined' &&
-    process.env.TEST !== 'true'
-  ) {
-    // Web, you made window.process, why :(, need process.env.TEST to make sure the frontend gets evaluated.
-    // The frontend can spoof this too :(
-    return undefined
   }
-
   return process.env
 }
 
@@ -49,7 +39,6 @@ export const processEnv = () => {
 export default (): EnvironmentVariables => {
   // Compute the possible environment variables, order operation is important
   // runtime (TODO) > process.env > window.electron.process.env > import.meta.env
-
   const viteOnly = viteEnv()
   const windowElectronProcessEnvOnly = windowElectronProcessEnv()
   const processEnvOnly = processEnv()
@@ -66,7 +55,6 @@ export default (): EnvironmentVariables => {
       (env.VITE_KITTYCAD_SITE_BASE_URL as string) || undefined,
     VITE_KITTYCAD_SITE_APP_URL:
       (env.VITE_KITTYCAD_SITE_APP_URL as string) || undefined,
-    TEST: (env.TEST as string) || undefined,
   }
   return environmentVariables
 }

src/lib/settings/settingsUtils.ts

@@ -2,7 +2,6 @@ import type { Configuration } from '@rust/kcl-lib/bindings/Configuration'
 import type { NamedView } from '@rust/kcl-lib/bindings/NamedView'
 import type { ProjectConfiguration } from '@rust/kcl-lib/bindings/ProjectConfiguration'
 import { default_app_settings } from '@rust/kcl-wasm-lib/pkg/kcl_wasm_lib'
-import env from '@src/env'
 
 import {
   defaultAppSettings,
@@ -548,14 +547,12 @@ export function getSettingInputType(setting: Setting) {
 
 export const jsAppSettings = async (): Promise<DeepPartial<Configuration>> => {
   let jsAppSettings = default_app_settings()
-  if (!env().TEST) {
-    // TODO: https://github.com/KittyCAD/modeling-app/issues/6445
-    const settings = await import('@src/lib/singletons').then((module) =>
-      module.getSettings()
-    )
-    if (settings) {
-      jsAppSettings = getAllCurrentSettings(settings)
-    }
+  // TODO: https://github.com/KittyCAD/modeling-app/issues/6445
+  const settings = await import('@src/lib/singletons').then((module) =>
+    module.getSettings()
+  )
+  if (settings) {
+    jsAppSettings = getAllCurrentSettings(settings)
   }
   return settingsPayloadToConfiguration(jsAppSettings)
 }

src/preload.ts

@@ -293,7 +293,6 @@ contextBridge.exposeInMainWorld('electron', {
         'VITE_KITTYCAD_API_TOKEN',
         'VITE_KITTYCAD_SITE_BASE_URL',
         'VITE_KITTYCAD_SITE_APP_URL',
-        'TEST',
       ])
     ),
   },