Merge branch 'master' into feat/offline-webui

Author: lidel

package.json

@@ -132,7 +132,7 @@
     "get-port": "5.0.0",
     "http-dns": "3.0.1",
     "http-node": "1.2.0",
-    "ipfs": "https://github.com/ipfs/js-ipfs/tarball/d9986ee4d7945f6a5d77dc7a2db4863d06971eb9/js-ipfs.tar.gz",
+    "ipfs": "https://github.com/ipfs/js-ipfs/tarball/b6505c1f2eda09c398af101954e6334c200b5587/js-ipfs.tar.gz",
     "ipfs-css": "0.13.1",
     "ipfs-http-client": "38.2.0",
     "ipfs-http-response": "0.3.1",

yarn.lock

@@ -2424,6 +2424,13 @@ bl@^3.0.0:
   dependencies:
     readable-stream "^3.0.1"
 
+bl@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.0.tgz#fc7351c473992110749d3552087e1fe942021e65"
+  integrity sha512-QwQvAZZA1Bw1FWnhNj2X5lu+sPxxB2ITH3mqEqYyahN6JZR13ONjk+XiTnBaGEzMPUrAgOkaD68pBH1rvPRPsw==
+  dependencies:
+    readable-stream "^3.4.0"
+
 blakejs@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.0.tgz#69df92ef953aa88ca51a32df6ab1c54a155fc7a5"
@@ -4051,6 +4058,11 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+
 deglob@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/deglob/-/deglob-4.0.1.tgz#0685c6383992fd6009be10653a2b1116696fad55"
@@ -6880,7 +6892,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/ipfs-css/-/ipfs-css-0.13.1.tgz#f751be9cc89e30c34c50325848233f6da6b6728e"
   integrity sha512-hofJSYVBE3VC3/MOYZKfF66SKuHgnYkhXUmPDS8PISI8ygcljGOyBSSU4Je3dfgZX5UHDBEnzq5XyrTU822EDg==
 
-[email protected], ipfs-http-client@ipfs/js-ipfs-http-client#add-async-iterator-methods:
+[email protected]:
   version "38.2.0"
   resolved "https://codeload.github.com/ipfs/js-ipfs-http-client/tar.gz/7e9a0ee312cc033cab6d4084684aca1bff0336e4"
   dependencies:
@@ -6998,6 +7010,74 @@ ipfs-http-client@^33.1.0:
     tar-stream "^2.0.1"
     through2 "^3.0.1"
 
+ipfs-http-client@^39.0.0:
+  version "39.0.0"
+  resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-39.0.0.tgz#687168844816c10f85854a701c603ab72ac076e7"
+  integrity sha512-rtHlwy77jO6btkLcmNJedBWnKTftVZo4jiFnqnM575nf5yMkE2MpweIuUUQkGbbfWGa+AN0CzgHyuGYQAWVASQ==
+  dependencies:
+    abort-controller "^3.0.0"
+    async "^2.6.1"
+    async-iterator-all "^1.0.0"
+    async-iterator-to-pull-stream "^1.3.0"
+    bignumber.js "^9.0.0"
+    bl "^4.0.0"
+    bs58 "^4.0.1"
+    buffer "^5.4.2"
+    callbackify "^1.1.0"
+    cids "~0.7.1"
+    concat-stream "github:hugomrdias/concat-stream#feat/smaller"
+    debug "^4.1.0"
+    delay "^4.3.0"
+    detect-node "^2.0.4"
+    end-of-stream "^1.4.1"
+    err-code "^2.0.0"
+    event-iterator "^1.2.0"
+    explain-error "^1.0.4"
+    flatmap "0.0.3"
+    form-data "^2.5.1"
+    fs-extra "^8.1.0"
+    glob "^7.1.3"
+    ipfs-block "~0.8.1"
+    ipfs-utils "^0.4.0"
+    ipld-dag-cbor "~0.15.0"
+    ipld-dag-pb "^0.18.1"
+    ipld-raw "^4.0.0"
+    is-ipfs "~0.6.1"
+    is-pull-stream "0.0.0"
+    is-stream "^2.0.0"
+    iso-stream-http "~0.1.2"
+    iso-url "~0.4.6"
+    it-glob "0.0.6"
+    it-to-stream "^0.1.1"
+    iterable-ndjson "^1.1.0"
+    just-kebab-case "^1.1.0"
+    just-map-keys "^1.1.0"
+    kind-of "^6.0.2"
+    ky "^0.15.0"
+    ky-universal "^0.3.0"
+    lru-cache "^5.1.1"
+    merge-options "^1.0.1"
+    multiaddr "^6.0.6"
+    multibase "~0.6.0"
+    multicodec "~0.5.1"
+    multihashes "~0.4.14"
+    ndjson "github:hugomrdias/ndjson#feat/readable-stream3"
+    once "^1.4.0"
+    peer-id "~0.12.3"
+    peer-info "~0.15.1"
+    promise-nodeify "^3.0.1"
+    promisify-es6 "^1.0.3"
+    pull-defer "~0.2.3"
+    pull-stream "^3.6.9"
+    pull-stream-to-async-iterator "^1.0.2"
+    pull-to-stream "~0.1.1"
+    pump "^3.0.0"
+    qs "^6.5.2"
+    readable-stream "^3.1.1"
+    stream-to-pull-stream "^1.7.2"
+    tar-stream "^2.0.1"
+    through2 "^3.0.1"
+
 [email protected], ipfs-http-response@~0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ipfs-http-response/-/ipfs-http-response-0.3.1.tgz#5cc351f8abf5f77dae47a41781fd7bc0c88fcaf8"
@@ -7177,9 +7257,9 @@ ipfs-utils@~0.0.3:
     kind-of "^6.0.2"
     readable-stream "^3.3.0"
 
-"ipfs@https://github.com/ipfs/js-ipfs/tarball/d9986ee4d7945f6a5d77dc7a2db4863d06971eb9/js-ipfs.tar.gz":
+"ipfs@https://github.com/ipfs/js-ipfs/tarball/b6505c1f2eda09c398af101954e6334c200b5587/js-ipfs.tar.gz":
   version "0.38.0"
-  resolved "https://github.com/ipfs/js-ipfs/tarball/d9986ee4d7945f6a5d77dc7a2db4863d06971eb9/js-ipfs.tar.gz#588eee8495676459592227a515eb2dd17c000d74"
+  resolved "https://github.com/ipfs/js-ipfs/tarball/b6505c1f2eda09c398af101954e6334c200b5587/js-ipfs.tar.gz#6da10bea98c2ed62d85c30c05e29fa7106753ed6"
   dependencies:
     "@hapi/ammo" "^3.1.1"
     "@hapi/boom" "^7.4.3"
@@ -7194,7 +7274,7 @@ ipfs-utils@~0.0.3:
     base32.js "~0.1.0"
     bignumber.js "^9.0.0"
     binary-querystring "~0.1.2"
-    bl "^3.0.0"
+    bl "^4.0.0"
     bs58 "^4.0.1"
     buffer-peek-stream "^1.0.1"
     byteman "^1.3.5"
@@ -7221,7 +7301,7 @@ ipfs-utils@~0.0.3:
     ipfs-bitswap "^0.26.0"
     ipfs-block "~0.8.1"
     ipfs-block-service "~0.16.0"
-    ipfs-http-client ipfs/js-ipfs-http-client#add-async-iterator-methods
+    ipfs-http-client "^39.0.0"
     ipfs-http-response "~0.3.1"
     ipfs-mfs "^0.13.0"
     ipfs-multipart "^0.2.0"
@@ -7249,7 +7329,7 @@ ipfs-utils@~0.0.3:
     jsondiffpatch "~0.3.11"
     just-safe-set "^2.1.0"
     kind-of "^6.0.2"
-    ky "^0.14.0"
+    ky "^0.15.0"
     ky-universal "~0.3.0"
     libp2p "^0.26.2"
     libp2p-bootstrap "~0.9.3"
@@ -7295,12 +7375,12 @@ ipfs-utils@~0.0.3:
     pull-defer "~0.2.3"
     pull-file "^1.1.0"
     pull-mplex "~0.1.1"
-    pull-ndjson "~0.1.1"
+    pull-ndjson "^0.2.0"
     pull-pushable "^2.2.0"
     pull-sort "^1.0.1"
     pull-stream "^3.6.14"
     pull-stream-to-async-iterator "^1.0.2"
-    pull-stream-to-stream "^1.3.4"
+    pull-stream-to-stream "^2.0.0"
     pull-traverse "^1.0.3"
     readable-stream "^3.4.0"
     receptacle "^1.3.2"
@@ -8043,6 +8123,14 @@ [email protected]:
     fs-extra "^8.1.0"
     minimatch "^3.0.4"
 
+[email protected]:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/it-glob/-/it-glob-0.0.6.tgz#1a111bfd04ae56922a1ace3ea63ecce0c73b02c4"
+  integrity sha512-B2FsVvjP/iDzHIph3g9oSeqwOwTfcxuuiKSC7U78/AIWKbBzM8tyVZAEIgOjMOQDNMqCBUD2MNedt0gSIOJU8w==
+  dependencies:
+    fs-extra "^8.1.0"
+    minimatch "^3.0.4"
+
 it-multipart@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/it-multipart/-/it-multipart-0.0.2.tgz#83e8d55aec54026340e94ea9f7928266597adb20"
@@ -8432,6 +8520,11 @@ ky@^0.14.0:
   resolved "https://registry.yarnpkg.com/ky/-/ky-0.14.0.tgz#b99bda5818d3a493f9857f39532ff567e2773c35"
   integrity sha512-NSjg+WCElQPdlF3BFZnjh8s5QlMIP+vIGoyukrRU+n+23VBUX87bQYOoG5h3HX5tO7kKQYXvg+QZVt8n0uWmhg==
 
+ky@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/ky/-/ky-0.15.0.tgz#bea059d57cc179575adadbba2d8e15610d8fd75b"
+  integrity sha512-6IlJRPFHq4ZKRRa9lyh6YqHqlmddAkfyXI9CYvZpLQtg7fQvwncPHyHrmtXAHKCqHOilINPMT88eW6FTA3HwkA==
+
 latency-monitor@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/latency-monitor/-/latency-monitor-0.2.1.tgz#4043d5f23de86e2bfcef6ced4a3b5b922e1dd7ed"
@@ -11969,14 +12062,14 @@ pull-mplex@~0.1.1:
     pull-through "^1.0.18"
     varint "^5.0.0"
 
-pull-ndjson@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pull-ndjson/-/pull-ndjson-0.1.1.tgz#831e06bad9aa6c5c5ebc12a897e3a0e15d49e07e"
-  integrity sha1-gx4GutmqbFxevBKol+Og4V1J4H4=
+pull-ndjson@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/pull-ndjson/-/pull-ndjson-0.2.0.tgz#aa28c8de8424021b3e219813a51d516c542ddfa4"
+  integrity sha512-4EjvTyMCAnDKJ+eu3UNyZ6K2M23IrhZpPkfzifBbG1OBHY+BfsyNCPhd8Hl8Pv6bJO04Re3v4D2POAjOW1tQwg==
   dependencies:
     pull-split "^0.2.0"
     pull-stream "^3.4.5"
-    pull-stringify "^1.2.2"
+    pull-stringify "^2.0.0"
 
 pull-offset-limit@^1.1.1:
   version "1.1.1"
@@ -12036,6 +12129,11 @@ pull-stream-to-stream@^1.3.4:
   resolved "https://registry.yarnpkg.com/pull-stream-to-stream/-/pull-stream-to-stream-1.3.4.tgz#3f81d8216bd18d2bfd1a198190471180e2738399"
   integrity sha1-P4HYIWvRjSv9GhmBkEcRgOJzg5k=
 
+pull-stream-to-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pull-stream-to-stream/-/pull-stream-to-stream-2.0.0.tgz#943b67362b9b37890b2881c50175711d7bb67020"
+  integrity sha512-lhgwUn2hQalava39zAzrRhjvVOpR99mfx5tCYRMD8Is85kBvXhQ39zIonVA+2TzdOFjmTQYbPWbEH0HAG+0t0Q==
+
 pull-stream@^3.2.3, pull-stream@^3.4.5, pull-stream@^3.5.0, pull-stream@^3.6.13, pull-stream@^3.6.2, pull-stream@^3.6.8, pull-stream@^3.6.9:
   version "3.6.13"
   resolved "https://registry.yarnpkg.com/pull-stream/-/pull-stream-3.6.13.tgz#181435322841b0397c7ed44ee5a3fae32662ac1b"
@@ -12046,10 +12144,12 @@ pull-stream@^3.6.14:
   resolved "https://registry.yarnpkg.com/pull-stream/-/pull-stream-3.6.14.tgz#529dbd5b86131f4a5ed636fdf7f6af00781357ee"
   integrity sha512-KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew==
 
-pull-stringify@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/pull-stringify/-/pull-stringify-1.2.2.tgz#5a1c34e0075faf2f2f6d46004e36dccd33bd7c7c"
-  integrity sha1-Whw04Adfry8vbUYATjbczTO9fHw=
+pull-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pull-stringify/-/pull-stringify-2.0.0.tgz#22ba31da95af0888e0fb559238b1fa915a6a5b64"
+  integrity sha1-Irox2pWvCIjg+1WSOLH6kVpqW2Q=
+  dependencies:
+    defined "^1.0.0"
 
 pull-through@^1.0.18, pull-through@~1.0.6:
   version "1.0.18"