Skip to content

Commit

Permalink
make sure workflows dont break on merge commits
Browse files Browse the repository at this point in the history
  • Loading branch information
@eps1lon
eps1lon committed Jan 26, 2021
1 parent e0e9596 commit 4d48ff1
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 84 deletions.
164 changes: 86 additions & 78 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

<!-- generated comparing v5.0.0-alpha.23..next -->

_Jan 25, 2021_
_Jan 26, 2021_

Big thanks to the 21 contributors who made this release possible. Here are some highlights ✨:
Big thanks to the 23 contributors who made this release possible. Here are some highlights ✨:

- 👩‍🎤 Convert 27 components to emotion. 38% of the components have been migrated so far thanks to the help of the community.
- 👩‍🎤 Convert 31 components to emotion. Around 40% of the components have been migrated so far thanks to the help of the community.
- 🐛 Fix two long-standing issues with the Grid. Solve the horizontal scrollbar as well as dimensions when nesting (#24332) @greguintow.
- 📚 Fix various display issues on API documentation pages (#24526, #24503, #24504. #24517, #24417).
- 📐 Add a subset of the system as flatten props on the CSS utility components (`Grid` and `Box` so far, `Typography` and `Stack` coming later) (#24485, #24499) @mnajdova.
Expand All @@ -19,103 +19,111 @@ Big thanks to the 21 contributors who made this release possible. Here are some

### `@material-ui/[email protected]`

- <!-- 01 --> [BottomNavigation] Migrate to emotion (#24556) @vinyldarkscratch
- <!-- 03 --> [CardActions] Fix wrong classes export name (#24609) @mnajdova
- <!-- 04 --> [Card] Migrate CardContent to emotion (#24600) @vicasas
- <!-- 05 --> [Card] Migrate to emotion (#24597) @povilass
- <!-- 06 --> [TextField] Migrate InputBase to emotion (#24555) @duganbrett
- <!-- 07 --> [Accordion] Allow to disable gutter/spacing (#24532) @TimonPllkrn
- <!-- 08 --> [List] Migrate to emotion (#24560) @vinyldarkscratch
- <!-- 09 --> [Card] Migrate CardActions to emotion (#24604) @vicasas
- <!-- 11 --> [List] Migrate ListSubheader to emotion (#24561) @vinyldarkscratch
- <!-- 12 --> [Breadcrumbs] Migrate to emotion (#24522) @vinyldarkscratch
- <!-- 13 --> [Divider] Migrate to emotion (#24558) @vinyldarkscratch
- <!-- 14 --> [Switch] Migrate SwitchBase to emotion (#24552) @vinyldarkscratch
- <!-- 15 --> [Hidden] Migrate to emotion (#24544) @vinyldarkscratch
- <!-- 16 --> [List] Migrate ListItem to emotion (#24543) @xs9627
- <!-- 18 --> [TextField] Fix Google Translate zero-width space issue (#24563) @d3mp
- <!-- 19 --> [Table] Separate classes for different labels (#24568) @tonysepia
- <!-- 22 --> [Accordion] Migrate AccordionSummary to emotion (#24540) @vinyldarkscratch
- <!-- 23 --> [IconButton] Migrate to emotion (#24542) @vinyldarkscratch
- <!-- 26 --> [Accordion] Migrate AccordionActions to emotion (#24538) @vinyldarkscratch
- <!-- 27 --> [Accordion] Migrate AccordionDetails to emotion (#24539) @vinyldarkscratch
- <!-- 30 --> [Link] Migrate to emotion (#24529) @praveenkumar-kalidass
- <!-- 31 --> [Accordion] Migrate to emotion (#24518) @vinyldarkscratch
- <!-- 34 --> [Backdrop] Migrate to emotion (#24523) @vinyldarkscratch
- <!-- 41 --> [Grid] Add system props (#24499) @mnajdova
- <!-- 42 --> [Icon] Migrate to emotion (#24516) @vinyldarkscratch
- <!-- 44 --> [Collapse] Migrate to emotion (#24501) @vinyldarkscratch
- <!-- 47 --> [SvgIcon] Migrate to emotion (#24506) @oliviertassinari
- <!-- 48 --> [Avatar] Migrate AvatarGroup to emotion (#24452) @praveenkumar-kalidass
- <!-- 49 --> [Box] Add back system props (#24485) @mnajdova
- <!-- 50 --> [Alert] Migrate AlertTitle to emotion (#24448) @povilass
- <!-- 54 --> [Alert] Migrate to emotion (#24442) @kutnickclose
- <!-- 59 --> [l10n] Improve Hebrew translation (#24449) @eladmotola
- <!-- 61 --> [Checkbox][Switch] Document defaultChecked (#24446) @praveenkumar-kalidass
- <!-- 62 --> [AppBar] Migrate to emotion (#24439) @povilass
- <!-- 64 --> [l10n] Improve German translation (#24436) @lukaselmer
- <!-- 65 --> [Button][Badge] Support custom colors and sizes (#24408) @mnajdova
- <!-- 70 --> [Grid] Fix horizontal scrollbar and nested dimensions (#24332) @greguintow
- <!-- 73 --> [Grid] Migrate to emotion (#24395) @mnajdova
- <!-- 74 --> [Badge] Fix TS custom variants (#24407) @mnajdova
- <!-- 85 --> [Dialog] Migrate DialogActions to emotion (#24613) @vicasas
- <!-- 84 --> [Toolbar] Migrate to emotion (#24567) @natac13
- <!-- 83 --> [Hidden] Fix unsupported props warning when sx prop is used (#24624) @mnajdova
- <!-- 82 --> [List] Migrate ListItemText to emotion (#24602) @natac13
- <!-- 80 --> [List] Migrate ListItemSecondaryAction to emotion (#24593) @xs9627
- <!-- 79 --> [BottomNavigation] Migrate to emotion (#24556) @vinyldarkscratch
- <!-- 77 --> [CardActions] Fix wrong classes export name (#24609) @mnajdova
- <!-- 76 --> [Card] Migrate CardContent to emotion (#24600) @vicasas
- <!-- 75 --> [Card] Migrate to emotion (#24597) @povilass
- <!-- 74 --> [TextField] Migrate InputBase to emotion (#24555) @duganbrett
- <!-- 73 --> [Accordion] Allow to disable gutter/spacing (#24532) @TimonPllkrn
- <!-- 72 --> [List] Migrate to emotion (#24560) @vinyldarkscratch
- <!-- 71 --> [Card] Migrate CardActions to emotion (#24604) @vicasas
- <!-- 69 --> [List] Migrate ListSubheader to emotion (#24561) @vinyldarkscratch
- <!-- 68 --> [Breadcrumbs] Migrate to emotion (#24522) @vinyldarkscratch
- <!-- 67 --> [Divider] Migrate to emotion (#24558) @vinyldarkscratch
- <!-- 66 --> [Switch] Migrate SwitchBase to emotion (#24552) @vinyldarkscratch
- <!-- 65 --> [Hidden] Migrate to emotion (#24544) @vinyldarkscratch
- <!-- 64 --> [List] Migrate ListItem to emotion (#24543) @xs9627
- <!-- 62 --> [TextField] Fix Google Translate zero-width space issue (#24563) @d3mp
- <!-- 61 --> [Table] Separate classes for different labels (#24568) @tonysepia
- <!-- 58 --> [Accordion] Migrate AccordionSummary to emotion (#24540) @vinyldarkscratch
- <!-- 57 --> [IconButton] Migrate to emotion (#24542) @vinyldarkscratch
- <!-- 54 --> [Accordion] Migrate AccordionActions to emotion (#24538) @vinyldarkscratch
- <!-- 53 --> [Accordion] Migrate AccordionDetails to emotion (#24539) @vinyldarkscratch
- <!-- 50 --> [Link] Migrate to emotion (#24529) @praveenkumar-kalidass
- <!-- 49 --> [Accordion] Migrate to emotion (#24518) @vinyldarkscratch
- <!-- 46 --> [Backdrop] Migrate to emotion (#24523) @vinyldarkscratch
- <!-- 39 --> [Grid] Add system props (#24499) @mnajdova
- <!-- 38 --> [Icon] Migrate to emotion (#24516) @vinyldarkscratch
- <!-- 36 --> [Collapse] Migrate to emotion (#24501) @vinyldarkscratch
- <!-- 33 --> [SvgIcon] Migrate to emotion (#24506) @oliviertassinari
- <!-- 32 --> [Avatar] Migrate AvatarGroup to emotion (#24452) @praveenkumar-kalidass
- <!-- 31 --> [Box] Add back system props (#24485) @mnajdova
- <!-- 30 --> [Alert] Migrate AlertTitle to emotion (#24448) @povilass
- <!-- 26 --> [Alert] Migrate to emotion (#24442) @kutnickclose
- <!-- 21 --> [l10n] Improve Hebrew translation (#24449) @eladmotola
- <!-- 19 --> [Checkbox][Switch] Document defaultChecked (#24446) @praveenkumar-kalidass
- <!-- 18 --> [AppBar] Migrate to emotion (#24439) @povilass
- <!-- 16 --> [l10n] Improve German translation (#24436) @lukaselmer
- <!-- 15 --> [Button][Badge] Support custom colors and sizes (#24408) @mnajdova
- <!-- 10 --> [Grid] Fix horizontal scrollbar and nested dimensions (#24332) @greguintow
- <!-- 07 --> [Grid] Migrate to emotion (#24395) @mnajdova
- <!-- 06 --> [Badge] Fix TS custom variants (#24407) @mnajdova

### `@material-ui/[email protected]`

- <!-- 32 --> [DatePicker] Remove unnecessary wrapping dom node (#24533) @mxsph
- <!-- 68 --> [DateRangePicker] Remove variant prop override for Textfield (#24433) @praveenkumar-kalidass
- <!-- 77 --> [lab] Reflect draft pattern of picker value in implementation (#24367) @eps1lon
- <!-- 48 --> [DatePicker] Remove unnecessary wrapping dom node (#24533) @mxsph
- <!-- 12 --> [DateRangePicker] Remove variant prop override for Textfield (#24433) @praveenkumar-kalidass
- <!-- 03 --> [lab] Reflect draft pattern of picker value in implementation (#24367) @eps1lon

### `@material-ui/[email protected]`

- <!-- 67 --> [styled-engine] Rename StylesProvider to StyledEngineProvider (#24429) @mnajdova
- <!-- 13 --> [styled-engine] Rename StylesProvider to StyledEngineProvider (#24429) @mnajdova

### `@material-ui/[email protected]`

- <!-- 36 --> [system] Fix handling of null-ish values (#24530) @oliviertassinari
- <!-- 44 --> [system] Fix handling of null-ish values (#24530) @oliviertassinari

### `@material-ui/[email protected]`

- <!-- 72 --> [unstyled] Convert composeClasses to TypeScript (#24396) @eps1lon
- <!-- 08 --> [unstyled] Convert composeClasses to TypeScript (#24396) @eps1lon

### `@material-ui/[email protected]`

- <!-- 20 --> [utils] `useEventCallback` `args` defaults to `unknown[]` (#24564) @eps1lon
- <!-- 69 --> [utils] Fix requirePropFactory to merge validators (#24423) @mnajdova
- <!-- 60 --> [utils] `useEventCallback` `args` defaults to `unknown[]` (#24564) @eps1lon
- <!-- 11 --> [utils] Fix requirePropFactory to merge validators (#24423) @mnajdova

### docs

- <!-- 02 --> [docs] Add missing newline in component JSDOC (#24610) @eps1lon
- <!-- 10 --> [docs] Add API of picker components (#24497) @eps1lon
- <!-- 17 --> [examples] Add `locale` prop to the Nextjs Link component (#24596) @CyanoFresh
- <!-- 28 --> [docs] List required props first in /api/* (#24526) @eps1lon
- <!-- 35 --> [docs] Mention the system props when available in the API pages (#24503) @mnajdova
- <!-- 37 --> [docs] Improve system properties page (#24524) @mnajdova
- <!-- 38 --> [docs] Fix malformed component API description (#24504) @eps1lon
- <!-- 39 --> [docs] Fix ToC "Component name" fragment link on /api/* (#24517) @eps1lon
- <!-- 86 --> [examples] Patch preact example not working (#24616)
- <!-- 78 --> [docs] Add missing newline in component JSDOC (#24610) @eps1lon
- <!-- 70 --> [docs] Add API of picker components (#24497) @eps1lon
- <!-- 63 --> [examples] Add `locale` prop to the Nextjs Link component (#24596) @CyanoFresh
- <!-- 52 --> [docs] List required props first in /api/* (#24526) @eps1lon
- <!-- 45 --> [docs] Mention the system props when available in the API pages (#24503) @mnajdova
- <!-- 43 --> [docs] Improve system properties page (#24524) @mnajdova
- <!-- 42 --> [docs] Fix malformed component API description (#24504) @eps1lon
- <!-- 41 --> [docs] Fix ToC "Component name" fragment link on /api/* (#24517) @eps1lon
- <!-- 40 --> [docs] Fix ToC on /api pages linking to api-docs (#24515) @eps1lon
- <!-- 43 --> [docs] Add comment explaining specificity bump on Select (#24509) @KarimMokhtar
- <!-- 52 --> [docs] Compute spreadable from tests (#24490) @eps1lon
- <!-- 53 --> [docs] Fix label bug in stepper vertical demo (#24491) @artola
- <!-- 60 --> [docs] Update Divjoy URL (#24447) @mbrookes
- <!-- 63 --> [docs] Improve packages description (#24330) @oliviertassinari
- <!-- 66 --> [docs] Fix content-layout-shift (#24418) @oliviertassinari
- <!-- 71 --> [docs] Document default values of external props (#24417) @eps1lon
- <!-- 78 --> [docs] Update in-house ads (#24410) @mbrookes
- <!-- 37 --> [docs] Add comment explaining specificity bump on Select (#24509) @KarimMokhtar
- <!-- 28 --> [docs] Compute spreadable from tests (#24490) @eps1lon
- <!-- 27 --> [docs] Fix label bug in stepper vertical demo (#24491) @artola
- <!-- 20 --> [docs] Update Divjoy URL (#24447) @mbrookes
- <!-- 17 --> [docs] Improve packages description (#24330) @oliviertassinari
- <!-- 14 --> [docs] Fix content-layout-shift (#24418) @oliviertassinari
- <!-- 09 --> [docs] Document default values of external props (#24417) @eps1lon
- <!-- 02 --> [docs] Update in-house ads (#24410) @mbrookes @ewldev

### core

- <!-- 21 --> [test] Simplify DatePicker tests (#24545) @eps1lon
- <!-- 29 --> [core] Improve pseudo classes overrides error (#24535) @mnajdova
- <!-- 45 --> [core] Fix styleProps to always contain all props (#24505) @mnajdova
- <!-- 46 --> [test] Fix AvatarGroup failing test (#24512) @mnajdova
- <!-- 51 --> [pickers] Sort tests (#24481) @eps1lon
- <!-- 55 --> [test] Split tests in describeConformanceV5 to isolate them (#24479) @mnajdova
- <!-- 56 --> [core] Do not forward classes prop by default in experimentalStyled (#24451) @mnajdova
- <!-- 57 --> [core] Pass styleProps on all slots in the styled() components (#24454) @mnajdova
- <!-- 58 --> [core] Batch small changes (#24445) @oliviertassinari
- <!-- 79 --> [core] Normalize generating declaration files (#24411)

All contributors of this release in alphabetical order: @artola, @CyanoFresh, @d3mp, @duganbrett, @eladmotola, @eps1lon, @greguintow, @KarimMokhtar, @kutnickclose, @lukaselmer, @mbrookes, @mnajdova, @mxsph, @oliviertassinari, @povilass, @praveenkumar-kalidass, @TimonPllkrn, @tonysepia, @vicasas, @vinyldarkscratch, @xs9627
- <!-- 87 --> [core] Skip downloading browser binaries in codesandbox/ci (#24628) @eps1lon
- <!-- 81 --> [core] Batch small changes (#24599) @oliviertassinari
- <!-- 59 --> [test] Simplify DatePicker tests (#24545) @eps1lon
- <!-- 51 --> [core] Improve pseudo classes overrides error (#24535) @mnajdova
- <!-- 35 --> [core] Fix styleProps to always contain all props (#24505) @mnajdova
- <!-- 34 --> [test] Fix AvatarGroup failing test (#24512) @mnajdova
- <!-- 29 --> [pickers] Sort tests (#24481) @eps1lon
- <!-- 25 --> [test] Split tests in describeConformanceV5 to isolate them (#24479) @mnajdova
- <!-- 24 --> [core] Do not forward classes prop by default in experimentalStyled (#24451) @mnajdova
- <!-- 23 --> [core] Pass styleProps on all slots in the styled() components (#24454) @mnajdova
- <!-- 22 --> [core] Batch small changes (#24445) @oliviertassinari
- <!-- 01 --> [core] Normalize generating declaration files (#24411) @eps1lon

All contributors of this release in alphabetical order: @artola, @CyanoFresh, @d3mp, @duganbrett, @eladmotola, @eps1lon, @ewldev, @greguintow, @KarimMokhtar, @kutnickclose, @lukaselmer, @mbrookes, @mnajdova, @mxsph, @natac13, @oliviertassinari, @povilass, @praveenkumar-kalidass, @TimonPllkrn, @tonysepia, @vicasas, @vinyldarkscratch, @xs9627

## 5.0.0-alpha.23

Expand Down
13 changes: 7 additions & 6 deletions scripts/releaseChangelog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,26 +110,27 @@ async function main(argv) {
.join(', ');

// We don't know when a particular commit was made from the API.
// Only that the commits are ordered by date DESC
const commitsItemsByDateAsc = commitsItems.slice().reverse();
// Only that the commits are ordered by date ASC
const commitsItemsByDateDesc = commitsItems.slice().reverse();
// Sort by tags ASC, date desc
// Will only consider exact matches of tags so `[Slider]` will not be grouped with `[Slider][Modal]`
commitsItems.sort((a, b) => {
const aTags = parseTags(a.commit.message);
const bTags = parseTags(b.commit.message);
if (aTags === bTags) {
return commitsItemsByDateAsc.indexOf(a) - commitsItemsByDateAsc.indexOf(b);
return commitsItemsByDateDesc.indexOf(a) - commitsItemsByDateDesc.indexOf(b);
}
return aTags.localeCompare(bTags);
});
const changes = commitsItems.map((commitsItem) => {
// Helps changelog author keeping track of order when grouping commits under headings.
const dateSortMarker = `<!-- ${commitsItemsByDateAsc
.indexOf(commitsItem)
const dateSortMarker = `<!-- ${(
commitsItemsByDateDesc.length - commitsItemsByDateDesc.indexOf(commitsItem)
)
.toString()
// Padding them with a zero means we can just feed a list into online sorting tools like https://www.online-utility.org/text/sort.jsp
// i.e. we can sort the lines alphanumerically
.padStart(Math.ceil(Math.log10(commitsItemsByDateAsc.length)), '0')} -->`;
.padStart(Math.ceil(Math.log10(commitsItemsByDateDesc.length)), '0')} -->`;
const shortMessage = commitsItem.commit.message.split('\n')[0];
return `- ${dateSortMarker} ${shortMessage} @${commitsItem.author.login}`;
});
Expand Down

0 comments on commit 4d48ff1

Please sign in to comment.