chore: pull text encoder from ipfs-utils

ipfs · Jul 24, 2020 · db3dcd1 · db3dcd1
1 parent 0c0b1ee
commit db3dcd1
Show file tree

Hide file tree

Showing 9 changed files with 784 additions and 963 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
- "lerna": "3.20.2",
+ "lerna": "3.22.1",
  "packages": [
  "packages/*"
  ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
  "update-contributors": "aegir release --lint=false --test=false --bump=false --build=false --changelog=false --commit=false --tag=false --push=false --ghrelease=false --docs=false --publish=false"
  },
  "devDependencies": {
- "lerna": "^3.20.2"
+ "lerna": "^3.22.1"
  },
  "repository": {
  "type": "git",

diff --git a/packages/ipfs-unixfs-exporter/package-lock.json b/packages/ipfs-unixfs-exporter/package-lock.json
diff --git a/packages/ipfs-unixfs-exporter/package.json b/packages/ipfs-unixfs-exporter/package.json
@@ -58,6 +58,7 @@
  "err-code": "^2.0.0",
  "hamt-sharding": "^1.0.0",
  "ipfs-unixfs": "^1.0.2",
+ "ipfs-utils": "^2.3.1",
  "it-last": "^1.0.1",
  "multihashing-async": "^1.0.0"
  }

diff --git a/packages/ipfs-unixfs-exporter/src/utils/find-cid-in-shard.js b/packages/ipfs-unixfs-exporter/src/utils/find-cid-in-shard.js
@@ -2,10 +2,11 @@
 
 const Bucket = require('hamt-sharding/src/bucket')
 const multihashing = require('multihashing-async')
+const TextEncoder = require('ipfs-utils/src/text-encoder')
 
 // FIXME: this is copy/pasted from ipfs-unixfs-importer/src/dir-sharded.js
 const hashFn = async function (value) {
- const buf = new TextEncoder('utf-8').encode(value)
+ const buf = new TextEncoder('utf8').encode(value)
  const hash = await multihashing(buf, 'murmur3-128')
 
  // Multihashing inserts preamble of 2 bytes. Remove it.

diff --git a/packages/ipfs-unixfs-importer/package.json b/packages/ipfs-unixfs-importer/package.json
@@ -56,6 +56,7 @@
  "err-code": "^2.0.0",
  "hamt-sharding": "^1.0.0",
  "ipfs-unixfs": "^1.0.2",
+ "ipfs-utils": "^2.3.1",
  "ipld-dag-pb": "^0.19.0",
  "it-all": "^1.0.1",
  "it-batch": "^1.0.3",

diff --git a/packages/ipfs-unixfs-importer/src/dag-builder/validate-chunks.js b/packages/ipfs-unixfs-importer/src/dag-builder/validate-chunks.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const errCode = require('err-code')
+const TextEncoder = require('ipfs-utils/src/text-encoder')
 
 // make sure the content only emits buffer-a-likes
 async function * validateChunks (source) {

diff --git a/packages/ipfs-unixfs-importer/src/dir-sharded.js b/packages/ipfs-unixfs-importer/src/dir-sharded.js
@@ -10,6 +10,7 @@ const Dir = require('./dir')
 const persist = require('./utils/persist')
 const Bucket = require('hamt-sharding')
 const mergeOptions = require('merge-options').bind({ ignoreUndefined: true })
+const TextEncoder = require('ipfs-utils/src/text-encoder')
 
 const hashFn = async function (value) {
  const buf = new TextEncoder('utf-8').encode(value)