Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync alpha with master #3303

Merged
merged 160 commits into from
Dec 4, 2024
Merged

Conversation

PKulkoRaccoonGang
Copy link
Contributor

@PKulkoRaccoonGang PKulkoRaccoonGang commented Nov 26, 2024

Description

Added new commits from master branch to alpha branch.

Merge Checklist

  • If your update includes visual changes, have they been reviewed by a designer? Send them a link to the Netlify deploy preview, if applicable.
  • Does your change adhere to the documented style conventions?
  • Do any prop types have missing descriptions in the Props API tables in the documentation site (check deploy preview)?
  • Were your changes tested using all available themes (see theme switcher in the header of the deploy preview, under the "Settings" icon)?
  • Were your changes tested in the example app?
  • Is there adequate test coverage for your changes?
  • Consider whether this change needs to reviewed/QA'ed for accessibility (a11y). If so, please request an a11y review for the PR in the #wg-paragon Open edX Slack channel.

Post-merge Checklist

  • Verify your changes were released to NPM at the expected version.
  • If you'd like, share your contribution in #show-and-tell.
  • 🎉 🙌 Celebrate! Thanks for your contribution.

bradenmacdonald and others added 30 commits November 26, 2024 15:53
* feat: add typings for <Button>

* chore: bump @types/react and @types/react-dom

* feat: re-export bootstrap helpers as ComponentWithAsProp, BsPropsWithAs
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [ws](https://github.com/websockets/ws) from 7.5.9 to 7.5.10.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.5.9...7.5.10)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/alpha-master-sync branch from a8d8dab to 523aa2f Compare November 26, 2024 15:18
@PKulkoRaccoonGang PKulkoRaccoonGang marked this pull request as ready for review November 26, 2024 17:04
Copy link
Contributor

@brian-smith-tcril brian-smith-tcril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The number of lines changed scared me a little at first, I was happy to see that it is mostly dependent-usage.json.

I pulled the branch down and clicked around the docs site locally a bit, everything seems to be functioning!

Thanks again for all the design tokens work!

:shipit:

@PKulkoRaccoonGang
Copy link
Contributor Author

@brian-smith-tcril Thank you! Yes, these are the changes in half a year. I also checked the documentation site superficially. Everything seems to work!

@PKulkoRaccoonGang PKulkoRaccoonGang merged commit e96baef into alpha Dec 4, 2024
8 checks passed
@PKulkoRaccoonGang PKulkoRaccoonGang deleted the Peter_Kulko/alpha-master-sync branch December 4, 2024 10:22
@openedx-semantic-release-bot

🎉 This PR is included in version 23.0.0-alpha.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

@openedx-semantic-release-bot

🎉 This PR is included in version 23.0.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
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.