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
Update GrapesJS generated JS dist files #13661
base: 5.x
Are you sure you want to change the base?
Conversation
7fc7840
to
6af5647
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The dist files was recently updated in #13665. I'm not sure why there are differences. Are you sure this was running on the latest 5.x with this change? How can I check how this action generate the files?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The issue (#13271) with apply button exists on this branch.
6af5647
to
d3a36ae
Compare
The conflicts seen in generated files like this, are caused by things like whitespaces and timestamping (eg. when you have a map file, like this has). If there are no conflicts in the source files, all that is needed is to regenerate the files from the dist folder and commit those regenerated files.
|
Ideally, we'd move towards not having these generated files inside the repo but have composer tell npm to generate them on update/install. That would get rid of conflicts like these. |
I would suggest closing this as no longer relevant, as there have been more recent merges into 5.x, which made changes to those files. |
d18be02
to
6dff6f2
Compare
6dff6f2
to
e6e8522
Compare
Automated changes by create-pull-request GitHub action