add support for node 18 (#118)

Author: regevbr

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
       - '**'
 
 env:
-  PRIMARY_NODE_VERSION: 16.x
+  PRIMARY_NODE_VERSION: 18.x
   PRIMARY_OS: ubuntu-latest
   REGISTRY: https://registry.npmjs.org/
 
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        node-version: [6.x, 8.x, 10.x, 12.x, 14.x, 16.x]
+        node-version: [6.x, 8.x, 10.x, 12.x, 14.x, 16.x, 18.x]
 
     steps:
 
@@ -44,23 +44,24 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-      - name: Get npm cache directory
-        id: npm-cache-dir
+
+      - name: Get yarn cache directory
+        id: yarn-cache-dir
         run: |
-          echo "::set-output name=dir::$(npm config get cache)"
+          echo "::set-output name=dir::$(yarn cache dir)"
 
       - uses: actions/cache@v2
-        id: npm-cache
+        id: yarn-cache
         with:
-          path: ${{ steps.npm-cache-dir.outputs.dir }}
-          key: ${{ matrix.os }}-${{ matrix.node-version }}-node
+          path: ${{ steps.yarn-cache-dir.outputs.dir }}
+          key: ${{ matrix.os }}-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            ${{ matrix.os }}-${{ matrix.node-version }}-node
+            ${{ matrix.os }}-${{ matrix.node-version }}-yarn-
 
       - name: Install dependencies and build
         run: |
-          npm install
-          npm run build
+          yarn install --frozen-lockfile
+          yarn build
 
       - name: Snyk security check
         if: matrix.node-version == env.PRIMARY_NODE_VERSION && matrix.os == env.PRIMARY_OS
@@ -74,11 +75,11 @@ jobs:
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:
-          coverageCommand: npm run cover
+          coverageCommand: yarn cover
 
       - name: Run unit tests
         if: "!(matrix.node-version == env.PRIMARY_NODE_VERSION && matrix.os == env.PRIMARY_OS)"
-        run: npm run test
+        run: yarn test
 
   publish_version:
     name: Publish
@@ -104,23 +105,23 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: ${{ env.REGISTRY }}
 
-      - name: Get npm cache directory
-        id: npm-cache-dir
+      - name: Get yarn cache directory
+        id: yarn-cache-dir
         run: |
-          echo "::set-output name=dir::$(npm config get cache)"
+          echo "::set-output name=dir::$(yarn cache dir)"
 
       - uses: actions/cache@v2
-        id: npm-cache
+        id: yarn-cache
         with:
-          path: ${{ steps.npm-cache-dir.outputs.dir }}
-          key: ${{ matrix.os }}-${{ matrix.node-version }}-node
+          path: ${{ steps.yarn-cache-dir.outputs.dir }}
+          key: ${{ matrix.os }}-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            ${{ matrix.os }}-${{ matrix.node-version }}-node
+            ${{ matrix.os }}-${{ matrix.node-version }}-yarn-
 
       - name: Install dependencies and build
         run: |
-          npm install
-          npm run build
+          yarn install --frozen-lockfile
+          yarn build
 
       - name: Publish
         uses: JS-DevTools/npm-publish@v1

.gitignore

@@ -4,12 +4,13 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-
+packages
 # Runtime data
 pids
 *.pid
 *.seed
 *.pid.lock
+package-lock.json
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

.npmrc

@@ -1,20 +1,20 @@
 {
   "name": "squiss-ts",
-  "version": "4.2.2",
+  "version": "4.3.0",
   "description": "High-volume SQS poller",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": "^6 || ^8 || ^10 || ^12 || ^14 || ^16"
+    "node": "^6 || ^8 || ^10 || ^12 || ^14 || ^16 || ^18"
   },
   "scripts": {
-    "postinstall": "node -e \"const semver = require('semver');process.exit(semver.lt(process.version, '10.16.0'));\" || npm install --no-save iltorb@2.4.3",
+    "postinstall": " node -e \"const semver = require('semver');const relevant = semver.lt(process.version, '10.16.0');if (relevant == false) {process.exit(0);}try {require('iltorb'); process.exit(0);} catch (err){process.exit(1);}\" || yarn add --pure-lockfile --ignore-engines iltorb@2.4.3",
     "clean": "rm -rf node_modules build coverage dist",
-    "build": "npm run lint && npm run compile",
+    "build": "yarn lint && yarn compile",
     "compile": "tsc",
-    "test": "npm run lint && npm run mocha",
+    "test": "yarn lint && yarn mocha",
     "mocha": "_mocha --opts src/test/mocha.opts",
-    "cover": "nyc --reporter=lcov --reporter=text-summary npm run test",
+    "cover": "nyc --reporter=lcov --reporter=text-summary npm run mocha",
     "lint": "tslint -c tslint.json \"src/**/*.ts\" \"test/**/*.ts\""
   },
   "repository": {
@@ -47,9 +47,9 @@
   },
   "homepage": "https://github.com/PruvoNet/squiss-ts#readme",
   "dependencies": {
-    "aws-sdk": "^2.720.0",
+    "aws-sdk": "2.814.0",
     "linked-list": "^2.1.0",
-    "semver": "7.3.5",
+    "semver": "6.3.0",
     "ts-type-guards": "^0.7.0",
     "uuid": "^8.3.2"
   },
@@ -70,11 +70,11 @@
     "mocha": "6.2.2",
     "nyc": "14.1.1",
     "proxyquire": "^2.1.3",
-    "sinon": "^9.0.2",
+    "sinon": "^7.5.0",
     "sinon-chai": "^3.5.0",
     "source-map-support": "^0.5.19",
-    "ts-node": "^9.1.1",
-    "tslint": "^6.1.2",
-    "typescript": "^4.3.5"
+    "ts-node": "^8.10.2",
+    "tslint": "^6.1.3",
+    "typescript": "4.6.4"
   }
 }