Skip to content

Commit

Permalink
Merge branch 'next' into automation/discord-release-announcement
Browse files Browse the repository at this point in the history
Signed-off-by: Michel Engelen <32863416+michelengelen@users.noreply.github.com>
  • Loading branch information
michelengelen committed Apr 3, 2024
2 parents ce22355 + 9045cc0 commit aca244c
Show file tree
Hide file tree
Showing 2,279 changed files with 41,608 additions and 18,595 deletions.
21 changes: 0 additions & 21 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,6 @@ opera 76
safari 14
samsung 13.0

# Same as `stable` but with IE 11

[legacy]
ie 11
and_chr 91
and_ff 89
and_qq 10.4
and_uc 12.12
android 91
baidu 7.12
chrome 90
edge 91
firefox 78
ios_saf 12.2
kaios 2.5
op_mini all
op_mob 73
opera 76
safari 14
samsung 13.0

# snapshot of `npx browserslist "maintained node versions"`

# On update check all #stable-snapshot markers
Expand Down
55 changes: 36 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ parameters:
type: string
default: ''

defaults: &defaults
default-job: &default-job
parameters:
react-dist-tag:
description: The dist-tag of react to be used
Expand Down Expand Up @@ -46,13 +46,17 @@ defaults: &defaults
# restore_cache:
# key: v1-repo-{{ .Branch }}-{{ .Revision }}

default-context: &default-context
context:
- org-global

commands:
install_js:
parameters:
browsers:
type: boolean
default: false
description: 'Set to true if you intend to any browser (e.g. with playwright).'
description: 'Set to true if you intend to any browser (for example with playwright).'

steps:
- run:
Expand Down Expand Up @@ -114,7 +118,7 @@ commands:

jobs:
checkout:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand All @@ -125,10 +129,13 @@ jobs:
name: Check for duplicated packages
command: yarn deduplicate
test_unit:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
- run:
name: Tests charts
command: yarn test:charts:unit # Run special test for charts due to ESM compatibility issue
- run:
name: Tests fake browser
command: yarn test:coverage
Expand All @@ -146,7 +153,7 @@ jobs:
chmod +x codecov
./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_DIST_TAG-jsdom"
test_lint:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand All @@ -160,7 +167,7 @@ jobs:
name: Lint Markdown
command: yarn markdownlint
test_static:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand Down Expand Up @@ -191,9 +198,9 @@ jobs:
yarn docs:link-check
git add -A && git diff --exit-code --staged
test_browser:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.1-focal
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -208,7 +215,7 @@ jobs:
path: /tmp/_karma_webpack_
destination: artifact-file
test_types:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand All @@ -224,9 +231,9 @@ jobs:
environment:
NODE_OPTIONS: --max-old-space-size=3072
test_e2e:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.1-focal
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -237,9 +244,9 @@ jobs:
name: Run e2e tests
command: yarn test:e2e
test_e2e_website:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.1-focal
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -252,9 +259,9 @@ jobs:
environment:
PLAYWRIGHT_TEST_BASE_URL: << parameters.e2e-base-url >>
test_regressions:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.1-focal
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -268,9 +275,9 @@ jobs:
name: Upload screenshots to Argos CI
command: yarn test:argos
run_danger:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.1-focal
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -288,36 +295,46 @@ workflows:
when:
equal: [pipeline, << pipeline.parameters.workflow >>]
jobs:
- checkout
- checkout:
<<: *default-context
- test_unit:
<<: *default-context
requires:
- checkout
- test_lint:
<<: *default-context
requires:
- checkout
- test_static:
<<: *default-context
requires:
- checkout
- test_browser:
<<: *default-context
requires:
- checkout
- test_types:
<<: *default-context
requires:
- checkout
- test_e2e:
<<: *default-context
requires:
- checkout
- test_regressions:
<<: *default-context
requires:
- checkout
- run_danger:
<<: *default-context
requires:
- checkout
e2e-website:
when:
equal: [e2e-website, << pipeline.parameters.workflow >>]
jobs:
- checkout
- checkout:
<<: *default-context
- test_e2e_website:
requires:
- checkout
26 changes: 11 additions & 15 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,27 @@
"installCommand": "install:codesandbox",
"node": "18",
"packages": [
"packages/x-license-pro",
"packages/grid/x-data-grid",
"packages/grid/x-data-grid-pro",
"packages/grid/x-data-grid-premium",
"packages/grid/x-data-grid-generator",
"packages/x-license",
"packages/x-data-grid",
"packages/x-data-grid-pro",
"packages/x-data-grid-premium",
"packages/x-data-grid-generator",
"packages/x-date-pickers",
"packages/x-date-pickers-pro",
"packages/x-charts",
"packages/x-tree-view"
],
"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-premium": "packages/grid/x-data-grid-premium/build",
"@mui/x-data-grid-generator": "packages/grid/x-data-grid-generator/build",
"@mui/x-license": "packages/x-license/build",
"@mui/x-data-grid": "packages/x-data-grid/build",
"@mui/x-data-grid-pro": "packages/x-data-grid-pro/build",
"@mui/x-data-grid-premium": "packages/x-data-grid-premium/build",
"@mui/x-data-grid-generator": "packages/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",
"@mui/x-charts": "packages/x-charts/build",
"@mui/x-tree-view": "packages/x-tree-view/build"
},
"sandboxes": [
"new",
"github/mui/material-ui/tree/master/examples/create-react-app",
"github/mui/material-ui/tree/master/examples/create-react-app-with-typescript"
],
"sandboxes": ["/bug-reproductions/x-data-grid"],
"silent": true
}
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/docs/export
/docs/pages/playground/
/lerna.json
/packages/grid/x-data-grid/src/lib
/packages/x-codemod/src/**/*.spec.js
build
CHANGELOG.md
Expand Down
29 changes: 20 additions & 9 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,16 @@ module.exports = {
},
},
{
files: ['packages/grid/**/*.ts', 'packages/grid/**/*.js', 'docs/src/pages/**/*.tsx'],
files: [
'packages/x-data-grid/**/*{.tsx,.ts,.js}',
'packages/x-data-grid-pro/**/*{.tsx,.ts,.js}',
'packages/x-data-grid-premium/**/*{.tsx,.ts,.js}',
'docs/src/pages/**/*.tsx',
],
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',
'packages/x-data-grid/src/themeAugmentation/index.js', // TypeScript ignores JS files with the same name as the TS file
'packages/x-data-grid-pro/src/themeAugmentation/index.js',
'packages/x-data-grid-premium/src/themeAugmentation/index.js',
],
rules: {
'material-ui/no-direct-state-access': 'error',
Expand All @@ -122,6 +127,12 @@ module.exports = {
'filenames/match-exported': ['error'],
},
},
{
files: ['**/*.mjs'],
rules: {
'import/extensions': ['error', 'ignorePackages'],
},
},
{
files: ['packages/*/src/**/*{.ts,.tsx,.js}'],
excludedFiles: ['*.d.ts', '*.spec.ts', '*.spec.tsx'],
Expand All @@ -146,12 +157,12 @@ module.exports = {
},
},
buildPackageRestrictedImports('@mui/x-charts', 'x-charts'),
buildPackageRestrictedImports('@mui/x-data-grid', 'grid/x-data-grid'),
buildPackageRestrictedImports('@mui/x-data-grid-pro', 'grid/x-data-grid-pro'),
buildPackageRestrictedImports('@mui/x-data-grid-premium', 'grid/x-data-grid-premium'),
buildPackageRestrictedImports('@mui/x-data-grid-generator', 'grid/x-data-grid-generator'),
buildPackageRestrictedImports('@mui/x-data-grid', 'x-data-grid'),
buildPackageRestrictedImports('@mui/x-data-grid-pro', 'x-data-grid-pro'),
buildPackageRestrictedImports('@mui/x-data-grid-premium', 'x-data-grid-premium'),
buildPackageRestrictedImports('@mui/x-data-grid-generator', 'x-data-grid-generator'),
buildPackageRestrictedImports('@mui/x-pickers', 'x-pickers'),
buildPackageRestrictedImports('@mui/x-pickers-pro', 'x-pickers-pro'),
buildPackageRestrictedImports('@mui/x-license-pro', 'x-license-pro'),
buildPackageRestrictedImports('@mui/x-license', 'x-license'),
],
};
4 changes: 1 addition & 3 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ body:
description: |
**⚠️ Issues that we can't reproduce can't be fixed.**
If you don't have one, you can use one of these options:
- [DataGrid codesandbox template](https://codesandbox.io/s/github/mui/mui-x/tree/master/templates/x-data-grid?file=/src/demo.tsx)
- Fork any of the examples in our [documentation](https://mui.com/x/introduction/) by [clicking on the codesandbox or stackblitz icon](https://mui.com/static/docs/forking-an-example.png)
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/x/introduction/support/#bug-reproductions) on how to build a reproduction case.
value: |
Link to live example: (required)
Expand Down
5 changes: 1 addition & 4 deletions .github/ISSUE_TEMPLATE/3.pro-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ body:
attributes:
label: The problem in depth
description: |
**If applicable, please provide a live example to explain your problem.**
If you don't have one, you can use one of these options:
- [DataGrid codesandbox template](https://codesandbox.io/s/github/mui/mui-x/tree/master/templates/x-data-grid?file=/src/demo.tsx)
- Fork any of the examples in our [documentation](https://mui.com/x/introduction/) by [clicking on the codesandbox or stackblitz icon](https://mui.com/static/docs/forking-an-example.png)
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/x/introduction/support/#bug-reproductions) on how to build a reproduction case.
- type: textarea
attributes:
label: Your environment
Expand Down
5 changes: 1 addition & 4 deletions .github/ISSUE_TEMPLATE/4.premium-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ body:
attributes:
label: The problem in depth
description: |
**If applicable, please provide a live example to explain your problem.**
If you don't have one, you can use one of these options:
- [DataGrid codesandbox template](https://codesandbox.io/s/github/mui/mui-x/tree/master/templates/x-data-grid?file=/src/demo.tsx)
- Fork any of the examples in our [documentation](https://mui.com/x/introduction/) by [clicking on the codesandbox or stackblitz icon](https://mui.com/static/docs/forking-an-example.png)
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/x/introduction/support/#bug-reproductions) on how to build a reproduction case.
- type: textarea
attributes:
label: Your environment
Expand Down
5 changes: 1 addition & 4 deletions .github/ISSUE_TEMPLATE/5.priority-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ body:
attributes:
label: The problem in depth
description: |
**If you're reporting a bug, please provide a live example for your report.**
If you don't have one, you can use one of these options:
- [DataGrid codesandbox template](https://codesandbox.io/s/github/mui/mui-x/tree/master/templates/x-data-grid?file=/src/demo.tsx)
- Fork any of the examples in our [documentation](https://mui.com/x/introduction/) by [clicking on the codesandbox or stackblitz icon](https://mui.com/static/docs/forking-an-example.png)
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/x/introduction/support/#bug-reproductions) on how to build a reproduction case.
- type: textarea
attributes:
label: Your environment
Expand Down
16 changes: 0 additions & 16 deletions .github/styles/Blog/BrandName.yml

This file was deleted.

Loading

0 comments on commit aca244c

Please sign in to comment.