Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
flaviendelangle committed Sep 21, 2023
2 parents 88bf1d0 + 9a54ab9 commit ebd74cf
Show file tree
Hide file tree
Showing 28,330 changed files with 317,395 additions and 180,991 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ firefox 78
ios_saf 12.2
kaios 2.5
op_mini all
op_mob 76
op_mob 73
opera 76
safari 14
samsung 13.0
Expand All @@ -44,7 +44,7 @@ firefox 78
ios_saf 12.2
kaios 2.5
op_mini all
op_mob 76
op_mob 73
opera 76
safari 14
samsung 13.0
Expand Down
82 changes: 39 additions & 43 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: 2.1
orbs:
aws-s3: circleci/[email protected]
aws-cli: circleci/[email protected]
aws-s3: circleci/[email protected]

parameters:
browserstack-force:
Expand Down Expand Up @@ -44,7 +45,7 @@ defaults: &defaults
AWS_REGION_ARTIFACTS: eu-central-1
working_directory: /tmp/material-ui
docker:
- image: cimg/node:14.20
- image: cimg/node:18.17

# CircleCI has disabled the cache across forks for security reasons.
# Following their official statement, it was a quick solution, they
Expand Down Expand Up @@ -136,7 +137,7 @@ jobs:
steps:
- run:
name: Should not have any git not staged
command: git diff --exit-code
command: git add -A && git diff --exit-code --staged
- run:
name: Check for duplicated packages
command: yarn deduplicate
Expand Down Expand Up @@ -199,7 +200,7 @@ jobs:
- install_js
- run:
name: Eslint
command: yarn lint:ci
command: yarn eslint:ci
- run:
name: Stylelint
command: yarn stylelint
Expand All @@ -222,29 +223,35 @@ jobs:
command: yarn proptypes
- run:
name: '`yarn proptypes` changes committed?'
command: git diff --exit-code
command: git add -A && git diff --exit-code --staged
- run:
name: 'Write "use client" directive'
command: yarn rsc:build
- run:
name: '`yarn rsc:build` changes committed?'
command: git add -A && git diff --exit-code --staged
- run:
name: Generate the documentation
command: yarn docs:api
- run:
name: '`yarn docs:api` changes committed?'
command: git diff --exit-code
command: git add -A && git diff --exit-code --staged
- run:
name: Update the navigation translations
command: yarn docs:i18n
- run:
name: '`yarn docs:i18n` changes committed?'
command: git diff --exit-code
command: git add -A && git diff --exit-code --staged
- run:
name: '`yarn extract-error-codes` changes committed?'
command: |
yarn extract-error-codes
git diff --exit-code
git add -A && git diff --exit-code --staged
- run:
name: '`yarn docs:link-check` changes committed?'
command: |
yarn docs:link-check
git diff --exit-code
git add -A && git diff --exit-code --staged
test_types:
<<: *defaults
resource_class: 'medium+'
Expand All @@ -261,20 +268,11 @@ jobs:
name: Tests TypeScript definitions
command: yarn typescript:ci
- run:
name: Test module augmenation
name: Test module augmentation
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
keys:
# #default-branch-switch
# We assume that the target branch is `master` and that declaration files are persisted in commit order.
# "If there are multiple matches, the most recently generated cache will be used."
- typescript-declaration-files-master

- run:
name: Diff declaration files
command: |
Expand All @@ -283,7 +281,6 @@ jobs:
git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
yarn lerna run build:types
git --no-pager diff
- run:
name: Any defect declaration files?
command: node scripts/testBuiltTypes.mjs
Expand Down Expand Up @@ -348,7 +345,7 @@ jobs:
<<: *defaults
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -378,7 +375,7 @@ jobs:
test_e2e:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -397,7 +394,7 @@ jobs:
test_e2e_website:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -412,7 +409,7 @@ jobs:
test_profile:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -439,7 +436,7 @@ jobs:
test_regressions:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -493,7 +490,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -517,7 +514,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -541,7 +538,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -565,7 +562,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -589,7 +586,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -613,7 +610,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -641,7 +638,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -672,7 +669,7 @@ jobs:
DANGER_COMMAND: prepareBundleSizeReport
- run:
name: build @mui packages
command: yarn lerna run --ignore @mui/icons-material --parallel --scope "@mui/*" build
command: yarn lerna run --ignore @mui/icons-material --concurrency 8 --scope "@mui/*" build
- run:
name: create @mui/material canary distributable
command: |
Expand All @@ -691,11 +688,12 @@ jobs:
pattern: '^pull/.+$'
value: << pipeline.git.branch >>
steps:
- aws-cli/setup:
aws_access_key_id: AWS_ACCESS_KEY_ID_ARTIFACTS
aws_secret_access_key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
region: ${AWS_REGION_ARTIFACTS}
# Upload distributables to S3
- aws-s3/copy:
aws-access-key-id: AWS_ACCESS_KEY_ID_ARTIFACTS
aws-region: AWS_REGION_ARTIFACTS
aws-secret-access-key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
from: mui-material.tgz
to: s3://mui-org-ci/artifacts/$CIRCLE_BRANCH/$CIRCLE_SHA1/
- store_artifacts:
Expand All @@ -719,20 +717,18 @@ jobs:
pattern: '^pull/.+$'
value: << pipeline.git.branch >>
steps:
- aws-cli/setup:
aws_access_key_id: AWS_ACCESS_KEY_ID_ARTIFACTS
aws_secret_access_key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
region: ${AWS_REGION_ARTIFACTS}
# persist size snapshot on S3
- aws-s3/copy:
arguments: --content-type application/json
aws-access-key-id: AWS_ACCESS_KEY_ID_ARTIFACTS
aws-region: AWS_REGION_ARTIFACTS
aws-secret-access-key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
from: size-snapshot.json
to: s3://mui-org-ci/artifacts/$CIRCLE_BRANCH/$CIRCLE_SHA1/
# symlink size-snapshot to latest
- aws-s3/copy:
arguments: --content-type application/json
aws-access-key-id: AWS_ACCESS_KEY_ID_ARTIFACTS
aws-region: AWS_REGION_ARTIFACTS
aws-secret-access-key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
from: size-snapshot.json
to: s3://mui-org-ci/artifacts/$CIRCLE_BRANCH/latest/
- run:
Expand All @@ -743,7 +739,7 @@ jobs:
test_benchmark:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.27.1-focal
- image: mcr.microsoft.com/playwright:v1.37.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down
10 changes: 5 additions & 5 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"buildCommand": "build:codesandbox",
"installCommand": "install:codesandbox",
"node": "14",
"node": "18",
"packages": [
"packages/mui-material",
"packages/mui-codemod",
Expand Down Expand Up @@ -36,10 +36,10 @@
},
"sandboxes": [
"material-ui-issue-latest-s2dsx",
"github/mui/material-ui/tree/HEAD/examples/create-react-app",
"github/mui/material-ui/tree/HEAD/examples/create-react-app-with-typescript",
"github/mui/material-ui/tree/HEAD/examples/joy-cra-typescript",
"github/mui/material-ui/tree/HEAD/examples/base-cra-typescript"
"/examples/material-ui-cra",
"/examples/material-ui-cra-ts",
"/examples/joy-ui-cra-ts",
"/examples/base-ui-cra-ts"
],
"silent": true
}
9 changes: 5 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
/coverage
/docs/export
/docs/pages/playground/
/examples/create-react-app*/src/serviceWorker.js
/examples/gatsby/public/
/examples/preact/config
/examples/preact/scripts
/examples/material-ui-cra*/src/serviceWorker.js
/examples/material-ui-gatsby/public/
/examples/material-ui-preact/config
/examples/material-ui-preact/scripts
/examples/material-ui-nextjs/src
/packages/mui-codemod/lib
/packages/mui-codemod/src/*/*.test/*
/packages/mui-icons-material/fixtures
Expand Down
Loading

0 comments on commit ebd74cf

Please sign in to comment.