Merge branch 'protocol_designer-migrate-webpack-to-vite' of https://g…

…ithub.com/Opentrons/opentrons into protocol_designer-migrate-webpack-to-vite

Makefile

@@ -256,7 +256,7 @@ circular-dependencies-js:
 
 .PHONY: test-js-internal
 test-js-internal:
-	yarn jest $(tests) $(test_opts) $(cov_opts)
+	yarn vitest $(tests) $(test_opts) $(cov_opts)
 
 .PHONY: test-js-%
 test-js-%: 

app-shell/src/config/actions.ts

@@ -75,6 +75,12 @@ import {
   USB_HTTP_REQUESTS_STOP,
   VALUE_UPDATED,
   VIEW_PROTOCOL_SOURCE_FOLDER,
+  NOTIFY_SUBSCRIBE,
+  NOTIFY_UNSUBSCRIBE,
+  ROBOT_MASS_STORAGE_DEVICE_ADDED,
+  ROBOT_MASS_STORAGE_DEVICE_ENUMERATED,
+  ROBOT_MASS_STORAGE_DEVICE_REMOVED,
+  UPDATE_BRIGHTNESS,
 } from '../constants'
 import type {
   InitializedAction,
@@ -102,14 +108,6 @@ import type {
   UpdateBrightnessAction,
   UsbRequestsAction,
 } from '@opentrons/app/src/redux/shell/types'
-import type {
-  NOTIFY_SUBSCRIBE,
-  NOTIFY_UNSUBSCRIBE,
-  ROBOT_MASS_STORAGE_DEVICE_ADDED,
-  ROBOT_MASS_STORAGE_DEVICE_ENUMERATED,
-  ROBOT_MASS_STORAGE_DEVICE_REMOVED,
-  UPDATE_BRIGHTNESS,
-} from '@opentrons/app/src/redux/shell/actions'
 
 // config file has been initialized
 export const configInitialized = (config: Config): ConfigInitializedAction => ({

components/src/hardware-sim/RobotCoordinateSpace/RobotCoordinateSpace.tsx

@@ -15,7 +15,6 @@ export function RobotCoordinateSpace(
     ...restProps,
   }
   return animated ? (
-    // @ts-expect-error Type instantiation is excessively deep and possibly infinite
     <AnimatedSvg {...allPassThroughProps}>{children}</AnimatedSvg>
   ) : (
     <Svg {...allPassThroughProps}>{children}</Svg>
@@ -25,4 +24,5 @@ export function RobotCoordinateSpace(
 /**
  * These animated components needs to be split out because react-spring and styled-components don't play nice
  * @see https://github.com/pmndrs/react-spring/issues/1515 */
+// @ts-expect-error Type instantiation is excessively deep and possibly infinite
 const AnimatedSvg = styled(animated.svg)<typeof animated.svg>``

labware-library/src/labware-creator/__tests__/labwareDefToFields.test.ts

@@ -12,7 +12,7 @@ vi.mock('../../definitions')
 describe('labwareDefToFields', () => {
   it('fixture_96_plate', () => {
     const def = fixture_96_plate
-    const result = labwareDefToFields(def)
+    const result = labwareDefToFields(def as any)
     expect(result).toEqual({
       labwareType: 'wellPlate',
       tubeRackInsertLoadName: null,
@@ -59,7 +59,7 @@ describe('labwareDefToFields', () => {
   it('fixture_12_trough', () => {
     // make sure rectangular wells + single row works as expected
     const def = fixture_12_trough
-    const result = labwareDefToFields(def)
+    const result = labwareDefToFields(def as any)
 
     expect(result?.labwareType).toEqual('reservoir')
     expect(result?.gridSpacingY).toBe(null) // single row -> null Y-spacing
@@ -69,13 +69,13 @@ describe('labwareDefToFields', () => {
 
   it('fixture_irregular_example_1 should return null (until multi-grid labware is supported in LC)', () => {
     const def = fixture_irregular_example_1
-    const result = labwareDefToFields(def)
+    const result = labwareDefToFields(def as any)
     expect(result).toEqual(null)
   })
 
   it('fixture_24_tuberack should match snapshot', () => {
     const def = fixture_24_tuberack
-    const result = labwareDefToFields(def)
+    const result = labwareDefToFields(def as any)
 
     expect(result?.labwareType).toEqual('tubeRack')
     expect(result?.brand).toBe('Opentrons')

labware-library/src/labware-creator/__tests__/loadAndSaveIntegration.test.ts

@@ -23,19 +23,19 @@ describe('load and immediately save integrity test', () => {
   // (without these fields, Yup schema cast would fail)
   const testCases = [
     {
-      inputDef: fixture_96_plate,
+      inputDef: fixture_96_plate as LabwareDefinition2,
       extraFields: { pipetteName },
     },
     {
-      inputDef: fixture_12_trough,
+      inputDef: fixture_12_trough as LabwareDefinition2,
       extraFields: { pipetteName },
     },
     {
-      inputDef: fixture_tiprack_300_ul,
+      inputDef: fixture_tiprack_300_ul as LabwareDefinition2,
       extraFields: { pipetteName },
     },
     {
-      inputDef: fixture_24_tuberack,
+      inputDef: fixture_24_tuberack as LabwareDefinition2,
       extraFields: { pipetteName, tubeRackInsertLoadName: 'customTubeRack' },
     },
   ]

protocol-designer/src/components/FilePage.tsx

@@ -15,7 +15,6 @@ import {
   InputField,
 } from '@opentrons/components'
 import { resetScrollElements } from '../ui/steps/utils'
-import { Portal } from './portals/MainPageModalPortal'
 import { EditModulesCard } from './modules'
 import { EditModules } from './EditModules'
 

protocol-designer/src/components/FileSidebar/FileSidebar.tsx

@@ -18,7 +18,7 @@ import { selectors as stepFormSelectors } from '../../step-forms'
 import { getRobotType } from '../../file-data/selectors'
 import { getAdditionalEquipment } from '../../step-forms/selectors'
 import { resetScrollElements } from '../../ui/steps/utils'
-import { Portal, getMainPagePortalEl } from '../portals/MainPageModalPortal'
+import { getMainPagePortalEl } from '../portals/MainPageModalPortal'
 import { useBlockingHint } from '../Hints/useBlockingHint'
 import { KnowledgeBaseLink } from '../KnowledgeBaseLink'
 import {

protocol-designer/src/components/IngredientsList/LabwareDetailsCard/LabwareDetailsCard.tsx

@@ -63,7 +63,11 @@ export function LabwareDetailsCard(): JSX.Element {
             {t('generic.nickname')}
           </span>
           <EditableTextField
-            value={labwareNicknamesById[labwareId] ?? 'Unnamed Labware'}
+            value={
+              labwareId != null && labwareNicknamesById[labwareId] != null
+                ? labwareNicknamesById[labwareId]
+                : 'Unnamed Labware'
+            }
             saveEdit={renameLabware}
           />
         </div>

protocol-designer/src/components/LiquidPlacementModal.tsx

@@ -19,7 +19,7 @@ import { WellSelectionInstructions } from './WellSelectionInstructions'
 
 import styles from './LiquidPlacementModal.module.css'
 
-export function LiquidPlacementModal(): JSX.Element {
+export function LiquidPlacementModal(): JSX.Element | null {
   const [highlightedWells, setHighlightedWells] = React.useState<
     WellGroup | {}
   >({})
@@ -37,6 +37,7 @@ export function LiquidPlacementModal(): JSX.Element {
       false,
       'LiquidPlacementModal: No labware is selected, and no labwareId was given to LiquidPlacementModal'
     )
+    return null
   }
 
   const labwareDef = labwareEntities[labwareId]?.def

protocol-designer/src/components/modals/CreateFileWizard/__tests__/MetadataTile.test.tsx

@@ -27,7 +27,7 @@ const mockWizardTileProps: Partial<WizardTileProps> = {
   goBack: vi.fn(),
   proceed: vi.fn(),
   watch: vi.fn((name: keyof typeof values) => values[name]) as any,
-  register: vi.fn(),
+  register: vi.fn() as any,
   formState: {
     errors: { fields: { name: null } },
     touchedFields: { fields: { name: true } },

protocol-designer/src/components/modals/FileUploadMessageModal/modalContents.tsx

@@ -195,7 +195,6 @@ export function useModalContents(
         false,
         `invalid messageKey ${uploadResponse.messageKey} specified for modal`
       )
-      // @ts-expect-error (ce, 2021-06-23) the case below will never happened, as we've already narrowed all posibilities
       return { title: '', body: uploadResponse.messageKey }
     }
   }

protocol-designer/src/timelineMiddleware/__tests__/generateRobotStateTimeline.test.ts

@@ -130,8 +130,8 @@ describe('generateRobotStateTimeline', () => {
     )
     // NOTE: if you update this snapshot, make sure this it exhibits eager tip dropping
     expect(commandOverview).toMatchInlineSnapshot(`
-      Array [
-        Array [
+      [
+        [
           "pickUpTip",
           "aspirate",
           "dispense",
@@ -140,14 +140,14 @@ describe('generateRobotStateTimeline', () => {
           "moveToAddressableAreaForDropTip",
           "dropTipInPlace",
         ],
-        Array [
+        [
           "pickUpTip",
           "aspirate",
           "dispense",
           "moveToAddressableAreaForDropTip",
           "dropTipInPlace",
         ],
-        Array [
+        [
           "pickUpTip",
           "aspirate",
           "dispense",

protocol-designer/src/timelineMiddleware/generateRobotStateTimeline.ts

@@ -22,7 +22,6 @@ export interface GenerateRobotStateTimelineArgs {
 export const generateRobotStateTimeline = (
   args: GenerateRobotStateTimelineArgs
 ): StepGeneration.Timeline => {
-  console.log('got to generateRobotStateTimeline')
   const {
     allStepArgsAndErrors,
     orderedStepIds,

protocol-designer/tsconfig-data.json

@@ -7,6 +7,6 @@
     "rootDir": ".",
     "outDir": "lib"
   },
-  "include": ["src/**/*.json", "fixtures/**/*.json"],
+  "include": ["src/**/*.json", "fixtures/**/*.json", "vite.config.ts"],
   "exclude": ["**/*.ts", "**/*.tsx"]
 }

protocol-designer/tsconfig.json

@@ -12,8 +12,7 @@
     },
     {
       "path": "../step-generation"
-    },
-    { "path": "./tsconfig.node.json" }
+    }
   ],
   "compilerOptions": {
     "rootDir": "src",

protocol-designer/typings/global.d.ts

@@ -1,12 +1,12 @@
-declare global {
-  interface Global {
-    document: {
-      getElementsByClassName: (val: string) => any[]
-    }
-    enablePrereleaseMode: () => void
+declare const global: typeof globalThis & {
+  document: {
+    getElementsByClassName: (val: string) => any[]
   }
+  enablePrereleaseMode: () => void
+
 }
 
+
 interface Window {
   __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: (val: string) => any
 }

step-generation/src/fixtures/commandFixtures.ts

@@ -1,5 +1,12 @@
 import { expect } from 'vitest'
-import { tiprackWellNamesFlat } from './data'
+import {
+  tiprackWellNamesFlat,
+  DEFAULT_PIPETTE,
+  SOURCE_LABWARE,
+  AIR_GAP_META,
+  DEFAULT_BLOWOUT_WELL,
+  DEST_LABWARE,
+} from './data'
 import {
   AddressableAreaName,
   AspDispAirgapParams,
@@ -89,17 +96,6 @@ export const getFlowRateAndOffsetParamsMix = (): FlowRateAndOffsetParamsMix => (
   // for mix only
   touchTipMmFromBottom: TOUCH_TIP_OFFSET_FROM_BOTTOM_MM,
 })
-// =================
-export const DEFAULT_PIPETTE = 'p300SingleId'
-export const MULTI_PIPETTE = 'p300MultiId'
-export const PIPETTE_96 = 'p100096Id'
-export const SOURCE_LABWARE = 'sourcePlateId'
-export const DEST_LABWARE = 'destPlateId'
-export const TROUGH_LABWARE = 'troughId'
-export const DEFAULT_BLOWOUT_WELL = 'A1'
-export const TIPRACK_1 = 'tiprack1Id'
-export const AIR_GAP_META = { isAirGap: true } // to differentiate if the aspirate or dispense command is an air gap or not
-// =================
 type MakeAspDispHelper<P> = (
   bakedParams?: Partial<P>
 ) => (well: string, volume: number, params?: Partial<P>) => CreateCommand

step-generation/src/fixtures/index.ts

@@ -1,2 +1,3 @@
 export * from './robotStateFixtures'
 export * from './commandFixtures'
+export * from './data'

step-generation/src/index.ts

@@ -30,3 +30,4 @@ export * from './types'
 export * from './constants'
 export * from './getNextRobotStateAndWarnings'
 export * from './fixtures/robotStateFixtures'
+export * from './fixtures/data'

step-generation/src/utils/index.ts

@@ -5,6 +5,7 @@ import { reduceCommandCreators } from './reduceCommandCreators'
 import { modulePipetteCollision } from './modulePipetteCollision'
 import { thermocyclerPipetteCollision } from './thermocyclerPipetteCollision'
 import { getLabwareSlot } from './getLabwareSlot'
+import { movableTrashCommandsUtil } from './movableTrashCommandsUtil'
 
 export {
   commandCreatorsTimeline,
@@ -13,6 +14,7 @@ export {
   modulePipetteCollision,
   thermocyclerPipetteCollision,
   getLabwareSlot,
+  movableTrashCommandsUtil,
 }
 export * from './commandCreatorArgsGetters'
 export * from './heaterShakerCollision'

step-generation/tsconfig.json

@@ -8,6 +8,7 @@
   "compilerOptions": {
     "composite": true,
     "noErrorTruncation": true,
+    "emitDeclarationOnly": false,
     "rootDir": "src",
     "outDir": "lib"
   },

tsconfig-base.json

@@ -13,8 +13,5 @@
     "skipLibCheck": true,
     "moduleResolution": "node",
     "types": ["vite/client", "vitest/globals", "@testing-library/jest-dom"],
-    "paths": {
-      "@opentrons/shared-data": ["./shared-data"]
-    }
   }
 }