Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/mui-org/material-ui into …
Browse files Browse the repository at this point in the history
…fix-select-label-click-handler
  • Loading branch information
siriwatknp committed Feb 7, 2022
2 parents 7b94d37 + 49b3d6d commit 548693e
Show file tree
Hide file tree
Showing 3,101 changed files with 19,519 additions and 4,148 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 10 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ commands:
key: v8-yarn-{{ checksum "yarn.lock" }}
paths:
# Keep path in sync with "Set yarn cache folder"
# Can't use environment variables for `save_cache` paths (tested in https://app.circleci.com/pipelines/github/mui-org/material-ui/37813/workflows/5b1e207f-ac8b-44e7-9ba4-d0f9a01f5c55/jobs/223370)
# 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)
- /tmp/yarn-cache
- when:
condition: << parameters.browsers >>
Expand All @@ -119,7 +119,7 @@ commands:
key: v5-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-org/material-ui/37813/workflows/5b1e207f-ac8b-44e7-9ba4-d0f9a01f5c55/jobs/223370)
# 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)
- /tmp/pw-browsers

jobs:
Expand Down Expand Up @@ -187,7 +187,10 @@ jobs:
fi
- run:
name: Coverage
command: bash <(curl -s https://codecov.io/bash) -Z -F "$REACT_DIST_TAG-jsdom"
command: |
curl -Os https://uploader.codecov.io/latest/linux/codecov
chmod +x codecov
./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_DIST_TAG-jsdom"
test_lint:
<<: *defaults
steps:
Expand Down Expand Up @@ -360,7 +363,10 @@ jobs:
fi
- run:
name: Coverage
command: bash <(curl -s https://codecov.io/bash) -Z -F "$REACT_DIST_TAG-browser"
command: |
curl -Os https://uploader.codecov.io/latest/linux/codecov
chmod +x codecov
./codecov -t ${CODECOV_TOKEN} -Z -F "$REACT_DIST_TAG-browser"
- store_artifacts:
# hardcoded in karma-webpack
path: /tmp/_karma_webpack_
Expand Down
6 changes: 3 additions & 3 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
},
"sandboxes": [
"material-ui-issue-latest-s2dsx",
"github/mui-org/material-ui/tree/HEAD/examples/create-react-app",
"github/mui-org/material-ui/tree/HEAD/examples/create-react-app-with-typescript",
"github/mui-org/material-ui/tree/HEAD/examples/joy-cra-typescript"
"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"
],
"silent": true
}
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const path = require('path');

const forbidTopLevelMessage = [
'Prefer one level nested imports to avoid bundling everything in dev mode',
'See https://github.com/mui-org/material-ui/pull/24147 for the kind of win it can unlock.',
'See https://github.com/mui/material-ui/pull/24147 for the kind of win it can unlock.',
].join('\n');
// This only applies to packages published from this monorepo.
// If you build a library around `@mui/material` you can safely use `createStyles` without running into the same issue as we are.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:
- type: checkboxes
attributes:
label: Duplicates
description: Please [search the history](https://github.com/mui-org/material-ui/issues) to see if an issue already exists for the same problem.
description: Please [search the history](https://github.com/mui/material-ui/issues) to see if an issue already exists for the same problem.
options:
- label: I have searched the existing issues
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2.feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:
- type: checkboxes
attributes:
label: Duplicates
description: Please [search the history](https://github.com/mui-org/material-ui/issues) to see if an issue already exists for the same problem.
description: Please [search the history](https://github.com/mui/material-ui/issues) to see if an issue already exists for the same problem.
options:
- label: I have searched the existing issues
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!-- Thanks so much for your PR, your contribution is appreciated! ❤️ -->

- [ ] I have followed (at least) the [PR section of the contributing guide](https://github.com/mui-org/material-ui/blob/HEAD/CONTRIBUTING.md#sending-a-pull-request).
- [ ] I have followed (at least) the [PR section of the contributing guide](https://github.com/mui/material-ui/blob/HEAD/CONTRIBUTING.md#sending-a-pull-request).
Loading

0 comments on commit 548693e

Please sign in to comment.