diff --git a/.github/workflows/abr-testing-lint-test.yaml b/.github/workflows/abr-testing-lint-test.yaml
index e103c61efdd..447597c2b89 100644
--- a/.github/workflows/abr-testing-lint-test.yaml
+++ b/.github/workflows/abr-testing-lint-test.yaml
@@ -36,11 +36,11 @@ jobs:
runs-on: 'windows-latest'
steps:
- name: Checkout opentrons repo
- uses: 'actions/checkout@v3'
+ uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- name: Setup Node
- uses: 'actions/setup-node@v3'
+ uses: 'actions/setup-node@v4'
with:
node-version: '12'
- name: Setup Python
@@ -52,8 +52,6 @@ jobs:
with:
project: 'abr-testing'
- name: lint
- run:
- make -C abr-testing lint
+ run: make -C abr-testing lint
- name: test
- run:
- make -C abr-testing test
+ run: make -C abr-testing test
diff --git a/.github/workflows/api-test-lint-deploy.yaml b/.github/workflows/api-test-lint-deploy.yaml
index 5143c6e8021..f3e8f0bbeac 100644
--- a/.github/workflows/api-test-lint-deploy.yaml
+++ b/.github/workflows/api-test-lint-deploy.yaml
@@ -51,12 +51,12 @@ jobs:
timeout-minutes: 10
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
@@ -84,7 +84,7 @@ jobs:
with-ot-hardware: 'true'
runs-on: '${{ matrix.os }}'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -93,9 +93,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: ${{ matrix.python }}
@@ -134,7 +134,7 @@ jobs:
runs-on: 'ubuntu-22.04'
if: github.event_name == 'push'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -143,9 +143,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
diff --git a/.github/workflows/app-test-build-deploy.yaml b/.github/workflows/app-test-build-deploy.yaml
index 8c3bd21503d..b3590b617e1 100644
--- a/.github/workflows/app-test-build-deploy.yaml
+++ b/.github/workflows/app-test-build-deploy.yaml
@@ -56,10 +56,10 @@ jobs:
name: 'opentrons app frontend unit tests'
timeout-minutes: 60
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -101,7 +101,7 @@ jobs:
timeout-minutes: 60
runs-on: ${{ matrix.os }}
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -110,9 +110,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: actions/setup-python@v4
with:
python-version: '3.10'
@@ -257,7 +257,7 @@ jobs:
echo "bucket=${{env._APP_DEPLOY_BUCKET_OT3}}" >> $GITHUB_OUTPUT
echo "folder=${{env._APP_DEPLOY_FOLDER_OT3}}" >> $GITHUB_OUTPUT
fi
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -266,9 +266,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: actions/setup-python@v4
with:
python-version: '3.10'
@@ -475,7 +475,7 @@ jobs:
_ACCESS_URL: https://${{env._APP_DEPLOY_BUCKET_ROBOTSTACK}}/${{env._APP_DEPLOY_FOLDER_ROBOTSTACK}}
- name: 'pull repo for scripts'
- uses: 'actions/checkout@v3'
+ uses: 'actions/checkout@v4'
with:
path: ./monorepo
# https://github.com/actions/checkout/issues/290
@@ -485,9 +485,9 @@ jobs:
cd ./monorepo
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
diff --git a/.github/workflows/components-test-build-deploy.yaml b/.github/workflows/components-test-build-deploy.yaml
index 01d4355e355..c4cd1c00baf 100644
--- a/.github/workflows/components-test-build-deploy.yaml
+++ b/.github/workflows/components-test-build-deploy.yaml
@@ -43,10 +43,10 @@ jobs:
timeout-minutes: 30
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -79,10 +79,10 @@ jobs:
if: github.event_name != 'pull_request'
needs: ['js-unit-test']
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -140,16 +140,16 @@ jobs:
['js-unit-test', 'build-components-storybook', 'determine-build-type']
if: needs.determine-build-type.outputs.type != 'none'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
@@ -180,16 +180,16 @@ jobs:
needs: ['js-unit-test', 'determine-build-type']
if: needs.determine-build-type.outputs.type == 'publish'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
registry-url: 'https://registry.npmjs.org'
- name: 'install udev for usb-detection'
run: |
@@ -213,9 +213,9 @@ jobs:
VERSION_STRING=$(echo ${{ github.ref }} | sed 's/refs\/tags\/components@//')
json -I -f ./components/package.json -e "this.version=\"$VERSION_STRING\""
json -I -f ./components/package.json -e "this.dependencies['@opentrons/shared-data']=\"$VERSION_STRING\""
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
registry-url: 'https://registry.npmjs.org'
- name: 'publish to npm registry'
env:
diff --git a/.github/workflows/docs-build.yaml b/.github/workflows/docs-build.yaml
index 08b1c2b76cf..0871b826334 100644
--- a/.github/workflows/docs-build.yaml
+++ b/.github/workflows/docs-build.yaml
@@ -40,7 +40,7 @@ jobs:
name: opentrons documentation build
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -49,9 +49,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.10'
diff --git a/.github/workflows/g-code-confirm-tests.yaml b/.github/workflows/g-code-confirm-tests.yaml
index 146fa96b9a2..9c43bfe16d8 100644
--- a/.github/workflows/g-code-confirm-tests.yaml
+++ b/.github/workflows/g-code-confirm-tests.yaml
@@ -1,4 +1,4 @@
-name: "G-Code-Confirm"
+name: 'G-Code-Confirm'
on:
# Run on any change to the api directory
@@ -31,20 +31,14 @@ jobs:
confirm-g-code:
strategy:
matrix:
- command: [
- '2-modules',
- 'swift-smoke',
- 'swift-turbo',
- 'omega',
- 'fast'
- ]
+ command: ['2-modules', 'swift-smoke', 'swift-turbo', 'omega', 'fast']
name: 'Confirm G-Code (${{ matrix.command }})'
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
node-version: '12'
- uses: 'actions/setup-python@v3'
@@ -54,7 +48,7 @@ jobs:
with:
project: 'g-code-testing'
- - name: "Verify no missing comparison files"
+ - name: 'Verify no missing comparison files'
run: make -C g-code-testing check-for-missing-comparison-files
- name: 'Run & Compare to comparison files'
diff --git a/.github/workflows/g-code-testing-lint-test.yaml b/.github/workflows/g-code-testing-lint-test.yaml
index e174bc7ac52..ba7cf215679 100644
--- a/.github/workflows/g-code-testing-lint-test.yaml
+++ b/.github/workflows/g-code-testing-lint-test.yaml
@@ -42,7 +42,7 @@ jobs:
name: 'g-code-testing package linting and tests'
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- name: 'install udev'
@@ -50,9 +50,9 @@ jobs:
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update && sudo apt-get install libudev-dev
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
diff --git a/.github/workflows/hardware-lint-test.yaml b/.github/workflows/hardware-lint-test.yaml
index f5e701ea883..8714a40d250 100644
--- a/.github/workflows/hardware-lint-test.yaml
+++ b/.github/workflows/hardware-lint-test.yaml
@@ -44,11 +44,11 @@ jobs:
runs-on: 'ubuntu-20.04'
steps:
- name: Checkout opentrons repo
- uses: 'actions/checkout@v3'
+ uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- name: Setup Node
- uses: 'actions/setup-node@v3'
+ uses: 'actions/setup-node@v4'
with:
node-version: '12'
diff --git a/.github/workflows/hardware-testing-protocols.yaml b/.github/workflows/hardware-testing-protocols.yaml
index ee59d2dc25c..1573c69380a 100644
--- a/.github/workflows/hardware-testing-protocols.yaml
+++ b/.github/workflows/hardware-testing-protocols.yaml
@@ -38,12 +38,12 @@ jobs:
runs-on: 'ubuntu-20.04'
steps:
- name: Checkout opentrons repo
- uses: 'actions/checkout@v3'
+ uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- name: Setup Node
- uses: 'actions/setup-node@v3'
+ uses: 'actions/setup-node@v4'
with:
node-version: '12'
diff --git a/.github/workflows/hardware-testing.yaml b/.github/workflows/hardware-testing.yaml
index bb738b13e4b..116ca872c85 100644
--- a/.github/workflows/hardware-testing.yaml
+++ b/.github/workflows/hardware-testing.yaml
@@ -43,12 +43,12 @@ jobs:
runs-on: 'ubuntu-20.04'
steps:
- name: Checkout opentrons repo
- uses: 'actions/checkout@v3'
+ uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- name: Setup Node
- uses: 'actions/setup-node@v3'
+ uses: 'actions/setup-node@v4'
with:
node-version: '12'
diff --git a/.github/workflows/http-docs-build.yaml b/.github/workflows/http-docs-build.yaml
index 6294eeb2172..c19b6263ead 100644
--- a/.github/workflows/http-docs-build.yaml
+++ b/.github/workflows/http-docs-build.yaml
@@ -40,7 +40,7 @@ jobs:
name: HTTP API reference build
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -52,9 +52,9 @@ jobs:
- uses: 'actions/setup-python@v3'
with:
python-version: '3.10'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: './.github/actions/python/setup'
with:
project: 'robot-server'
diff --git a/.github/workflows/js-check.yaml b/.github/workflows/js-check.yaml
index 139d3b618ad..9f429925cd6 100644
--- a/.github/workflows/js-check.yaml
+++ b/.github/workflows/js-check.yaml
@@ -42,10 +42,10 @@ jobs:
runs-on: 'ubuntu-22.04'
timeout-minutes: 20
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
diff --git a/.github/workflows/ll-test-build-deploy.yaml b/.github/workflows/ll-test-build-deploy.yaml
index 140537593e2..5f02f866251 100644
--- a/.github/workflows/ll-test-build-deploy.yaml
+++ b/.github/workflows/ll-test-build-deploy.yaml
@@ -42,10 +42,10 @@ jobs:
timeout-minutes: 20
runs-on: 'ubuntu-20.04'
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
@@ -85,16 +85,16 @@ jobs:
timeout-minutes: 30
runs-on: 'ubuntu-20.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install libudev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -126,7 +126,7 @@ jobs:
runs-on: 'ubuntu-20.04'
if: github.event_name != 'pull_request'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -135,9 +135,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install libudev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -174,16 +174,16 @@ jobs:
needs: ['js-unit-test', 'e2e-test', 'build-ll']
if: github.event_name != 'pull_request'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
diff --git a/.github/workflows/opentrons-ai-client-staging-continuous-deploy.yaml b/.github/workflows/opentrons-ai-client-staging-continuous-deploy.yaml
index af767b36adc..68a95869539 100644
--- a/.github/workflows/opentrons-ai-client-staging-continuous-deploy.yaml
+++ b/.github/workflows/opentrons-ai-client-staging-continuous-deploy.yaml
@@ -23,10 +23,10 @@ jobs:
name: 'OpentronsAI client edge continuous deployment to staging'
timeout-minutes: 10
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
diff --git a/.github/workflows/opentrons-ai-client-test-build-deploy.yaml b/.github/workflows/opentrons-ai-client-test-build-deploy.yaml
index 2f569d9bf78..a8d4cfb4c46 100644
--- a/.github/workflows/opentrons-ai-client-test-build-deploy.yaml
+++ b/.github/workflows/opentrons-ai-client-test-build-deploy.yaml
@@ -43,10 +43,10 @@ jobs:
name: 'opentrons ai frontend unit tests'
timeout-minutes: 60
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
diff --git a/.github/workflows/opentrons-ai-production-deploy.yaml b/.github/workflows/opentrons-ai-production-deploy.yaml
index 825c3561f25..605cf01b348 100644
--- a/.github/workflows/opentrons-ai-production-deploy.yaml
+++ b/.github/workflows/opentrons-ai-production-deploy.yaml
@@ -23,10 +23,10 @@ jobs:
name: 'OpentronsAI client prod deploy'
timeout-minutes: 10
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
diff --git a/.github/workflows/pd-test-build-deploy.yaml b/.github/workflows/pd-test-build-deploy.yaml
index 9f23419da94..bf27d4eb8db 100644
--- a/.github/workflows/pd-test-build-deploy.yaml
+++ b/.github/workflows/pd-test-build-deploy.yaml
@@ -42,16 +42,16 @@ jobs:
runs-on: 'ubuntu-22.04'
timeout-minutes: 30
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -88,7 +88,7 @@ jobs:
os: ['ubuntu-22.04']
runs-on: '${{ matrix.os }}'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -97,9 +97,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
if: startsWith(matrix.os, 'ubuntu')
run: |
@@ -128,7 +128,7 @@ jobs:
runs-on: 'ubuntu-22.04'
if: github.event_name != 'pull_request'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -137,9 +137,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -174,16 +174,16 @@ jobs:
needs: ['js-unit-test', 'build-pd']
if: github.event_name != 'pull_request'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
diff --git a/.github/workflows/react-api-client-test.yaml b/.github/workflows/react-api-client-test.yaml
index a8f5ed959b2..8c1256c80a1 100644
--- a/.github/workflows/react-api-client-test.yaml
+++ b/.github/workflows/react-api-client-test.yaml
@@ -36,10 +36,10 @@ jobs:
timeout-minutes: 30
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install libudev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
diff --git a/.github/workflows/robot-server-lint-test.yaml b/.github/workflows/robot-server-lint-test.yaml
index 96d1969121b..a8e8364831a 100644
--- a/.github/workflows/robot-server-lint-test.yaml
+++ b/.github/workflows/robot-server-lint-test.yaml
@@ -56,12 +56,12 @@ jobs:
matrix:
with-ot-hardware: ['true', 'false']
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
diff --git a/.github/workflows/server-utils-lint-test.yaml b/.github/workflows/server-utils-lint-test.yaml
index 240d9e0bd25..2d25ac29095 100644
--- a/.github/workflows/server-utils-lint-test.yaml
+++ b/.github/workflows/server-utils-lint-test.yaml
@@ -41,12 +41,12 @@ jobs:
timeout-minutes: 10
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
@@ -62,12 +62,12 @@ jobs:
needs: [lint]
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
diff --git a/.github/workflows/shared-data-test-lint-deploy.yaml b/.github/workflows/shared-data-test-lint-deploy.yaml
index 39cc4cd30e4..5798f7454c4 100644
--- a/.github/workflows/shared-data-test-lint-deploy.yaml
+++ b/.github/workflows/shared-data-test-lint-deploy.yaml
@@ -46,12 +46,12 @@ jobs:
timeout-minutes: 10
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.10'
@@ -75,7 +75,7 @@ jobs:
runs-on: '${{ matrix.os }}'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- name: 'install udev for usb-detection'
@@ -86,7 +86,7 @@ jobs:
sudo apt-get update && sudo apt-get install libudev-dev
- uses: 'actions/setup-node@v1'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: ${{ matrix.python }}
@@ -115,10 +115,10 @@ jobs:
runs-on: 'ubuntu-22.04'
timeout-minutes: 30
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -152,7 +152,7 @@ jobs:
runs-on: 'ubuntu-22.04'
if: github.event_name == 'push'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
@@ -161,9 +161,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
@@ -223,16 +223,16 @@ jobs:
needs: ['js-test', 'publish-switch']
if: needs.publish-switch.outputs.should_publish == 'true'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
registry-url: 'https://registry.npmjs.org'
- name: 'install udev for usb-detection'
run: |
@@ -252,7 +252,7 @@ jobs:
run: |
npm config set cache ./.npm-cache
yarn config set cache-folder ./.yarn-cache
- make setup-js
+ make setup-js
- name: 'build typescript'
run: make build-ts
- name: 'build library'
@@ -265,9 +265,9 @@ jobs:
VERSION_STRING=$(echo ${{ github.ref }} | sed -E 's/refs\/tags\/(components|shared-data)@//')
json -I -f ./shared-data/package.json -e "this.version=\"$VERSION_STRING\""
cd ./shared-data
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
registry-url: 'https://registry.npmjs.org'
- name: 'publish to npm registry'
env:
diff --git a/.github/workflows/step-generation-test.yaml b/.github/workflows/step-generation-test.yaml
index 7ac65f3997e..ebf414099aa 100644
--- a/.github/workflows/step-generation-test.yaml
+++ b/.github/workflows/step-generation-test.yaml
@@ -35,10 +35,10 @@ jobs:
runs-on: 'ubuntu-22.04'
timeout-minutes: 30
steps:
- - uses: 'actions/checkout@v3'
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/checkout@v4'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
diff --git a/.github/workflows/system-server-lint-test.yaml b/.github/workflows/system-server-lint-test.yaml
index 720ca905bd7..6cdeec1cba3 100644
--- a/.github/workflows/system-server-lint-test.yaml
+++ b/.github/workflows/system-server-lint-test.yaml
@@ -43,12 +43,12 @@ jobs:
timeout-minutes: 10
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
@@ -64,12 +64,12 @@ jobs:
needs: [lint]
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
diff --git a/.github/workflows/tag-releases.yaml b/.github/workflows/tag-releases.yaml
index 864f1e45b36..eea09005c0e 100644
--- a/.github/workflows/tag-releases.yaml
+++ b/.github/workflows/tag-releases.yaml
@@ -19,12 +19,12 @@ jobs:
# git fetch origin ${{ github.ref_name }}:${{ github.ref_name }}
# git checkout ${{ github.ref_name }}
# This would pull history for only the tag in question.
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- name: 'cache yarn cache'
uses: actions/cache@v3
with:
diff --git a/.github/workflows/test-edge-with-hypothesis.yaml b/.github/workflows/test-edge-with-hypothesis.yaml
index 15e452dc33a..596a5339d45 100644
--- a/.github/workflows/test-edge-with-hypothesis.yaml
+++ b/.github/workflows/test-edge-with-hypothesis.yaml
@@ -2,8 +2,8 @@ name: 'Testing Edge with Hypothesis'
on:
schedule:
- - cron: '45 22 * * 1-5'
-
+ - cron: '45 22 * * 1-5'
+
workflow_dispatch:
concurrency:
@@ -20,23 +20,23 @@ jobs:
timeout-minutes: 120
runs-on: 'ubuntu-latest'
steps:
- - name: 'Checkout opentrons repo'
- uses: 'actions/checkout@v3'
- with:
- ref: 'edge'
- fetch-depth: 0
-
- - name: 'Setup Python'
- uses: 'actions/setup-python@v5'
- with:
- python-version: '3.10'
- cache: 'pipenv'
- cache-dependency-path: 'test-data-generation/Pipfile.lock'
-
- - name: 'Install Python deps'
- uses: './.github/actions/python/setup'
- with:
- project: 'test-data-generation'
-
- - name: 'Run Hypothesis tests'
- run: 'make -C test-data-generation test'
+ - name: 'Checkout opentrons repo'
+ uses: 'actions/checkout@v4'
+ with:
+ ref: 'edge'
+ fetch-depth: 0
+
+ - name: 'Setup Python'
+ uses: 'actions/setup-python@v5'
+ with:
+ python-version: '3.10'
+ cache: 'pipenv'
+ cache-dependency-path: 'test-data-generation/Pipfile.lock'
+
+ - name: 'Install Python deps'
+ uses: './.github/actions/python/setup'
+ with:
+ project: 'test-data-generation'
+
+ - name: 'Run Hypothesis tests'
+ run: 'make -C test-data-generation test'
diff --git a/.github/workflows/update-server-lint-test.yaml b/.github/workflows/update-server-lint-test.yaml
index b4d1435838f..22c87c131e4 100644
--- a/.github/workflows/update-server-lint-test.yaml
+++ b/.github/workflows/update-server-lint-test.yaml
@@ -41,12 +41,12 @@ jobs:
timeout-minutes: 10
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
@@ -62,12 +62,12 @@ jobs:
needs: [lint]
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
diff --git a/.github/workflows/usb-bridge-lint-test.yaml b/.github/workflows/usb-bridge-lint-test.yaml
index 2888291871a..2984615b475 100644
--- a/.github/workflows/usb-bridge-lint-test.yaml
+++ b/.github/workflows/usb-bridge-lint-test.yaml
@@ -41,12 +41,12 @@ jobs:
timeout-minutes: 10
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
@@ -62,12 +62,12 @@ jobs:
needs: [lint]
runs-on: 'ubuntu-22.04'
steps:
- - uses: 'actions/checkout@v3'
+ - uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- - uses: 'actions/setup-node@v3'
+ - uses: 'actions/setup-node@v4'
with:
- node-version: '18.19.0'
+ node-version: '22.4.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
diff --git a/.nvmrc b/.nvmrc
index 3c032078a4a..a9d087399d7 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18
+18.19.0
diff --git a/DEV_SETUP.md b/DEV_SETUP.md
index 238f2c7fda3..7efaa8984ad 100644
--- a/DEV_SETUP.md
+++ b/DEV_SETUP.md
@@ -13,7 +13,7 @@ You will need the following tools installed to develop on the Opentrons platform
- curl
- ssh
- Python v3.10
-- Node.js v18
+- Node.js v22
### macOS
@@ -85,7 +85,7 @@ nvs --version
Now we can use `nvs` to install the currently required Node.js version set in `.nvmrc`. The `auto` command selects the correct version of Node.js any time we're in the `opentrons` project directory. Without `auto`, we would have to manually run `use` or `install` each time we work on the project.
```shell
-nvs add 18
+nvs add 22
nvs auto on
```
@@ -202,7 +202,7 @@ Once you are inside the repository for the first time, you should do two things:
3. Run `python --version` to confirm your chosen version. If you get the incorrect version and you're using an Apple silicon Mac, try running `eval "$(pyenv init --path)"` and then `pyenv local 3.10.13`. Then check `python --version` again.
```shell
-# confirm Node v18
+# confirm Node v22
node --version
# set Python version, and confirm
diff --git a/app-shell-odd/electron-builder.config.js b/app-shell-odd/electron-builder.config.js
index d5cd4ac7eea..7f37b56c74b 100644
--- a/app-shell-odd/electron-builder.config.js
+++ b/app-shell-odd/electron-builder.config.js
@@ -2,7 +2,7 @@
module.exports = {
appId: 'com.opentrons.odd',
- electronVersion: '27.0.0',
+ electronVersion: '31.3.1',
npmRebuild: false,
files: [
'**/*',
diff --git a/app-shell-odd/package.json b/app-shell-odd/package.json
index e080060ca7c..0ba7783061b 100644
--- a/app-shell-odd/package.json
+++ b/app-shell-odd/package.json
@@ -44,7 +44,7 @@
"dateformat": "3.0.3",
"electron-devtools-installer": "3.2.0",
"electron-store": "5.1.1",
- "electron-updater": "4.1.2",
+ "electron-updater": "6.2.1",
"execa": "4.0.0",
"form-data": "2.5.0",
"fs-extra": "10.0.0",
diff --git a/app-shell/Makefile b/app-shell/Makefile
index 5daafd82f44..1a99a169be0 100644
--- a/app-shell/Makefile
+++ b/app-shell/Makefile
@@ -59,7 +59,7 @@ no_python_bundle ?=
builder := yarn electron-builder \
--config electron-builder.config.js \
- --config.electronVersion=27.0.0 \
+ --config.electronVersion=31.3.1 \
--publish never
diff --git a/app-shell/electron-builder.config.js b/app-shell/electron-builder.config.js
index 1b048915255..b001ba70fe3 100644
--- a/app-shell/electron-builder.config.js
+++ b/app-shell/electron-builder.config.js
@@ -25,7 +25,7 @@ const publishConfig =
module.exports = async () => ({
appId:
project === 'robot-stack' ? 'com.opentrons.app' : 'com.opentrons.appot3',
- electronVersion: '27.0.0',
+ electronVersion: '31.3.1',
npmRebuild: false,
releaseInfo: {
releaseNotesFile:
diff --git a/app-shell/package.json b/app-shell/package.json
index e93babb3342..e14a00eeaf6 100644
--- a/app-shell/package.json
+++ b/app-shell/package.json
@@ -52,7 +52,7 @@
"electron-localshortcut": "3.2.1",
"electron-devtools-installer": "3.2.0",
"electron-store": "5.1.1",
- "electron-updater": "4.1.2",
+ "electron-updater": "6.2.1",
"execa": "4.0.0",
"form-data": "2.5.0",
"fs-extra": "10.0.0",
diff --git a/app-shell/src/__tests__/update.test.ts b/app-shell/src/__tests__/update.test.ts
index 19d22e65b8f..3c0afe3e514 100644
--- a/app-shell/src/__tests__/update.test.ts
+++ b/app-shell/src/__tests__/update.test.ts
@@ -38,7 +38,7 @@ describe('update', () => {
vi.mocked(ElectronUpdater.autoUpdater).emit('update-available', {
version: '1.0.0',
- })
+ } as any)
expect(dispatch).toHaveBeenCalledWith({
type: 'shell:CHECK_UPDATE_RESULT',
@@ -50,7 +50,7 @@ describe('update', () => {
handleAction({ type: 'shell:CHECK_UPDATE', meta: { shell: true } })
vi.mocked(ElectronUpdater.autoUpdater).emit('update-not-available', {
version: '1.0.0',
- })
+ } as any)
expect(dispatch).toHaveBeenCalledWith({
type: 'shell:CHECK_UPDATE_RESULT',
@@ -82,7 +82,7 @@ describe('update', () => {
vi.mocked(ElectronUpdater.autoUpdater).downloadUpdate
).toHaveBeenCalledTimes(1)
- const progress = {
+ const progress: any = {
percent: 20,
}
@@ -97,7 +97,7 @@ describe('update', () => {
vi.mocked(ElectronUpdater.autoUpdater).emit('update-downloaded', {
version: '1.0.0',
- })
+ } as any)
expect(dispatch).toHaveBeenCalledWith({
type: 'shell:DOWNLOAD_UPDATE_RESULT',
diff --git a/app-shell/src/update.ts b/app-shell/src/update.ts
index 5742904ae8b..bfb3ffed62b 100644
--- a/app-shell/src/update.ts
+++ b/app-shell/src/update.ts
@@ -4,13 +4,14 @@ import updater from 'electron-updater'
import { createLogger } from './log'
import { getConfig } from './config'
import { UI_INITIALIZED, UPDATE_VALUE } from './constants'
-import type { UpdateInfo } from '@opentrons/app/src/redux/shell/types'
+import type { UpdateInfo } from '@opentrons/app'
import type { Action, Dispatch, PlainError } from './types'
const autoUpdater = updater.autoUpdater
autoUpdater.logger = createLogger('update')
autoUpdater.autoDownload = false
+autoUpdater.forceDevUpdateConfig = true
export const CURRENT_VERSION: string = autoUpdater.currentVersion.version
@@ -77,16 +78,9 @@ interface ProgressInfo {
percent: number
bytesPerSecond: number
}
-interface DownloadingPayload {
- progress: ProgressInfo
- bytesPerSecond: number
- percent: number
- total: number
- transferred: number
-}
function downloadUpdate(dispatch: Dispatch): void {
- const onDownloading = (payload: DownloadingPayload): void => {
+ const onDownloading = (payload: ProgressInfo): void => {
dispatch({ type: 'shell:DOWNLOAD_PERCENTAGE', payload })
}
const onDownloaded = (): void => {
diff --git a/app/package.json b/app/package.json
index 43a1869b186..87f6a5ce201 100644
--- a/app/package.json
+++ b/app/package.json
@@ -75,6 +75,7 @@
"@types/node-fetch": "2.6.11",
"@types/styled-components": "^5.1.26",
"axios": "^0.21.1",
+ "electron-updater": "6.2.1",
"postcss-apply": "0.12.0",
"postcss-color-mod-function": "3.0.3",
"postcss-import": "16.0.0",
diff --git a/app/src/index.tsx b/app/src/index.tsx
index cf4fcbfc44c..a615908157b 100644
--- a/app/src/index.tsx
+++ b/app/src/index.tsx
@@ -6,6 +6,7 @@ import { HashRouter } from 'react-router-dom'
import { ApiClientProvider } from '@opentrons/react-api-client'
+import { App } from './App'
import { createLogger } from './logger'
import { uiInitialized } from './redux/shell'
@@ -16,8 +17,10 @@ import '../src/atoms/SoftwareKeyboard/FullKeyboard/index.css'
import '../src/atoms/SoftwareKeyboard/IndividualKey/index.css'
import '../src/atoms/SoftwareKeyboard/NumericalKeyboard/index.css'
+// export public types so they can be accessed by external deps
+export * from './redux/types'
+
// component tree
-import { App } from './App'
const log = createLogger(new URL('', import.meta.url).pathname)
diff --git a/app/src/organisms/UpdateAppModal/index.tsx b/app/src/organisms/UpdateAppModal/index.tsx
index 431bc144a31..009adcc1fe7 100644
--- a/app/src/organisms/UpdateAppModal/index.tsx
+++ b/app/src/organisms/UpdateAppModal/index.tsx
@@ -94,7 +94,14 @@ export function UpdateAppModal(props: UpdateAppModalProps): JSX.Element {
error,
info: updateInfo,
} = updateState
- const releaseNotes = updateInfo?.releaseNotes
+ let releaseNotesText = updateInfo?.releaseNotes
+ if (Array.isArray(releaseNotesText)) {
+ // it is unclear to me why/how electron-updater would ever expose
+ // release notes this way, but this should never happen...
+ // this string representation should always be returned
+ releaseNotesText = releaseNotesText[0].note
+ }
+
const { t } = useTranslation(['app_settings', 'branded'])
const navigate = useNavigate()
const { removeActiveAppUpdateToast } = useRemoveActiveAppUpdateToast()
@@ -193,7 +200,7 @@ export function UpdateAppModal(props: UpdateAppModalProps): JSX.Element {
{t('branded:update_requires_restarting_app')}
-
+
) : null}
diff --git a/app/src/redux/shell/index.ts b/app/src/redux/shell/index.ts
index 5a918f75eb3..f82caa7d498 100644
--- a/app/src/redux/shell/index.ts
+++ b/app/src/redux/shell/index.ts
@@ -4,5 +4,6 @@ export * from './actions'
export * from './update'
export * from './is-ready/actions'
export * from './is-ready/selectors'
+export * from './types'
export const CURRENT_VERSION: string = _PKG_VERSION_
diff --git a/app/src/redux/shell/types.ts b/app/src/redux/shell/types.ts
index aeee1fe72c6..1c2252484cf 100644
--- a/app/src/redux/shell/types.ts
+++ b/app/src/redux/shell/types.ts
@@ -1,4 +1,6 @@
import type { IpcMainEvent } from 'electron'
+import type { UpdateFileInfo } from 'electron-updater'
+import type { ReleaseNoteInfo } from 'builder-util-runtime'
import type { Error } from '../types'
import type { RobotSystemAction } from './is-ready/types'
@@ -31,16 +33,11 @@ export type NotifyBrokerResponses = NotifyRefetchData | NotifyUnsubscribeData
export type NotifyNetworkError = 'ECONNFAILED' | 'ECONNREFUSED'
export type NotifyResponseData = NotifyBrokerResponses | NotifyNetworkError
-interface File {
- sha512: string
- url: string
- [key: string]: unknown
-}
export interface UpdateInfo {
version: string
- files: File[]
+ files: UpdateFileInfo[]
releaseDate?: string
- releaseNotes?: string
+ releaseNotes?: string | null | ReleaseNoteInfo[]
}
export interface ShellUpdateState {
diff --git a/app/src/redux/types.ts b/app/src/redux/types.ts
index 9ed69c3e71f..a1fa9ddff11 100644
--- a/app/src/redux/types.ts
+++ b/app/src/redux/types.ts
@@ -115,3 +115,5 @@ export type Epic = (
) => Observable
export type Error = Partial<{ name: string; message: string }>
+
+export * from './shell/types'
diff --git a/app/tsconfig.json b/app/tsconfig.json
index 1eb90375651..2eeac4d318a 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -27,7 +27,7 @@
},
{
"path": "../labware-library"
- },
+ }
],
"compilerOptions": {
"composite": true,
diff --git a/package.json b/package.json
index 0727c37a148..b451b89541a 100755
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
},
"packageManager": "yarn@1.22.19",
"engines": {
- "node": "^18.19.0"
+ "node": ">=18.19.0"
},
"resolutions": {
"@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0"
@@ -38,7 +38,7 @@
"@aws-sdk/client-dynamodb": "^3.582.0",
"@aws-sdk/credential-provider-ini": "^3.582.0",
"@cypress/webpack-preprocessor": "^5.1.2",
- "@electron/rebuild": "3.2.10",
+ "@electron/rebuild": "3.6.0",
"@octokit/rest": "^19.0.5",
"@rollup/plugin-alias": "^3.1.2",
"@rollup/plugin-babel": "^5.3.0",
@@ -83,8 +83,8 @@
"cz-conventional-changelog": "2.1.0",
"decompress": "4.2.1",
"download": "8.0.0",
- "electron": "27.0.0",
- "electron-builder": "24.0.0",
+ "electron": "31.3.1",
+ "electron-builder": "24.13.3",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.1.0",
"eslint-config-standard": "^16.0.2",
diff --git a/yarn.lock b/yarn.lock
index bcf51c052b0..76c14e5e641 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,10 +7,10 @@
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz#6abbdc22f33cab742053777a26db2e25ca527179"
integrity sha512-XtGk+IF57pr852UK1AhQJXqmm1WmSgS5uISL+LPs0z/iAxXouMvdlLJrHPeukP6gd7yR2rDTMSMkHNODgwIq7A==
-"7zip-bin@~5.1.1":
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
- integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==
+"7zip-bin@~5.2.0":
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.2.0.tgz#7a03314684dd6572b7dfa89e68ce31d60286854d"
+ integrity sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==
"@aashutoshrathi/word-wrap@^1.2.3":
version "1.2.6"
@@ -2202,18 +2202,19 @@
optionalDependencies:
global-agent "^3.0.0"
-"@electron/notarize@^1.2.3":
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.4.tgz#a7d38773f4cad40df111a5edc64037e5d768ea1e"
- integrity sha512-W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg==
+"@electron/notarize@2.2.1":
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.1.tgz#d0aa6bc43cba830c41bfd840b85dbe0e273f59fe"
+ integrity sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==
dependencies:
debug "^4.1.1"
fs-extra "^9.0.1"
+ promise-retry "^2.0.1"
-"@electron/osx-sign@^1.0.4":
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.2.0.tgz#d1c83cac03e52f210858594eb011142a1ad0ae70"
- integrity sha512-kOA3bAeDXFMj2JHj0R2fk/IT92qpu3tZHwM4l/PdksAuy7eA3/23QktCiAoQICwPdtxCYdt9ZLimKvnNyUpdSQ==
+"@electron/osx-sign@1.0.5":
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.5.tgz#0af7149f2fce44d1a8215660fd25a9fb610454d8"
+ integrity sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==
dependencies:
compare-version "^0.1.2"
debug "^4.3.4"
@@ -2222,27 +2223,7 @@
minimist "^1.2.6"
plist "^3.0.5"
-"@electron/rebuild@3.2.10":
- version "3.2.10"
- resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz#adc9443179709d4e4b93a68fac6a08b9a3b9e5e6"
- integrity sha512-SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg==
- dependencies:
- "@malept/cross-spawn-promise" "^2.0.0"
- chalk "^4.0.0"
- debug "^4.1.1"
- detect-libc "^2.0.1"
- fs-extra "^10.0.0"
- got "^11.7.0"
- lzma-native "^8.0.5"
- node-abi "^3.0.0"
- node-api-version "^0.1.4"
- node-gyp "^9.0.0"
- ora "^5.1.0"
- semver "^7.3.5"
- tar "^6.0.5"
- yargs "^17.0.1"
-
-"@electron/rebuild@^3.2.10":
+"@electron/rebuild@3.6.0":
version "3.6.0"
resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.6.0.tgz#60211375a5f8541a71eb07dd2f97354ad0b2b96f"
integrity sha512-zF4x3QupRU3uNGaP5X1wjpmcjfw1H87kyqZ00Tc3HvriV+4gmOGuvQjGNkrJuXdsApssdNyVwLsy+TaeTGGcVw==
@@ -2262,10 +2243,10 @@
tar "^6.0.5"
yargs "^17.0.1"
-"@electron/universal@1.3.4":
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777"
- integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==
+"@electron/universal@1.5.1":
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.5.1.tgz#f338bc5bcefef88573cf0ab1d5920fac10d06ee5"
+ integrity sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==
dependencies:
"@electron/asar" "^3.2.1"
"@malept/cross-spawn-promise" "^1.1.0"
@@ -5484,13 +5465,20 @@
dependencies:
undici-types "~5.26.4"
-"@types/node@^18.0.0", "@types/node@^18.11.18":
+"@types/node@^18.0.0":
version "18.19.31"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.31.tgz#b7d4a00f7cb826b60a543cebdbda5d189aaecdcd"
integrity sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==
dependencies:
undici-types "~5.26.4"
+"@types/node@^20.9.0":
+ version "20.14.14"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.14.tgz#6b655d4a88623b0edb98300bb9dd2107225f885e"
+ integrity sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==
+ dependencies:
+ undici-types "~5.26.4"
+
"@types/normalize-package-data@^2.4.0":
version "2.4.4"
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
@@ -5645,11 +5633,6 @@
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.23.0.tgz#0a6655b3e2708eaabca00b7372fafd7a792a7b09"
integrity sha512-YIoDCTH3Af6XM5VuwGG/QL/CJqga1Zm3NkU3HZ4ZHK2fRMPYP1VczsTUqtsf43PH/iJNVlPHAo2oWX7BSdB2Hw==
-"@types/semver@^6.0.1":
- version "6.2.7"
- resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.7.tgz#473fb8d63ea04f7511c699fb9b96830c51e8a53d"
- integrity sha512-blctEWbzUFzQx799RZjzzIdBJOXmE37YYEyDtKkx5Dg+V7o/zyyAxLPiI98A2jdTtDgxZleMdfV+7p8WbRJ1OQ==
-
"@types/semver@^7.3.12", "@types/semver@^7.3.4", "@types/semver@^7.3.6", "@types/semver@^7.5.0":
version "7.5.8"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
@@ -5767,7 +5750,7 @@
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
-"@types/yargs@17.0.32", "@types/yargs@^17.0.16", "@types/yargs@^17.0.8":
+"@types/yargs@17.0.32", "@types/yargs@^17.0.8":
version "17.0.32"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
@@ -6470,26 +6453,25 @@ app-builder-bin@4.0.0:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
-app-builder-lib@24.0.0:
- version "24.0.0"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0.tgz#1f04a05abe225290caf2216110f9e266cf7372c4"
- integrity sha512-S9wBoyXz2aQ7N3nV/SQS8Cg72NyhsIYGu0xm0w8iW+CWHkIOqQrwVd/cyV1iSYt6QntLGvS54j4SpW9OIkUqPw==
+app-builder-lib@24.13.3:
+ version "24.13.3"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.13.3.tgz#36e47b65fecb8780bb73bff0fee4e0480c28274b"
+ integrity sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==
dependencies:
- "7zip-bin" "~5.1.1"
"@develar/schema-utils" "~2.6.5"
- "@electron/notarize" "^1.2.3"
- "@electron/osx-sign" "^1.0.4"
- "@electron/rebuild" "^3.2.10"
- "@electron/universal" "1.3.4"
+ "@electron/notarize" "2.2.1"
+ "@electron/osx-sign" "1.0.5"
+ "@electron/universal" "1.5.1"
"@malept/flatpak-bundler" "^0.4.0"
+ "@types/fs-extra" "9.0.13"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9"
- builder-util "24.0.0"
- builder-util-runtime "9.2.0"
+ builder-util "24.13.1"
+ builder-util-runtime "9.2.4"
chromium-pickle-js "^0.2.0"
debug "^4.3.4"
ejs "^3.1.8"
- electron-publish "24.0.0"
+ electron-publish "24.13.1"
form-data "^4.0.0"
fs-extra "^10.1.0"
hosted-git-info "^4.1.0"
@@ -7496,18 +7478,10 @@ buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.7.1:
base64-js "^1.3.1"
ieee754 "^1.1.13"
-builder-util-runtime@8.3.0:
- version "8.3.0"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.3.0.tgz#f5fac9139af6facf42a21fbe4d3aebed88fda33e"
- integrity sha512-CSOdsYqf4RXIHh1HANPbrZHlZ9JQJXSuDDloblZPcWQVN62inyYoTQuSmY3KrgefME2Sv3Kn2MxHvbGQHRf8Iw==
- dependencies:
- debug "^4.1.1"
- sax "^1.2.4"
-
-builder-util-runtime@9.2.0:
- version "9.2.0"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0.tgz#64e7764f0a3b8bcba520efbd5f64e7926815b148"
- integrity sha512-6S0FLP5n57MgSVEypgjq5veUMd8C8NKt/IgRRXyYXYnhRG9AxxAB4/uULQhDG4JbAoeb5ahOTPC1jAxT0l2ylQ==
+builder-util-runtime@9.2.4:
+ version "9.2.4"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz#13cd1763da621e53458739a1e63f7fcba673c42a"
+ integrity sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==
dependencies:
debug "^4.3.4"
sax "^1.2.4"
@@ -7522,17 +7496,16 @@ builder-util-runtime@^4.4.0, builder-util-runtime@^4.4.1:
fs-extra-p "^4.6.1"
sax "^1.2.4"
-builder-util@24.0.0:
- version "24.0.0"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0.tgz#db1f43bce6fbe34b706e50bbc8ab6903b843b068"
- integrity sha512-7UzkO1Uanui9Eyo6X4lM2UjEz6qA7sbZ7bPNsxhIi51nZ95o4EsQxIqIZgQlwM3cPSZba5pnu8oBThsAQVAhEg==
+builder-util@24.13.1:
+ version "24.13.1"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.13.1.tgz#4a4c4f9466b016b85c6990a0ea15aa14edec6816"
+ integrity sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==
dependencies:
- "7zip-bin" "~5.1.1"
+ "7zip-bin" "~5.2.0"
"@types/debug" "^4.1.6"
- "@types/fs-extra" "^9.0.11"
app-builder-bin "4.0.0"
bluebird-lst "^1.0.9"
- builder-util-runtime "9.2.0"
+ builder-util-runtime "9.2.4"
chalk "^4.1.2"
cross-spawn "^7.0.3"
debug "^4.3.4"
@@ -9803,14 +9776,14 @@ dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"
-dmg-builder@24.0.0:
- version "24.0.0"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0.tgz#44832b7dd4bca46370c72c5571587c0c8f3e9b8b"
- integrity sha512-/SWd0gYfn/ddx7mmBeAymOsslyyTNIO0ZFPKMlKcaBELziMqgrc3SX5qEwfPOh2942VgEQZyWzR9FhE+Y9bo6Q==
+dmg-builder@24.13.3:
+ version "24.13.3"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.13.3.tgz#95d5b99c587c592f90d168a616d7ec55907c7e55"
+ integrity sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==
dependencies:
- app-builder-lib "24.0.0"
- builder-util "24.0.0"
- builder-util-runtime "9.2.0"
+ app-builder-lib "24.13.3"
+ builder-util "24.13.1"
+ builder-util-runtime "9.2.4"
fs-extra "^10.1.0"
iconv-lite "^0.6.2"
js-yaml "^4.1.0"
@@ -10097,22 +10070,21 @@ ejs@^3.1.8:
dependencies:
jake "^10.8.5"
-electron-builder@24.0.0:
- version "24.0.0"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0.tgz#9d04c1de80c2576899a16e8450b571092171b9ea"
- integrity sha512-31GXEEi02c0/lJwfs6cX0tQlyFEQOi9ZCCQ5GFyazdhnTlGGxYvVTTQogAG9LPxUGOzRNZiUvhai5KXmMp3a0g==
+electron-builder@24.13.3:
+ version "24.13.3"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.13.3.tgz#c506dfebd36d9a50a83ee8aa32d803d83dbe4616"
+ integrity sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg==
dependencies:
- "@types/yargs" "^17.0.16"
- app-builder-lib "24.0.0"
- builder-util "24.0.0"
- builder-util-runtime "9.2.0"
+ app-builder-lib "24.13.3"
+ builder-util "24.13.1"
+ builder-util-runtime "9.2.4"
chalk "^4.1.2"
- dmg-builder "24.0.0"
+ dmg-builder "24.13.3"
fs-extra "^10.1.0"
is-ci "^3.0.0"
lazy-val "^1.0.5"
read-config-file "6.3.2"
- simple-update-notifier "^1.1.0"
+ simple-update-notifier "2.0.0"
yargs "^17.6.2"
electron-context-menu@3.6.1:
@@ -10184,14 +10156,14 @@ electron-notarize@^1.2.1:
debug "^4.1.1"
fs-extra "^9.0.1"
-electron-publish@24.0.0:
- version "24.0.0"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0.tgz#c3ea5a00ec0d62e9c0348b707fdfa347045bb359"
- integrity sha512-XY99MVdMXfseO3oBPQ5jdT68DFcUd4eudonbVvqrCBj9qur0w/L80M/fBMmXulokTiwI4L8tIJzcswKE6W0ibA==
+electron-publish@24.13.1:
+ version "24.13.1"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.13.1.tgz#57289b2f7af18737dc2ad134668cdd4a1b574a0c"
+ integrity sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==
dependencies:
"@types/fs-extra" "^9.0.11"
- builder-util "24.0.0"
- builder-util-runtime "9.2.0"
+ builder-util "24.13.1"
+ builder-util-runtime "9.2.4"
chalk "^4.1.2"
fs-extra "^10.1.0"
lazy-val "^1.0.5"
@@ -10235,27 +10207,27 @@ electron-to-chromium@^1.4.668:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.746.tgz#787213e75f6c7bccb55dfe8b68170555c548d093"
integrity sha512-jeWaIta2rIG2FzHaYIhSuVWqC6KJYo7oSBX4Jv7g+aVujKztfvdpf+n6MGwZdC5hQXbax4nntykLH2juIQrfPg==
-electron-updater@4.1.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.1.2.tgz#46a6e62cc8d0c7d935db7aff83207da2a21ff788"
- integrity sha512-4Sk8IW0LfOilDz+WAB/gEDmX7+FUFRbKHGN1zGjehPilnd6H9cmjgBHK6Xzq/FLq/uOHGJ6GX/9tsF+jr7CvnA==
+electron-updater@6.2.1:
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.2.1.tgz#1c9adb9ba2a21a5dc50a8c434c45360d5e9fe6c9"
+ integrity sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==
dependencies:
- "@types/semver" "^6.0.1"
- builder-util-runtime "8.3.0"
- fs-extra "^8.1.0"
- js-yaml "^3.13.1"
- lazy-val "^1.0.4"
+ builder-util-runtime "9.2.4"
+ fs-extra "^10.1.0"
+ js-yaml "^4.1.0"
+ lazy-val "^1.0.5"
+ lodash.escaperegexp "^4.1.2"
lodash.isequal "^4.5.0"
- pako "^1.0.10"
- semver "^6.2.0"
+ semver "^7.3.8"
+ tiny-typed-emitter "^2.1.0"
-electron@27.0.0:
- version "27.0.0"
- resolved "https://registry.yarnpkg.com/electron/-/electron-27.0.0.tgz#bb6c45881e531b2ec1c7cc46c47aba773f38ee14"
- integrity sha512-mr3Zoy82l8XKK/TgguE5FeNeHZ9KHXIGIpUMjbjZWIREfAv+X2Q3vdX6RG0Pmi1K23AFAxANXQezIHBA2Eypwg==
+electron@31.3.1:
+ version "31.3.1"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-31.3.1.tgz#de5f21f10db1ba0568e0cdd7ae76ec40a4b800c3"
+ integrity sha512-9fiuWlRhBfygtcT+auRd/WdBK/f8LZZcrpx0RjpXhH2DPTP/PfnkC4JB1PW55qCbGbh4wAgkYbf4ExIag8oGCA==
dependencies:
"@electron/get" "^2.0.0"
- "@types/node" "^18.11.18"
+ "@types/node" "^20.9.0"
extract-zip "^2.0.1"
elliptic@^6.5.3, elliptic@^6.5.5:
@@ -14677,6 +14649,11 @@ lodash.debounce@^4.0.8:
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
+lodash.escaperegexp@^4.1.2:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
+ integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==
+
lodash.isequal@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -14881,15 +14858,6 @@ lz-string@^1.5.0:
resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==
-lzma-native@^8.0.5:
- version "8.0.6"
- resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665"
- integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA==
- dependencies:
- node-addon-api "^3.1.0"
- node-gyp-build "^4.2.1"
- readable-stream "^3.6.0"
-
madge@^3.6.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/madge/-/madge-3.12.0.tgz#727c1ebb268150d52e6d0c3ccd382b4c7bd0bf19"
@@ -16059,7 +16027,7 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
-node-abi@^3.0.0, node-abi@^3.45.0:
+node-abi@^3.45.0:
version "3.60.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.60.0.tgz#a325b13b3c401c2230202897559fbf0b5f9a90ac"
integrity sha512-zcGgwoXbzw9NczqbGzAWL/ToDYAxv1V8gL1D67ClbdkIfeeDBbY0GelZtC25ayLvVjr2q2cloHeQV1R0QAWqRQ==
@@ -16071,11 +16039,6 @@ node-addon-api@^1.6.3:
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
-node-addon-api@^3.1.0:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
- integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-
node-addon-api@^5.0.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
@@ -16086,13 +16049,6 @@ node-addon-api@^7.0.0:
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.0.tgz#71f609369379c08e251c558527a107107b5e0fdb"
integrity sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==
-node-api-version@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080"
- integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==
- dependencies:
- semver "^7.3.5"
-
node-api-version@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d"
@@ -16139,7 +16095,7 @@ node-forge@^0.10.0:
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
-node-gyp-build@^4.2.1, node-gyp-build@^4.3.0, node-gyp-build@^4.5.0:
+node-gyp-build@^4.3.0, node-gyp-build@^4.5.0:
version "4.8.0"
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd"
integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==
@@ -16751,16 +16707,16 @@ p-try@^2.0.0:
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-pako@^1.0.10, pako@~1.0.2, pako@~1.0.5:
- version "1.0.11"
- resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
- integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
-
pako@~0.2.0:
version "0.2.9"
resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
integrity sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==
+pako@~1.0.2, pako@~1.0.5:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+ integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
parallel-transform@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
@@ -19629,11 +19585,6 @@ semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semve
dependencies:
lru-cache "^6.0.0"
-semver@~7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
- integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
send@0.16.2:
version "0.16.2"
resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -19903,12 +19854,12 @@ simple-swizzle@^0.2.2:
dependencies:
is-arrayish "^0.3.1"
-simple-update-notifier@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
- integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
+simple-update-notifier@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb"
+ integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==
dependencies:
- semver "~7.0.0"
+ semver "^7.5.3"
sisteransi@^1.0.5:
version "1.0.5"
@@ -21092,6 +21043,11 @@ tiny-invariant@^1.3.1, tiny-invariant@^1.3.3:
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
+tiny-typed-emitter@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz#b3b027fdd389ff81a152c8e847ee2f5be9fad7b5"
+ integrity sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==
+
tiny-warning@^1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"