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

[SRM-665] Ckeditor5 and Claro upgrade #100

Merged
merged 7 commits into from
May 31, 2023
Merged

[SRM-665] Ckeditor5 and Claro upgrade #100

merged 7 commits into from
May 31, 2023

Conversation

vincent-gao
Copy link
Contributor

@vincent-gao vincent-gao commented Feb 22, 2023

Jira

https://digital-vic.atlassian.net/browse/SRM-665

Changes

  1. update drupal/video_embed_field to support CKeditor5.
  2. update js/embed_media_back_button.js to support CKeditor5

Related PRs

dpc-sdp/tide_core#380
dpc-sdp/tide_grant#27
#100
dpc-sdp/tide_publication#30
dpc-sdp/tide_landing_page#197
dpc-sdp/tide_site#124

@vincent-gao vincent-gao changed the title Ck5 CK5 Feb 22, 2023
# Conflicts:
#	composer.json
composer.json Outdated
"extra": {
"patches": {
"drupal/embed": {
"CKEditor 5 compatibility - https://www.drupal.org/project/embed/issues/3309747": "https://git.drupalcode.org/project/embed/-/merge_requests/2/diffs.patch"

Choose a reason for hiding this comment

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

This is a dangerous patch, as one commit to the PR will change the diff. If you can get a diff from a specific commit hash that would be safer.

Copy link
Contributor Author

@vincent-gao vincent-gao May 29, 2023

Choose a reason for hiding this comment

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

hey @krakerag , Thanks for the review.
for fixing the compatibility issue for ck5, it has several commits, so it seems impossible to get a patch for a specific commit and we want to include all of the changes.
I can remove diffs , it will be https://git.drupalcode.org/project/embed/-/merge_requests/2.patch
please advice.
https://git.drupalcode.org/project/embed/-/merge_requests/2/commits

Choose a reason for hiding this comment

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

If someone pushes up another commit to that PR #2, your patch will change.

I would download the patch, add it as a comment to the issue, so that the uploaded patch cannot change. That's how we do it with regular patchfiles that don't use a PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, that is correct.
will do.

@vincent-gao vincent-gao requested a review from krakerag May 29, 2023 03:38
Copy link
Contributor

@mayurngondhkar mayurngondhkar left a comment

Choose a reason for hiding this comment

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

LGTM

@vincent-gao vincent-gao merged commit 62fc475 into develop May 31, 2023
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