Skip to content

Commit

Permalink
Merge branch 'next' into cell-selection
Browse files Browse the repository at this point in the history
  • Loading branch information
m4theushw committed Oct 31, 2022
2 parents c2ef5be + 36794c5 commit 7ed0485
Show file tree
Hide file tree
Showing 378 changed files with 6,063 additions and 2,053 deletions.
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ jobs:
- run:
name: '`yarn l10n` changes committed?'
command: git diff --exit-code
- run:
name: '`yarn docs:link-check` changes committed?'
command: |
yarn docs:link-check
git diff --exit-code
test_browser:
<<: *defaults
docker:
Expand Down
8 changes: 7 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ const buildPackageRestrictedImports = (packageName, root) => ({
name: packageName,
message: 'Use relative import instead',
},
{
name: '@mui/material',
message: 'Use @mui/utils or a more specific import instead',
},
],
patterns: [
{
Expand Down Expand Up @@ -47,7 +51,7 @@ const baselineOverrides = baseline.overrides.filter((override) => {
return true;
}

return noRestrictedImports.paths?.every((rulePath) => rulePath.name !== '@mui/material');
return noRestrictedImports.paths;
});

module.exports = {
Expand Down Expand Up @@ -77,6 +81,7 @@ module.exports = {
'jsdoc/require-returns': ['error', { contexts: ['TSFunctionType'] }],
'jsdoc/require-returns-type': ['error', { contexts: ['TSFunctionType'] }],
'jsdoc/require-returns-description': ['error', { contexts: ['TSFunctionType'] }],
'react/no-unstable-nested-components': ['error', { allowAsProps: true }],
},
overrides: [
...baselineOverrides,
Expand Down Expand Up @@ -139,6 +144,7 @@ module.exports = {
'useMonthCalendarDefaultizedProps',
'useYearCalendarDefaultizedProps',
'useDateRangeCalendarDefaultizedProps',
'useNextDatePickerDefaultizedProps',
],
},
],
Expand Down
24 changes: 10 additions & 14 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,28 @@ body:
options:
- label: I have tested the latest version
required: true
- type: textarea
attributes:
label: Current behavior 😯
description: Describe what happens instead of the expected behavior.
- type: textarea
attributes:
label: Expected behavior 🤔
description: Describe what should happen.
- type: textarea
attributes:
label: Steps to reproduce 🕹
description: |
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug.
As a starting point, we recommend you [browse the documentation](https://mui.com/x/introduction/), and [select](https://mui.com/static/docs/forking-an-example.png) the closest example to your use case.
Or you can use a [basic template](https://mui.com/r/x-issue-template) to build your reproduction case.
**⚠️ Issues that we can't reproduce will be closed.**
Issues that we can't reproduce will be closed.
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. As a starting point, we recommend you [browse the documentation](https://mui.com/x/introduction/), and [select](https://mui.com/static/docs/forking-an-example.png) the closest example to your use case. Or you can use a [basic template](https://mui.com/r/x-issue-template) to build your reproduction case.
value: |
Link to live example:
Steps:
1.
2.
3.
4.
- type: textarea
attributes:
label: Current behavior 😯
description: Describe what happens instead of the expected behavior.
- type: textarea
attributes:
label: Expected behavior 🤔
description: Describe what should happen.
- type: textarea
attributes:
label: Context 🔦
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'CodeQL'
name: CodeQL

on:
schedule:
Expand All @@ -12,19 +12,14 @@ jobs:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: ['javascript', 'typescript']
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
steps:
- name: Checkout repository
uses: actions/checkout@v3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
languages: typescript
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
Expand All @@ -33,5 +28,3 @@ jobs:
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: '/language:${{matrix.language}}'
1 change: 0 additions & 1 deletion .github/workflows/mark-duplicate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
permissions:
contents: read
issues: write
pull-requests: write
steps:
- name: mark-duplicate
uses: actions-cool/issues-helper@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
issues: write
steps:
- uses: lee-dohm/no-response@v0.5.0
with:
Expand Down
Loading

0 comments on commit 7ed0485

Please sign in to comment.