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

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

.dockerignore

@@ -16,7 +16,7 @@
 .pypy_cache
 dist
 build
-pnpm-lock.yaml
+yarn.lock
 Pipfile.lock
 
 __pycache__

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

@@ -16,7 +16,7 @@ on:
       - '*.js'
       - 'scripts/**/*'
       - '*.json'
-      - 'pnpm-lock.yaml'
+      - 'yarn.lock'
       - '.github/workflows/app-test-build-deploy.yaml'
       - '.github/workflows/utils.js'
     branches:
@@ -36,7 +36,7 @@ on:
       - 'discovery-client/**/*'
       - '*.js'
       - '*.json'
-      - 'pnpm-lock.yaml'
+      - 'yarn.lock'
       - 'scripts/**/*'
   workflow_dispatch:
 

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

@@ -175,7 +175,7 @@ jobs:
       - name: 'setup-js'
         run: |
           npm config set cache ./.npm-cache
-          pnpm i 
+          yarn config set cache-folder ./.yarn-cache 
       - name: 'build typescript'
         run: make build-ts
       - name: 'build library'

.github/workflows/shared-data-test-lint-deploy.yaml

@@ -218,7 +218,7 @@ jobs:
       - name: 'js deps'
         run: |
           npm config set cache ./.npm-cache
-          pnpm i 
+          yarn config set cache-folder ./.yarn-cache 
       - name: 'build typescript'
         run: make build-ts
       - name: 'build library'

.github/workflows/tag-releases.yaml

@@ -28,7 +28,8 @@ jobs:
       - name: 'setup-js'
         run: |
           npm config set cache ${{ github.workspace }}/.npm-cache
-          pnpm i
+          yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
+
       - name: 'create release'
         run: |
           node ./scripts/deploy/create-release.js ${{ github.token }} ${{ github.ref_name }} --deploy

components/README.md

@@ -18,7 +18,7 @@ export default function CowButton(props) {
 
 Usage requirements for dependent projects:
 
-- Node v18 and pnpm
+- Node v18 and yarn
 - The following `dependencies` (peer dependencies of `@opentrons/components`)
   - `react`: `17.0.1`,
   - `react-router-dom`: `^4.2.2`,

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 pnpm run
-pnpm run discovery [command] [options]
+# run via yarm run
+yarm 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
-pnpm discovery --help
+yarm discovery --help
 ```
 
 | flag                 | description                                       | default  | example        |

protocol-designer/benchmarks/README.md

@@ -4,7 +4,7 @@ Note: this tooling around benchmark testing is very minimal and subject to chang
 
 To run all PD benchmarks, `make -C protocol-designer benchmarks`. This will output to a file `protocol-designer/benchmarks/output/$(date_time)`. To set the name of the file, specify `benchmark_output`
 
-These benchmarks use [Nanobench](https://github.com/mafintosh/nanobench), so you can pipe the output to a file and compare benchmark runs with `pnpm nanobench-compare fileA fileB`
+These benchmarks use [Nanobench](https://github.com/mafintosh/nanobench), so you can pipe the output to a file and compare benchmark runs with `yarn nanobench-compare fileA fileB`
 
 ## Local benchmarking guidelines
 

scripts/push.mk

@@ -1,6 +1,6 @@
 # utilities for pushing things to robots in a reusable fashion
 
-find_robot=$(shell pnpm run -s discovery find -i 169.254)
+find_robot=$(shell yarn run -s discovery find -i 169.254)
 default_ssh_key := ~/.ssh/robot_key
 default_ssh_opts := -o stricthostkeychecking=no -o userknownhostsfile=/dev/null
 version_dict=$(shell ssh $(call id-file-arg,$(2)) $(3) root@$(1) cat /etc/VERSION.json)