-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
Bump highlight.js to v9.18.5 #84296
Bump highlight.js to v9.18.5 #84296
Conversation
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.15.10 to 10.1.2. - [Release notes](https://github.com/highlightjs/highlight.js/releases) - [Changelog](https://github.com/highlightjs/highlight.js/blob/10.1.2/CHANGES.md) - [Commits](highlightjs/highlight.js@9.15.10...10.1.2) Signed-off-by: dependabot[bot] <support@github.com>
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
This reverts commit 929c766.
Includes transitive dependencies.
Jenkins test this |
I think we might need to bump highlight.js in @elastic/eui first: elastic/eui#4313 |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Jenkins test this |
Had to upgrade react-syntax-highlighter too. Fingers crossed.
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.
Author's notes.
"react-syntax-highlighter": "^5.7.0", | ||
"react-syntax-highlighter": "^15.3.1", |
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 existing dependency paths are:
react-syntax-highlighter@5.8.0 > highlight.js@9.12.0
react-syntax-highlighter@5.8.0 > lowlight@1.9.1 > highlight.js@9.12.0
I needed to upgrade the (years out-of-date) react-syntax-highlighter
package so I could bump its transitive dependencies of highlight.js
to ^10.4.1
.
@elastic/apm-ui, you are the only consumer of this package in Kibana. I read the react-syntax-highlighter
changelog and updated DatabaseContext
& Context
components accordingly. The unit tests are passing but I couldn't figure out how to access these in a manual smoke test. If you could please take a look it would be much appreciated!
@@ -96,6 +96,8 @@ | |||
"**/minimist": "^1.2.5", | |||
"**/node-jose/node-forge": "^0.10.0", | |||
"**/prismjs": "1.22.0", | |||
"**/react-syntax-highlighter": "^15.3.1", |
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.
Forcefully resolves:
@storybook/components > react-syntax-highlighter@12.2.1
to^15.3.1
@@ -96,6 +96,8 @@ | |||
"**/minimist": "^1.2.5", | |||
"**/node-jose/node-forge": "^0.10.0", | |||
"**/prismjs": "1.22.0", | |||
"**/react-syntax-highlighter": "^15.3.1", | |||
"**/react-syntax-highlighter/**/highlight.js": "^10.4.1", |
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.
Forcefully resolves:
react-syntax-highlighter > highlight.js@^10.1.1
to^10.4.1
react-syntax-highlighter > lowlight > highlight.js@~10.1.0
to^10.4.1
Jenkins test this |
@@ -681,7 +683,7 @@ | |||
"has-ansi": "^3.0.0", | |||
"hdr-histogram-js": "^1.2.0", | |||
"he": "^1.2.0", | |||
"highlight.js": "9.15.10", | |||
"highlight.js": "^9.18.5", |
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.
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.
Yeah, I was trying to avoid too many changes in this PR, as I don't own the code that consumes highlight.js
and I'm not sure I fully understand the implications of the breaking changes. I just wanted to bump to 9.latest until we get a chance to do a major version upgrade. It's worth noting that EUI currently relies on 9.latest as well (as of last week), but they plan to upgrade sometime soon.
Failed because of an unrelated flaky test, merging upstream and retesting. |
@elasticmachine merge upstream |
Jenkins test this |
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.
LGTM (I haven't had the chance to test this out locally though - I'm afk)
The old version of react-syntax-highlighter would ignore newline characters. This version renders them in the DOM instead. I had to update a component to remove newline characters from the ends of line strings so they would render as expected.
Jenkins test this |
💚 Build SucceededMetrics [docs]Module Count
Async chunks
Distributable file count
Page load bundle
Unknown metric groups@kbn/ui-shared-deps asset size
History
To update your PR or re-run it, just comment with: |
…k-field-to-hot-phase * 'master' of github.com:elastic/kibana: (429 commits) simplify popover open state logic (elastic#85379) [Logs UI][Metrics UI] Move actions to the kibana header (elastic#84648) [Search Source] Do not pick scripted fields if * provided (elastic#85133) [Search] Session SO polling (elastic#84225) [Transform] Replace legacy elasticsearch client (elastic#84932) [Uptime]Refactor header and action menu (elastic#83779) Fix agg select external link (elastic#85380) [ILM] Show forcemerge in hot when rollover is searchable snapshot is enabled (elastic#85292) clear using keyboard (elastic#85042) [GS] add tag and dashboard suggestion results (elastic#85144) [ML] API integration tests - skip GetAnomaliesTableData Add ECS field for event.code. (elastic#85109) [Functional][TSVB] Wait for markdown textarea to be cleaned (elastic#85128) skip flaky suite (elastic#62060) skip flaky suite (elastic#85098) Bump highlight.js to v9.18.5 (elastic#84296) Add `server.publicBaseUrl` config (elastic#85075) [Alerting & Actions ] More debug logging (elastic#85149) [Security Solution][Case] Manual attach alert to a case (elastic#82996) Loosen UUID regex to accept uuidv1 or uuidv4 (elastic#85338) ... # Conflicts: # x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index.ts # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/i18n_texts.ts # x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
2 similar comments
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
Bumps highlight.js from 9.15.10 to 10.1.2.
Release notes
Sourced from highlight.js's releases.
... (truncated)
Changelog
Sourced from highlight.js's changelog.
... (truncated)
Commits
edd73d2
bump v10.1.27241013
(parser) use null prototype objects for languages/aliases (#2636)93fd0d7
bump v10.1.1; (chore) add changelog for 10.1.1c5783d2
(chore) clean up types just a littlea4ee4e4
(chore) declare ambient modules for lib/core & languges0656588
(chore) removed dangling comma (#2612)b1bce6e
(chore) more import below metadata comment74de6ea
(chore) bump copyrightb2d19b0
bump v10.1.084f7fa3
(chore) upgrade some dev stuff to newer versionsMaintainer changes
This version was pushed to npm by isagalaev, a new releaser for highlight.js since your current version.
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)@dependabot use these labels
will set the current labels as the default for future PRs for this repo and language@dependabot use these reviewers
will set the current reviewers as the default for future PRs for this repo and language@dependabot use these assignees
will set the current assignees as the default for future PRs for this repo and language@dependabot use this milestone
will set the current milestone as the default for future PRs for this repo and languageYou can disable automated security fix PRs for this repo from the Security Alerts page.