Merge branch 'master' into update-unit-test-docs

mui · Dec 16, 2024 · a5e98a3 · a5e98a3
2 parents 7753afc + ab0aa3f
commit a5e98a3
Show file tree

Hide file tree

Showing 32 changed files with 529 additions and 509 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -5,6 +5,12 @@
  */
 
 const path = require('path');
+const a11yBase = require('eslint-config-airbnb/rules/react-a11y');
+
+const controlHasAssociatedLabelConfig = a11yBase.rules['jsx-a11y/control-has-associated-label'];
+
+const controlHasAssociatedLabelOptions =
+  typeof controlHasAssociatedLabelConfig[1] === 'object' ? controlHasAssociatedLabelConfig[1] : {};
 
 const OneLevelImportMessage = [
   'Prefer one level nested imports to avoid bundling everything in dev mode or breaking CJS/ESM split.',
@@ -158,6 +164,16 @@ module.exports = /** @type {Config} */ ({
     ],
     // We are a library, we need to support it too
     'jsx-a11y/no-autofocus': 'off',
+    // Remove when issues are fixed
+    // https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/issues/959
+    // https://github.com/airbnb/javascript/issues/3069
+    'jsx-a11y/control-has-associated-label': [
+      'error',
+      {
+        ...controlHasAssociatedLabelOptions,
+        ignoreElements: [...(controlHasAssociatedLabelOptions.ignoreElements || []), 'th', 'td'],
+      },
+    ],
 
     'material-ui/docgen-ignore-before-comment': 'error',
     'material-ui/rules-of-use-theme-variants': 'error',

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           languages: typescript
           config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -43,6 +43,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           sarif_file: results.sarif
diff --git a/apps/pigment-css-next-app/package.json b/apps/pigment-css-next-app/package.json
@@ -24,8 +24,8 @@
   },
   "devDependencies": {
     "@pigment-css/nextjs-plugin": "0.0.28",
-    "@types/node": "^20.17.9",
-    "@types/react": "^19.0.0",
+    "@types/node": "^20.17.10",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "eslint": "^8.57.1",
     "typescript": "^5.7.2"

diff --git a/apps/pigment-css-vite-app/package.json b/apps/pigment-css-vite-app/package.json
@@ -28,7 +28,7 @@
     "@babel/preset-react": "^7.25.9",
     "@babel/preset-typescript": "^7.26.0",
     "@pigment-css/vite-plugin": "0.0.28",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/webfontloader": "^1.6.38",
     "@vitejs/plugin-react": "^4.3.4",

diff --git a/docs/package.json b/docs/package.json
@@ -99,7 +99,7 @@
     "react-router": "^7.0.2",
     "react-runner": "^1.0.5",
     "react-simple-code-editor": "^0.14.1",
-    "react-spring": "^9.7.4",
+    "react-spring": "^9.7.5",
     "react-swipeable-views": "^0.14.0",
     "react-transition-group": "^4.4.5",
     "react-virtuoso": "^4.12.3",
@@ -124,9 +124,9 @@
     "@types/css-mediaquery": "^0.1.4",
     "@types/gtag.js": "^0.0.20",
     "@types/json2mq": "^0.2.2",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20.17.10",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/react-swipeable-views": "^0.13.6",
     "@types/react-transition-group": "^4.4.11",
@@ -138,7 +138,7 @@
     "marked": "^15.0.3",
     "playwright": "^1.48.2",
     "prettier": "^3.4.2",
-    "tailwindcss": "^3.4.15",
+    "tailwindcss": "^3.4.16",
     "yargs": "^17.7.2"
   }
 }
diff --git a/package.json b/package.json
@@ -123,16 +123,16 @@
     "@mui/joy": "workspace:*",
     "@mui/material": "workspace:^",
     "@mui/utils": "workspace:^",
-    "@next/eslint-plugin-next": "^15.0.4",
+    "@next/eslint-plugin-next": "^15.1.0",
     "@octokit/rest": "^21.0.2",
     "@pigment-css/react": "0.0.28",
     "@playwright/test": "1.48.2",
     "@types/babel__core": "^7.20.5",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.13",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.17.9",
-    "@types/react": "^19.0.0",
+    "@types/node": "^20.17.10",
+    "@types/react": "^19.0.1",
     "@types/yargs": "^17.0.33",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
@@ -159,7 +159,7 @@
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-filenames": "^1.3.2",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jsx-a11y": "6.7.1",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-material-ui": "workspace:^",
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-react": "^7.37.2",
@@ -216,7 +216,7 @@
     "@definitelytyped/header-parser": "^0.2.16",
     "@definitelytyped/typescript-versions": "^0.1.6",
     "@definitelytyped/utils": "^0.1.8",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20.17.10",
     "cross-fetch": "^4.0.0",
     "@pigment-css/react": "0.0.28",
     "@pigment-css/unplugin": "0.0.28",

diff --git a/packages-internal/babel-plugin-resolve-imports/package.json b/packages-internal/babel-plugin-resolve-imports/package.json
@@ -15,7 +15,7 @@
   "license": "MIT",
   "scripts": {},
   "dependencies": {
-    "resolve": "^1.22.8"
+    "resolve": "^1.22.9"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",

diff --git a/packages-internal/scripts/package.json b/packages-internal/scripts/package.json
@@ -42,8 +42,8 @@
     "@types/chai": "^4.3.20",
     "@types/doctrine": "^0.0.9",
     "@types/lodash": "^4.17.13",
-    "@types/node": "^20.17.9",
-    "@types/react": "^19.0.0",
+    "@types/node": "^20.17.10",
+    "@types/react": "^19.0.1",
     "@types/uuid": "^10.0.0",
     "chai": "^4.5.0",
     "fast-glob": "^3.3.2",

diff --git a/packages-internal/test-utils/package.json b/packages-internal/test-utils/package.json
@@ -59,7 +59,7 @@
     "@types/chai-dom": "^1.11.3",
     "@types/format-util": "^1.0.4",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/sinon": "^17.0.3",
     "typescript": "^5.7.2"

diff --git a/packages/api-docs-builder-core/package.json b/packages/api-docs-builder-core/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@types/chai": "^4.3.20",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20.17.10",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",
     "sinon": "^19.0.2",

diff --git a/packages/api-docs-builder/package.json b/packages/api-docs-builder/package.json
@@ -32,7 +32,7 @@
     "@types/doctrine": "^0.0.9",
     "@types/mdast": "4.0.4",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20.17.10",
     "@types/react-docgen": "workspace:*",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",

diff --git a/packages/mui-base/package.json b/packages/mui-base/package.json
@@ -55,7 +55,7 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/chai": "^4.3.20",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",

diff --git a/packages/mui-docs/package.json b/packages/mui-docs/package.json
@@ -45,9 +45,9 @@
     "@mui/icons-material": "workspace:*",
     "@mui/material": "workspace:*",
     "@types/gtag.js": "^0.0.20",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20.17.10",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "next": "^15.0.4",
     "react": "^19.0.0"
   },

diff --git a/packages/mui-envinfo/test/package.json b/packages/mui-envinfo/test/package.json
@@ -12,6 +12,6 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@types/react": "^19.0.0"
+    "@types/react": "^19.0.1"
   }
 }
diff --git a/packages/mui-icons-material/package.json b/packages/mui-icons-material/package.json
@@ -52,7 +52,7 @@
     "@mui/internal-waterfall": "workspace:^",
     "@mui/material": "workspace:^",
     "@types/chai": "^4.3.20",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "chai": "^4.5.0",
     "chalk": "^5.3.0",
     "cross-fetch": "^4.0.0",

diff --git a/packages/mui-joy/package.json b/packages/mui-joy/package.json
@@ -52,7 +52,7 @@
     "@mui/material": "workspace:^",
     "@types/chai": "^4.3.20",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",

diff --git a/packages/mui-lab/package.json b/packages/mui-lab/package.json
@@ -53,7 +53,7 @@
     "@mui/material": "workspace:*",
     "@types/chai": "^4.3.20",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",

diff --git a/packages/mui-material-nextjs/package.json b/packages/mui-material-nextjs/package.json
@@ -42,7 +42,7 @@
     "@emotion/cache": "^11.13.5",
     "@emotion/react": "^11.13.5",
     "@emotion/server": "^11.11.0",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "next": "^15.0.4",
     "react": "^19.0.0"
   },

diff --git a/packages/mui-material/package.json b/packages/mui-material/package.json
@@ -59,7 +59,7 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/chai": "^4.3.20",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",

diff --git a/packages/mui-material/src/Pagination/Pagination.test.js b/packages/mui-material/src/Pagination/Pagination.test.js
@@ -33,7 +33,7 @@ describe('<Pagination />', () => {
 
     // previous, page 1
     const [, page1] = getAllByRole('button');
-    expect(page1).to.have.attribute('aria-current', 'true');
+    expect(page1).to.have.attribute('aria-current', 'page');
     // verifying no regression from previous bug where `page` wasn't intercepted
     expect(container.querySelector('[page]')).to.equal(null);
   });

diff --git a/packages/mui-material/src/usePagination/usePagination.js b/packages/mui-material/src/usePagination/usePagination.js
@@ -124,7 +124,7 @@ export default function usePagination(props = {}) {
           page: item,
           selected: item === page,
           disabled,
-          'aria-current': item === page ? 'true' : undefined,
+          'aria-current': item === page ? 'page' : undefined,
         }
       : {
           onClick: (event) => {

diff --git a/packages/mui-private-theming/package.json b/packages/mui-private-theming/package.json
@@ -45,7 +45,7 @@
     "@mui/internal-test-utils": "workspace:^",
     "@mui/types": "workspace:^",
     "@types/chai": "^4.3.20",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "chai": "^4.5.0",
     "react": "^19.0.0"
   },

diff --git a/packages/mui-styled-engine-sc/package.json b/packages/mui-styled-engine-sc/package.json
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@mui/internal-test-utils": "workspace:^",
     "@types/chai": "^4.3.20",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "chai": "^4.5.0",
     "react": "^19.0.0",
     "styled-components": "^6.1.13"

diff --git a/packages/mui-styled-engine/package.json b/packages/mui-styled-engine/package.json
@@ -50,7 +50,7 @@
     "@mui/internal-test-utils": "workspace:^",
     "@mui/styled-engine": "workspace:*",
     "@types/chai": "^4.3.20",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "chai": "^4.5.0",
     "react": "^19.0.0"
   },

diff --git a/packages/mui-styles/package.json b/packages/mui-styles/package.json
@@ -59,7 +59,7 @@
     "@mui/internal-test-utils": "workspace:^",
     "@mui/material": "workspace:^",
     "@types/chai": "^4.3.20",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",

diff --git a/packages/mui-system/package.json b/packages/mui-system/package.json
@@ -55,7 +55,7 @@
     "@mui/system": "workspace:*",
     "@types/chai": "^4.3.20",
     "@types/prop-types": "^15.7.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.0.1",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",
     "fast-glob": "^3.3.2",

diff --git a/packages/mui-types/package.json b/packages/mui-types/package.json
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@mui/types": "workspace:*",
-    "@types/react": "^19.0.0"
+    "@types/react": "^19.0.1"
   },
   "peerDependencies": {
     "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"

diff --git a/packages/mui-utils/package.json b/packages/mui-utils/package.json
@@ -50,8 +50,8 @@
     "@mui/types": "workspace:^",
     "@types/chai": "^4.3.20",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.17.9",
-    "@types/react": "^19.0.0",
+    "@types/node": "^20.17.10",
+    "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.0",
     "@types/react-is": "^19.0.0",
     "@types/sinon": "^17.0.3",

diff --git a/packages/rsc-builder/package.json b/packages/rsc-builder/package.json
@@ -9,6 +9,6 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.17.9"
+    "@types/node": "^20.17.10"
   }
 }