Merge branch 'main' into 1388-make-sas9-servername-configurable

Author: allanbowe

.github/workflows/run-tests-windows.yml

@@ -16,26 +16,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
           cache: npm
+
       - uses: ssciwr/doxygen-install@v1
         with:
-          version: "1.9.3"
-      # - name: Install Doxygen
-      #   run: choco install doxygen.install
-      #
-      # `choco install doxygen.install` is unreliable
-
-#      - name: Install Doxygen
-#        run: |
-#          git clone https://github.com/sasjs/doxygen-installer.git
-#          .\doxygen-installer\install.bat
-
-#      - name: Add doxygen to path
-#        run: echo "C:\Program Files\doxygen\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          version: '1.9.3'
 
       - name: Check doxygen version
         run: doxygen -v

.github/workflows/run-tests.yml

@@ -23,14 +23,13 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: npm
 
-#      - name: Check npm audit
-#        run: npm audit --production --audit-level=low
+      #      - name: Check npm audit
+      #        run: npm audit --production --audit-level=low
 
       - name: Install production dependencies (fail if any warning)
         run: |
           npm ci --omit=dev --ignore-scripts
-#          sh ./npm-production-install.sh
-
+      #          sh ./npm-production-install.sh
       - name: Install dependencies
         run: |
           npm config set registry http://registry.npmjs.org
@@ -62,6 +61,7 @@ jobs:
         uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          test-script: npx jest --config=jest.config.js --silent --runInBand --ci --coverage --testLocationInResults --json --outputFile="report.json"
 
       - name: install pm2 for process management
         run: npm i -g pm2

bin/sasjs

@@ -1,4 +1,3 @@
 #!/usr/bin/env node
 
-require = require("esm")(module /*, options*/);
-require("../src/cli").cli(process.argv);
+require("../src/cli").cli(process.argv);

jest.config.js

@@ -43,10 +43,10 @@ module.exports = {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      statements: 73.51,
-      branches: 60.57,
-      functions: 73.56,
-      lines: 74.12
+      statements: 73,
+      branches: 60.55,
+      functions: 73.54,
+      lines: 74
     }
   },