10.4.0 release

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][]

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
 <link rel="stylesheet"
-      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/styles/default.min.css">
-<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/highlight.min.js"></script>
+      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/styles/default.min.css">
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/highlight.min.js"></script>
 <!-- and it's easy to individually load additional languages -->
 <script charset="UTF-8"
- src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.2/languages/go.min.js"></script>
+ src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/languages/go.min.js"></script>
 ```
 
 **jsdelivr** ([link](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release))
 
 ```html
 <link rel="stylesheet"
-      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/styles/default.min.css">
-<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/highlight.min.js"></script>
+      href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.0/build/styles/default.min.css">
+<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.4.0/build/highlight.min.js"></script>
 ```
 
 **unpkg** ([link](https://unpkg.com/browse/@highlightjs/cdn-assets/))
 
 ```html
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.3.1/styles/default.min.css">
-<script src="https://unpkg.com/@highlightjs/cdn-assets@10.3.1/highlight.min.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@10.4.0/styles/default.min.css">
+<script src="https://unpkg.com/@highlightjs/cdn-assets@10.4.0/highlight.min.js"></script>
 ```
 
 **Note:** *The CDN-hosted `highlight.min.js` package doesn't bundle every language.* It would be

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

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])
 

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)
 

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"