Skip to content

[6.8] Bump jquery from 3.4.1 to 3.5.0 (#64884) again#67036

Merged
jportner merged 4 commits intoelastic:6.8from
jportner:6.8-bump-jquery
May 21, 2020
Merged

[6.8] Bump jquery from 3.4.1 to 3.5.0 (#64884) again#67036
jportner merged 4 commits intoelastic:6.8from
jportner:6.8-bump-jquery

Conversation

@jportner
Copy link
Copy Markdown
Contributor

@jportner jportner commented May 19, 2020

This is a second attempt at the original backport in #65336.

jQuery 3.5.0 introduced a breaking change to its htmlPrefilter sanitization method so it is more strict. Self-closing tags with no content are now stripped out of the DOM. Self-closing tags should only be used by elements defined in the HTML Standard, such as <br />, <hr />, etc. This backport includes the update to jQuery 3.5.0, and also refactors Angular templates that previously (mis-)used self-closing tags.

The original backport broke ML by preventing page loads. This was triaged in #66170, and the root cause was determined to be additional Angular templates that were defined programmatically via string literals. I missed those templates during that backport process. We wound up reverting that backport with the aim to revisit this upgrade, which I am doing in this PR.

This time, I manually reviewed all Angular template entry-points (usage of the ui/routes module) to determine if we missed any other programmatically-defined Angular templates. I found one last instance in the Upgrade Assistant and updated it too (in 808cd21).

@jportner jportner added release_note:skip Skip the PR/issue when compiling release notes v6.8.10 labels May 19, 2020
@jportner jportner requested review from jgowdyelastic and legrego May 19, 2020 17:22
Copy link
Copy Markdown
Member

@jgowdyelastic jgowdyelastic left a comment

Choose a reason for hiding this comment

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

Tested, LGTM

Copy link
Copy Markdown
Member

@legrego legrego left a comment

Choose a reason for hiding this comment

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

LGTM!

@jportner
Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@jportner jportner merged commit fbe078c into elastic:6.8 May 21, 2020
@jportner jportner deleted the 6.8-bump-jquery branch May 21, 2020 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:skip Skip the PR/issue when compiling release notes v6.8.10

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants