From 97e20e5c0b5f78902b3c926d486fcf31938e7145 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Tue, 7 Apr 2020 03:25:32 +0200 Subject: [PATCH] fix: support POST-only HTTP API (clean way) Removes patching introduced in #1430 and uses ipfs-redux-bundle v7.0.0 to bring a compatible version of ipfs-http-client that is known to support POST-only HTTP API while also exposing the old JS API. Context: https://github.com/ipfs/js-ipfs/issues/2971 --- package-lock.json | 335 +++++++------------------- package.json | 4 +- patches/ipfs-http-client+39.0.2.patch | 91 ------- 3 files changed, 82 insertions(+), 348 deletions(-) delete mode 100644 patches/ipfs-http-client+39.0.2.patch diff --git a/package-lock.json b/package-lock.json index ff8e1cedb..e07376475 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ipfs-webui", - "version": "2.7.2", + "version": "2.7.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5530,11 +5530,6 @@ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, - "@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" - }, "abab": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", @@ -6129,11 +6124,6 @@ "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" }, - "async-iterator-all": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-iterator-all/-/async-iterator-all-1.0.0.tgz", - "integrity": "sha512-+vC2NFEmAuONF+A2MzM1tUS5pHovDH37/oQbmXW6FgnEns0S9BsR+MJGnzsFHzSN2iFQhbN7L8cFqV1W1F1kpQ==" - }, "async-iterator-to-pull-stream": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/async-iterator-to-pull-stream/-/async-iterator-to-pull-stream-1.3.0.tgz", @@ -8197,14 +8187,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "concat-stream": { - "version": "github:hugomrdias/concat-stream#057bc7b5d6d8df26c8cf00a3f151b6721a0a8034", - "from": "github:hugomrdias/concat-stream#feat/smaller", - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^3.0.2" - } - }, "confusing-browser-globals": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz", @@ -9320,11 +9302,6 @@ } } }, - "delay": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/delay/-/delay-4.3.0.tgz", - "integrity": "sha512-Lwaf3zVFDMBop1yDuFZ19F9WyGcZcGacsbdlZtWjQmM50tOcMntm1njF/Nb/Vjij3KaSvCF+sEYGKrrjObu2NA==" - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -10802,11 +10779,6 @@ "es5-ext": "~0.10.14" } }, - "event-iterator": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/event-iterator/-/event-iterator-1.2.0.tgz", - "integrity": "sha512-Daq7YUl0Mv1i4QEgzGQlz0jrx7hUFNyLGbiF+Ap7NCMCjDLCCnolyj6s0TAc6HmrBziO5rNVHsPwGMp7KdRPvw==" - }, "event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", @@ -11527,27 +11499,6 @@ "locate-path": "^3.0.0" } }, - "find-yarn-workspace-root": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz", - "integrity": "sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==", - "requires": { - "fs-extra": "^4.0.3", - "micromatch": "^3.1.4" - }, - "dependencies": { - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, "flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -11558,11 +11509,6 @@ "write": "1.0.3" } }, - "flatmap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/flatmap/-/flatmap-0.0.3.tgz", - "integrity": "sha1-Hxik2TgVLUlZZfnJWNkjqy3WabQ=" - }, "flatted": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", @@ -11669,12 +11615,12 @@ } }, "form-data": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", - "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", "requires": { "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", + "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } }, @@ -11743,7 +11689,8 @@ "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true }, "fs-exists-sync": { "version": "0.1.0", @@ -35315,6 +35262,11 @@ } } }, + "serialize-javascript": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.0.tgz", + "integrity": "sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==" + }, "serve-static": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", @@ -38072,6 +38024,11 @@ "glob": "^7.1.3" } }, + "serialize-javascript": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", + "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==" + }, "ssri": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", @@ -38089,6 +38046,7 @@ "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", + "serialize-javascript": "^1.7.0", "source-map": "^0.6.1", "terser": "^4.1.2", "webpack-sources": "^1.4.0", @@ -38748,13 +38706,11 @@ } }, "ipfs-http-client": { - "version": "39.0.2", - "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-39.0.2.tgz", - "integrity": "sha512-logfyeSMD2XJCqhKv8hVnSOb/NH2KDECoLeAkwIjWMYK9Yd7eqci0ZDLP4qed0wZ91GFJ09qgCO+6J8ApKrAaQ==", + "version": "41.0.1", + "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-41.0.1.tgz", + "integrity": "sha512-oyH0hXoB+jfz4NqM+SZSpk6c9wR+9uvUO+/0eQFT6B9Ludz4zR8T5MHo7bnQoVerj9Qlv0x0wO1ckSoekaSPpw==", "requires": { "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", @@ -38762,58 +38718,33 @@ "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", + "form-data": "^3.0.0", "ipfs-block": "~0.8.1", - "ipfs-utils": "^0.4.0", + "ipfs-utils": "^0.4.2", "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-all": "^1.0.1", + "it-glob": "0.0.7", + "it-tar": "^1.1.1", "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": "^2.0.0", "multiaddr": "^6.0.6", + "multiaddr-to-uri": "^5.0.0", "multibase": "~0.6.0", - "multicodec": "~0.5.1", + "multicodec": "^1.0.0", "multihashes": "~0.4.14", - "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3", - "once": "^1.4.0", + "parse-duration": "^0.1.1", "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" + "promise-nodeify": "^3.0.1" }, "dependencies": { "multiaddr": { @@ -38828,15 +38759,35 @@ "is-ip": "^2.0.0", "varint": "^5.0.0" } + }, + "multicodec": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.1.tgz", + "integrity": "sha512-yrrU/K8zHyAH2B0slNVeq3AiwluflHpgQ3TAzwNJcuO2AoPyXgBT2EDkdbP1D8B/yFOY+S2hDYmFlI1vhVFkQw==", + "requires": { + "buffer": "^5.5.0", + "varint": "^5.0.0" + }, + "dependencies": { + "buffer": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz", + "integrity": "sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + } + } } } }, "ipfs-redux-bundle": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ipfs-redux-bundle/-/ipfs-redux-bundle-6.0.1.tgz", - "integrity": "sha512-hn8chO6M60C34Zha8NFeI1Jo03X/5tRhXUoFbN8g2QZQWrpUySQvT0N4/g7kjrUvf7aWz12pvFDFfvOMzLcGCw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ipfs-redux-bundle/-/ipfs-redux-bundle-7.0.0.tgz", + "integrity": "sha512-sL6SR0PMYZbzhrI5J+An/gxj9l09DSRBByBOAHiF9sj7on7Gd/ArroSHL2EeFOFuH0gwcxP9BFjS18OyHU1jzg==", "requires": { - "ipfs-http-client": "^39.0.2", + "ipfs-http-client": "^41.0.1", "multiaddr": "^7.2.0", "uri-to-multiaddr": "^3.0.1", "window-or-global": "^1.0.1" @@ -38851,9 +38802,9 @@ } }, "ipfs-utils": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-0.4.1.tgz", - "integrity": "sha512-4RnGVElpfmg/cee3WMI2rTE4wJh414KV3G2R/8rWpxA2Ahg7jRnhxHVBCevvIIqLMyF5ctsMZS2yBKM/u1yJkA==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-0.4.2.tgz", + "integrity": "sha512-k/uNOniniqg7uCnHvmujis8ASNefn0url8GS7HaNLAhL3RV3dHBiibtQFp8JZ/zfN+80FrYJt7cPEzRbGbmJUA==", "requires": { "buffer": "^5.2.1", "err-code": "^2.0.0", @@ -38866,17 +38817,6 @@ "kind-of": "^6.0.2", "pull-stream-to-async-iterator": "^1.0.2", "readable-stream": "^3.4.0" - }, - "dependencies": { - "it-glob": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz", - "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==", - "requires": { - "fs-extra": "^8.1.0", - "minimatch": "^3.0.4" - } - } } }, "ipfsd-ctl": { @@ -39954,16 +39894,6 @@ "readable-stream": "^3.4.0" } }, - "iso-stream-http": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/iso-stream-http/-/iso-stream-http-0.1.2.tgz", - "integrity": "sha512-oHEDNOysIMTNypbg2f1SlydqRBvjl4ZbSE9+0awVxnkx3K2stGTFwB/kpVqnB6UEfF8QD36kAjDwZvqyXBLMnQ==", - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - } - }, "iso-url": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/iso-url/-/iso-url-0.4.6.tgz", @@ -40080,13 +40010,12 @@ "it-all": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/it-all/-/it-all-1.0.1.tgz", - "integrity": "sha512-DQ8MQXVfwCktZOja1xvKdsuka7E/OJHpLKLR3tMBmg6Kfo8Kob+XRE6pRfpbkXNsGyET4lMYrQ0y5T3XXF/Akw==", - "dev": true + "integrity": "sha512-DQ8MQXVfwCktZOja1xvKdsuka7E/OJHpLKLR3tMBmg6Kfo8Kob+XRE6pRfpbkXNsGyET4lMYrQ0y5T3XXF/Akw==" }, "it-glob": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.6.tgz", - "integrity": "sha512-B2FsVvjP/iDzHIph3g9oSeqwOwTfcxuuiKSC7U78/AIWKbBzM8tyVZAEIgOjMOQDNMqCBUD2MNedt0gSIOJU8w==", + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz", + "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==", "requires": { "fs-extra": "^8.1.0", "minimatch": "^3.0.4" @@ -40096,7 +40025,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/it-reader/-/it-reader-2.1.0.tgz", "integrity": "sha512-hSysqWTO9Tlwc5EGjVf8JYZzw0D2FsxD/g+eNNWrez9zODxWt6QlN6JAMmycK72Mv4jHEKEXoyzUN4FYGmJaZw==", - "dev": true, "requires": { "bl": "^4.0.0" } @@ -40105,7 +40033,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/it-tar/-/it-tar-1.1.1.tgz", "integrity": "sha512-bQyH1QRdKLcv338aVhKUs4Y//5TJpTdvLLEi70pdaWi8cDZM0MynzDRxSUo5eJH2rKCHyuS+7yNu/40FCOPVvA==", - "dev": true, "requires": { "bl": "^4.0.0", "buffer": "^5.4.3", @@ -40951,16 +40878,6 @@ "object.assign": "^4.1.0" } }, - "just-kebab-case": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/just-kebab-case/-/just-kebab-case-1.1.0.tgz", - "integrity": "sha512-QkuwuBMQ9BQHMUEkAtIA4INLrkmnnveqlFB1oFi09gbU0wBdZo6tTnyxNWMR84zHxBuwK7GLAwqN8nrvVxOLTA==" - }, - "just-map-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/just-map-keys/-/just-map-keys-1.1.0.tgz", - "integrity": "sha512-oNKi+4y7fr8lXnhKYpBbCkiwHRVkAnx0VDkCeTDtKKMzGr1Lz1Yym+RSieKUTKim68emC5Yxrb4YmiF9STDO+g==" - }, "keccak": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz", @@ -40996,14 +40913,6 @@ "graceful-fs": "^4.1.9" } }, - "klaw-sync": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", - "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", - "requires": { - "graceful-fs": "^4.1.11" - } - }, "kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -41584,11 +41493,6 @@ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz", "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==" }, - "looper": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz", - "integrity": "sha1-LvpUw7HLq6m5Su4uWRSwvlf7t0k=" - }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -42466,16 +42370,6 @@ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" }, - "ndjson": { - "version": "github:hugomrdias/ndjson#4db16da6b42e5b39bf300c3a7cde62abb3fa3a11", - "from": "github:hugomrdias/ndjson#feat/readable-stream3", - "requires": { - "json-stringify-safe": "^5.0.1", - "minimist": "^1.2.0", - "split2": "^3.1.0", - "through2": "^3.0.0" - } - }, "nearley": { "version": "2.19.0", "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.19.0.tgz", @@ -43275,8 +43169,7 @@ "parse-duration": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-0.1.2.tgz", - "integrity": "sha512-0qfMZyjOUFBeEIvJ5EayfXJqaEXxQ+Oj2b7tWJM3hvEXvXsYCk05EDVI23oYnEw2NaFYUWdABEVPBvBMh8L/pA==", - "dev": true + "integrity": "sha512-0qfMZyjOUFBeEIvJ5EayfXJqaEXxQ+Oj2b7tWJM3hvEXvXsYCk05EDVI23oYnEw2NaFYUWdABEVPBvBMh8L/pA==" }, "parse-entities": { "version": "1.2.2", @@ -43331,37 +43224,6 @@ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, - "patch-package": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz", - "integrity": "sha512-YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg==", - "requires": { - "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^2.4.2", - "cross-spawn": "^6.0.5", - "find-yarn-workspace-root": "^1.2.1", - "fs-extra": "^7.0.1", - "is-ci": "^2.0.0", - "klaw-sync": "^6.0.0", - "minimist": "^1.2.0", - "rimraf": "^2.6.3", - "semver": "^5.6.0", - "slash": "^2.0.0", - "tmp": "^0.0.33" - }, - "dependencies": { - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, "path-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", @@ -45009,11 +44871,6 @@ "safe-buffer": "^5.1.2" } }, - "pull-defer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/pull-defer/-/pull-defer-0.2.3.tgz", - "integrity": "sha512-/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA==" - }, "pull-file-reader": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pull-file-reader/-/pull-file-reader-1.0.2.tgz", @@ -45035,14 +44892,6 @@ "pull-stream": "^3.6.9" } }, - "pull-to-stream": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pull-to-stream/-/pull-to-stream-0.1.1.tgz", - "integrity": "sha512-thZkMv6F9PILt9zdvpI2gxs19mkDrlixYKX6cOBxAW16i1NZH+yLAmF4r8QfJ69zuQh27e01JZP9y27tsH021w==", - "requires": { - "readable-stream": "^3.1.1" - } - }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -45121,7 +44970,8 @@ "qs": { "version": "6.9.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz", - "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==" + "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==", + "dev": true }, "query-selector": { "version": "1.0.9", @@ -47672,14 +47522,6 @@ "extend-shallow": "^3.0.0" } }, - "split2": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz", - "integrity": "sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==", - "requires": { - "readable-stream": "^3.0.0" - } - }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -47870,15 +47712,6 @@ "p-defer": "^3.0.0" } }, - "stream-to-pull-stream": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz", - "integrity": "sha512-6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg==", - "requires": { - "looper": "^3.0.0", - "pull-stream": "^3.2.3" - } - }, "strftime": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/strftime/-/strftime-0.10.0.tgz", @@ -48276,6 +48109,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz", "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==", + "dev": true, "requires": { "bl": "^3.0.0", "end-of-stream": "^1.4.1", @@ -48288,6 +48122,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", + "dev": true, "requires": { "readable-stream": "^3.0.1" } @@ -48551,14 +48386,6 @@ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, - "through2": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", - "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", - "requires": { - "readable-stream": "2 || 3" - } - }, "thunky": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", @@ -49122,25 +48949,25 @@ } }, "uri-to-multiaddr": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/uri-to-multiaddr/-/uri-to-multiaddr-3.0.1.tgz", - "integrity": "sha512-77slJiNB/IxM35zgflBEgp8T8ywpyYAbEh8Ezdnq7kAuA6TRg6wfvNTi4Uixfh6CsPv9K2fAkI5+E4C2dw3tXA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/uri-to-multiaddr/-/uri-to-multiaddr-3.0.2.tgz", + "integrity": "sha512-I2AO1Y/3hUI7KfHiB6Py64lZ02jAB+hqlMVBzDRn4u6d85x+7tJhRwGzdKEYn8/1kDBtWFZVkHvgepF7Z+C1og==", "requires": { - "is-ip": "^2.0.0", - "multiaddr": "^6.0.3" + "is-ip": "^3.1.0", + "multiaddr": "^7.2.1" }, "dependencies": { - "multiaddr": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-6.1.1.tgz", - "integrity": "sha512-Q1Ika0F9MNhMtCs62Ue+GWIJtRFEhZ3Xz8wH7/MZDVZTWhil1/H2bEGN02kUees3hkI3q1oHSjmXYDM0gxaFjQ==", + "ip-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz", + "integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==" + }, + "is-ip": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz", + "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==", "requires": { - "bs58": "^4.0.1", - "class-is": "^1.1.0", - "hi-base32": "~0.5.0", - "ip": "^1.1.5", - "is-ip": "^2.0.0", - "varint": "^5.0.0" + "ip-regex": "^4.0.0" } } } diff --git a/package.json b/package.json index 43a68e3e1..0610513e7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "version": "2.7.3", "private": true, "scripts": { - "postinstall": "patch-package", "start": "run-script-os", "start:win32": "@powershell -Command $env:REACT_APP_GIT_REV=(git rev-parse --short HEAD); react-scripts start", "start:darwin:linux": "cross-env REACT_APP_GIT_REV=`git rev-parse --short HEAD` react-scripts start", @@ -46,7 +45,7 @@ "ip": "^1.1.5", "ipfs-css": "^0.13.1", "ipfs-geoip": "^4.0.0", - "ipfs-redux-bundle": "^6.0.1", + "ipfs-redux-bundle": "^7.0.0", "ipld-explorer-components": "^1.5.1", "is-binary": "^0.1.0", "is-ipfs": "^0.6.1", @@ -56,7 +55,6 @@ "multiaddr": "^7.2.1", "multiaddr-to-uri": "^5.1.0", "p-queue": "^6.2.1", - "patch-package": "6.2.2", "prop-types": "^15.7.2", "pull-file-reader": "^1.0.2", "react": "^16.12.0", diff --git a/patches/ipfs-http-client+39.0.2.patch b/patches/ipfs-http-client+39.0.2.patch deleted file mode 100644 index dbd8f5f33..000000000 --- a/patches/ipfs-http-client+39.0.2.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/node_modules/ipfs-http-client/src/config/profiles/list.js b/node_modules/ipfs-http-client/src/config/profiles/list.js -index dbfa579..6f501f7 100644 ---- a/node_modules/ipfs-http-client/src/config/profiles/list.js -+++ b/node_modules/ipfs-http-client/src/config/profiles/list.js -@@ -8,7 +8,7 @@ module.exports = configure(({ ky }) => { - return callbackify.variadic(async (options) => { - options = options || {} - -- const res = await ky.get('config/profile/list', { -+ const res = await ky.post('config/profile/list', { - timeout: options.timeout, - signal: options.signal, - headers: options.headers -diff --git a/node_modules/ipfs-http-client/src/files-regular/get.js b/node_modules/ipfs-http-client/src/files-regular/get.js -index 6c94264..68e15fe 100644 ---- a/node_modules/ipfs-http-client/src/files-regular/get.js -+++ b/node_modules/ipfs-http-client/src/files-regular/get.js -@@ -36,7 +36,7 @@ module.exports = configure(({ ky }) => { - searchParams.set('length', options.length) - } - -- const res = await ky.get('get', { -+ const res = await ky.post('get', { - timeout: options.timeout, - signal: options.signal, - headers: options.headers, -diff --git a/node_modules/ipfs-http-client/src/files-regular/ls.js b/node_modules/ipfs-http-client/src/files-regular/ls.js -index 0f13f55..d81a963 100644 ---- a/node_modules/ipfs-http-client/src/files-regular/ls.js -+++ b/node_modules/ipfs-http-client/src/files-regular/ls.js -@@ -31,7 +31,7 @@ module.exports = configure(({ ky }) => { - searchParams.set('recursive', options.recursive) - } - -- const res = await ky.get('ls', { -+ const res = await ky.post('ls', { - timeout: options.timeout, - signal: options.signal, - headers: options.headers, -diff --git a/node_modules/ipfs-http-client/src/files-regular/refs-local.js b/node_modules/ipfs-http-client/src/files-regular/refs-local.js -index efb8d32..afa1630 100644 ---- a/node_modules/ipfs-http-client/src/files-regular/refs-local.js -+++ b/node_modules/ipfs-http-client/src/files-regular/refs-local.js -@@ -9,7 +9,7 @@ module.exports = configure(({ ky }) => { - return async function * refsLocal (options) { - options = options || {} - -- const res = await ky.get('refs/local', { -+ const res = await ky.post('refs/local', { - timeout: options.timeout, - signal: options.signal, - headers: options.headers -diff --git a/node_modules/ipfs-http-client/src/files-regular/refs.js b/node_modules/ipfs-http-client/src/files-regular/refs.js -index c6136ed..dbeb9a1 100644 ---- a/node_modules/ipfs-http-client/src/files-regular/refs.js -+++ b/node_modules/ipfs-http-client/src/files-regular/refs.js -@@ -49,7 +49,7 @@ module.exports = configure(({ ky }) => { - searchParams.append('arg', arg.toString()) - } - -- const res = await ky.get('refs', { -+ const res = await ky.post('refs', { - timeout: options.timeout, - signal: options.signal, - headers: options.headers, -diff --git a/node_modules/ipfs-http-client/src/pubsub/ls.js b/node_modules/ipfs-http-client/src/pubsub/ls.js -index 177dcd4..d2bc8f6 100644 ---- a/node_modules/ipfs-http-client/src/pubsub/ls.js -+++ b/node_modules/ipfs-http-client/src/pubsub/ls.js -@@ -6,7 +6,7 @@ module.exports = configure(({ ky }) => { - return async (options) => { - options = options || {} - -- const { Strings } = await ky.get('pubsub/ls', { -+ const { Strings } = await ky.post('pubsub/ls', { - timeout: options.timeout, - signal: options.signal, - headers: options.headers, -diff --git a/node_modules/ipfs-http-client/src/pubsub/peers.js b/node_modules/ipfs-http-client/src/pubsub/peers.js -index bdeca60..5fa5b24 100644 ---- a/node_modules/ipfs-http-client/src/pubsub/peers.js -+++ b/node_modules/ipfs-http-client/src/pubsub/peers.js -@@ -14,7 +14,7 @@ module.exports = configure(({ ky }) => { - const searchParams = new URLSearchParams(options.searchParams) - searchParams.set('arg', topic) - -- const { Strings } = await ky.get('pubsub/peers', { -+ const { Strings } = await ky.post('pubsub/peers', { - timeout: options.timeout, - signal: options.signal, - headers: options.headers,