Skip to content

Commit

Permalink
Merge branch 'master' into yarn-to-pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
LukasTy committed Apr 5, 2024
2 parents 37b89a9 + d69feaf commit 679241c
Show file tree
Hide file tree
Showing 2,416 changed files with 49,083 additions and 20,562 deletions.
102 changes: 59 additions & 43 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,71 @@ node 14

# Default/Fallback

# `npx browserslist --mobile-to-desktop "> 0.5%, last 2 versions, Firefox ESR, not dead, not IE 11"` when the last major is released.

# Manually downgrading to ios_saf 12.4 for iPhone 6 and webpack 4 support.
# Explicit safari versions are here based on the agreed terms in: https://github.com/mui/material-ui/issues/40958#issuecomment-1953215043
# Run before a major release: `npx browserslist@latest --update-db && npx browserslist --mobile-to-desktop "> 0.5%, last 2 versions, Firefox ESR, not dead, safari >= 15.4, iOS >= 15.4"`.
# Update the versions in the `stable` section with the output result.
# Reference PR: https://github.com/mui/mui-x/pull/12521.

# On update, sync references where "#stable-snapshot" is mentioned in the codebase.

[stable]
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

# 12.4 but 12.2-12.5 are treated equally in caniuse-lite.

# Though caniuse-lite does not supporting finding an exact version in a range which is why `12.4` would result in "Unknown version 12.4 of ios_saf"

ios_saf 12.2
kaios 2.5
op_mini all
op_mob 73
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
and_chr 122
and_chr 121
and_ff 123
and_ff 122
and_qq 14.9
and_uc 15.5
android 122
android 121
chrome 122
chrome 121
chrome 120
chrome 119
chrome 109
edge 122
edge 121
firefox 123
firefox 122
firefox 115
ios_saf 17.4
ios_saf 17.3
ios_saf 17.2
ios_saf 17.1
ios_saf 17.0
ios_saf 16.6-16.7
ios_saf 16.5
ios_saf 16.4
ios_saf 16.3
ios_saf 16.2
ios_saf 16.1
ios_saf 16.0
ios_saf 15.6-15.8
ios_saf 15.5
ios_saf 15.4
kaios 3.0-3.1
kaios 2.5
op_mini all
op_mob 73
opera 76
safari 14
samsung 13.0
op_mob 80
opera 108
opera 107
opera 106
safari 17.4
safari 17.3
safari 17.2
safari 17.1
safari 17.0
safari 16.6
safari 16.5
safari 16.4
safari 16.3
safari 16.2
safari 16.1
safari 16.0
safari 15.6
safari 15.5
safari 15.4
samsung 23
samsung 22

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

Expand Down
57 changes: 37 additions & 20 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:
- restore_cache:
Expand Down Expand Up @@ -109,7 +113,7 @@ commands:

jobs:
checkout:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand All @@ -126,10 +130,13 @@ jobs:
pnpm dedupe --check
fi
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: pnpm test:coverage
Expand All @@ -147,7 +154,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 @@ -161,7 +168,7 @@ jobs:
name: Lint Markdown
command: pnpm markdownlint
test_static:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand Down Expand Up @@ -192,9 +199,9 @@ jobs:
pnpm 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 @@ -209,7 +216,7 @@ jobs:
path: /tmp/_karma_webpack_
destination: artifact-file
test_types:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand All @@ -223,11 +230,11 @@ jobs:
name: Tests TypeScript definitions
command: pnpm typescript:ci
environment:
NODE_OPTIONS: --max-old-space-size=3072
NODE_OPTIONS: --max-old-space-size=2048
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 @@ -238,9 +245,9 @@ jobs:
name: Run e2e tests
command: pnpm 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 @@ -253,9 +260,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 @@ -269,9 +276,9 @@ jobs:
name: Upload screenshots to Argos CI
command: pnpm 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 @@ -289,36 +296,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
29 changes: 13 additions & 16 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,28 @@
"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"
"@mui/x-tree-view": "packages/x-tree-view/build",
"@mui/x-tree-view-pro": "packages/x-tree-view-pro/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 @@ -4,7 +4,6 @@ pnpm-lock.yaml
/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
Loading

0 comments on commit 679241c

Please sign in to comment.