Merge branch 'edge' into labware-creator_remove-test-protocol

.codecov.yml

@@ -1,6 +1,5 @@
 ignore:
   - '**/node_modules'
-  - 'protocol-library-kludge'
   - 'webpack-config'
   - 'hardware-testing'
   - '**/*.md'

.eslintignore

@@ -5,11 +5,11 @@
 **/build/**
 **/venv/**
 .opentrons_config
-
+**/tsconfig*.json
+**/vite.config.ts
 # prettier
 **/package.json
 **/CHANGELOG.md
-lerna.json
 !api/release-notes.md
 !app-shell/build/release-notes.md
 
@@ -25,7 +25,6 @@ storybook-static
 api/**
 update-server/**
 robot-server/**
-notify-server/**
 shared-data/python/**
 hardware-testing/**
 

.eslintrc.js

@@ -7,9 +7,15 @@ module.exports = {
     project: require('path').join(__dirname, 'tsconfig-eslint.json'),
   },
 
-  extends: ['standard-with-typescript', 'plugin:react/recommended', 'prettier'],
+  extends: [
+    'standard-with-typescript',
+    'plugin:react/recommended',
+    'prettier',
+    'plugin:json/recommended',
+    'plugin:storybook/recommended',
+  ],
 
-  plugins: ['react', 'react-hooks', 'json', 'jest', 'testing-library'],
+  plugins: ['react', 'react-hooks', 'json', 'testing-library'],
 
   rules: {
     camelcase: 'off',
@@ -50,7 +56,15 @@ module.exports = {
   overrides: [
     {
       files: ['**/*.js'],
-      parser: '@babel/eslint-parser',
+      extends: ['plugin:@typescript-eslint/disable-type-checked'],
+      parserOptions: {
+        project: require('path').join(__dirname, 'tsconfig-eslint.json'),
+      },
+      rules: {
+        '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/explicit-function-return-type': 'warn',
+        '@typescript-eslint/no-unused-vars': 'warn',
+      },
     },
     {
       // TODO(mc, 2021-03-18): remove to default these rules back to errors
@@ -65,6 +79,22 @@ module.exports = {
         '@typescript-eslint/no-floating-promises': 'warn',
         '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
         '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'warn',
+        '@typescript-eslint/no-unsafe-argument': 'warn',
+        '@typescript-eslint/consistent-type-imports': 'warn',
+        '@typescript-eslint/consistent-indexed-object-style': 'warn',
+        '@typescript-eslint/no-confusing-void-expression': 'warn',
+        '@typescript-eslint/ban-types': 'warn',
+        '@typescript-eslint/non-nullable-type-assertion-style': 'warn',
+        '@typescript-eslint/await-thenable': 'warn',
+        '@typescript-eslint/ban-ts-comment': 'warn',
+        '@typescript-eslint/unbound-method': 'warn',
+        '@typescript-eslint/consistent-generic-constructors': 'warn',
+        '@typescript-eslint/no-misused-promises': 'warn',
+        // need this to be able to pass in css prop into raw elements (babel adds this at build time for styled-components)
+        'react/no-unknown-property': [
+          'error',
+          { ignore: ['css', 'indeterminate'] },
+        ],
       },
     },
     {
@@ -74,32 +104,22 @@ module.exports = {
         '**/__mocks__/**.@(js|ts|tsx)',
         '**/__utils__/**.@(js|ts|tsx)',
         '**/__fixtures__/**.@(js|ts|tsx)',
+        '**/fixtures/**.@(js|ts|tsx)',
         'scripts/*.@(js|ts|tsx)',
       ],
-      env: {
-        jest: true,
-      },
-      extends: ['plugin:jest/recommended'],
       rules: {
-        'jest/expect-expect': 'off',
-        'jest/no-standalone-expect': 'off',
-        'jest/no-disabled-tests': 'error',
-        'jest/consistent-test-it': 'error',
         '@typescript-eslint/consistent-type-assertions': 'off',
         '@typescript-eslint/no-var-requires': 'off',
         '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/no-confusing-void-expression': 'warn',
         'node/handle-callback-err': 'off',
-        // TODO(mc, 2021-01-29): fix these and remove warning overrides
-        'jest/no-deprecated-functions': 'warn',
-        'jest/valid-title': 'warn',
-        'jest/no-conditional-expect': 'warn',
       },
     },
     {
       files: ['**/__tests__/**test.tsx'],
-      env: { jest: true },
       extends: ['plugin:testing-library/react'],
       rules: {
+        'testing-library/no-manual-cleanup': 'off',
         'testing-library/prefer-screen-queries': 'warn',
       },
     },
@@ -113,6 +133,9 @@ module.exports = {
     {
       files: ['**/cypress/**'],
       extends: ['plugin:cypress/recommended'],
+      rules: {
+        'cypress/unsafe-to-chain-command': 'warn',
+      },
     },
   ],
 }

.github/CODEOWNERS

@@ -12,7 +12,6 @@
 /protocol-designer @Opentrons/app-and-uis
 /labware-designer @Opentrons/app-and-uis
 /labware-library @Opentrons/app-and-uis
-/protocol-library-kludge @Opentrons/app-and-uis
 /update-server @Opentrons/robot-svcs
 /discovery-client @Opentrons/robot-svcs @Opentrons/app-and-uis
 /shared-data/pipette @Opentrons/embedded-sw
@@ -24,6 +23,8 @@
 # subprojects by language - some subprojects are shared by teams but united by a
 # language community (including makefiles and config) so mark them appropriately
 /app @Opentrons/js
+/api-client @Opentrons/js
+/react-api-client @Opentrons/js
 /app-shell @Opentrons/js
 /components @Opentrons/js
 /api @Opentrons/py

.github/actions/python/pypi-deploy/action.yaml

@@ -28,7 +28,7 @@ runs:
           fi
         fi
         status=0
-        QUIET=1 BUILD_NUMBER=${OT_BUILD} make -C ${{ inputs.project }} clean deploy twine_repository_url=${{ inputs.repository_url }} pypi_username=opentrons pypi_password=${{ inputs.password }} || status=$?
+        CI=1 QUIET=1 BUILD_NUMBER=${OT_BUILD} make -C ${{ inputs.project }} clean deploy twine_repository_url=${{ inputs.repository_url }} pypi_username=__token__ pypi_password=${{ inputs.password }} || status=$?
         if [[ ${status} != 0 ]] && [[ ${{ inputs.repository_url }} =~ "test.pypi.org" ]]; then
           echo "upload failures allowed to test pypi"
           exit 0

.github/actions/python/setup/action.yaml

@@ -25,8 +25,10 @@ runs:
       if: ${{ inputs.python-version != 'false' }}
       run: echo "OT_VIRTUALENV_VERSION=${{ inputs.python-version }}" >> $GITHUB_ENV
     - shell: bash
-      run: |
-        npm install --global [email protected]
-        $OT_PYTHON -m pip install pipenv==2023.11.15
+      run: npm install --global [email protected]
+    - shell: bash
+      run: $OT_PYTHON -m pip install --upgrade pip
+    - shell: bash
+      run: $OT_PYTHON -m pip install --user pipenv==2023.12.1
     - shell: bash
-      run: 'make -C ${{ inputs.project }} setup'
+      run: 'make -C ${{ inputs.project }} setup || make -C ${{ inputs.project }} setup'

.github/workflows/analyses-snapshot-test.yaml

@@ -12,10 +12,11 @@ on:
         required: true
         default: 'edge'
   schedule:
-    - cron:  '0 7-8 * * *' # Random time between 2-3 AM EST (7-8 AM UTC)
+    - cron:  '26 7 * * *' # 7:26 AM UTC
 
 jobs:
   build-and-test:
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     env:
       TARGET: ${{ github.event.inputs.TARGET || 'edge' }}

.github/workflows/api-test-lint-deploy.yaml

@@ -56,7 +56,7 @@ jobs:
           fetch-depth: 0
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - uses: 'actions/setup-python@v4'
         with:
           python-version: '3.10'
@@ -95,7 +95,7 @@ jobs:
           git checkout ${{ github.ref }}
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - uses: 'actions/setup-python@v4'
         with:
           python-version: ${{ matrix.python }}
@@ -145,7 +145,7 @@ jobs:
           git checkout ${{ github.ref }}
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - uses: 'actions/setup-python@v4'
         with:
           python-version: '3.10'
@@ -165,11 +165,11 @@ jobs:
         with:
           project: 'api'
           repository_url: 'https://test.pypi.org/legacy/'
-          password: '${{ secrets.OT_TEST_PYPI_PASSWORD }}'
+          password: '${{ secrets.TEST_PYPI_DEPLOY_TOKEN_OPENTRONS }}'
       - if: startsWith(env.OT_TAG, 'v')
         name: 'upload to real pypi'
         uses: './.github/actions/python/pypi-deploy'
         with:
           project: 'api'
           repository_url: 'https://upload.pypi.org/legacy/'
-          password: '${{ secrets.OT_PYPI_PASSWORD }}'
+          password: '${{ secrets.PYPI_DEPLOY_TOKEN_OPENTRONS }}'

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

@@ -11,7 +11,6 @@ on:
       - 'app-shell-odd/**/*'
       - 'components/**/*'
       - 'shared-data/**/*'
-      - 'webpack-config/**/*'
       - 'discovery-client/**/*'
       - '*.js'
       - 'scripts/**/*'
@@ -32,7 +31,6 @@ on:
       - 'app-shell-odd/**/*'
       - 'components/**/*'
       - 'shared-data/**/*'
-      - 'webpack-config/**/*'
       - 'discovery-client/**/*'
       - '*.js'
       - '*.json'
@@ -61,7 +59,7 @@ jobs:
       - uses: 'actions/checkout@v3'
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - name: 'install udev'
         run: sudo apt-get update && sudo apt-get install libudev-dev
       - name: 'set complex environment variables'
@@ -110,7 +108,7 @@ jobs:
           git checkout ${{ github.ref }}
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
@@ -141,7 +139,7 @@ jobs:
           yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
           make setup-js
       - name: 'test native(er) packages'
-        run: make test-js-internal tests="app-shell/src app-shell-odd/src discovery-client/src" cov_opts="--coverage=true --ci=true --collectCoverageFrom='(app-shell|app-shell-odd| discovery-client)/src/**/*.(js|ts|tsx)'"
+        run: make test-js-internal tests="app-shell/src app-shell-odd/src discovery-client/src" cov_opts="--coverage=true"
       - name: 'Upload coverage report'
         uses: 'codecov/codecov-action@v3'
         with:
@@ -243,7 +241,7 @@ jobs:
           git checkout ${{ github.ref }}
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
@@ -293,7 +291,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'
@@ -427,7 +425,7 @@ jobs:
           git checkout ${{ github.ref }}
       - uses: 'actions/setup-node@v3'
         with:
-          node-version: '16'
+          node-version: '18.19.0'
       - name: 'install udev'
         run: sudo apt-get update && sudo apt-get install libudev-dev
       - name: 'set complex environment variables'
@@ -443,7 +441,6 @@ jobs:
           path: |
             ${{ github.workspace }}/.npm-cache/_prebuild
             ${{ github.workspace }}/.yarn-cache
-          key: js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
       - name: 'setup-js'
         run: |
           npm config set cache ${{ github.workspace }}/.npm-cache