Skip to content

Commit

Permalink
Merge branch 'support-code-tabs' of github.com:bharatkashyap/material…
Browse files Browse the repository at this point in the history
…-ui into support-code-tabs
  • Loading branch information
bharatkashyap committed Feb 3, 2024
2 parents 41b0eab + 0de3a88 commit 98e3775
Show file tree
Hide file tree
Showing 1,009 changed files with 15,147 additions and 9,945 deletions.
42 changes: 14 additions & 28 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ commands:
node scripts/useReactVersion.mjs
# log a patch for maintainers who want to check out this change
git --no-pager diff HEAD
- restore_cache:
name: Restore pnpm package cache
keys:
- pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
- when:
condition: << parameters.browsers >>
steps:
Expand Down Expand Up @@ -107,14 +103,6 @@ commands:
- run:
name: Install playwright browsers
command: pnpm playwright install --with-deps
- save_cache:
name: Save pnpm package cache
key: pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
paths:
- node_modules
- when:
condition: << parameters.browsers >>
steps:
- save_cache:
name: Save playwright cache
key: v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
Expand Down Expand Up @@ -304,10 +292,8 @@ jobs:
- checkout
- run:
name: Resolve typescript version
environment:
TYPESCRIPT_DIST_TAG: next
command: |
node scripts/useTypescriptDistTag.mjs
pnpm add typescript@next -d -w
# log a patch for maintainers who want to check out this change
git --no-pager diff HEAD
- install_js
Expand Down Expand Up @@ -350,7 +336,7 @@ jobs:
<<: *defaults
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -380,7 +366,7 @@ jobs:
test_e2e:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -399,7 +385,7 @@ jobs:
test_e2e_website:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -414,7 +400,7 @@ jobs:
test_profile:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -441,7 +427,7 @@ jobs:
test_regressions:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -495,7 +481,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -519,7 +505,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -543,7 +529,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -567,7 +553,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -591,7 +577,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -615,7 +601,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -643,7 +629,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -744,7 +730,7 @@ jobs:
test_benchmark:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.40.1-focal
- image: mcr.microsoft.com/playwright:v1.41.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down
38 changes: 22 additions & 16 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,44 @@
"installCommand": "install:codesandbox",
"node": "18",
"packages": [
"packages/mui-material",
"packages/mui-base",
"packages/mui-codemod",
"packages/mui-core-downloads-tracker",
"packages/mui-icons-material",
"packages/mui-joy",
"packages/mui-lab",
"packages/mui-material-next",
"packages/mui-material-nextjs",
"packages/mui-material",
"packages/mui-private-theming",
"packages/mui-styled-engine-sc",
"packages/mui-styled-engine",
"packages/mui-styles",
"packages/mui-system",
"packages/mui-private-theming",
"packages/mui-types",
"packages/mui-utils",
"packages/mui-base",
"packages/mui-styled-engine",
"packages/mui-styled-engine-sc",
"packages/mui-material-next",
"packages/mui-material-nextjs",
"packages/mui-joy"
"packages/docs-utils",
"packages/typescript-to-proptypes"
],
"publishDirectory": {
"@mui/base": "packages/mui-base/build",
"@mui/codemod": "packages/mui-codemod/build",
"@mui/material": "packages/mui-material/build",
"@mui/core-downloads-tracker": "packages/mui-core-downloads-tracker/build",
"@mui/icons-material": "packages/mui-icons-material/build",
"@mui/joy": "packages/mui-joy/build",
"@mui/lab": "packages/mui-lab/build",
"@mui/styles": "packages/mui-styles/build",
"@mui/styled-engine": "packages/mui-styled-engine/build",
"@mui/material-next": "packages/mui-material-next/build",
"@mui/material-nextjs": "packages/mui-material-nextjs/build",
"@mui/material": "packages/mui-material/build",
"@mui/private-theming": "packages/mui-private-theming/build",
"@mui/styled-engine-sc": "packages/mui-styled-engine-sc/build",
"@mui/styled-engine": "packages/mui-styled-engine/build",
"@mui/styles": "packages/mui-styles/build",
"@mui/system": "packages/mui-system/build",
"@mui/private-theming": "packages/mui-private-theming/build",
"@mui/types": "packages/mui-types/build",
"@mui/utils": "packages/mui-utils/build",
"@mui/base": "packages/mui-base/build",
"@mui/material-next": "packages/mui-material-next/build",
"@mui/material-nextjs": "packages/mui-material-nextjs/build",
"@mui/joy": "packages/mui-joy/build"
"@mui-internal/docs-utils": "packages/docs-utils",
"@mui-internal/typescript-to-proptypes": "packages/typescript-to-proptypes"
},
"sandboxes": [
"material-ui-issue-latest-s2dsx",
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
/examples/material-ui-nextjs/src
/packages/mui-codemod/lib
/packages/mui-codemod/src/*/*.test/*
/packages/mui-codemod/src/**/test-cases/*
/packages/mui-icons-material/fixtures
/packages/mui-icons-material/legacy
/packages/mui-icons-material/lib
Expand Down
14 changes: 6 additions & 8 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
name: Bug report 🐛
description: Create a bug report for MUI Core.
description: Create a bug report for Material UI, Base UI, MUI System, or Joy UI.
labels: ['status: waiting for maintainer']
body:
- type: markdown
attributes:
value: |
Please provide a searchable summary of the issue in the title above ⬆️.
Thanks for contributing by creating an issue! ❤️
value: Thanks for contributing by creating an issue! ❤️ Please provide a searchable summary of the issue in the title above ⬆️.
- type: input
attributes:
label: Search keywords
description: Your issue may have already been reported! List the keywords you've used to search the [existing issues](https://github.com/mui/material-ui/issues). This will also make your issue searchable for others.
placeholder: e.g. tooltip color
description: |
Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/material-ui/issues).
If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
validations:
required: true
- type: checkboxes
Expand Down Expand Up @@ -47,7 +45,7 @@ body:
- type: textarea
attributes:
label: Context
description: What are you trying to accomplish? How has this issue affected you? Providing context helps us come up with a solution that is more useful in the real world.
description: What are you trying to accomplish? Providing context helps us come up with a solution that is more useful in the real world.
- type: textarea
attributes:
label: Your environment
Expand Down
22 changes: 10 additions & 12 deletions .github/ISSUE_TEMPLATE/2.feature.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
name: Feature request 💄
description: Suggest a new idea for MUI Core.
description: Suggest a new idea for Material UI, Base UI, MUI System, or Joy UI.
labels: ['status: waiting for maintainer']
body:
- type: markdown
attributes:
value: |
Please provide a searchable summary of the issue in the title above ⬆️.
Thanks for contributing by creating an issue! ❤️
- type: checkboxes
value: Thanks for contributing by creating an issue! ❤️ Please provide a searchable summary of the issue in the title above ⬆️.
- type: input
attributes:
label: Duplicates
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
label: Search keywords
description: |
Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/material-ui/issues).
If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
validations:
required: true
- type: checkboxes
attributes:
label: Latest version
Expand All @@ -33,4 +31,4 @@ body:
- type: textarea
attributes:
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.
description: What are you trying to accomplish? Providing context helps us come up with a solution that is more useful in the real world.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/3.rfc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ body:
- type: textarea
attributes:
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.
description: Write a short paragraph or bulleted list to briefly explain what you're trying to do, what outcomes you're aiming for.
- type: textarea
attributes:
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?
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.
description: What are the alternative options to achieve the desired outcome?
- type: textarea
attributes:
label: Proposed solution
Expand All @@ -35,4 +34,4 @@ body:
- type: textarea
attributes:
label: Resources and benchmarks
description: Attach any issues, PRs, links, documents, etc… that might be relevant to the RFC
description: Attach any issues, PRs, links, documents, etc… that might be relevant to the RFC.
16 changes: 6 additions & 10 deletions .github/ISSUE_TEMPLATE/4.docs-feedback.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
name: Docs feedback
description: Improve documentation about Material UI, Joy UI, Base UI, MUI System.
description: Improve documentation about Material UI, Base UI, MUI System, or Joy UI.
labels: ['status: waiting for maintainer', 'support: docs-feedback']
title: '[docs] '
body:
- type: markdown
attributes:
value: |
Please provide a searchable summary of the issue in the title above ⬆️.
Thanks for contributing by creating an issue! ❤️
value: Thanks for contributing by creating an issue! ❤️ Please provide a searchable summary of the issue in the title above ⬆️.
- type: input
attributes:
label: Search keywords
description: Your issue may have already been reported! List the keywords you've used to search the [existing issues](https://github.com/mui/material-ui/issues). This will also make your issue searchable for others.
placeholder: e.g. datagrid column resizing
description: |
Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/material-ui/issues).
If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
validations:
required: true
- type: input
Expand All @@ -40,9 +38,7 @@ body:
label: Issue description
description: |
Let us know what went wrong when you were using this documentation and what we could do to improve it.
value: |
I was looking for ... and it appears that ...
- type: textarea
attributes:
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.
description: What are you trying to accomplish? Providing context helps us come up with a solution that is more useful in the real world.
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/5.priority-support.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: 'Priority Support: SLA ⏰'
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with MUI Core (Material UI, Base UI, MUI System, and Joy UI).
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with Material UI, Base UI, MUI System, or Joy UI.
title: '[question] '
labels: ['status: waiting for maintainer', 'support: unknown']
body:
- type: markdown
attributes:
value: |
Please provide a searchable summary of the issue in the title above ⬆️.
- type: checkboxes
- type: input
attributes:
label: Duplicates
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
label: Search keywords
description: |
Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/material-ui/issues).
If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
required: true
- type: checkboxes
attributes:
label: Latest version
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
contact_links:
- name: Support ❔
url: https://mui.com/getting-started/support/
about: I need support with MUI Core.
about: I need support with Material UI, Base UI, MUI System, or Joy UI.
4 changes: 4 additions & 0 deletions .github/styles/Blog/BrandName.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ swap:
MUI X: MUI X
Base UI: Base UI
MUI System: MUI System
MUI Store: MUI Store
MUI Core: MUI Core
MUI Toolpad: MUI Toolpad
MUI Connect: MUI Connect
Loading

0 comments on commit 98e3775

Please sign in to comment.