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

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

.github/workflows/app-test-build-deploy.yaml

@@ -283,7 +283,7 @@ jobs:
           OT_APP_DEPLOY_FOLDER: ${{ steps.project.outputs.folder }}
 
         run: |
-          make -C app-shell dist-${{ matrix.os }}
+          make -C app-shell dist-${{ matrix.os }} USE_HARD_LINKS=false
 
       - name: 'upload github artifact'
         if: matrix.target == 'desktop'

.npmrc

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

app/package.json

@@ -64,10 +64,9 @@
     "semver": "5.5.0",
     "styled-components": "5.3.6",
     "typeface-open-sans": "0.0.75",
-    "uuid": "8.3.2"
+    "uuid": "3.2.1"
   },
   "devDependencies": {
-    "@opentrons/discovery-client": "link:../discovery-client",
     "@types/classnames": "2.2.5",
     "@types/file-saver": "2.0.1",
     "@types/jszip": "3.1.7",

discovery-client/README.md

@@ -219,8 +219,8 @@ client.on('error', (error) => console.error(error)
 # prereq: build project before first run or after changes
 make -C discovery-client
 
-# run via yarm run
-yarm run discovery [command] [options]
+# run via yarn run
+yarn run discovery [command] [options]
 
 # run via npx
 npx discovery [command] [options]
@@ -234,7 +234,7 @@ node_modules/.bin/discovery [command] [options]
 The CLI's global options are almost completely the same as the API's options, with the addition of `logLevel`. You may print the options with:
 
 ```shell
-yarm discovery --help
+yarn discovery --help
 ```
 
 | flag                 | description                                       | default  | example        |

package.json

@@ -24,9 +24,9 @@
       "path": "cz-conventional-changelog"
     }
   },
+  "packageManager": "[email protected]",
   "engines": {
-    "node": "^18.19.0",
-    "pnpm": ">=3"
+    "node": "^18.19.0"
   },
   "resolutions": {
     "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0"