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

feat: Add merge utility #37

Merged
merged 1 commit into from
Mar 26, 2024
Merged

feat: Add merge utility #37

merged 1 commit into from
Mar 26, 2024

Conversation

just-boris
Copy link
Member

@just-boris just-boris commented Mar 25, 2024

Issue #, if available:

Description of changes:

Adding an extra built-in utility instead of relying on external dependency. See the updated readme for use-case example

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@just-boris just-boris requested a review from a team as a code owner March 25, 2024 17:19
@just-boris just-boris requested review from cansuaa and removed request for a team March 25, 2024 17:19
Copy link

codecov bot commented Mar 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (17cbb36) to head (0b3bfbe).

Additional details and impacted files
@@            Coverage Diff            @@
##              main       #37   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            1         2    +1     
  Lines           15        28   +13     
  Branches         1         5    +4     
=========================================
+ Hits            15        28   +13     

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

@@ -6165,7 +6166,6 @@
},
"node_modules/lodash": {
Copy link
Member Author

Choose a reason for hiding this comment

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

Any real world project probably already has a dependency on lodash anyway, so this addition comes with no extra cost

README.md Outdated
@@ -40,14 +40,14 @@ In your `jest.config.json`:

### Advanced usage

If you are already have another preset in your configuration, you can [merge them together](https://stackoverflow.com/questions/51002460/is-it-possible-to-use-jest-with-multiple-presets-at-the-same-time):
If you are already have another preset in your configuration, you can use `@cloudscape-design/jest-preset/merge` helper to merge them together:
Copy link

Choose a reason for hiding this comment

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

I know it isn't newly added but isn't the text supposed to be "If you already have another preset ..."?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good find, fixed

@just-boris just-boris merged commit b2e7e7a into main Mar 26, 2024
29 checks passed
@just-boris just-boris deleted the merge-helper branch March 26, 2024 10:05
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.

2 participants