From 34f1fde4310c6571e90a6d312924146e089b5a9d Mon Sep 17 00:00:00 2001
From: Alex Potsides <alex@achingbrain.net>
Date: Thu, 7 Apr 2022 14:31:51 +0100
Subject: [PATCH] chore: update aegir (#39)

Updates to the latest aegir, removes boilerplate config that's now been pushed into aegir.
---
 .gitignore                         |  1 +
 package.json                       | 31 ++++++++++++++++--------------
 src/index.ts                       |  1 +
 test/address-sort.spec.ts          |  2 +-
 test/array-equals.spec.ts          |  2 +-
 test/ip-port-to-multiaddr.spec.ts  |  2 +-
 test/multiaddr/is-loopback.spec.ts |  2 +-
 test/multiaddr/is-private.spec.ts  |  2 +-
 test/stream-to-ma-conn.spec.ts     |  2 +-
 tsconfig.json                      |  4 +---
 10 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 src/index.ts

diff --git a/.gitignore b/.gitignore
index ce9a4d1..7d3286a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ pids
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
+.nyc_output
 
 # Coverage directory used by tools like istanbul
 coverage
diff --git a/package.json b/package.json
index 12f180e..484c376 100644
--- a/package.json
+++ b/package.json
@@ -156,18 +156,18 @@
     ]
   },
   "scripts": {
+    "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
-    "build": "tsc",
-    "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test/*.js -f ./dist/test/**/*.js",
-    "test:chrome": "npm run test -- -t browser --cov",
-    "test:chrome-webworker": "npm run test -- -t webworker",
-    "test:firefox": "npm run test -- -t browser -- --browser firefox",
-    "test:firefox-webworker": "npm run test -- -t webworker -- --browser firefox",
-    "test:node": "npm run test -- -t node --cov",
-    "test:electron-main": "npm run test -- -t electron-main",
-    "release": "semantic-release"
+    "dep-check": "aegir dep-check",
+    "build": "aegir build",
+    "test": "aegir test",
+    "test:chrome": "aegir test -t browser --cov",
+    "test:chrome-webworker": "aegir test -t webworker",
+    "test:firefox": "aegir test -t browser -- --browser firefox",
+    "test:firefox-webworker": "aegir test -t webworker -- --browser firefox",
+    "test:node": "aegir test -t node --cov",
+    "test:electron-main": "aegir test -t electron-main",
+    "release": "aegir release"
   },
   "dependencies": {
     "@achingbrain/ip-address": "^8.1.0",
@@ -177,13 +177,16 @@
     "err-code": "^3.0.1",
     "is-loopback-addr": "^2.0.1",
     "it-stream-types": "^1.0.4",
-    "private-ip": "^2.1.1"
+    "private-ip": "^2.1.1",
+    "ts-mocha": "^9.0.2",
+    "ts-node": "^10.7.0"
   },
   "devDependencies": {
     "@libp2p/interfaces": "^1.0.3",
-    "aegir": "^36.1.2",
+    "aegir": "^37.0.4",
     "it-all": "^1.0.6",
     "it-pair": "^2.0.2",
-    "it-pipe": "^2.0.2"
+    "it-pipe": "^2.0.2",
+    "uint8arrays": "^3.0.0"
   }
 }
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 0000000..336ce12
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1 @@
+export {}
diff --git a/test/address-sort.spec.ts b/test/address-sort.spec.ts
index eb7aaf4..258b0e2 100644
--- a/test/address-sort.spec.ts
+++ b/test/address-sort.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { publicAddressesFirst } from '../src/address-sort.js'
 
diff --git a/test/array-equals.spec.ts b/test/array-equals.spec.ts
index 6aa3977..6d54d23 100644
--- a/test/array-equals.spec.ts
+++ b/test/array-equals.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { arrayEquals } from '../src/array-equals.js'
 
diff --git a/test/ip-port-to-multiaddr.spec.ts b/test/ip-port-to-multiaddr.spec.ts
index 39e5897..2e16317 100644
--- a/test/ip-port-to-multiaddr.spec.ts
+++ b/test/ip-port-to-multiaddr.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { ipPortToMultiaddr, Errors } from '../src/ip-port-to-multiaddr.js'
 
 describe('IP and port to Multiaddr', () => {
diff --git a/test/multiaddr/is-loopback.spec.ts b/test/multiaddr/is-loopback.spec.ts
index 4431962..d8b918c 100644
--- a/test/multiaddr/is-loopback.spec.ts
+++ b/test/multiaddr/is-loopback.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { isLoopback } from '../../src/multiaddr/is-loopback.js'
 
diff --git a/test/multiaddr/is-private.spec.ts b/test/multiaddr/is-private.spec.ts
index dcfe813..3a2070f 100644
--- a/test/multiaddr/is-private.spec.ts
+++ b/test/multiaddr/is-private.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { isPrivate } from '../../src/multiaddr/is-private.js'
 
diff --git a/test/stream-to-ma-conn.spec.ts b/test/stream-to-ma-conn.spec.ts
index 39978d1..0f6888d 100644
--- a/test/stream-to-ma-conn.spec.ts
+++ b/test/stream-to-ma-conn.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { pair } from 'it-pair'
 import { pipe } from 'it-pipe'
 import { Multiaddr } from '@multiformats/multiaddr'
diff --git a/tsconfig.json b/tsconfig.json
index f296f99..13a3599 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,9 +1,7 @@
 {
   "extends": "aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "emitDeclarationOnly": false,
-    "module": "ES2020"
+    "outDir": "dist"
   },
   "include": [
     "src",