From 061f7245062b26cd0f6bbf5b04fec65526864f3a Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Thu, 12 Mar 2020 11:48:38 +0000 Subject: [PATCH 1/3] fix: dont include util.textencoder in the browser node 10 only has textencoder inside util and not in the global var so we need to do the standard node/browser swap to avoid including node util in the browser --- packages/ipfs-utils/package.json | 3 ++- packages/ipfs-utils/src/http.js | 2 +- packages/ipfs-utils/src/text-encoder.browser.js | 5 +++++ packages/ipfs-utils/src/text-encoder.js | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 packages/ipfs-utils/src/text-encoder.browser.js create mode 100644 packages/ipfs-utils/src/text-encoder.js diff --git a/packages/ipfs-utils/package.json b/packages/ipfs-utils/package.json index feeabb8a05..40c465b6d4 100644 --- a/packages/ipfs-utils/package.json +++ b/packages/ipfs-utils/package.json @@ -54,6 +54,7 @@ "Marcin Rataj " ], "browser": { - "fs-extra": false + "fs-extra": false, + "./src/text-encoder.js": "./src/text-encoder.browser.js" } } diff --git a/packages/ipfs-utils/src/http.js b/packages/ipfs-utils/src/http.js index 71569659c6..83de94edf7 100644 --- a/packages/ipfs-utils/src/http.js +++ b/packages/ipfs-utils/src/http.js @@ -5,6 +5,7 @@ const fetch = require('node-fetch') const merge = require('merge-options') const { URL, URLSearchParams } = require('iso-url') const global = require('./globalthis') +const TextDecoder = require('./text-encoder') const Request = global.Request const AbortController = global.AbortController @@ -235,7 +236,6 @@ class HTTP { * @returns {AsyncGenerator} */ const ndjson = async function * (source) { - const TextDecoder = globalThis.TextDecoder || require('util').TextDecoder const decoder = new TextDecoder() let buf = '' diff --git a/packages/ipfs-utils/src/text-encoder.browser.js b/packages/ipfs-utils/src/text-encoder.browser.js new file mode 100644 index 0000000000..749a308e33 --- /dev/null +++ b/packages/ipfs-utils/src/text-encoder.browser.js @@ -0,0 +1,5 @@ +'use strict' + +const global = require('./globalthis') + +module.exports = global.TextDecoder diff --git a/packages/ipfs-utils/src/text-encoder.js b/packages/ipfs-utils/src/text-encoder.js new file mode 100644 index 0000000000..44fc2333a9 --- /dev/null +++ b/packages/ipfs-utils/src/text-encoder.js @@ -0,0 +1,2 @@ +'use strict' +module.exports = require('util').TextDecoder From ea6d5425b905ee7c4493777bc04320dda13e128a Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Thu, 12 Mar 2020 15:16:01 +0000 Subject: [PATCH 2/3] fix: fix object stat timeout test --- packages/interface-ipfs-core/src/object/stat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/interface-ipfs-core/src/object/stat.js b/packages/interface-ipfs-core/src/object/stat.js index 244d924eee..35a6e1b3ff 100644 --- a/packages/interface-ipfs-core/src/object/stat.js +++ b/packages/interface-ipfs-core/src/object/stat.js @@ -66,7 +66,7 @@ module.exports = (common, options) => { expect(err.message).to.equal('failed to get block for QmNggDXca24S6cMPEYHZjeuc4QRmofkRrAEqVL3MzzzzzZ: context deadline exceeded') } - expect(timeForRequest).to.not.lessThan(timeout - 0.1) + expect(timeForRequest).to.not.lessThan(timeout - 1000) expect(timeForRequest).to.not.greaterThan(timeout + 1000) }) From e528bd2e3abcccd800c5c5792ff129fab7211836 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Fri, 13 Mar 2020 15:02:02 +0000 Subject: [PATCH 3/3] fix: add interop gh branch --- packages/interface-ipfs-core/package.json | 2 +- packages/ipfs-http-client/package.json | 2 +- packages/ipfs-mfs/package.json | 2 +- packages/ipfs/package.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index eb111e5028..cb93dc2bb1 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -41,7 +41,7 @@ "ipfs-unixfs": "^1.0.0", "ipfs-utils": "^0.7.2", "ipld-dag-cbor": "^0.15.1", - "ipld-dag-pb": "^0.18.2", + "ipld-dag-pb": "^0.18.3", "is-ipfs": "^0.6.1", "it-all": "^1.0.1", "it-concat": "^1.0.0", diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index 5343144cf6..a0530e75fe 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -49,7 +49,7 @@ "ipfs-block": "^0.8.1", "ipfs-utils": "^0.7.2", "ipld-dag-cbor": "^0.15.1", - "ipld-dag-pb": "^0.18.2", + "ipld-dag-pb": "^0.18.3", "ipld-raw": "^4.0.1", "iso-url": "^0.4.6", "it-tar": "^1.2.1", diff --git a/packages/ipfs-mfs/package.json b/packages/ipfs-mfs/package.json index 75023d1ee7..4026c1e2db 100644 --- a/packages/ipfs-mfs/package.json +++ b/packages/ipfs-mfs/package.json @@ -70,7 +70,7 @@ "ipfs-unixfs-exporter": "^1.0.1", "ipfs-unixfs-importer": "^1.0.1", "ipfs-utils": "^0.7.0", - "ipld-dag-pb": "^0.18.2", + "ipld-dag-pb": "^0.18.3", "it-all": "^1.0.1", "it-last": "^1.0.1", "it-to-stream": "^0.1.1", diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 84e5f1e69a..de450d34ce 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -107,7 +107,7 @@ "ipld": "^0.25.0", "ipld-bitcoin": "^0.3.0", "ipld-dag-cbor": "^0.15.1", - "ipld-dag-pb": "^0.18.2", + "ipld-dag-pb": "^0.18.3", "ipld-ethereum": "^4.0.0", "ipld-git": "^0.5.0", "ipld-raw": "^4.0.1", @@ -182,7 +182,7 @@ "go-ipfs-dep": "0.4.23-3", "hat": "0.0.3", "interface-ipfs-core": "^0.132.0", - "ipfs-interop": "^1.0.0", + "ipfs-interop": "ipfs/interop#fix/name-pubsub", "ipfsd-ctl": "^3.0.0", "it-first": "^1.0.1", "ncp": "^2.0.0",