From afae65d090a7d586b0120c31108bd2f2af866e4f Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Wed, 28 Jul 2021 20:09:28 +0100 Subject: [PATCH 1/7] chore: update uint8arrays --- package.json | 3 +-- src/http.js | 2 ++ test/http.spec.js | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a13b7a0..e63fc98 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ }, "repository": "github:ipfs/js-ipfs-utils", "scripts": { - "prepare": "aegir build --no-bundle", "test": "aegir test", "test:browser": "aegir test -t browser", "test:node": "aegir test -t node", @@ -77,7 +76,7 @@ "it-last": "^1.0.4", "react-native-polyfill-globals": "^3.0.0", "readable-stream": "^3.6.0", - "uint8arrays": "^2.0.5", + "@vascosantos/uint8arrays": "^3.0.3", "util": "^0.12.3" }, "eslintConfig": { diff --git a/src/http.js b/src/http.js index 9ce142c..437f241 100644 --- a/src/http.js +++ b/src/http.js @@ -122,6 +122,8 @@ class HTTP { headers.set('content-type', 'application/json') } + /** @type {AbortController} */ + // @ts-ignore Type 'AbortController | AbortController' is not assignable to type 'AbortController'. const abortController = new AbortController() // @ts-ignore const signal = anySignal([abortController.signal, opts.signal]) diff --git a/test/http.spec.js b/test/http.spec.js index 7e48c1f..13285b3 100644 --- a/test/http.spec.js +++ b/test/http.spec.js @@ -11,9 +11,9 @@ const drain = require('it-drain') const all = require('it-all') const { isBrowser, isWebWorker, isReactNative } = require('../src/env') const { Buffer } = require('buffer') -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayEquals = require('uint8arrays/equals') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { equals: uint8ArrayEquals } = require('@vascosantos/uint8arrays/equals') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const ECHO_SERVER = process.env.ECHO_SERVER || '' From 3c87899fe6ca271ec6447c485cb2651b6883176a Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Wed, 11 Aug 2021 14:56:01 +0200 Subject: [PATCH 2/7] chore: update aegir --- package.json | 2 +- src/http.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index e63fc98..23bda41 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "stream-to-it": "^0.2.2" }, "devDependencies": { - "aegir": "^33.2.0", + "aegir": "^34.1.0", "delay": "^5.0.0", "events": "^3.3.0", "ipfs-unixfs": "^4.0.1", diff --git a/src/http.js b/src/http.js index 437f241..9ce142c 100644 --- a/src/http.js +++ b/src/http.js @@ -122,8 +122,6 @@ class HTTP { headers.set('content-type', 'application/json') } - /** @type {AbortController} */ - // @ts-ignore Type 'AbortController | AbortController' is not assignable to type 'AbortController'. const abortController = new AbortController() // @ts-ignore const signal = anySignal([abortController.signal, opts.signal]) From d85014d1a4eefda8d1b4735d0e319807ccf83a6d Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 16 Aug 2021 15:10:03 +0200 Subject: [PATCH 3/7] chore: revert uint8arrays fork --- package.json | 2 +- test/http.spec.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 23bda41..e23b774 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "it-last": "^1.0.4", "react-native-polyfill-globals": "^3.0.0", "readable-stream": "^3.6.0", - "@vascosantos/uint8arrays": "^3.0.3", + "uint8arrays": "^3.0.0-rc.0", "util": "^0.12.3" }, "eslintConfig": { diff --git a/test/http.spec.js b/test/http.spec.js index 13285b3..d361e2e 100644 --- a/test/http.spec.js +++ b/test/http.spec.js @@ -11,9 +11,9 @@ const drain = require('it-drain') const all = require('it-all') const { isBrowser, isWebWorker, isReactNative } = require('../src/env') const { Buffer } = require('buffer') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { equals: uint8ArrayEquals } = require('@vascosantos/uint8arrays/equals') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { equals: uint8ArrayEquals } = require('uint8arrays/equals') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const ECHO_SERVER = process.env.ECHO_SERVER || '' From b14dad97f66d55cd4e6bdc30107acbe8606b420e Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 16 Aug 2021 16:20:23 +0200 Subject: [PATCH 4/7] chore: update aegir Co-authored-by: Alex Potsides --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e23b774..2f0928b 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "stream-to-it": "^0.2.2" }, "devDependencies": { - "aegir": "^34.1.0", + "aegir": "^35.0.1", "delay": "^5.0.0", "events": "^3.3.0", "ipfs-unixfs": "^4.0.1", From 4ee5760d756c8fe083d54158cc794c351e6d6bc5 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 16 Aug 2021 21:11:02 +0200 Subject: [PATCH 5/7] chore: tmp use older bundle size action --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac68404..248b1b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: - uses: gozala/typescript-error-reporter-action@v1.0.8 - run: npx aegir build - run: npx aegir dep-check - - uses: ipfs/aegir/actions/bundle-size@master + - uses: ipfs/aegir/actions/bundle-size@v34.1.0 name: size with: github_token: ${{ secrets.GITHUB_TOKEN }} From 3f40913733dd007d85e1c98da1a2d41e8e719839 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Tue, 17 Aug 2021 10:21:40 +0200 Subject: [PATCH 6/7] chore: use final uint8arrays --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f0928b..61dee3b 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "it-last": "^1.0.4", "react-native-polyfill-globals": "^3.0.0", "readable-stream": "^3.6.0", - "uint8arrays": "^3.0.0-rc.0", + "uint8arrays": "^3.0.0", "util": "^0.12.3" }, "eslintConfig": { From e50780de496f3a116d0158ef626b89e9a85f2c19 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Thu, 19 Aug 2021 09:29:53 +0200 Subject: [PATCH 7/7] chore: use bundle action master version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 248b1b6..ac68404 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: - uses: gozala/typescript-error-reporter-action@v1.0.8 - run: npx aegir build - run: npx aegir dep-check - - uses: ipfs/aegir/actions/bundle-size@v34.1.0 + - uses: ipfs/aegir/actions/bundle-size@master name: size with: github_token: ${{ secrets.GITHUB_TOKEN }}