chore: update aegir (#425)

Removes boilerplate config that isn't needed any more.
libp2p · Apr 8, 2022 · 1cb62cb · 1cb62cb
1 parent c2c0fe5
commit 1cb62cb
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "build": "lerna run build",
     "lint": "lerna run lint",
     "dep-check": "lerna run dep-check",
-    "release": "lerna exec --concurrency 1 -- semantic-release -e semantic-release-monorepo"
+    "release": "lerna run --concurrency 1 release -- --"
   },
   "dependencies": {
     "lerna": "^4.0.0",

diff --git a/packages/webrtc-star-protocol/package.json b/packages/webrtc-star-protocol/package.json
@@ -121,15 +121,17 @@
     ]
   },
   "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",
+    "release": "aegir release"
   },
   "dependencies": {
     "@multiformats/multiaddr": "^10.1.7",
     "socket.io-client": "^4.1.2"
   },
   "devDependencies": {
-    "aegir": "^36.1.3"
+    "aegir": "^37.0.7"
   }
 }
diff --git a/.../webrtc-star-signalling-server/.aegir.cjs → ...s/webrtc-star-signalling-server/.aegir.js b/.../webrtc-star-signalling-server/.aegir.cjs → ...s/webrtc-star-signalling-server/.aegir.js
@@ -1,5 +1,3 @@
-'use strict'
-
 let firstRun = true
 let sigServers = []
 
@@ -41,9 +39,12 @@ async function stop () {
 }
 
 /** @type {import('aegir').PartialOptions} */
-module.exports = {
+export default {
   test: {
     before: boot,
     after: stop
+  },
+  build: {
+    bundle: false
   }
 }
diff --git a/packages/webrtc-star-signalling-server/package.json b/packages/webrtc-star-signalling-server/package.json
@@ -126,18 +126,19 @@
     ]
   },
   "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\"",
-    "test:node": "npm run test -- -t node --cov",
-    "start": "node src/sig-server/bin.js"
+    "dep-check": "aegir dep-check",
+    "build": "aegir build",
+    "test": "aegir test -t node",
+    "test:node": "aegir test -t node --cov",
+    "start": "node src/sig-server/bin.js",
+    "release": "aegir release"
   },
   "dependencies": {
     "@hapi/hapi": "^20.0.0",
     "@hapi/inert": "^6.0.3",
-    "@libp2p/logger": "^1.1.2",
+    "@libp2p/logger": "^1.1.3",
     "@libp2p/webrtc-star-protocol": "^1.0.0",
     "@multiformats/multiaddr": "^10.1.7",
     "menoetius": "0.0.3",
@@ -149,7 +150,7 @@
   "devDependencies": {
     "@types/hapi__hapi": "^20.0.10",
     "@types/hapi__inert": "^5.2.3",
-    "aegir": "^36.1.3",
+    "aegir": "^37.0.7",
     "p-event": "^5.0.1",
     "p-wait-for": "^4.1.0",
     "socket.io-client-v2": "npm:socket.io-client@^2.3.0",

diff --git a/packages/webrtc-star-signalling-server/test/sig-server.ts b/packages/webrtc-star-signalling-server/test/sig-server.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 { SigServer, sigServer } from '../src/index.js'
 import pWaitFor from 'p-wait-for'

diff --git a/packages/webrtc-star-transport/.aegir.cjs → packages/webrtc-star-transport/.aegir.js b/packages/webrtc-star-transport/.aegir.cjs → packages/webrtc-star-transport/.aegir.js
@@ -1,13 +1,13 @@
-'use strict'
-
 // TODO: Temporary fix per wrtc issue
 // https://github.com/node-webrtc/node-webrtc/issues/636#issuecomment-774171409
 process.on('beforeExit', (code) => process.exit(code))
 
+import { sigServer } from '@libp2p/webrtc-star-signalling-server'
+
 let firstRun = true
 
 /** @type {import('aegir').PartialOptions} */
-module.exports = {
+export default {
   test: {
     async before () {
       const options1 = {
@@ -32,7 +32,6 @@ module.exports = {
         firstRun = false
       }
 
-      const { sigServer } = await import('@libp2p/webrtc-star-signalling-server')
       const sigServers = []
 
       sigServers.push(await sigServer(options1))

diff --git a/packages/webrtc-star-transport/package.json b/packages/webrtc-star-transport/package.json
@@ -121,23 +121,24 @@
     ]
   },
   "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/**/*.spec.js\"",
-    "test:node": "npm run test -- -t node -f ./dist/test/node.js ",
-    "test:chrome": "npm run test -- -t browser -f ./dist/test/browser.js ",
-    "test:firefox": "npm run test -- -t browser -- --browser firefox -f ./dist/test/browser.js",
+    "dep-check": "aegir dep-check",
+    "build": "aegir build",
+    "test": "aegir test",
+    "test:node": "aegir test -t node -f ./dist/test/node.js --cov",
+    "test:chrome": "aegir test -t browser -f ./dist/test/browser.js --cov",
+    "test:firefox": "aegir test -t browser -- --browser firefox -f ./dist/test/browser.js",
     "test:dns": "WEBRTC_STAR_REMOTE_SIGNAL_DNS=1 aegir test -t browser",
-    "test:ip": "WEBRTC_STAR_REMOTE_SIGNAL_IP=1 aegir test -t browser"
+    "test:ip": "WEBRTC_STAR_REMOTE_SIGNAL_IP=1 aegir test -t browser",
+    "release": "aegir release"
   },
   "dependencies": {
-    "@libp2p/interfaces": "^1.3.15",
-    "@libp2p/logger": "^1.1.2",
-    "@libp2p/peer-id": "^1.1.8",
-    "@libp2p/utils": "^1.0.9",
-    "@libp2p/webrtc-peer": "^1.0.2",
+    "@libp2p/interfaces": "^1.3.20",
+    "@libp2p/logger": "^1.1.3",
+    "@libp2p/peer-id": "^1.1.9",
+    "@libp2p/utils": "^1.0.10",
+    "@libp2p/webrtc-peer": "^1.0.5",
     "@libp2p/webrtc-star-protocol": "^1.0.0",
     "@multiformats/mafmt": "^11.0.2",
     "@multiformats/multiaddr": "^10.1.7",
@@ -153,10 +154,11 @@
     "socket.io-client": "^4.1.2"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "^1.1.17",
+    "@libp2p/interface-compliance-tests": "^1.1.21",
+    "@libp2p/peer-id-factory": "^1.0.9",
     "@libp2p/webrtc-star-signalling-server": "^1.0.0",
     "@mapbox/node-pre-gyp": "^1.0.5",
-    "aegir": "^36.1.3",
+    "aegir": "^37.0.7",
     "electron-webrtc": "~0.3.0",
     "it-all": "^1.0.5",
     "p-wait-for": "^4.1.0",

diff --git a/packages/webrtc-star-transport/test/transport/dial.ts b/packages/webrtc-star-transport/test/transport/dial.ts
@@ -1,5 +1,5 @@
 /* eslint-env mocha */
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { pipe } from 'it-pipe'
 import all from 'it-all'

diff --git a/packages/webrtc-star-transport/test/transport/discovery.ts b/packages/webrtc-star-transport/test/transport/discovery.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 { pEvent } from 'p-event'
 import { cleanUrlSIO } from '../../src/utils.js'

diff --git a/packages/webrtc-star-transport/test/transport/filter.ts b/packages/webrtc-star-transport/test/transport/filter.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 type { WebRTCStar } from '../../src/index.js'
 

diff --git a/packages/webrtc-star-transport/test/transport/instance.spec.ts b/packages/webrtc-star-transport/test/transport/instance.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { WebRTCStar } from '../../src/index.js'
 
 describe('instantiate the transport', () => {

diff --git a/packages/webrtc-star-transport/test/transport/listen.ts b/packages/webrtc-star-transport/test/transport/listen.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 { pEvent } from 'p-event'
 import type { WebRTCStar } from '../../src/index.js'

diff --git a/packages/webrtc-star-transport/test/transport/multiple-signal-servers.ts b/packages/webrtc-star-transport/test/transport/multiple-signal-servers.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 { pipe } from 'it-pipe'
 import type { WebRTCStar } from '../../src/index.js'

diff --git a/packages/webrtc-star-transport/test/transport/reconnect.node.ts b/packages/webrtc-star-transport/test/transport/reconnect.node.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 { sigServer } from '@libp2p/webrtc-star-signalling-server'
 import { pEvent } from 'p-event'

diff --git a/packages/webrtc-star-transport/test/transport/track.ts b/packages/webrtc-star-transport/test/transport/track.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 /* eslint-disable no-console */
 
-import { expect } from 'aegir/utils/chai.js'
+import { expect } from 'aegir/chai'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { pipe } from 'it-pipe'
 import pWaitFor from 'p-wait-for'

diff --git a/packages/webrtc-star-transport/test/utils.spec.ts b/packages/webrtc-star-transport/test/utils.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 { cleanMultiaddr, cleanUrlSIO } from '../src/utils.js'