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

Address beta to main merge conflicts #213

Merged
merged 20 commits into from
Sep 30, 2024
Merged

Conversation

jordanjones243
Copy link
Contributor

@jordanjones243 jordanjones243 commented Aug 21, 2024

Alaska Airlines Pull Request

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Resolves: # (issue, if applicable)

Summary:

Please summarize the scope of the changes you have submitted, what the intent of the work is and anything that describes the before/after state of the project.

Address merge conflicts when comparing beta to main

Type of change:

Please delete options that are not relevant.

  • New capability
  • Revision of an existing capability
  • Infrastructure change (automation, etc.)
  • Other (please elaborate)

Checklist:

  • My update follows the CONTRIBUTING guidelines of this project
  • I have performed a self-review of my own update

By submitting this Pull Request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Pull Requests will be evaluated by their quality of update and whether it is consistent with the goals and values of this project. Any submission is to be considered a conversation between the submitter and the maintainers of this project and may require changes to your submission.

Thank you for your submission!

-- Auro Design System Team

Summary by Sourcery

Resolve merge conflicts between beta and main branches by updating documentation, refactoring component styling, and enhancing performance through dependency updates. Introduce theme support for the auro-menu component and fix styling token names.

New Features:

  • Introduce theme support for the auro-menu component, allowing customization through SCSS variables.

Bug Fixes:

  • Fix token name for container colors to ensure correct styling.

Enhancements:

  • Update dependencies and utilize library scripts for improved performance.
  • Refactor auro-menuoption to use auro-icon for selected check mark, enhancing visual consistency.

Build:

  • Add new ESLint configuration file to standardize code quality checks.

Documentation:

  • Update README.md and other documentation files to reflect changes in component usage and styling options.

@jordanjones243 jordanjones243 self-assigned this Aug 21, 2024
@jordanjones243 jordanjones243 requested a review from a team as a code owner August 21, 2024 15:19
Copy link

sourcery-ai bot commented Aug 21, 2024

Reviewer's Guide by Sourcery

This pull request addresses merge conflicts between the 'beta' and 'main' branches. The changes primarily involve updating dependencies, refactoring code to use new components and styles, and improving the theming capabilities of the auro-menu component. Key changes include:

  1. Updating dependencies and using library scripts for improved performance.
  2. Refactoring the auro-menuoption component to use auro-icon instead of inline SVG.
  3. Implementing theme support with new CSS custom properties for easier customization.
  4. Updating the build and development process, including changes to ESLint configuration and script files.
  5. Modifying the component's styling to use the new theming system and color tokens.
  6. Updating documentation and examples to reflect the new changes and capabilities.

File-Level Changes

Files Changes
package.json
src/auro-menuoption.js
demo/api.html
Updated dependencies and refactored code to use library scripts for improved performance
src/tokens.scss
src/color-menu.scss
src/color-menuoption.scss
demo/api.md
docs/partials/api.md
Implemented theme support with new CSS custom properties for easier customization of the auro-menu component
src/auro-menuoption.js
src/style-menuoption.scss
Refactored auro-menuoption to use auro-icon instead of inline SVG for the selected checkmark
eslint.config.mjs
scripts/generateDocs.mjs
scripts/postCss.mjs
scripts/prepForBuild.mjs
scripts/staticStyles-template.js
Updated build and development process, including changes to ESLint configuration
src/style-menu.scss
src/style-menuoption.scss
src/color-menu.scss
src/color-menuoption.scss
Modified component styling to use the new theming system and color tokens
README.md
CHANGELOG.md
demo/api.md
docs/partials/api.md
Updated documentation and examples to reflect new changes and capabilities

Tips
  • Trigger a new Sourcery review by commenting @sourcery-ai review on the pull request.
  • Continue your discussion with Sourcery by replying directly to review comments.
  • You can change your review settings at any time by accessing your dashboard:
    • Enable or disable the Sourcery-generated pull request summary or reviewer's guide;
    • Change the review language;
  • You can always contact us if you have any questions or feedback.

@CLAassistant
Copy link

CLAassistant commented Aug 21, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ jordanjones243
✅ jason-capsule42
❌ semantic-release-bot
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @jordanjones243 - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟡 Complexity: 1 issue found
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.

src/auro-menuoption.js Show resolved Hide resolved
jason-capsule42 and others added 16 commits August 26, 2024 10:45
* **imports:** update all imports to include extension in file path [#208](#208) ([cd1ebf9](cd1ebf9))
* **icon:** use auro-icon for selected check mark ([180f905](180f905))
* Revert "perf(icon): use auro-icon for selected check mark" ([fa75810](fa75810))
* **icon:** use auro-icon for selected check mark ([9d3ef07](9d3ef07))
* Revert "perf(icon): use auro-icon for selected check mark" ([fa75810](fa75810))
* **deps:** update to correct icon version ([1330bf2](1330bf2))
* refactor color tokens to use tier 3 tokens [#198](#198) ([9100c1d](9100c1d))
* **token:** update token name for container colors ([20e9bc5](20e9bc5))

* update dependencies and use library scripts ([be1a5f8](be1a5f8))
@jordanjones243 jordanjones243 force-pushed the jjones/betaMergeConflicts branch from c48a8ee to 4e5d2d1 Compare August 26, 2024 17:56
@jordanjones243 jordanjones243 linked an issue Aug 26, 2024 that may be closed by this pull request
2 tasks
@jordanjones243 jordanjones243 force-pushed the jjones/betaMergeConflicts branch from fb40c4a to ceee9ce Compare September 17, 2024 18:57
@jason-capsule42 jason-capsule42 merged commit e61aa0e into beta Sep 30, 2024
3 of 4 checks passed
@jason-capsule42 jason-capsule42 deleted the jjones/betaMergeConflicts branch September 30, 2024 23:03
@blackfalcon
Copy link
Member

🎉 This PR is included in version 4.0.0-beta.1 🎉

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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update color tokens for theming support
5 participants