Skip to content

Commit

Permalink
Merge branch 'master' into react-18
Browse files Browse the repository at this point in the history
  • Loading branch information
m4theushw committed Jul 14, 2022
2 parents 877accc + a3bb2ca commit 0e11c9a
Show file tree
Hide file tree
Showing 1,908 changed files with 86,158 additions and 26,754 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ jobs:
test_browser:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright@sha256:3d36197320f4f77b062a7973e99406d10a436e11706eddebde6be08836bfe5d1
- image: mcr.microsoft.com/playwright@sha256:c3c8a833254aaad31b2d336e67b0dbb9af744a12ab486e18f230033b99649c4f
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -211,11 +211,11 @@ jobs:
command: git add -A && git diff --exit-code --staged
- run:
name: Tests TypeScript definitions
command: yarn typescript
command: yarn typescript:ci
test_e2e:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright@sha256:3d36197320f4f77b062a7973e99406d10a436e11706eddebde6be08836bfe5d1
- image: mcr.microsoft.com/playwright@sha256:c3c8a833254aaad31b2d336e67b0dbb9af744a12ab486e18f230033b99649c4f
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -228,7 +228,7 @@ jobs:
test_e2e_website:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright@sha256:3d36197320f4f77b062a7973e99406d10a436e11706eddebde6be08836bfe5d1
- image: mcr.microsoft.com/playwright@sha256:c3c8a833254aaad31b2d336e67b0dbb9af744a12ab486e18f230033b99649c4f
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -243,7 +243,7 @@ jobs:
test_regressions:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright@sha256:3d36197320f4f77b062a7973e99406d10a436e11706eddebde6be08836bfe5d1
- image: mcr.microsoft.com/playwright@sha256:c3c8a833254aaad31b2d336e67b0dbb9af744a12ab486e18f230033b99649c4f
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -259,7 +259,7 @@ jobs:
test_performance:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright@sha256:3d36197320f4f77b062a7973e99406d10a436e11706eddebde6be08836bfe5d1
- image: mcr.microsoft.com/playwright@sha256:c3c8a833254aaad31b2d336e67b0dbb9af744a12ab486e18f230033b99649c4f
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down
10 changes: 8 additions & 2 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@
"packages/x-license-pro",
"packages/grid/x-data-grid",
"packages/grid/x-data-grid-pro",
"packages/grid/x-data-grid-generator"
"packages/grid/x-data-grid-premium",
"packages/grid/x-data-grid-generator",
"packages/x-date-pickers",
"packages/x-date-pickers-pro"
],
"publishDirectory": {
"@mui/x-license-pro": "packages/x-license-pro/build",
"@mui/x-data-grid": "packages/grid/x-data-grid/build",
"@mui/x-data-grid-pro": "packages/grid/x-data-grid-pro/build",
"@mui/x-data-grid-generator": "packages/grid/x-data-grid-generator/build"
"@mui/x-data-grid-premium": "packages/grid/x-data-grid-premium/build",
"@mui/x-data-grid-generator": "packages/grid/x-data-grid-generator/build",
"@mui/x-date-pickers": "packages/x-date-pickers/build",
"@mui/x-date-pickers-pro": "packages/x-date-pickers-pro/build"
},
"sandboxes": [
"new",
Expand Down
16 changes: 9 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,15 @@ module.exports = {
excludedFiles: [
'packages/grid/x-data-grid/src/themeAugmentation/index.js', // TypeScript ignores JS files with the same name as the TS file
'packages/grid/x-data-grid-pro/src/themeAugmentation/index.js',
'packages/grid/x-data-grid-premium/src/themeAugmentation/index.js',
],
rules: {
'material-ui/no-direct-state-access': 'error',
},
parserOptions: { tsconfigRootDir: __dirname, project: ['./tsconfig.json'] },
},
{
files: ['docs/src/pages/components/**/*.js', 'docs/src/pages/components/**/*.tsx'],
files: ['docs/data/**/*.js', 'docs/data/**/*.tsx'],
rules: {
'filenames/match-exported': ['error'],
},
Expand All @@ -78,33 +79,34 @@ module.exports = {
'useDatePickerDefaultizedProps',
'useTimePickerDefaultizedProps',
'useDateTimePickerDefaultizedProps',
'useDateRangePickerDefaultizedProps',
],
},
],
},
},
{
files: ['packages/x-pickers/src/**/*{.ts,.tsx,.js}'],
files: ['packages/x-date-pickers/src/**/*{.ts,.tsx,.js}'],
excludedFiles: ['*.d.ts', '*.spec.ts', '*.spec.tsx', '**.test.tx', '**.test.tsx'],
rules: {
'no-restricted-imports': [
'error',
{
paths: ['@mui/x-pickers'],
patterns: ['@mui/x-pickers/*'],
paths: ['@mui/x-date-pickers'],
patterns: ['@mui/x-date-pickers/*'],
},
],
},
},
{
files: ['packages/x-pickers-pro/src/**/*{.ts,.tsx,.js}'],
files: ['packages/x-date-pickers-pro/src/**/*{.ts,.tsx,.js}'],
excludedFiles: ['*.d.ts', '*.spec.ts', '*.spec.tsx', '**.test.tx', '**.test.tsx'],
rules: {
'no-restricted-imports': [
'error',
{
paths: ['@mui/x-pickers-pro'],
patterns: ['@mui/x-pickers-pro/*'],
paths: ['@mui/x-date-pickers-pro'],
patterns: ['@mui/x-date-pickers-pro/*'],
},
],
},
Expand Down
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ body:
attributes:
label: Steps to reproduce 🕹
description: |
Provide a link to a live example (you can use codesandbox.io) and an unambiguous set of steps to reproduce this bug.
Include code to reproduce, if relevant (which it most likely is).
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 our [documentation](https://mui.com/x/advanced-components/), and [select](https://mui.com/static/docs/forking-an-example.png) the closest example to your use case.
You can use the official codesandbox template of the [DataGrid](https://codesandbox.io/s/datagrid-v5-quick-start-54iz1) or [DataGridPro](https://codesandbox.io/s/datagridpro-v5-quick-start-5pjhc) as a starting point.
If you have an issue concerning TypeScript please start from this TypeScript playground: https://mui.com/r/ts-issue-template.
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.
value: |
Link to live example:
Steps:
1.
2.
3.
Expand All @@ -59,7 +59,7 @@ body:
description: Run `npx @mui/envinfo` and post the results. If you encounter issues with TypeScript please include the used tsconfig.
value: |
<details>
<summary>`npx @mui/envinfo`</summary>
<summary><code>npx @mui/envinfo</code></summary>
```
Don't forget to mention which browser you used.
Expand All @@ -71,4 +71,4 @@ body:
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.
placeholder: 'ex. #11111'
placeholder: 'e.g. 11111'
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2.feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ body:
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.
placeholder: 'ex. #11111'
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 @@ -14,7 +14,7 @@ body:
attributes:
label: Order ID 💳
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: 'ex. #11111'
placeholder: 'e.g. 11111'
validations:
required: true
- type: checkboxes
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 @@ -14,7 +14,7 @@ body:
attributes:
label: Order ID 💳
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: 'ex. #11111'
placeholder: 'e.g. 11111'
validations:
required: true
- type: checkboxes
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/check-if-pr-has-label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Check if PR has label

on:
pull_request:
types: [opened, reopened, labeled, unlabeled]

jobs:
test-label-applied:
# Tests that label is added on the PR
runs-on: ubuntu-latest
steps:
- uses: mnajdova/github-action-required-labels@v2.0
with:
mode: minimum
count: 1
labels: ""
17 changes: 0 additions & 17 deletions .github/workflows/close-incomplete-inactive.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: No Response

# Both `issue_comment` and `scheduled` event types are required for this Action
# to work properly.
on:
issue_comment:
types: [created]
schedule:
# Schedule for five minutes after the hour, every hour
- cron: '5 * * * *'

jobs:
noResponse:
runs-on: ubuntu-latest
steps:
- uses: lee-dohm/no-response@v0.5.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 7
# Label requiring a response
responseRequiredLabel: 'status: needs more information'
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
Since the issue is missing key information and has been inactive for 7 days, it has been automatically closed.
If you wish to see the issue reopened, please provide the missing information.
4 changes: 2 additions & 2 deletions .github/workflows/support-stackoverflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
We use GitHub issues as a bug and feature requests tracker, however,
this issue appears to be a support request.
For support, please check out https://mui.com/components/data-grid/getting-started/#support. Thanks!
For support, please check out https://mui.com/getting-started/support/. Thanks!
If you have a question on StackOverflow, you are welcome to link to it here, it might help others.
If your issue is subsequently confirmed as a bug, and the report follows the issue template, it can be reopened.
If your issue is subsequently confirmed as a bug, and the report follows the issue template, it can be reopened.
close-issue: true
lock-issue: false
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ __diff_output__
/coverage
/docs/.next
/docs/pages/playground.tsx
/docs/pages/playground
/docs/export
/test/regressions/screenshots
build
Expand Down
Loading

0 comments on commit 0e11c9a

Please sign in to comment.