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

Bump highlight.js to v9.18.5 #84296

Merged
merged 10 commits into from
Dec 9, 2020

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Nov 25, 2020

Bumps highlight.js from 9.15.10 to 10.1.2.

Release notes

Sourced from highlight.js's releases.

10.1.2

Fixes:

  • fix(night) Prevent object prototype values from being returned by getLanguage (#2636) night

10.1.1

Fixes:

  • Resolve issue on Node 6 due to dangling comma (#2608) [Edwin Hoogerbeets][]
  • Resolve index.d.ts is not a module error (#2603) [Josh Goebel][]

10.1.0

Just your typical minor release. Plenty of fixes and enhancements, few new themes.

Some deprecations language maintainers might want to pay attention to:

  • htmlbars grammar is now deprecated. Use handlebars instead. (#2344) [Nils Knappmeier][]
  • when using highlightBlock result.re deprecated. Use result.relevance instead. (#2552) [Josh Goebel][]
  • ditto for result.second_best.re => result.second_best.relevance (#2552)
  • lexemes is now deprecated in favor of keywords.$pattern key (#2519) [Josh Goebel][]
  • endSameAsBegin is now deprecated. (#2261) [Josh Goebel][]

10.0.2

Fixes a serious potential freeze/infinite loop issue. Everyone on version 10 should upgrade.

  • Remove support for AMD module loading, which never truly worked properly anyways.

10.0.1

Fixes: sublanguage with no rule matches causes text to disappear in final output. (#2506).

10.0.0

Welcome to version 10.0. This a major release and therefore will contain breaking changes.

Breaking Changes

Our normal minor releases try to never break anything, holding all breaking changes for major releases. We tried to squeeze in as many as we could this time so that after 10.0 ships we'll be back to quiet sailing for a while before we need to push version 11. That said, we're very conservative about what we consider a breaking change.

i.e., if there it could possibly break things for anyone, it's typically a breaking change. The fact is a vast majority of users should upgrade and probably not notice any changes at all.

See VERSION_10_BREAKING_CHANGES.md for a comprehensive list of breaking changes, but here is a summary... if you use:

Core highlight.js lib on the client (with no extra CDN languages)

Just keep doing that.

  • If you're using darkula.css, you'll need to change that to darcula.css

... (truncated)

Changelog

Sourced from highlight.js's changelog.

Version 10.1.2

Fixes:

  • fix(night) Prevent object prototype values from being returned by getLanguage (#2636) night

Version 10.1.1

Fixes:

Version 10.1.0

New themes:

  • NNFX and NNFX-dark by [Jim Mason][]
  • lioshi by [lioshi][]

Parser Engine:

  • (parser) Now escapes quotes in text content when escaping HTML (#2564) Josh Goebel
  • (parser) Adds keywords.$pattern key to grammar definitions (#2519) Josh Goebel
  • (parser) Adds SHEBANG utility mode Josh Goebel
  • (parser) Adds registerAliases method (#2540) [Taufik Nurrohman][]
  • (enh) Added on:begin callback for modes (#2261) Josh Goebel
  • (enh) Added on:end callback for modes (#2261) Josh Goebel
  • (enh) Added ability to programatically ignore begin and end matches (#2261) Josh Goebel
  • (enh) Added END_SAME_AS_BEGIN mode to replace endSameAsBegin parser attribute (#2261) Josh Goebel
  • (fix) fixMarkup would rarely destroy markup when useBR was enabled (#2532) Josh Goebel

Deprecations:

  • htmlbars grammar is now deprecated. Use handlebars instead. (#2344) [Nils Knappmeier][]
  • when using highlightBlock result.re deprecated. Use result.relevance instead. (#2552) Josh Goebel
  • ditto for result.second_best.re => result.second_best.relevance (#2552)
  • lexemes is now deprecated in favor of keywords.$pattern key (#2519) Josh Goebel
  • endSameAsBegin is now deprecated. (#2261) Josh Goebel

Language Improvements:

  • fix(groovy) strings are not allowed inside ternary clauses (#2217) Josh Goebel

... (truncated)

Commits
  • edd73d2 bump v10.1.2
  • 7241013 (parser) use null prototype objects for languages/aliases (#2636)
  • 93fd0d7 bump v10.1.1; (chore) add changelog for 10.1.1
  • c5783d2 (chore) clean up types just a little
  • a4ee4e4 (chore) declare ambient modules for lib/core & languges
  • 0656588 (chore) removed dangling comma (#2612)
  • b1bce6e (chore) more import below metadata comment
  • 74de6ea (chore) bump copyright
  • b2d19b0 bump v10.1.0
  • 84f7fa3 (chore) upgrade some dev stuff to newer versions
  • Additional commits viewable in compare view
Maintainer changes

This version was pushed to npm by isagalaev, a new releaser for highlight.js since your current version.


Dependabot compatibility score

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 language

You can disable automated security fix PRs for this repo from the Security Alerts page.

@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Nov 25, 2020
@kibanamachine
Copy link
Contributor

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?

@kibanamachine kibanamachine added 💝community and removed dependencies Pull requests that update a dependency file labels Nov 25, 2020
@jportner jportner self-assigned this Nov 25, 2020
@jportner jportner added backport:skip This commit does not require backporting release_note:skip Skip the PR/issue when compiling release notes v8.0.0 labels Nov 25, 2020
@jportner
Copy link
Contributor

Jenkins test this

@jportner jportner requested a review from watson November 25, 2020 22:41
@jportner jportner added v7.10.1 v7.11.0 and removed backport:skip This commit does not require backporting labels Nov 25, 2020
@watson
Copy link
Contributor

watson commented Nov 26, 2020

I think we might need to bump highlight.js in @elastic/eui first: elastic/eui#4313

@watson watson changed the title Bump highlight.js from 9.15.10 to 10.1.2 Bump highlight.js to v9.18.5 Nov 26, 2020
@mistic

This comment has been minimized.

@mistic

This comment has been minimized.

@dependabot @github

This comment has been minimized.

@mistic

This comment has been minimized.

@jportner jportner added v7.10.2 and removed v7.10.1 labels Nov 30, 2020
@jportner
Copy link
Contributor

jportner commented Dec 7, 2020

Jenkins test this

Had to upgrade react-syntax-highlighter too. Fingers crossed.
@dependabot dependabot bot requested a review from a team as a code owner December 7, 2020 20:17
@botelastic botelastic bot added the Team:APM All issues that need APM UI Team support label Dec 7, 2020
Copy link
Contributor

@jportner jportner left a comment

Choose a reason for hiding this comment

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

Author's notes.

Comment on lines -788 to +790
"react-syntax-highlighter": "^5.7.0",
"react-syntax-highlighter": "^15.3.1",
Copy link
Contributor

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",
Copy link
Contributor

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

See react-syntax-highlighter changelog.

@@ -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",
Copy link
Contributor

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

See highlight.js changelog.

@jportner
Copy link
Contributor

jportner commented Dec 7, 2020

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",
Copy link
Member

Choose a reason for hiding this comment

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

Did you decide no to bump to 10.2? Moving away from 9.x sounds like a good idea

image

Copy link
Contributor

@jportner jportner Dec 8, 2020

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.

@jportner
Copy link
Contributor

jportner commented Dec 8, 2020

Failed because of an unrelated flaky test, merging upstream and retesting.

@jportner
Copy link
Contributor

jportner commented Dec 8, 2020

@elasticmachine merge upstream

@jportner
Copy link
Contributor

jportner commented Dec 8, 2020

Jenkins test this

Copy link
Contributor

@watson watson left a 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)

@sorenlouv
Copy link
Member

sorenlouv commented Dec 8, 2020

There might be a linebreak issue with ruby highlighting.

Before

After

I'll try to investigate.

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.
@jportner
Copy link
Contributor

jportner commented Dec 8, 2020

Jenkins test this

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
apm 1153 1720 +567

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
apm 3.1MB 5.4MB ⚠️ +2.3MB
enterpriseSearch 1.7MB 1.7MB +97.0B
total ⚠️ +2.3MB

Distributable file count

id before after diff
default 46948 47722 +774

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
apm 48.8KB 48.8KB +8.0B
upgradeAssistant 60.4KB 60.5KB +97.0B
total +105.0B
Unknown metric groups

@kbn/ui-shared-deps asset size

id before after diff
kbn-ui-shared-deps.@elastic.js 3.2MB 2.4MB -765.1KB
kbn-ui-shared-deps.js 13.5MB 14.3MB ⚠️ +812.9KB
total +47.8KB

History

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

@jportner jportner merged commit 176d7e4 into master Dec 9, 2020
@jportner jportner deleted the dependabot/npm_and_yarn/highlight.js-10.1.2 branch December 9, 2020 03:02
jportner added a commit that referenced this pull request Dec 9, 2020
jloleysens added a commit to jloleysens/kibana that referenced this pull request Dec 9, 2020
…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
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Dec 10, 2020
@kibanamachine
Copy link
Contributor

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
@kibanamachine
Copy link
Contributor

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.

@kibanamachine
Copy link
Contributor

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.

jportner added a commit to jportner/kibana that referenced this pull request Dec 14, 2020
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Dec 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport pending 💝community release_note:skip Skip the PR/issue when compiling release notes Team:APM All issues that need APM UI Team support v7.10.2 v7.11.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants