Merge pull request #59 from jaredwray/moving-to-nodejs-20-and-22.-removing-support-for-18

moving to nodejs 20 and 22. removing support for 18

Author: jaredwray

.github/workflows/code-coverage.yml

@@ -0,0 +1,36 @@
+name: code-coverage
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  code-coverage:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: ['20']
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Install Dependencies
+      run: npm install
+
+    - name: Testing    
+      run: npm run test:ci
+
+    - name: Code Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        token: ${{ secrets.CODECOV_KEY }}
+        verbose: true

.github/workflows/codeql.yml

@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: "codeql"
 
 on:
   push:

.github/workflows/deploy-site.yml

@@ -12,15 +12,15 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18]
+        node-version: ['20']
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Test
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 

.github/workflows/release.yml

@@ -6,18 +6,18 @@ on:
     types: [released]
 
 jobs:
-  build:
+  setup-build-release:
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [18]
+        node-version: ['20']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 

.github/workflows/tests.yaml

@@ -8,29 +8,23 @@ on:
     branches: [ main ]
 
 jobs:
-  build:
+  setup-build-tests:
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: ['18', '20']
+        node-version: ['20', '22']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 
     - name: Install Dependencies
       run: npm install
 
     - name: Testing    
-      run: npm run test:ci
-
-    - name: Code Coverage
-      uses: codecov/codecov-action@v3
-      with:
-        token: ${{ secrets.CODECOV_KEY }}
-        verbose: true
+      run: npm run test:ci

.nvmrc

@@ -1 +1 @@
-18
+20

package.json

@@ -103,7 +103,7 @@
     "require": "./index.js"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=20"
   },
   "scripts": {
     "test": "c8 mocha --reporter list",
@@ -129,7 +129,7 @@
     "handlebars-utils": "^1.0.6",
     "has-value": "^2.0.2",
     "helper-date": "^1.0.1",
-    "highlight.js": "^11.9.0",
+    "highlight.js": "^11.10.0",
     "html-tag": "^2.0.0",
     "is-even": "^1.0.0",
     "is-glob": "^4.0.3",

test/md.js

@@ -130,7 +130,11 @@ describe('highlight:', function(argument) {
       highlight: function(code, lang) {
         try {
           try {
-            return hljs.highlight(lang, code).value;
+            if(lang) {
+            return hljs.highlight(code,{language: lang}).value;
+            } else {
+              return hljs.highlightAuto(code).value;
+            }
           } catch (err) {
             if (!/Unknown language/i.test(err.message)) {
               throw err;