chore: update ci commands and benchmarks

Author: achingbrain

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
       - run: yarn --prefer-offline --frozen-lockfile
-      - run: npx aegir test -t node --bail --cov
+      - run: npm run test:node -- --bail --cov
       - uses: codecov/codecov-action@v1
 
   test-chrome:
@@ -78,7 +78,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
       - run: yarn --prefer-offline --frozen-lockfile
-      - run: npx aegir test -t browser -t webworker --bail
+      - run: npm run test:browser -- --bail
 
   test-firefox:
     name: Test Firefox
@@ -100,7 +100,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
       - run: yarn --prefer-offline --frozen-lockfile
-      - run: npx aegir test -t browser -t webworker --bail -- --browser firefox
+      - run: npm run test:browser -- --bail -- --browser firefox
 
   test-webkit:
     name: Test Webkit
@@ -123,7 +123,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
       - run: yarn --prefer-offline --frozen-lockfile
-      - run: npx aegir test -t browser -t webworker --bail -- --browser webkit
+      - run: npm run test:browser -- --bail -- --browser webkit
 
   test-electron-main:
     name: Test Electron Main
@@ -145,28 +145,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
       - run: yarn --prefer-offline --frozen-lockfile
-      - run: npx xvfb-maybe aegir test -t electron-main --bail
-
-  test-electron-renderer:
-    name: Test Electron Renderer
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - uses: actions/checkout@v2
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - run: yarn --prefer-offline --frozen-lockfile
-      - run: npx xvfb-maybe aegir test -t electron-renderer --bail
-        env:
-          ESBUILD_WORKER_THREADS: 0
+      - run: npm run test:electron-main -- --bail

benchmarks/benchmark.js

@@ -1,9 +1,9 @@
 /* eslint-disable */
 
-const { Noise } = require('../dist/src/index')
-const benchmark = require('benchmark')
-const { duplexPair } = require('it-pair/duplex')
-const { createFromJSON } = require('@libp2p/peer-id-factory')
+import { Noise } from '../dist/src/index.js'
+import benchmark from 'benchmark'
+import { duplexPair } from 'it-pair/duplex'
+import { createFromJSON } from '@libp2p/peer-id-factory'
 
 const bench = async function () {
   console.log('Initializing handshake benchmark')

package.json

@@ -34,7 +34,8 @@
     "pretest": "yarn run check",
     "test": "aegir test -f \"./dist/test/**/*.spec.js\"",
     "test:node": "npm run test -- -t node",
-    "test:browser": "npm run test -- -t browser",
+    "test:browser": "npm run test -- -t browser -t webworker",
+    "test:electron-main": "npm run test -- -t electron-main",
     "docs": "aegir docs",
     "proto:gen": "pbjs -t static-module -w es6 -r libp2p-noise -o ./src/proto/payload.js ./src/proto/payload.proto && pbts -o ./src/proto/payload.d.ts ./src/proto/payload.js"
   },