Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/next' into use-renderer-interc…
Browse files Browse the repository at this point in the history
…eptor-for-date-time-picker
  • Loading branch information
LukasTy committed Mar 20, 2024
2 parents 6f575c4 + 0b3a64d commit a9461e1
Show file tree
Hide file tree
Showing 637 changed files with 5,891 additions and 4,913 deletions.
42 changes: 28 additions & 14 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,7 +129,7 @@ jobs:
name: Check for duplicated packages
command: yarn deduplicate
test_unit:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand All @@ -149,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 @@ -163,7 +167,7 @@ jobs:
name: Lint Markdown
command: yarn markdownlint
test_static:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand Down Expand Up @@ -194,7 +198,7 @@ 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.2-focal
environment:
Expand All @@ -211,7 +215,7 @@ jobs:
path: /tmp/_karma_webpack_
destination: artifact-file
test_types:
<<: *defaults
<<: *default-job
steps:
- checkout
- install_js
Expand All @@ -227,7 +231,7 @@ jobs:
environment:
NODE_OPTIONS: --max-old-space-size=3072
test_e2e:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
Expand All @@ -240,7 +244,7 @@ jobs:
name: Run e2e tests
command: yarn test:e2e
test_e2e_website:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
Expand All @@ -255,7 +259,7 @@ jobs:
environment:
PLAYWRIGHT_TEST_BASE_URL: << parameters.e2e-base-url >>
test_regressions:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
Expand All @@ -271,7 +275,7 @@ jobs:
name: Upload screenshots to Argos CI
command: yarn test:argos
run_danger:
<<: *defaults
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.41.2-focal
environment:
Expand All @@ -291,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
8 changes: 4 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@ 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', 'x-license'),
Expand Down
24 changes: 0 additions & 24 deletions .github/styles/Blog/BrandName.yml

This file was deleted.

24 changes: 0 additions & 24 deletions .github/styles/Blog/ComponentNaming.yml

This file was deleted.

15 changes: 0 additions & 15 deletions .github/styles/Blog/ComposedWords.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/styles/Blog/NamingConventions.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/styles/Blog/NoCompanyName.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .github/styles/Blog/Typos.yml

This file was deleted.

Empty file removed .github/styles/Vocab/accept.txt
Empty file.
Empty file removed .github/styles/Vocab/reject.txt
Empty file.
6 changes: 4 additions & 2 deletions .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ on:
issue_comment:
types: [created]
schedule:
# Schedule for five minutes after the hour, every hour
- cron: '5 * * * *'
# These runs in our repos are spread evenly throughout the day to avoid hitting rate limits.
# If you change this schedule, consider changing the remaining repositories as well.
# Runs at 3 am, 3 pm
- cron: '0 3,15 * * *'

permissions: {}

Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@ dist
node_modules
size-snapshot.json
performance-snapshot.json
# vale downloaded config
.github/styles/Google
.github/styles/write-good
.github/styles/MUI
.github/styles/.vale-config
44 changes: 19 additions & 25 deletions .vale.ini
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
# Config vale. More information at https://docs.errata.ai/vale/config
# Vale config. More information at https://vale.sh/docs/topics/config/
StylesPath = .github/styles
MinAlertLevel = suggestion
MinAlertLevel = error

Packages = Google
# To update mui-vale package:
# 1. Go to the docs folder in the material-ui repo
# 2. Update/create YAML files
# 3. Run `pnpm docs:zipRules` to generate the zip files
# 4. You can test locally by replacing the url with the file path of the generated zip
Packages = Google, https://github.com/mui/material-ui/raw/HEAD/docs/mui-vale.zip

[*.md]
# Ignore code injection which start with {{...
# Ignore code injections that start with {{...
BlockIgnores = {{.*

# Custom syle
# BasedOnStyles = Blog
BasedOnStyles = MUI

Blog.ComposedWords = YES
Blog.NamingConventions = YES
Blog.Typos = YES
Blog.BrandName = YES
Blog.NoCompanyName = YES
# Google errors:
Google.GenderBias = YES # No Gender bias
# Google warings:
Google.FirstPerson = YES # Avoid first-person
Google.We = YES # Avoid first-person plural
Google.Will = YES # Avoid future tense
Google.OxfordComma = YES # Prefer Oxford comma

# Google:
Google.FirstPerson = YES # Avoid first-person pronouns such as I, me, ...'.
Google.GenderBias = YES # Avoid gendered profession
Google.OxfordComma = YES
Google.Quotes = YES # Commas and periods go inside quotation marks.
Google.Spelling = YES # In general, use American spelling (word ending with 'nised' or 'logue')
Google.We = YES # Try to avoid using first-person plural

# Those rules are not repected a lot
# Google.Passive = YES # In general, use active voice instead of passive voice.
# Google.Will = YES # Avoid using will

# False positives with "1st" nearly no use in our doc
# Google.Units = YES # Put a nonbreaking space between the number and the unit
[CHANGELOG*.md]
MUI.CorrectReferenceAllCases = NO
Loading

0 comments on commit a9461e1

Please sign in to comment.