Skip to content

Commit

Permalink
Merge branch 'master' into column-menu-components-to-slots
Browse files Browse the repository at this point in the history
  • Loading branch information
MBilalShafi committed Mar 27, 2023
2 parents 49a4eca + 397fb44 commit 2287e80
Show file tree
Hide file tree
Showing 968 changed files with 16,048 additions and 6,618 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/3.pro-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4.premium-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 17 additions & 0 deletions .github/styles/Blog/ComponentNaming.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions .github/styles/Blog/ComposedWords.yml
Original file line number Diff line number Diff line change
@@ -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
24 changes: 24 additions & 0 deletions .github/styles/Blog/NamingConventions.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions .github/styles/Blog/Typos.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2.2.1
uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
with:
languages: typescript
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -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@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
2 changes: 1 addition & 1 deletion .github/workflows/mark-duplicate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
with:
sarif_file: results.sarif
7 changes: 7 additions & 0 deletions .vale.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 2287e80

Please sign in to comment.