fix: dont include util.textencoder in the browser (#2919)

* 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 * fix: fix object stat timeout test * fix: add interop gh branch
ipfs · Mar 13, 2020 · 3207e3b · 3207e3b
1 parent 9bc9625
commit 3207e3b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 8 deletions.
diff --git 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/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)
     })
 

diff --git 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
@@ -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-utils/package.json b/packages/ipfs-utils/package.json
@@ -54,6 +54,7 @@
     "Marcin Rataj <lidel@lidel.org>"
   ],
   "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
@@ -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<Object, void, any>}
  */
 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
@@ -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
@@ -0,0 +1,2 @@
+'use strict'
+module.exports = require('util').TextDecoder
diff --git 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",