Skip to content

Commit

Permalink
Merge branch 'master' into emotion_compat_2
Browse files Browse the repository at this point in the history
  • Loading branch information
michaldudak committed Aug 1, 2022
2 parents e808c86 + 3a1276e commit e041ef9
Show file tree
Hide file tree
Showing 796 changed files with 17,697 additions and 18,796 deletions.
80 changes: 49 additions & 31 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ parameters:
description: Whether to force browserstack usage. We have limited resources on browserstack so the pipeline might decide to skip browserstack if this parameter isn't set to true.
type: boolean
default: false
react-dist-tag:
description: The dist-tag of react to be used
react-version:
description: The version of react to be used
type: string
default: stable
workflow:
Expand All @@ -22,10 +22,10 @@ parameters:

defaults: &defaults
parameters:
react-dist-tag:
description: The dist-tag of react to be used
react-version:
description: The version of react to be used
type: string
default: << pipeline.parameters.react-dist-tag >>
default: << pipeline.parameters.react-version >>
test-gate:
description: A particular type of tests that should be run
type: string
Expand All @@ -39,12 +39,12 @@ defaults: &defaults
PLAYWRIGHT_BROWSERS_PATH: /tmp/pw-browsers
# expose it globally otherwise we have to thread it from each job to the install command
BROWSERSTACK_FORCE: << pipeline.parameters.browserstack-force >>
REACT_DIST_TAG: << parameters.react-dist-tag >>
REACT_VERSION: << parameters.react-version >>
TEST_GATE: << parameters.test-gate >>
AWS_REGION_ARTIFACTS: eu-central-1
working_directory: /tmp/material-ui
docker:
- image: cimg/node:12.22
- image: cimg/node:14.20

# CircleCI has disabled the cache across forks for security reasons.
# Following their official statement, it was a quick solution, they
Expand Down Expand Up @@ -72,9 +72,9 @@ commands:
- run:
name: Resolve react version
command: |
node scripts/use-react-dist-tag
node scripts/use-react-version
# log a patch for maintainers who want to check out this change
git --no-pager diff HEAD
git --no-pager diff HEAD
- restore_cache:
name: Restore yarn cache
keys:
Expand All @@ -99,7 +99,7 @@ commands:
- restore_cache:
name: Restore playwright cache
keys:
- v5-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
- v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
- run:
name: Install js dependencies
command: yarn install --verbose
Expand All @@ -117,7 +117,7 @@ commands:
steps:
- save_cache:
name: Save playwright cache
key: v5-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
key: v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
paths:
# Keep path in sync with "PLAYWRIGHT_BROWSERS_PATH"
# Can't use environment variables for `save_cache` paths (tested in https://app.circleci.com/pipelines/github/mui/material-ui/37813/workflows/5b1e207f-ac8b-44e7-9ba4-d0f9a01f5c55/jobs/223370)
Expand All @@ -132,7 +132,7 @@ jobs:
- when:
# Install can be "dirty" when running with non-default versions of React
condition:
equal: [<< parameters.react-dist-tag >>, stable]
equal: [<< parameters.react-version >>, stable]
steps:
- run:
name: Should not have any git not staged
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
command: |
curl -Os https://uploader.codecov.io/latest/linux/codecov
chmod +x codecov
./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_DIST_TAG-jsdom"
./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_VERSION-jsdom"
test_lint:
<<: *defaults
steps:
Expand Down Expand Up @@ -260,6 +260,7 @@ jobs:
command: |
yarn workspace @mui/material typescript:module-augmentation
yarn workspace @mui/base typescript:module-augmentation
yarn workspace @mui/joy typescript:module-augmentation
- restore_cache:
name: Restore generated declaration files
Expand Down Expand Up @@ -341,7 +342,7 @@ jobs:
test_browser:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -363,15 +364,15 @@ jobs:
command: |
curl -Os https://uploader.codecov.io/latest/linux/codecov
chmod +x codecov
./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_DIST_TAG-browser"
./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_VERSION-browser"
- store_artifacts:
# hardcoded in karma-webpack
path: /tmp/_karma_webpack_
destination: artifact-file
test_e2e:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -390,7 +391,7 @@ jobs:
test_e2e_website:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -405,7 +406,7 @@ jobs:
test_profile:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -432,7 +433,7 @@ jobs:
test_regressions:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -486,7 +487,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -510,7 +511,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -534,7 +535,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -558,7 +559,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -582,7 +583,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -606,7 +607,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -634,7 +635,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -736,7 +737,7 @@ jobs:
test_benchmark:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.22.2-focal
- image: mcr.microsoft.com/playwright:v1.24.0-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -822,6 +823,23 @@ workflows:
equal: [profile, << pipeline.parameters.workflow >>]
jobs:
- test_profile
react-17:
triggers:
- schedule:
cron: '0 0 * * *'
filters:
branches:
only:
- master
jobs:
- test_unit:
react-version: ^17.0.0
- test_browser:
react-version: ^17.0.0
- test_regressions:
react-version: ^17.0.0
- test_e2e:
react-version: ^17.0.0
react-next:
triggers:
- schedule:
Expand All @@ -832,13 +850,13 @@ workflows:
- master
jobs:
- test_unit:
react-dist-tag: next
react-version: next
- test_browser:
react-dist-tag: next
react-version: next
- test_regressions:
react-dist-tag: next
react-version: next
- test_e2e:
react-dist-tag: next
react-version: next
typescript-next:
triggers:
- schedule:
Expand Down
2 changes: 1 addition & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"buildCommand": "build:codesandbox",
"installCommand": "install:codesandbox",
"node": "12",
"node": "14",
"packages": [
"packages/mui-material",
"packages/mui-codemod",
Expand Down
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ module.exports = {
allowRequiredDefaults: true,
},
],
// No need to check this as prop types are autogenerated.
// Plus, there are a few false positives.
'react/no-unused-prop-types': 'off',
// Can add verbosity to small functions making them harder to grok.
// Though we have to manually enforce it for function components with default values.
'react/destructuring-assignment': 'off',
Expand Down Expand Up @@ -226,7 +229,7 @@ module.exports = {
rules: {
'material-ui/no-hardcoded-labels': [
'error',
{ allow: ['MUI', 'Twitter', 'GitHub', 'StackOverflow'] },
{ allow: ['MUI', 'Twitter', 'GitHub', 'Stack Overflow'] },
],
},
},
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/support-stackoverflow.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Configuration for support-requests - https://github.com/dessant/support-requests
name: 'Support StackOverflow'
name: 'Support Stack Overflow'

on:
issues:
Expand All @@ -16,7 +16,7 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
# Label used to mark issues as support requests
support-label: 'support: StackOverflow'
support-label: 'support: Stack Overflow'
# Comment to post on issues marked as support requests. Add a link
# to a support page, or set to `false` to disable
issue-comment: |
Expand All @@ -27,7 +27,7 @@ jobs:
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 you have a question on Stack Overflow, 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.
close-issue: true
lock-issue: false
6 changes: 5 additions & 1 deletion .markdownlint.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,9 @@
// MD028/no-blanks-blockquote prevent double blockquote
"MD028": false,
// MD031/blanks-around-fences Some code blocks inside li
"MD031": false
"MD031": false,
// MD051/link-fragments. Many false positives in the changelog.
"MD051": false,
// MD052/reference-links-images. Many false positives in the changelog.
"MD052": false
}
Loading

0 comments on commit e041ef9

Please sign in to comment.