Skip to content

Commit 58d9d9b

Browse files
authored
[core] Update branch switch tags (#45198)
1 parent 70e8ed0 commit 58d9d9b

File tree

77 files changed

+223
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+223
-178
lines changed

.circleci/config.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
- run:
134134
name: '`pnpm dedupe` was run?'
135135
command: |
136-
# #default-branch-switch
136+
# #target-branch-reference
137137
if [[ $(git diff --name-status master | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
138138
then
139139
echo "No changes to dependencies detected. Skipping..."
@@ -926,9 +926,10 @@ workflows:
926926
filters:
927927
branches:
928928
only:
929+
# #target-branch-reference
929930
- master
930-
- next
931931
- v5.x
932+
- v6.x
932933
jobs:
933934
- test_unit:
934935
<<: *default-context
@@ -976,8 +977,9 @@ workflows:
976977
filters:
977978
branches:
978979
only:
980+
# #target-branch-reference
979981
- master
980-
- next
982+
- v6.x
981983
jobs:
982984
- test_unit:
983985
<<: *default-context
@@ -1003,8 +1005,9 @@ workflows:
10031005
filters:
10041006
branches:
10051007
only:
1008+
# #target-branch-reference
10061009
- master
1007-
- next
1010+
- v6.x
10081011
jobs:
10091012
- test_types_next:
10101013
<<: *default-context

.github/workflows/maintenance.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@ on:
44
# So that PRs touching the same files as the push are updated
55
push:
66
branches:
7+
# #target-branch-reference
78
- master
8-
- next
9+
- v6.x
910
# So that the `dirtyLabel` is removed if conflicts are resolved
1011
# Could put too much strain on rate limit
1112
# If we hit the rate limit too often remove this event
1213
pull_request_target:
1314
branches:
15+
# #target-branch-reference
1416
- master
15-
- next
17+
- v6.x
1618
types: [synchronize]
1719

1820
permissions: {}

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ cd material-ui
7070
git remote add upstream https://github.com/mui/material-ui.git
7171
```
7272

73-
<!-- #default-branch-switch -->
73+
<!-- #target-branch-reference -->
7474

7575
3. Synchronize your local `master` branch with the upstream one:
7676

@@ -144,7 +144,7 @@ If any of these checks fail, refer to [Checks and how to fix them](#checks-and-h
144144

145145
Make sure the following is true:
146146

147-
<!-- #default-branch-switch -->
147+
<!-- #target-branch-reference -->
148148

149149
- The branch is targeted at `master` for ongoing development. All tests are passing. Code that lands in `master` must be compatible with the latest stable release. It may contain additional features but no breaking changes. We should be able to release a new minor version from the tip of `master` at any time.
150150
- If a feature is being added:

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- #default-branch-switch -->
1+
<!-- #host-reference -->
22
<!-- markdownlint-disable-next-line -->
33
<p align="center">
44
<a href="https://next.mui.com/core/" rel="noopener" target="_blank"><img width="150" height="133" src="https://mui.com/static/logo.svg" alt="Material UI logo"></a>
@@ -108,6 +108,8 @@ For how-to questions that don't involve making changes to the code base, please
108108

109109
## Examples
110110

111+
<!-- #repo-reference -->
112+
111113
Our documentation features [a collection of example projects](https://github.com/mui/material-ui/tree/master/examples).
112114

113115
## Premium templates

docs/data/material/components/about-the-lab/about-the-lab.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For a component to be ready to move to the core, the following criteria are cons
1919

2020
To install and save in your `package.json` dependencies, run one of the following commands:
2121

22-
<!-- #default-branch-switch -->
22+
<!-- #npm-tag-reference -->
2323

2424
<codeblock storageKey="package-manager">
2525

docs/data/material/components/icons/icons.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You can [search the full list of these icons](/material-ui/material-icons/).
2626

2727
Run one of the following commands to install it and save it to your `package.json` dependencies:
2828

29-
<!-- #default-branch-switch -->
29+
<!-- #npm-tag-reference -->
3030

3131
<codeblock storageKey="package-manager">
3232
```bash npm

docs/data/material/components/material-icons/material-icons.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ includes the 2,100+ official [Material Icons](https://fonts.google.com/icons?ico
1818
It depends on `@mui/material`, which requires Emotion packages.
1919
Use one of the following commands to install it:
2020

21-
<!-- #default-branch-switch -->
21+
<!-- #npm-tag-reference -->
2222

2323
<codeblock storageKey="package-manager">
2424

docs/data/material/customization/dark-mode/dark-mode.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ Use the `theme.applyStyles()` utility to apply styles for a specific mode.
175175

176176
We recommend using this function over checking `theme.palette.mode` to switch between styles as it has more benefits:
177177

178+
<!-- #repo-reference -->
179+
178180
- It can be used with [Pigment CSS](https://github.com/mui/material-ui/tree/master/packages/pigment-css-react), our in-house zero-runtime CSS-in-JS solution.
179181
- It is generally more readable and maintainable.
180182
- It is slightly more performant as it doesn't require to do style recalculation but the bundle size of SSR generated styles is larger.

docs/data/material/customization/palette/palette.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ const theme = createTheme({
149149

150150
{{"demo": "ManuallyProvideCustomColor.js", "defaultCodeOpen": false}}
151151

152+
<!-- #repo-reference -->
153+
152154
If you need to manipulate colors, `@mui/material/styles` provides [a set of utilities](https://github.com/mui/material-ui/blob/master/packages/mui-material/src/styles/index.d.ts#L52-L67) to help with this.
153155
The following example uses the `alpha()` and `getContrastRatio()` utilities to define tokens using opacity:
154156

docs/data/material/getting-started/example-projects/example-projects.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
## Official integrations
66

7+
<!-- #repo-reference -->
8+
79
The following integration examples are available in the [`/examples`](https://github.com/mui/material-ui/tree/master/examples) folder of the Material UI GitHub repository.
810
These examples feature Material UI paired with other popular React libraries and frameworks, so you can skip the initial setup steps and jump straight into building.
911

0 commit comments

Comments
 (0)