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

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

.npmrc

@@ -0,0 +1 @@
+node-linker=hoisted

app-shell-odd/src/config/migrate.ts

@@ -1,7 +1,6 @@
 import path from 'path'
 import { app } from 'electron'
 import uuid from 'uuid/v4'
-import { CONFIG_VERSION_LATEST } from '@opentrons/app/src/redux/config'
 
 import type {
   Config,
@@ -21,6 +20,8 @@ import type {
 // any default values for later config versions are specified in the migration
 // functions for those version below
 
+const CONFIG_VERSION_LATEST = 21 // update this after each config version bump
+
 export const DEFAULTS_V12: ConfigV12 = {
   version: 12,
   devtools: false,

app-shell/Makefile

@@ -85,7 +85,7 @@ all: package
 # must be wrapped in pnpm run otherwise `prebuild-install` will fail silently
 # due to how `electron-rebuild` calls `prebuild-install`
 setup:
-	pnpm rebuild
+	pnpm i
 
 .PHONY: clean
 clean:

app-shell/package.json

@@ -29,14 +29,14 @@
     ]
   },
   "devDependencies": {
-    "@opentrons/app": "link:../app",
-    "@opentrons/discovery-client": "link:../discovery-client",
-    "@opentrons/shared-data": "link:../shared-data",
-    "@opentrons/usb-bridge/node-client": "link:../usb-bridge/node-client",
     "electron-notarize": "^1.2.1",
     "electron-publisher-s3": "^20.17.2"
   },
   "dependencies": {
+    "@opentrons/app": "link:../app",
+    "@opentrons/discovery-client": "link:../discovery-client",
+    "@opentrons/shared-data": "link:../shared-data",
+    "@opentrons/usb-bridge/node-client": "link:../usb-bridge/node-client",
     "@thi.ng/paths": "1.6.5",
     "@types/dateformat": "^3.0.1",
     "@types/fs-extra": "9.0.13",
@@ -48,6 +48,7 @@
     "dateformat": "3.0.3",
     "electron-context-menu": "3.6.1",
     "electron-debug": "3.0.1",
+    "electron-is-dev": "1.2.0",
     "electron-localshortcut": "3.2.1",
     "electron-devtools-installer": "3.2.0",
     "electron-store": "5.1.1",