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

Update GrapesJS generated JS dist files #13661

Open
wants to merge 1 commit into
base: 5.x
Choose a base branch
from

Conversation

github-actions[bot]
Copy link
Contributor

Automated changes by create-pull-request GitHub action

Copy link
Member

@patrykgruszka patrykgruszka left a 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?

Copy link
Member

@patrykgruszka patrykgruszka left a 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.

image

@LordRembo
Copy link
Contributor

LordRembo commented Apr 19, 2024

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.

cd plugins/GrapesJsBuilderBundle/package-lock.json
npm i
npm run build  #or alternatively, npm run rebuild, after merge of the GrapesJS upgrade

@LordRembo
Copy link
Contributor

LordRembo commented Apr 19, 2024

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.

@LordRembo
Copy link
Contributor

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.

@github-actions github-actions bot force-pushed the create-pull-request/patch branch 6 times, most recently from d18be02 to 6dff6f2 Compare May 3, 2024 10:02
@github-actions github-actions bot force-pushed the create-pull-request/patch branch from 6dff6f2 to e6e8522 Compare May 4, 2024 10:02
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.

None yet

3 participants