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

generate-proxy.json should be sorted to avoid conflicts #18306

Closed
1 task done
ltvan opened this issue Nov 30, 2023 · 3 comments · Fixed by #18327
Closed
1 task done

generate-proxy.json should be sorted to avoid conflicts #18306

ltvan opened this issue Nov 30, 2023 · 3 comments · Fixed by #18327

Comments

@ltvan
Copy link

ltvan commented Nov 30, 2023

Is there an existing issue for this?

  • I have searched the existing issues

Is your feature request related to a problem? Please describe the problem.

Currently the modules and types in generate-proxy.json are generated in different order each running. This make this file conflicts when merging feature branches.

Describe the solution you'd like

The modules and types should be sorted alphabetically, so that it's always generated in a predictable manner, reduce the chance of conflicts.

Additional context

No response

@realLiangshiwei
Copy link
Member

realLiangshiwei commented Nov 30, 2023

Hi,

Because it is a generated file, if it conflicts when merging branches, you just need to regenerate it.

@ltvan
Copy link
Author

ltvan commented Nov 30, 2023

It took times for every merge. yarn.lock and other kinds of lock file are sorted to make sure that same input, same output, so there are not much conflicts occurred. This should be the same.

@realLiangshiwei
Copy link
Member

Ok, we can consider it.

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

Successfully merging a pull request may close this issue.

2 participants