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

Ease up-merging changes after new release #3778

Closed
mhsdesign opened this issue May 14, 2024 · 2 comments
Closed

Ease up-merging changes after new release #3778

mhsdesign opened this issue May 14, 2024 · 2 comments

Comments

@mhsdesign
Copy link
Member

Currently up-merging the Ui is a PITA.

This is because after release, each branch will get pushed a new commit bumping the version field in EACH package.json:

Updating composer dependency and npm versions for release of 8.3.7

42ff732#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519

This is of course doomed to fail when simultaneously releasing say 8.3.42 and 9.0.24 because the commit will be on each branch and when upmerging there will be a conflict. Those conflicts must be solved completely manually. Being lazy and always accepting ours for all package.json lead to missed dependency changes in the past when upmerging.

So i like to question the why. For composer.json we dont do this as well.
There was a reason for this in the past when we still manually wrote a version number into the javascript files so it would be visible in the Neos Ui, but this was refactored in the esbuild change.

Now the commit is obsolete and we can remove it.

@mhsdesign
Copy link
Member Author

We had this logic prevously in place when we used lerna and were not able to reference workspace packages via

487978e#diff-2d72bdead8afa0798d18995311992d684348a694c2d5e214e8e4d2b6153e4821

"@neos-project/neos-ui-decorators": "workspace:*",

but that time is over.

But as seen in 42aeb54 we might need it still partially to update the .yarn/cache folder?

@mhsdesign
Copy link
Member Author

Seems to work quite well tested with release 8.3.8 and all npm packages have been published with "version": "8.3.8", inside.

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

No branches or pull requests

1 participant