fix: add aegir

Author: hugomrdias

.aegir.js

@@ -2,11 +2,9 @@
 
 const EchoServer = require('aegir/utils/echo-server')
 const { format } =require('iso-url')
-const path = require('path')
 
 /** @type {import('aegir').Options["build"]["config"]} */
 const esbuild = {
-  //inject: [path.join(__dirname, '../../scripts/node-globals.js')],
   plugins: [
     {
       name: 'node built ins',
@@ -19,6 +17,7 @@ const esbuild = {
   ]
 }
 
+/** @type {import('aegir').PartialOptions} */
 module.exports = {
   build: {
     config: esbuild
@@ -29,13 +28,17 @@ module.exports = {
         buildConfig: esbuild
       }
     },
-    before: async () => {
+    async before (options) {
       let echoServer = new EchoServer()
       await echoServer.start()
       const { address, port } = echoServer.server.address()
+      let hostname = address
+      if(options.runner === 'react-native-android') {
+        hostname = '10.0.2.2'
+      }
       return {
         echoServer,
-        env: { ECHO_SERVER : format({ protocol: 'http:', hostname: address, port })}
+        env: { ECHO_SERVER : format({ protocol: 'http:', hostname, port })}
       }
     },
     async after (options, before) {

.github/workflows/main.yml

@@ -76,21 +76,21 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel
-          avd-name: google-pixel
+          avd-name: aegir-android-29
           script: |
-            npx rn-test --platform android --emulator google-pixel 'test/**/*.spec.js'
-  test-react-native-ios:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: npm install
-      - name: Create and run iOS simulator
-        run: |
-          SIMULATOR_RUNTIME=$(echo "iOS 14.4" | sed 's/[ \.]/-/g')
-          SIMULATOR_ID=$(xcrun simctl create "iPhone 11" com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.$SIMULATOR_RUNTIME)
-          echo "IOS_SIMULATOR=$SIMULATOR_ID" >> $GITHUB_ENV
-          xcrun simctl boot $SIMULATOR_ID &
-      - run: npx rn-test --platform ios --simulator 'iPhone 11 (14.4)' --rn 0.62.0 'test/**/*.spec.js'
-      - name: Shutdown iOS simulator
-        run: |
-          xcrun simctl shutdown $IOS_SIMULATOR
+            npx aegir test -t react-native-android'
+  # test-react-native-ios:
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - run: npm install
+  #     - name: Create and run iOS simulator
+  #       run: |
+  #         SIMULATOR_RUNTIME=$(echo "iOS 14.4" | sed 's/[ \.]/-/g')
+  #         SIMULATOR_ID=$(xcrun simctl create "iPhone 11" com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.$SIMULATOR_RUNTIME)
+  #         echo "IOS_SIMULATOR=$SIMULATOR_ID" >> $GITHUB_ENV
+  #         xcrun simctl boot $SIMULATOR_ID &
+  #     - run: npx rn-test --platform ios --simulator 'iPhone 11 (14.4)' --rn 0.62.0 'test/**/*.spec.js'
+  #     - name: Shutdown iOS simulator
+  #       run: |
+  #         xcrun simctl shutdown $IOS_SIMULATOR

package.json

@@ -59,7 +59,7 @@
     "is-electron": "^2.2.0",
     "iso-url": "^1.1.3",
     "it-glob": "~0.0.11",
-    "it-to-stream": "^0.1.2",
+    "it-to-stream": "^1.0.0",
     "merge-options": "^3.0.4",
     "nanoid": "^3.1.20",
     "native-abort-controller": "^1.0.3",
@@ -71,17 +71,17 @@
   "devDependencies": {
     "@types/err-code": "^2.0.0",
     "@types/fs-extra": "^9.0.5",
-    "aegir": "^32.2.0",
+    "aegir": "ipfs/aegir#feat/rn",
     "delay": "^5.0.0",
     "events": "^3.3.0",
     "ipfs-unixfs": "^4.0.1",
     "it-all": "^1.0.4",
     "it-drain": "^1.0.3",
     "it-last": "^1.0.4",
+    "react-native-polyfill-globals": "^3.0.0",
     "readable-stream": "^3.6.0",
     "uint8arrays": "^2.0.5",
-    "util": "^0.12.3",
-    "react-native-polyfill-globals": "^3.0.0"
+    "util": "^0.12.3"
   },
   "eslintConfig": {
     "extends": "ipfs",

src/http/error.js

@@ -18,7 +18,7 @@ exports.AbortError = AbortError
 
 class HTTPError extends Error {
   /**
-   * @param {import('native-fetch').Response} response
+   * @param {Response} response
    */
   constructor (response) {
     super(response.statusText)

tsconfig.json

@@ -2,13 +2,8 @@
     "extends": "aegir/src/config/tsconfig.aegir.json",
     "compilerOptions": {
         "outDir": "dist"
-        // "baseUrl": "./",
-        // "paths": {
-        //     "*": ["./types/*"]
-        // }
     },
     "include": [
-        // "types", 
         "test", 
         "src"
     ]