From 4055826e7a66c960565c4f56fcc62616c6451fad Mon Sep 17 00:00:00 2001 From: Josh Goebel Date: Wed, 18 Nov 2020 13:58:34 -0500 Subject: [PATCH] 10.4.0 release --- CHANGES.md | 12 ++++-------- README.md | 16 ++++++++-------- SECURITY.md | 10 ++++------ docs/conf.py | 2 +- docs/maintainers-guide.rst | 1 + package-lock.json | 2 +- package.json | 2 +- 7 files changed, 20 insertions(+), 25 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index afdeb16cd9..887ddc8e33 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,6 @@ -## Version 10.4.0-beta1 +## Version 10.4.0 -Parser: - -- enh(parser) use negative look-ahead for `beginKeywords` support (#2813) [Josh Goebel][] +A largish release with many improvements and fixes from quite a few different contributors. Enjoy! Deprecations: @@ -12,6 +10,8 @@ Deprecations: Parser: +- enh(parser) use negative look-ahead for `beginKeywords` support (#2813) [Josh Goebel][] +- enh(grammars) allow `classNameAliases` for more complex grammars [Josh Goebel][] - fix(vue): Language name now appears in CSS class (#2807) [Michael Rush][] - (chore) Clean up all regexs to be UTF-8 compliant/ready (#2759) [Josh Goebel][] @@ -60,10 +60,6 @@ Dev Improvements: - chore(dev) add theme picker to the tools/developer tool (#2770) [Josh Goebel][] - fix(dev) the Vue.js plugin no longer throws an exception when hljs is not in the global namespace [Kyle Brown][] -Parser: - -- enh(grammars) allow `classNameAliases` for more complex grammars [Josh Goebel][] - New themes: - *StackOverflow Dark* by [Jan Pilzer][] diff --git a/README.md b/README.md index 5e4745b9f9..111ee9181a 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Please read [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/ ##### Support for older versions -Please see [OLD_VERSIONS.md](https://github.com/highlightjs/highlight.js/blob/master/OLD_VERSIONS.md) for support information. +Please see [SECURITY.md](https://github.com/highlightjs/highlight.js/blob/master/SECURITY.md) for support information. ## Getting Started @@ -244,26 +244,26 @@ A prebuilt version of highlight.js bundled with many common languages is hosted ```html - + href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/styles/default.min.css"> + + src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/languages/go.min.js"> ``` **jsdelivr** ([link](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release)) ```html - + href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.0/build/styles/default.min.css"> + ``` **unpkg** ([link](https://unpkg.com/browse/@highlightjs/cdn-assets/)) ```html - - + + ``` **Note:** *The CDN-hosted `highlight.min.js` package doesn't bundle every language.* It would be diff --git a/SECURITY.md b/SECURITY.md index b6d96ba069..6a29f68bbd 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,16 +2,14 @@ ## Supported Versions -Due to both time and resource constrains the Highlight.js core team only fully supports the most current major/minor release of the library. Problems with prior minor releases are often solved by upgrading to the most recent minor release. Prior major release will only receive critical security updates (when feasible). +Due to both time and resource constrains the Highlight.js core team only fully supports the most current major/minor release of the library. Problems with prior minor releases are often resolved by upgrading to the most recent minor release. Prior major release will only receive critical security updates (when feasible). -| Version | | Status | +| Version | Supported | Status | | :-----: | :-: | :------ | -| 10.3.x | :white_check_mark: | The 10.x series recieves regular updates, new features & bug fixes. | -| <= 10.2.x | :x: | *Please upgrade to a more recent release.* | +| 10.4.x | :white_check_mark: | The 10.x series recieves regular updates, new features & bug fixes. | +| <= 10.3.x | :x: | *Please upgrade to the latest 10.x release.* | | 9.18.x | :closed_lock_with_key: | Security updates only. See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). | | <= 9.17.x | :x: | Obsolete. | -| 8.x | :x: | Obsolete. | -| 7.x | :x: | Obsolete. | | Older | :x: | Obsolete. | ### Version 9 diff --git a/docs/conf.py b/docs/conf.py index 1094886b3f..70f4fe120c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,7 +48,7 @@ # built documents. # The full version, including alpha/beta/rc tags. -release = '10.4.0-beta1' +release = '10.4.0' # The short X.Y version. version = ".".join(release.split(".")[:2]) diff --git a/docs/maintainers-guide.rst b/docs/maintainers-guide.rst index 950fde17d3..8b16073a77 100644 --- a/docs/maintainers-guide.rst +++ b/docs/maintainers-guide.rst @@ -31,6 +31,7 @@ The goal being that minor version series always get more stable over time and th * ``version`` attribute in package-lock.json (run `npm install`) * ``release`` variable in docs/conf.py * All mentions of version number in the README + * Update ``SECURITY.md`` version table * Commit the version changes and tag the commit with the version number (``10.4.0``, no "v" prefix or anything like that) diff --git a/package-lock.json b/package-lock.json index 2c5c7657f9..ac10403957 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "highlight.js", - "version": "10.4.0-beta1", + "version": "10.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c2d01c2609..ae9512e143 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "syntax" ], "homepage": "https://highlightjs.org/", - "version": "10.4.0-beta1", + "version": "10.4.0", "author": { "name": "Ivan Sagalaev", "email": "maniac@softwaremaniacs.org"