Merge branch 'main' into refactor/update-table-to-css-modules

primer · Dec 9, 2024 · 6c0020f · 6c0020f
2 parents dea5404 + d57b1de
commit 6c0020f
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 40 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -200,8 +200,14 @@ module.exports = {
       parserOptions: {
         project: 'tsconfig.json',
       },
-      extends: ['plugin:playwright/jest-playwright'],
-      rules: {},
+      extends: ['plugin:playwright/recommended'],
+      rules: {
+        'playwright/expect-expect': 'off',
+        'playwright/no-conditional-expect': 'off',
+        'playwright/no-conditional-in-test': 'off',
+        'playwright/no-wait-for-selector': 'off',
+        'playwright/valid-title': 'off',
+      },
     },
 
     // rules which apply only to Markdown

diff --git a/.github/workflows/assign_release_conductor.yml b/.github/workflows/assign_release_conductor.yml
@@ -18,7 +18,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 22
-      - run: npm i -g npm@^10.5.1
       - run: npm ci
       - uses: ./.github/actions/pagerduty
         id: pagerduty

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Check for unformatted files
@@ -43,7 +42,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Lint JavaScript
@@ -63,7 +61,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build
@@ -81,7 +78,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build project
@@ -99,7 +95,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build
@@ -118,7 +113,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build storybook
@@ -159,7 +153,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: install dependencies
         run: npm ci
       - name: download all reports
@@ -196,7 +189,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build storybook
@@ -237,7 +229,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: install dependencies
         run: npm ci
       - name: download all reports
@@ -270,7 +261,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build storybook
@@ -311,7 +301,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: install dependencies
         run: npm ci
       - name: download all reports
@@ -348,7 +337,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build storybook
@@ -389,7 +377,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: install dependencies
         run: npm ci
       - name: download all reports
@@ -419,7 +406,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build components.json
@@ -435,7 +421,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build

diff --git a/.github/workflows/codescan.yml b/.github/workflows/codescan.yml
@@ -18,7 +18,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
 

diff --git a/.github/workflows/deploy_preview.yml b/.github/workflows/deploy_preview.yml
@@ -18,7 +18,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build docs preview

diff --git a/.github/workflows/deploy_preview_forks.yml b/.github/workflows/deploy_preview_forks.yml
@@ -19,7 +19,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build docs preview

diff --git a/.github/workflows/release-schedule.yml b/.github/workflows/release-schedule.yml
@@ -31,7 +31,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 22
-      - run: npm i -g npm@^10.5.1
       - name: Install packages for github-script
         run: npm i date-fns
       - name: Create Release Issue

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/release_canary.yml b/.github/workflows/release_canary.yml
@@ -27,7 +27,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build

diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml
@@ -23,7 +23,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/vrt.yml b/.github/workflows/vrt.yml
@@ -39,7 +39,6 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm i -g npm@^10.5.1
       - name: Install dependencies
         run: npm ci
       - name: Build storybook

diff --git a/e2e/components/DataTable.test.ts b/e2e/components/DataTable.test.ts
@@ -175,12 +175,12 @@ test.describe('DataTable', () => {
       const region = page.getByRole('region')
       const table = region.getByRole('table')
 
-      const tabIndex = await region.getAttribute('tabindex')
-      const labelledby = await region.getAttribute('aria-labelledby')
+      const tabIndex = region
+      const labelledby = region
 
       await expect(region).toBeVisible()
-      expect(tabIndex).toBe('0')
-      expect(labelledby).toBe(headingId)
+      await expect(tabIndex).toHaveAttribute('tabindex', '0')
+      await expect(labelledby).toHaveAttribute('aria-labelledby', headingId!)
 
       await expect(table).toBeVisible()
       expect(labelledby).toBe(headingId)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "eslint-plugin-jest": "28.8.3",
     "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-mdx": "3.1.5",
-    "eslint-plugin-playwright": "0.15.1",
+    "eslint-plugin-playwright": "^2.1.0",
     "eslint-plugin-prettier": "5.0.0",
     "eslint-plugin-primer-react": "5.4.0",
     "eslint-plugin-react": "7.32.2",
@@ -94,5 +94,5 @@
       "running": false
     }
   ],
-  "packageManager": "[email protected].1+sha512.c89530d37c4baa38afd43e76a077a84b9aa63840b986426584fd5c5a54ab0a0b21bb1595c851042b733784b0b43706d36a494b4d8ae1a086a762cb8d3f95942a"
+  "packageManager": "[email protected].2+sha512.8ab88f10f224a0c614cb717a7f7c30499014f77134120e9c1f0211ea3cf3397592cbe483feb38e0c4b3be1c54e347292c76a1b5edb94a3289d5448484ab8ac81"
 }