resolve conflicts between next and main #380
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Leonardo Di Vittorio <leonardo.divittorio@Leonardos-MacBook-Pro.local>
### [1.32.2](v1.32.1...v1.32.2) (2023-08-17) ### Bug Fixes * add border secondary ([#355](#355)) ([75243ec](75243ec))
* feat: add breadcrumbs component * feat: add a11y properites --------- Co-authored-by: Leonardo Di Vittorio <leonardo.divittorio@Leonardos-MacBook-Pro.local>
## [1.33.0](v1.32.2...v1.33.0) (2023-08-18) ### Features * add breadcrumbs component ([#353](#353)) ([ed82e05](ed82e05))
* fix: add Open Sans font to storybook * feat: add variants of tag component in Tag and SelectList (#354) * feat: add variants of tag component, resolve comments --------- Co-authored-by: Yurii Pavlovskyi <yurii.pavlovskyi@free-now.com>
* refactor: migrate Datepicker to popper positioning engine * build: remove react-tether dependency * chore: remove unnecessary prop types and use useState directly
martimalek
requested review from
nlopin,
div-Leo and
jonotrujillo
as code owners
martimalek
commented
Sep 28, 2023
### [1.34.1](v1.34.0...v1.34.1) (2023-09-29) ### Bug Fixes * **input:** add aria-invalid when an input has an error ([#379](#379)) ([ec26782](ec26782))
nlopin
approved these changes
Sep 29, 2023
martimalek
force-pushed
the
main-into-next-conflicts
branch
from
9a64870 to
e3f889c
Compare
1 task
|
🎉 This PR is included in version 3.0.0-next.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
|
🎉 This PR is included in version 2.1.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What:
Resolve conflicts between
nextandmain
Why:
We want to have
nextup to date withmain
How:
Create new branch from
nextand mergedmaininto itAccepted all incoming changes except in the
SelectListandTagcomponents, where the migration to css variables had already been done, so I accepted kept that (new variants for those components lack css vars, I'll open a PR soon)Ready to be merged
Thanks to having next up to date I'll be able to update #374, removing the
weakprop altogether and merging the PR.