forked from mui/material-ui
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next' into change-pnpm-order
- Loading branch information
Showing
1,824 changed files
with
74,370 additions
and
34,930 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| version: 2.1 | ||
| orbs: | ||
| aws-cli: circleci/aws-cli@4.1.3 | ||
| aws-cli: circleci/aws-cli@4.2.3 | ||
| aws-s3: circleci/[email protected] | ||
|
|
||
| parameters: | ||
|
|
@@ -69,13 +69,6 @@ commands: | |
| description: 'Set to true if you intend to any browser (for example with playwright).' | ||
|
|
||
| steps: | ||
| - run: | ||
| name: Resolve React version | ||
| command: | | ||
| node scripts/useReactVersion.mjs | ||
| # log a patch for maintainers who want to check out this change | ||
| git --no-pager diff HEAD | ||
| - when: | ||
| condition: << parameters.browsers >> | ||
| steps: | ||
|
|
@@ -106,6 +99,14 @@ commands: | |
| command: | | ||
| node --version | ||
| pnpm --version | ||
| - run: | ||
| name: Resolve React version | ||
| command: | | ||
| pnpm use-react-version | ||
| # log a patch for maintainers who want to check out this change | ||
| git --no-pager diff HEAD | ||
| - run: | ||
| name: Install js dependencies | ||
| command: pnpm install | ||
|
|
@@ -138,7 +139,7 @@ jobs: | |
| name: Should not have any git not staged | ||
| command: git add -A && git diff --exit-code --staged | ||
| - run: | ||
| name: Check for duplicated packages | ||
| name: '`pnpm dedupe` was run?' | ||
| command: | | ||
| # #default-branch-switch | ||
| if [[ $(git diff --name-status next | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]]; | ||
|
|
@@ -298,6 +299,12 @@ jobs: | |
| command: | | ||
| pnpm docs:link-check | ||
| git add -A && git diff --exit-code --staged | ||
| - run: | ||
| name: Update the templates shared themes | ||
| command: pnpm template:update-theme | ||
| - run: | ||
| name: '`pnpm template:update-theme` changes committed?' | ||
| command: git add -A && git diff --exit-code --staged | ||
| test_types: | ||
| <<: *default-job | ||
| resource_class: 'medium+' | ||
|
|
@@ -321,6 +328,7 @@ jobs: | |
| pnpm --filter @mui/material typescript:module-augmentation | ||
| pnpm --filter @mui/base typescript:module-augmentation | ||
| pnpm --filter @mui/joy typescript:module-augmentation | ||
| pnpm --filter @mui/system typescript:module-augmentation | ||
| - run: | ||
| name: Diff declaration files | ||
| command: | | ||
|
|
@@ -345,13 +353,13 @@ jobs: | |
| resource_class: 'medium+' | ||
| steps: | ||
| - checkout | ||
| - install_js | ||
| - run: | ||
| name: Resolve typescript version | ||
| command: | | ||
| pnpm add typescript@next -d -w | ||
| pnpm update -r typescript@next | ||
| # log a patch for maintainers who want to check out this change | ||
| git --no-pager diff HEAD | ||
| - install_js | ||
| - run: | ||
| name: Tests TypeScript definitions | ||
| command: | | ||
|
|
@@ -391,7 +399,7 @@ jobs: | |
| <<: *default-job | ||
| resource_class: 'medium+' | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -421,7 +429,7 @@ jobs: | |
| test_e2e: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -435,7 +443,7 @@ jobs: | |
| # NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -450,7 +458,7 @@ jobs: | |
| test_profile: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -477,7 +485,7 @@ jobs: | |
| test_regressions: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -531,7 +539,7 @@ jobs: | |
| <<: *default-job | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/ | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -555,7 +563,7 @@ jobs: | |
| <<: *default-job | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/ | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -579,7 +587,7 @@ jobs: | |
| <<: *default-job | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/ | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -603,7 +611,7 @@ jobs: | |
| <<: *default-job | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/ | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -627,7 +635,7 @@ jobs: | |
| <<: *default-job | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/vite/ | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -651,7 +659,7 @@ jobs: | |
| <<: *default-job | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/ | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -679,7 +687,7 @@ jobs: | |
| <<: *default-job | ||
| working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/ | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -780,7 +788,7 @@ jobs: | |
| test_benchmark: | ||
| <<: *default-job | ||
| docker: | ||
| - image: mcr.microsoft.com/playwright:v1.44.1-focal | ||
| - image: mcr.microsoft.com/playwright:v1.46.1-focal | ||
| environment: | ||
| NODE_ENV: development # Needed if playwright is in `devDependencies` | ||
| steps: | ||
|
|
@@ -887,48 +895,106 @@ workflows: | |
| jobs: | ||
| - test_profile: | ||
| <<: *default-context | ||
|
|
||
| # This workflow can be triggered manually on the PR | ||
| react-17: | ||
| when: | ||
| equal: [react-17, << pipeline.parameters.workflow >>] | ||
| jobs: | ||
| - test_unit: | ||
| <<: *default-context | ||
| react-version: ^17.0.0 | ||
| name: test_unit-react@17 | ||
| - test_browser: | ||
| <<: *default-context | ||
| react-version: ^17.0.0 | ||
| name: test_browser-react@17 | ||
| - test_regressions: | ||
| <<: *default-context | ||
| react-version: ^17.0.0 | ||
| name: test_regressions-react@17 | ||
| - test_e2e: | ||
| <<: *default-context | ||
| react-version: ^17.0.0 | ||
| name: test_e2e-react@17 | ||
|
|
||
| # This workflow is identical to react-17, but scheduled | ||
| react-17-cron: | ||
| triggers: | ||
| - schedule: | ||
| cron: '0 0 * * *' | ||
| filters: | ||
| branches: | ||
| only: | ||
| - master | ||
| - next | ||
| jobs: | ||
| - test_unit: | ||
| <<: *default-context | ||
| react-version: ^17.0.0 | ||
| name: test_unit-react@17 | ||
| - test_browser: | ||
| <<: *default-context | ||
| react-version: ^17.0.0 | ||
| name: test_browser-react@17 | ||
| - test_regressions: | ||
| <<: *default-context | ||
| react-version: ^17.0.0 | ||
| name: test_regressions-react@17 | ||
| - test_e2e: | ||
| <<: *default-context | ||
| react-version: ^17.0.0 | ||
| name: test_e2e-react@17 | ||
|
|
||
| # This workflow can be triggered manually on the PR | ||
| react-next: | ||
| when: | ||
| equal: [react-next, << pipeline.parameters.workflow >>] | ||
| jobs: | ||
| - test_unit: | ||
| <<: *default-context | ||
| react-version: next | ||
| name: test_unit-react@next | ||
| - test_browser: | ||
| <<: *default-context | ||
| react-version: next | ||
| name: test_browser-react@next | ||
| - test_regressions: | ||
| <<: *default-context | ||
| react-version: next | ||
| name: test_regressions-react@next | ||
| - test_e2e: | ||
| <<: *default-context | ||
| react-version: next | ||
| name: test_e2e-react@next | ||
| # This workflow is identical to react-next, but scheduled | ||
| react-next-cron: | ||
| triggers: | ||
| - schedule: | ||
| cron: '0 0 * * *' | ||
| filters: | ||
| branches: | ||
| only: | ||
| - master | ||
| - next | ||
| jobs: | ||
| - test_unit: | ||
| <<: *default-context | ||
| react-version: next | ||
| name: test_unit-react@next | ||
| - test_browser: | ||
| <<: *default-context | ||
| react-version: next | ||
| name: test_browser-react@next | ||
| - test_regressions: | ||
| <<: *default-context | ||
| react-version: next | ||
| name: test_regressions-react@next | ||
| - test_e2e: | ||
| <<: *default-context | ||
| react-version: next | ||
| name: test_e2e-react@next | ||
|
|
||
| typescript-next: | ||
| triggers: | ||
| - schedule: | ||
|
|
@@ -937,6 +1003,7 @@ workflows: | |
| branches: | ||
| only: | ||
| - master | ||
| - next | ||
| jobs: | ||
| - test_types_next: | ||
| <<: *default-context | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.