Skip to content

Commit

Permalink
Merge branch 'master' into docs-fix-snackbar
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeeshanTamboli committed Jan 11, 2024
2 parents d3df818 + cfc0f0f commit 60cf132
Show file tree
Hide file tree
Showing 21,686 changed files with 76,914 additions and 231,561 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
187 changes: 93 additions & 94 deletions .circleci/config.yml

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
/packages/mui-icons-material/src/*.js
/packages/mui-icons-material/templateSvgIcon.js
/packages/mui-utils/macros/__fixtures__/
/packages/zero-runtime/utils/
/packages/zero-runtime/processors/
/packages/zero-runtime/exports/
/packages/zero-runtime/theme/
/packages/zero-next-plugin/loader.js
# Ignore fixtures
/packages/typescript-to-proptypes/test/*/*
/test/bundling/fixtures/**/*.fixture.js
Expand All @@ -30,6 +35,7 @@
build
node_modules
.nyc_output
pnpm-lock.yaml

# These come from crowdin.
# If we would commit changes crowdin would immediately try to revert.
Expand Down
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ module.exports = {
'material-ui/docgen-ignore-before-comment': 'error',
'material-ui/rules-of-use-theme-variants': 'error',
'material-ui/no-empty-box': 'error',
'material-ui/no-styled-box': 'error',
'material-ui/straight-quotes': 'error',

'react-hooks/exhaustive-deps': ['error', { additionalHooks: 'useEnhancedEffect' }],
Expand Down Expand Up @@ -163,6 +164,9 @@ module.exports = {
'react/state-in-constructor': 'off',
// stylistic opinion. For conditional assignment we want it outside, otherwise as static
'react/static-property-placement': 'off',
// noopener is enough, no IE 11 support
// https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/jsx-no-target-blank.md#rule-options
'react/jsx-no-target-blank': ['error', { allowReferrer: true }],

'no-restricted-syntax': [
// See https://github.com/eslint/eslint/issues/9192 for why it's needed
Expand Down Expand Up @@ -209,7 +213,6 @@ module.exports = {
// matching the pattern of the test runner
'*.test.mjs',
'*.test.js',
'*.test.mjs',
'*.test.ts',
'*.test.tsx',
],
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/2.feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ body:
required: true
- type: textarea
attributes:
label: Summary 💡
label: Summary
description: Describe how it should work.
- type: textarea
attributes:
label: Examples 🌈
label: Examples
description: Provide a link to the Material Design specification, other implementations, or screenshots of the expected behavior.
- type: textarea
attributes:
label: Motivation 🔦
label: Motivation
description: What are you trying to accomplish? How has the lack of this feature affected you? Providing context helps us come up with a solution that is more useful in the real world.
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/3.rfc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ body:
Thanks for contributing by creating an RFC! ❤️
- type: textarea
attributes:
label: What's the problem? 🤔
label: What's the problem?
description: Write a short paragraph or bulleted list to briefly explain what you're trying to do, what outcomes you're aiming for, and any other relevant details to help us understand the motivation behind this RFC.
- type: textarea
attributes:
label: What are the requirements?
label: What are the requirements?
description: Provide a list of requirements that should be met by the accepted proposal.
- type: textarea
attributes:
label: What are our options? 💡
label: What are our options?
description: |
Have you considered alternative options for achieving your desired outcome? It's not necessary to go into too much detail here, but it can help strengthen your main proposal.
- type: textarea
attributes:
label: Proposed solution 🟢
label: Proposed solution
description: |
This is the core of the RFC. Please clearly explain the reasoning behind your proposed solution, including why it would be preferred over possible alternatives.
Expand All @@ -34,5 +34,5 @@ body:
- linking to relevant project briefs or wireframes
- type: textarea
attributes:
label: Resources and benchmarks 🔗
label: Resources and benchmarks
description: Attach any issues, PRs, links, documents, etc… that might be relevant to the RFC
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/4.docs-feedback.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Docs feedback
description: Improve documentation about MUI Core.
description: Improve documentation about Material UI, Joy UI, Base UI, MUI System.
labels: ['status: waiting for maintainer', 'support: docs-feedback']
title: '[docs] '
body:
Expand Down Expand Up @@ -44,5 +44,5 @@ body:
I was looking for ... and it appears that ...
- type: textarea
attributes:
label: Context 🔦
label: Context
description: What are you trying to accomplish? What brought you to this page? Your context can help us to come up with solutions that benefit the community as a whole.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/5.priority-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ body:
required: true
- type: textarea
attributes:
label: The problem in depth 🔍
label: The problem in depth
- type: textarea
attributes:
label: Your environment 🌎
label: Your environment
description: Run `npx @mui/envinfo` and post the results. If you encounter issues with TypeScript please include the used tsconfig.
value: |
<details>
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,22 @@ jobs:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
# fetch all tags which are required for `yarn release:changelog`
# fetch all tags which are required for `pnpm release:changelog`
fetch-depth: 0
- name: Set up pnpm
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
- name: Use Node.js 18.x
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
with:
node-version: 18.18 # ts-node throws error on Node.js 18.19 (https://github.com/TypeStrong/ts-node/issues/2094)
cache: 'yarn' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
- run: yarn install
- run: yarn release:build
- run: yarn release:changelog
node-version: 18
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
- run: pnpm install
- run: pnpm release:build
- run: pnpm release:changelog
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: yarn validate-declarations
- name: yarn release:tag
- run: pnpm validate-declarations
- name: pnpm release:tag
run: |
git remote -v
yarn release:tag --dryRun
pnpm release:tag --dryRun
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
/packages/mui-envinfo/*.tgz
/packages/mui-icons-material/src/*.js
/test/bundling/fixtures/*/yarn.lock
/test/bundling/fixtures/*/pnpm-lock.yaml
# created by test/bundling/scripts/createFixture
/test/bundling/fixtures/**/*.fixture.js
# created by test/bundling/fixtures/gatsby gatsby build
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
enable-pre-post-scripts = true
Loading

0 comments on commit 60cf132

Please sign in to comment.