From 8ab109755160f0bf4beb9bdba3e5d1db2779e9fd Mon Sep 17 00:00:00 2001
From: Alex Potsides <alex@achingbrain.net>
Date: Thu, 7 Apr 2022 15:15:06 +0100
Subject: [PATCH] chore: update aegir (#62)

Updates to the latest aegir and removes boilerplate config
---
 .aegir.js                   |  9 +++++++++
 package.json                | 11 ++++++-----
 src/connect.ts              |  2 +-
 src/dht/content-fetching.ts |  2 +-
 src/dht/content-routing.ts  |  2 +-
 src/dht/peer-routing.ts     |  2 +-
 src/pubsub/floodsub.ts      |  2 +-
 src/pubsub/gossipsub.ts     |  2 +-
 src/pubsub/hybrid.ts        |  2 +-
 tsconfig.json               |  5 +----
 10 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 .aegir.js

diff --git a/.aegir.js b/.aegir.js
new file mode 100644
index 0000000..35647b8
--- /dev/null
+++ b/.aegir.js
@@ -0,0 +1,9 @@
+
+export default {
+  build: {
+    config: {
+      platform: 'node'
+    },
+    bundlesizeMax: '31KB'
+  }
+}
diff --git a/package.json b/package.json
index 2c722f8..d111e20 100644
--- a/package.json
+++ b/package.json
@@ -119,11 +119,12 @@
     ]
   },
   "scripts": {
+    "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
-    "build": "tsc",
+    "dep-check": "aegir dep-check",
+    "build": "aegir build",
     "postbuild": "cp src/resources/keys/*.key dist/src/resources/keys",
-    "release": "semantic-release"
+    "release": "aegir release"
   },
   "dependencies": {
     "@libp2p/daemon-client": "^0.0.2",
@@ -138,9 +139,9 @@
     "uint8arrays": "^3.0.0"
   },
   "peerDependencies": {
-    "aegir": "^36.0.0"
+    "aegir": "^37.0.4"
   },
   "devDependencies": {
-    "aegir": "^36.0.0"
+    "aegir": "^37.0.4"
   }
 }
diff --git a/src/connect.ts b/src/connect.ts
index 89918d7..80de62c 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -1,4 +1,4 @@
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import type { Daemon, NodeType, SpawnOptions, DaemonFactory, PeerIdType } from './index.js'
 import { keys } from './resources/keys/index.js'
 
diff --git a/src/dht/content-fetching.ts b/src/dht/content-fetching.ts
index ebeea88..5a86855 100644
--- a/src/dht/content-fetching.ts
+++ b/src/dht/content-fetching.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
diff --git a/src/dht/content-routing.ts b/src/dht/content-routing.ts
index 5a86a8d..0166d2a 100644
--- a/src/dht/content-routing.ts
+++ b/src/dht/content-routing.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { CID } from 'multiformats/cid'
 import all from 'it-all'
 import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js'
diff --git a/src/dht/peer-routing.ts b/src/dht/peer-routing.ts
index 6e9d2a1..555187d 100644
--- a/src/dht/peer-routing.ts
+++ b/src/dht/peer-routing.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js'
 import pRetry from 'p-retry'
 import type { PeerInfo } from '@libp2p/interfaces/peer-info'
diff --git a/src/pubsub/floodsub.ts b/src/pubsub/floodsub.ts
index be6cc19..525298f 100644
--- a/src/pubsub/floodsub.ts
+++ b/src/pubsub/floodsub.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import first from 'it-first'
diff --git a/src/pubsub/gossipsub.ts b/src/pubsub/gossipsub.ts
index b9d7cc9..794cabb 100644
--- a/src/pubsub/gossipsub.ts
+++ b/src/pubsub/gossipsub.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import first from 'it-first'
diff --git a/src/pubsub/hybrid.ts b/src/pubsub/hybrid.ts
index 0df422b..beba327 100644
--- a/src/pubsub/hybrid.ts
+++ b/src/pubsub/hybrid.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import first from 'it-first'
diff --git a/tsconfig.json b/tsconfig.json
index b1f3cc8..5fe8ea4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,7 @@
 {
   "extends": "aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "emitDeclarationOnly": false,
-    "module": "ES2020",
-    "lib": ["ES2021", "ES2021.Promise", "ES2021.String", "ES2020.BigInt", "DOM", "DOM.Iterable"],
+    "outDir": "dist"
   },
   "include": [
     "src"