Merge branch 'mui:master' into 6411_fix

.circleci/config.yml

@@ -189,7 +189,7 @@ jobs:
  test_browser:
  <<: *defaults
  docker:
- - image: mcr.microsoft.com/playwright:v1.29.2-focal
+ - image: mcr.microsoft.com/playwright:v1.32.3-focal
  environment:
  NODE_ENV: development # Needed if playwright is in `devDependencies`
  steps:
@@ -220,7 +220,7 @@ jobs:
  test_e2e:
  <<: *defaults
  docker:
- - image: mcr.microsoft.com/playwright:v1.29.2-focal
+ - image: mcr.microsoft.com/playwright:v1.32.3-focal
  environment:
  NODE_ENV: development # Needed if playwright is in `devDependencies`
  steps:
@@ -233,7 +233,7 @@ jobs:
  test_e2e_website:
  <<: *defaults
  docker:
- - image: mcr.microsoft.com/playwright:v1.29.2-focal
+ - image: mcr.microsoft.com/playwright:v1.32.3-focal
  environment:
  NODE_ENV: development # Needed if playwright is in `devDependencies`
  steps:
@@ -248,7 +248,7 @@ jobs:
  test_regressions:
  <<: *defaults
  docker:
- - image: mcr.microsoft.com/playwright:v1.29.2-focal
+ - image: mcr.microsoft.com/playwright:v1.32.3-focal
  environment:
  NODE_ENV: development # Needed if playwright is in `devDependencies`
  steps:
@@ -264,7 +264,7 @@ jobs:
  test_performance:
  <<: *defaults
  docker:
- - image: mcr.microsoft.com/playwright:v1.29.2-focal
+ - image: mcr.microsoft.com/playwright:v1.32.3-focal
  environment:
  NODE_ENV: development # Needed if playwright is in `devDependencies`
  steps:

.eslintrc.js

@@ -81,6 +81,9 @@ module.exports = {
  'jsdoc/require-returns': ['error', { contexts: ['TSFunctionType'] }],
  'jsdoc/require-returns-type': ['error', { contexts: ['TSFunctionType'] }],
  'jsdoc/require-returns-description': ['error', { contexts: ['TSFunctionType'] }],
+ // Fixes false positive when using both `inputProps` and `InputProps` on the same example
+ // See https://stackoverflow.com/questions/42367236/why-am-i-getting-this-warning-no-duplicate-props-allowed-react-jsx-no-duplicate
+ 'react/jsx-no-duplicate-props': [1, { ignoreCase: false }],
  'react/no-unstable-nested-components': ['error', { allowAsProps: true }],
  },
  overrides: [

.github/ISSUE_TEMPLATE/1.bug.yml

@@ -64,6 +64,6 @@ body:
  - type: input
  id: contact
  attributes:
- label: Order ID 💳 (optional)
- description: The [Pro plan](https://mui.com/pricing/) comes with priority over the Community plan. Providing your order ID might give your problem more attention.
+ label: Order ID or Support key 💳 (optional)
+ description: The [Pro plan](https://mui.com/pricing/) comes with priority over the Community plan. Providing your order ID (or support key) gives your problem more attention.
  placeholder: 'e.g. 11111'

.github/ISSUE_TEMPLATE/3.pro-support.yml

@@ -12,7 +12,7 @@ body:
  - type: input
  id: contact
  attributes:
- label: Order ID 💳
+ label: Order ID or Support key 💳 (optional)
  description: The order ID of the purchased Pro plan. Community users can [learn more about support](https://mui.com/getting-started/support/) in the documentation.
  placeholder: 'e.g. 11111'
  validations:

.github/ISSUE_TEMPLATE/4.premium-support.yml

@@ -12,7 +12,7 @@ body:
  - type: input
  id: contact
  attributes:
- label: Order ID 💳
+ label: Order ID or Support key 💳 (optional)
  description: The order ID of the purchased Premium plan. Community users can [learn more about support](https://mui.com/getting-started/support/) in the documentation.
  placeholder: 'e.g. 11111'
  validations:

.github/styles/Blog/ComponentNaming.yml

@@ -0,0 +1,17 @@
+extends: substitution
+message: Unless you're referring to the general concept, consider using '%s' instead of '%s'.
+level: suggestion
+ignorecase: false
+# swap maps tokens in form of bad: good
+# for more information: https://vale.sh/docs/topics/styles/#substitution
+swap:
+ # Capitalize
+ data grid: Data Grid
+ date picker: Date Picker
+ time picker: Time Picker
+ date time picker: Date Time Picker
+ date range picker: Date Range Picker
+ time range picker: Time Range Picker
+ date time range picker: Date Time Range Picker
+ # use Data Grid instead of grid
+ the grid: the Data Grid

.github/styles/Blog/ComposedWords.yml

@@ -0,0 +1,9 @@
+extends: substitution
+message: To be consistent with the rest of the documentation, consider using '%s' instead of '%s'.
+level: warning
+ignorecase: true
+# swap maps tokens in form of bad: good
+# for more information: https://vale.sh/docs/topics/styles/#substitution
+swap:
+ sub-component: subcomponent
+ sub-components: subcomponents

.github/styles/Blog/NamingConventions.yml

@@ -0,0 +1,24 @@
+extends: substitution
+message: To be consistent with capitalization, consider using '%s' instead of '%s'.
+level: warning
+ignorecase: false
+# swap maps tokens in form of bad: good
+# for more information: https://vale.sh/docs/topics/styles/#substitution
+swap:
+ api: API
+ Api: API
+ typescript: TypeScript
+ Typescript: TypeScript
+ ts: TypeScript
+ TS: TypeScript
+ javascript: JavaScript
+ Javascript: JavaScript
+ css: CSS
+ Css: CSS
+ Data grid: Data Grid
+ Date picker: Date Picker
+ Time picker: Time Picker
+ Date [t|T]ime picker: Date Time Picker
+ Date [r|R]ange picker: Date Range Picker
+ Time [r|R]ange picker: Time Range Picker
+ Date [t|T]ime [r|R]ange picker: Date Time Range Picker

.github/styles/Blog/Typos.yml

@@ -0,0 +1,8 @@
+extends: substitution
+message: Do you mean '%s' instead of '%s'?
+level: warning
+ignorecase: true
+# swap maps tokens in form of bad: good
+# for more information: https://vale.sh/docs/topics/styles/#substitution
+swap:
+ bellow: below

.github/workflows/codeql.yml

@@ -16,10 +16,10 @@ jobs:
  security-events: write
  steps:
  - name: Checkout repository
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+ uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2.2.1
+ uses: github/codeql-action/init@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
  with:
  languages: typescript
  # If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,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@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2.2.1
+ uses: github/codeql-action/analyze@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0

.github/workflows/l10n.yml

@@ -17,7 +17,7 @@ jobs:
  issues: write
  steps:
  - run: echo "${{ github.actor }}"
- - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
  - name: Use Node.js 14.x
  uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
  with:

.github/workflows/mark-duplicate.yml

@@ -14,7 +14,7 @@ jobs:
  issues: write
  steps:
  - name: mark-duplicate
- uses: actions-cool/issues-helper@275328970dbc3bfc3bc43f5fe741bf3638300c0a # v3.3.3
+ uses: actions-cool/issues-helper@65840f57fe2b3b9a796776577b6b19d2a16adc72 # v3.4.0
  with:
  actions: 'mark-duplicate'
  token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/scorecards.yml

@@ -23,12 +23,12 @@ jobs:
 
  steps:
  - name: Checkout code
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+ uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
  with:
  persist-credentials: false
 
  - name: Run analysis
- uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+ uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
  with:
  results_file: results.sarif
  results_format: sarif
@@ -44,6 +44,6 @@ jobs:
 
  # Upload the results to GitHub's code scanning dashboard.
  - name: Upload to code-scanning
- uses: github/codeql-action/upload-sarif@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2.2.1
+ uses: github/codeql-action/upload-sarif@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
  with:
  sarif_file: results.sarif

.github/workflows/vale-action.yml

@@ -12,7 +12,7 @@ jobs:
  contents: read
  pull-requests: write
  steps:
- - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+ - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
  - uses: errata-ai/vale-action@c4213d4de3d5f718b8497bd86161531c78992084 # v2.0.1
  with:
  reporter: github-pr-review

.vale.ini

@@ -8,6 +8,13 @@ Packages = Google
 # Ignore code injection which start with {{...
 BlockIgnores = {{.*
 
+# Custom syle
+# BasedOnStyles = Blog
+
+Blog.ComposedWords = YES
+Blog.NamingConventions = YES
+Blog.Typos = YES
+
 # Google:
 Google.FirstPerson = YES # Avoid first-person pronouns such as I, me, ...'.
 Google.GenderBias = YES # Avoid gendered profession