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

[e18e]: Replace lodash/merge & lodash/mergeWith with an alternative #28663

Draft
wants to merge 7 commits into
base: e18e-lodash
Choose a base branch
from

Conversation

xeho91
Copy link

@xeho91 xeho91 commented Jul 20, 2024

This is a sub-partial work for tracking-issue #28611.

Just an idea.
Perhaps we could do one branch, derived from next e.g. e18e, where we could put all of the work related to replacing lodash with alternatives?
It could possibly be easier to show how significant change on the summarised work of replacing lodash impact on bundle
size as well as performance.

What I did

Replaced lodash/merge and lodash/mergeWith with deepmerge-ts.

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests

  • stories
  • unit tests
  • integration tests
  • end-to-end tests

Manual testing

This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!

I am not entirely sure if there's no breaking visual changes in the UI. After the changes to:

  • merge snippet - I couldn't find tests specific to this snippet, nor explore in depth where it is being used
  • combineParameters() - existing tests passed

Documentation

  • Add or update documentation reflecting your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Checklist for Maintainers

  • When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli/src/sandbox-templates.ts

  • Make sure this PR contains one of the labels below:

    Available labels
    • bug: Internal changes that fixes incorrect behavior.
    • maintenance: User-facing maintenance tasks.
    • dependencies: Upgrading (sometimes downgrading) dependencies.
    • build: Internal-facing build tooling & test updates. Will not show up in release changelog.
    • cleanup: Minor cleanup style change. Will not show up in release changelog.
    • documentation: Documentation only changes. Will not show up in release changelog.
    • feature request: Introducing a new feature.
    • BREAKING CHANGE: Changes that break compatibility in some way with current major version.
    • other: Changes that don't fit in the above categories.

🦋 Canary release

This PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the @storybookjs/core team here.

core team members can create a canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<PR_NUMBER>

@tobiasdiez
Copy link
Contributor

An alternative to deepmerge-ts would be https://github.com/unjs/defu, which allows a bit more control on how to merge two objects.

@xeho91
Copy link
Author

xeho91 commented Jul 20, 2024

An alternative to deepmerge-ts would be https://github.com/unjs/defu, which allows a bit more control on how to merge two objects.

Thanks, I haven't heard about this one!

I'm not sure what you had in your mind with 'more control'? By quick glance deepmerge-ts has more extensive API. And I want to make it crystal clear - I'm not willing die on hill favouring this one, and willing to switch to defu if needed.

To compare quickly:

- deepmerge-ts defu
bundle size 👎 5.8kB 👍 1.2kB
dependencies 👍 0 👍 0
API very extensive simple
learning curve 👎 hard if used deepmergeCustom 👍 easy with createDefu
performance 👎 benchmark 👍benchmark

From what I've observed while working on this PR.
I didn't see any need for the "advanced" usage with the need for a customized merger other than merge snippet:

@xeho91 xeho91 changed the title [e18e]: Replace lodash/merge & lodash/mergeWith with deemperge [e18e]: Replace lodash/merge & lodash/mergeWith with an alternative Jul 20, 2024
@tobiasdiez
Copy link
Contributor

I don't have a strong opinion either, just wanted to drop this alternative because it worked for me (and is the go-to solution in the nuxt ecosystem). But as you said the usage of merging objects in storybook is quite simple, so it doesn't really matter.

@xeho91
Copy link
Author

xeho91 commented Jul 20, 2024

I've created an initial benchmark PR on deepmerge-ts repo.

Looks like defu is a clear winner in terms of performance.

@valentinpalkovic
Copy link
Contributor

valentinpalkovic commented Jul 22, 2024

Hi @xeho91

I think it definitely makes sense to create a base branch to merge all the changes in because, in the beginning, the bundle size will be increased until we are able to remove the lodash library. I have created the branch e18e-lodash.

@valentinpalkovic valentinpalkovic changed the base branch from next to e18e-lodash July 22, 2024 12:21
@valentinpalkovic
Copy link
Contributor

I guess let's use defu then, and let's take a deeper look at adding some unit tests.

Maybe we could reuse/copy over the unit tests from lodash (merge, merge-ts and mergeWith to understand in which aspects the libraries are behaving differently so that we can make a solid assessment.

Copy link

nx-cloud bot commented Jul 22, 2024

☁️ Nx Cloud Report

CI is running/has finished running commands for commit c28f30b. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this CI Pipeline Execution


✅ Successfully ran 1 target

Sent with 💌 from NxCloud.

@xeho91
Copy link
Author

xeho91 commented Jul 31, 2024

I guess let's use defu then, and let's take a deeper look at adding some unit tests.

Maybe we could reuse/copy over the unit tests from lodash (merge, merge-ts and mergeWith to understand in which aspects the libraries are behaving differently so that we can make a solid assessment.

About the unit tests - should we put them in merge.test.ts:

  1. in the same directory as merge.ts
  2. or is there any different location the test file should be placed?

@xeho91
Copy link
Author

xeho91 commented Jul 31, 2024

I've had to merge next to this branch, because I've had issues with PreviewWeb tests snapshots and using defu. They started to pass once I merged latest changes.

Hence e18e-lodash branch might need merging next, so we can exclude changes unrelated to this PR.

Comment on lines +15 to +17
// TODO: Ask for what is prefered:
// 1. type guard (safe at runtime, but potential performance slow-down)
// 2. or type assertion (unsafe at runtime)
Copy link
Author

Choose a reason for hiding this comment

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

I need help with decision on this one.

I've had issues with types mismatch, when the records from the second argument had types which did not exists on the first argument (source) in the PreviewWeb.test.ts.

Is it okay to change type of second argument from Partial<TObj> to Partial<TObj> & any?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure. Just widen the types for now and we can take a proper look afterwards.

@valentinpalkovic
Copy link
Contributor

I guess let's use defu then, and let's take a deeper look at adding some unit tests.
Maybe we could reuse/copy over the unit tests from lodash (merge, merge-ts and mergeWith to understand in which aspects the libraries are behaving differently so that we can make a solid assessment.

About the unit tests - should we put them in merge.test.ts:

  1. in the same directory as merge.ts
  2. or is there any different location the test file should be placed?

Yes, let's put them in merge.test.ts

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like the formatting in this file got borked?

@JReinhold
Copy link
Contributor

JReinhold commented Sep 26, 2024

FYI, even though we just merged #28981 to replace lodash with es-toolkit, that shouldn't block this PR from moving forward, because I still think the approach in this PR is an improvement (better and smaller) than the solution we've just merged.

💪

@JReinhold JReinhold marked this pull request as draft October 1, 2024 09:31
@xeho91
Copy link
Author

xeho91 commented Oct 17, 2024

I somehow unsubscribed myself from the notifications for PR. 😟

If we still can move forward with using defu for merging, should I use the same target branch or the next?
Asking in advance, so I don't spend too much time on resolving existing conflicts.

@JReinhold
Copy link
Contributor

Good question, I'd say target next directly here. Perhaps that other target branch is now entirely superseded by our done lodash migration @valentinpalkovic ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants