Updated JavaScriptEngineSwitcher and highlight.js (#269)

statiqdev · Jun 16, 2023 · bff830b · bff830b
1 parent 625bd47
commit bff830b
Show file tree

Hide file tree

Showing 10 changed files with 12,784 additions and 15,838 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,8 @@
+# 1.0.0-beta.71
+
+- Updated JavaScriptEngineSwitcher.Core and JavaScriptEngineSwitcher.Jint.
+- Updated `highlight.js` used in `Statiq.Highlight` (#269).
+
 # 1.0.0-beta.70
 
 - Updated Markdig to 0.31.0 to fix an upstream bug when using alt text on images (#267).

diff --git a/src/core/Statiq.Core/Statiq.Core.csproj b/src/core/Statiq.Core/Statiq.Core.csproj
@@ -4,8 +4,8 @@
     <PackageTags>Statiq Static StaticContent StaticSite Blog BlogEngine</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JavaScriptEngineSwitcher.Core" Version="3.19.0" />
-    <PackageReference Include="JavaScriptEngineSwitcher.Jint" Version="3.1.0" />
+    <PackageReference Include="JavaScriptEngineSwitcher.Core" Version="3.21.0" />
+    <PackageReference Include="JavaScriptEngineSwitcher.Jint" Version="3.21.2" />
     <PackageReference Include="JSPool" Version="2.0.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.18" />

diff --git a/src/core/Statiq.Testing.JavaScript/Statiq.Testing.JavaScript.csproj b/src/core/Statiq.Testing.JavaScript/Statiq.Testing.JavaScript.csproj
@@ -4,8 +4,8 @@
     <PackageTags>Statiq Static StaticContent StaticSite Blog BlogEngine</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JavaScriptEngineSwitcher.Core" Version="3.19.0" />
-    <PackageReference Include="JavaScriptEngineSwitcher.Jint" Version="3.1.0" />
+    <PackageReference Include="JavaScriptEngineSwitcher.Core" Version="3.21.0" />
+    <PackageReference Include="JavaScriptEngineSwitcher.Jint" Version="3.21.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Statiq.Common\Statiq.Common.csproj" />

diff --git a/src/extensions/Statiq.Highlight/HighlightCode.cs b/src/extensions/Statiq.Highlight/HighlightCode.cs
@@ -94,7 +94,7 @@ protected override async Task<IEnumerable<IDocument>> ExecuteContextAsync(IExecu
             {
                 if (string.IsNullOrWhiteSpace(_highlightJsFile))
                 {
-                    x.ExecuteResource("highlight-all.js", typeof(HighlightCode));
+                    x.ExecuteResource("highlight.js", typeof(HighlightCode));
                 }
                 else
                 {

diff --git a/src/extensions/Statiq.Highlight/HighlightShortcode.cs b/src/extensions/Statiq.Highlight/HighlightShortcode.cs
@@ -66,7 +66,7 @@ public override ShortcodeResult Execute(KeyValuePair<string, string>[] args, str
                 }
                 else
                 {
-                    x.ExecuteResource("highlight-all.js", typeof(Statiq.Highlight.HighlightCode));
+                    x.ExecuteResource("highlight.js", typeof(Statiq.Highlight.HighlightCode));
                 }
             }))
             {

diff --git a/src/extensions/Statiq.Highlight/README.md b/src/extensions/Statiq.Highlight/README.md
@@ -0,0 +1,31 @@
+To update `highlight.js` download a CDN copy from one of the standard CDNs listed at https://highlightjs.org/download/.
+
+All usages of `console` should be commented out (I.e. `console.log()`, etc.).
+
+It then needs a few tweaks to be compliant with the .NET regex engine:
+
+- for python replace
+  ```
+  const IDENT_RE = /[\p{XID_Start}_]\p{XID_Continue}*/u;
+  ```
+  with
+  ```
+  const IDENT_RE = /[a-zA-Z0-9_-]*/u;
+  ```
+  Note that `\p{XID_Start}` and `\p{XID_Continue}` are unicode character classes that are not supported by the .NET regex engine (at least at the time this was written). Replacing them with the equivalent character classes works well enough, but does result in a loss of parsing fidelity. More information is at https://perldoc.perl.org/perlrecharclass#Unicode-Properties.
+- for ada replace 
+  ```
+  var BAD_CHARS = '[]{}%#\'\"'
+  ```
+  with
+  ```
+  var BAD_CHARS = '{}%#\'\"'
+  ```
+- for lisp replace
+  ```
+  var MEC_RE = '\\|[^]*?\\|';
+  ```
+  with
+  ```
+  var MEC_RE = '\\|[\S\s]*?\\|';
+  ```
diff --git a/src/extensions/Statiq.Highlight/Statiq.Highlight.csproj b/src/extensions/Statiq.Highlight/Statiq.Highlight.csproj
@@ -4,10 +4,10 @@
     <PackageTags>Statiq Static StaticContent StaticSite Blog BlogEngine Highlight.js</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <None Remove="highlight-all.js" />
+    <None Remove="highlight.js" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="highlight-all.js" />
+    <EmbeddedResource Include="highlight.js" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\Statiq.Common\Statiq.Common.csproj" />