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: merge alpha into master #3158

Closed
wants to merge 236 commits into from

Conversation

PKulkoRaccoonGang
Copy link
Contributor

@PKulkoRaccoonGang PKulkoRaccoonGang commented Jul 31, 2024

Description

  • merged alpha into master
  • fixed --pgn-typography-font-weight-table-th variable

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.

@openedx-webhooks
Copy link

Thanks for the pull request, @PKulkoRaccoonGang!

What's next?

Please work through the following steps to get your changes ready for engineering review:

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

  • If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
    • This process (including the steps you'll need to take) is documented here.
  • If it doesn't, simply proceed with the next step.

🔘 Provide context

To help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:

  • Dependencies

    This PR must be merged before / after / at the same time as ...

  • Blockers

    This PR is waiting for OEP-1234 to be accepted.

  • Timeline information

    This PR must be merged by XX date because ...

  • Partner information

    This is for a course on edx.org.

  • Supporting documentation
  • Relevant Open edX discussion forum threads

🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

🔘 Let us know that your PR is ready for review:

Who will review my changes?

This repository is currently maintained by @openedx/paragon-working-group. Tag them in a comment and let them know that your changes are ready for review.

Where can I find more information?

If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:

When can I expect my changes to be merged?

Our goal is to get community contributions seen and reviewed as efficiently as possible.

However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:

  • The size and impact of the changes that it introduces
  • The need for product review
  • Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Jul 31, 2024
Copy link

netlify bot commented Jul 31, 2024

Deploy Preview for paragon-openedx ready!

Name Link
🔨 Latest commit de7cf28
🔍 Latest deploy log https://app.netlify.com/sites/paragon-openedx/deploys/66b2ffbd547fc60008e7fd0b
😎 Deploy Preview https://deploy-preview-3158--paragon-openedx.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@@ -76,7 +76,7 @@
"description": "Basic font weight."
},
"lead": { "value": "inherit", "type": "fontWeight", "source": "$lead-font-weight", "description": "Lead text font weight." },
"table-th": { "value": "normal", "type": "fontWeight", "source": "$table-th-font-weight", "description": "Table th font weight." }
"table-th": { "value": "bold", "type": "fontWeight", "source": "$table-th-font-weight", "description": "Table th font weight." }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Alpha
image

Master
image

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.

Thank you so much for making this PR. Landing design tokens is feeling closer than ever!

I left a couple comments about release.yml and .releaserc that we'll want to address in a separate PR before this can land.

I also noticed that commitlint is failing for this (https://github.com/openedx/paragon/actions/runs/10178424453/job/28152012015?pr=3158). I'd like to land this with the commit history intact, so rebasing to reword those commits would be helpful.

Thanks again!

@@ -1,9 +1,12 @@
name: Release CI

on:
workflow_dispatch:
Copy link
Contributor

Choose a reason for hiding this comment

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

Just curious as to if we want to permanently add manual workflow runs as an option or if this was a temporary thing.

Comment on lines +8 to +9
- alpha
- beta
Copy link
Contributor

Choose a reason for hiding this comment

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

Before this PR lands this file should show no changes. This will mean making a PR to current master updating this file to deploy from master and 22.x.

Comment on lines +2 to +7
"branches": [
"master",
"next",
{ "name": "alpha", "prerelease": true },
{ "name": "beta", "prerelease": true }
],
Copy link
Contributor

Choose a reason for hiding this comment

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

Before this PR lands this file should show no changes. This will mean making a PR to current master updating this file to deploy from master and 22.x.

Copy link

codecov bot commented Jul 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.76%. Comparing base (ed25534) to head (de7cf28).
Report is 102 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3158      +/-   ##
==========================================
+ Coverage   93.25%   93.76%   +0.51%     
==========================================
  Files         249      229      -20     
  Lines        4388     3787     -601     
  Branches     1035      906     -129     
==========================================
- Hits         4092     3551     -541     
+ Misses        293      232      -61     
- Partials        3        4       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

viktorrusakov and others added 21 commits August 5, 2024 11:48
BREAKING CHANGE: Introduces design tokens.
* feat: resolve some Bootstrap conflicts with design tokens

Co-authored-by: Peter Kulko <[email protected]>
BREAKING CHANGE: all of the deprecated components were removed from Paragon, these include `CheckBoxGroup`, `Checkbox`, `Fieldset`, `Input`, `InputSelect`, `InputText`, `ListBox`, `Modal`, `RadioButtonGroup`, `StatusAlert`, `Table`, `TextArea`, `ValidationFormGroup`, `Button.Deprecated`, `Tabs.Deprecated`, `Dropdown.Deprecated`.
* refactor: update design tokens naming and add missing ones

* feat: expose replace vars script to CLI

Co-authored-by: Viktor Rusakov <[email protected]>
github-actions bot and others added 22 commits August 5, 2024 19:54
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>
…, <IconButton> (#3100)

* feat: add typings for <Overlay> and <OverlayTrigger>

* feat: add typings for <Tooltip>

* feat: add typings for <IconButton>

* chore: typing cleanups for <Chip> code

* feat: slightly more detailed types for <Chip/ChipIcon> - per review
@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/merge-alpha-into-master branch from d6bf6a8 to d5bb848 Compare August 6, 2024 09:39
@PKulkoRaccoonGang
Copy link
Contributor Author

@brian-smith-tcril
Copy link
Contributor

It sounds like this is currently an issue on master as well, so this is not a blocker.

This is docsite specific and we are still figuring out how we want to handle loading brand packages into the docsite going forward, so this is not a blocker.

I have commented on this issue noting that we should remove CardDeck.Deprecated in the alpha branch.

This is docsite specific and not a blocker.

@PKulkoRaccoonGang
Copy link
Contributor Author

we don’t want to release off master anymore; instead, we only want to release off specific named release branches (release-23.x)

According to the discussions on PWG we decided to have several branches, so this PR for inclusion in master has lost its relevance.
The alpha branch will be used for further preparation for the release.
#3303

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
design tokens open-source-contribution PR author is not from Axim or 2U
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.