build TS types along with JS bundle

Opentrons · May 17, 2024 · 420a8f8 · 420a8f8
1 parent 08ee506
commit 420a8f8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/components-test-build-deploy.yaml b/.github/workflows/components-test-build-deploy.yaml
@@ -190,9 +190,9 @@ jobs:
           npm config set cache ./.npm-cache
           yarn config set cache-folder ./.yarn-cache
           make setup-js
-      - name: 'build typescript'
-        run: make build-ts
-      - name: 'build library'
+      - name: 'build typescript types'
+        run: make -C components build-ts
+      - name: 'build js bundle'
         run: |
           make -C components lib
       # replace package.json stub version number with version from tag

diff --git a/components/Makefile b/components/Makefile
@@ -31,6 +31,10 @@ lib: export NODE_ENV := production
 lib:
 	yarn vite build
 
+.PHONY: build-ts
+build-ts:
+	yarn tsc --build --emitDeclarationOnly
+
 # development
 #####################################################################
 

diff --git a/components/src/hardware-sim/DeckSlotLocation/index.tsx b/components/src/hardware-sim/DeckSlotLocation/index.tsx
@@ -20,6 +20,8 @@ interface LegacyDeckSlotLocationProps extends React.SVGProps<SVGGElement> {
   slotClipColor?: React.SVGProps<SVGPathElement>['stroke']
 }
 
+type AddressableAreaFromDeckDef = typeof ot2DeckDefV5.locations.addressableAreas[number]
+
 // dimensions of the OT-2 fixed trash, not in deck definition
 export const OT2_FIXED_TRASH_X_DIMENSION = 172.86
 export const OT2_FIXED_TRASH_Y_DIMENSION = 165.86
@@ -41,7 +43,7 @@ export function LegacyDeckSlotLocation(
   if (robotType !== OT2_ROBOT_TYPE) return null
 
   const slotDef = ot2DeckDefV5.locations.addressableAreas.find(
-    s => s.id === slotName
+    (s: AddressableAreaFromDeckDef) => s.id === slotName
   )
   if (slotDef == null) {
     console.warn(

diff --git a/components/vite.config.ts b/components/vite.config.ts
@@ -12,6 +12,8 @@ export default defineConfig({
     // Relative to the root
     ssr: 'src/index.ts',
     outDir: 'lib',
+    // do not delete the outdir, typescript types might live there and we dont want to delete them
+    emptyOutDir: false,
     commonjsOptions: {
       transformMixedEsModules: true,
       esmExternals: true,

diff --git a/vite.config.ts b/vite.config.ts
@@ -27,7 +27,7 @@ export default defineConfig({
     esbuildOptions: {
       target: 'es2020',
     },
-    exclude: ['node_modules']
+    exclude: ['node_modules'],
   },
   css: {
     postcss: {