diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index f31d9da9d..fcb6d265a 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -1,6 +1,7 @@ import groovy.transform.Field // Global for which node version to use on macos and windows -@Field final String nodeVersion = '9.2.0' +// When in doubt, should follow https://github.com/ipfs/jenkins-libs/blob/master/vars/javascript.groovy +@Field final String nodeVersion = '8.11.3' // Run targets in parallel parallel( @@ -63,7 +64,7 @@ parallel( bat 'npx yarn@1.7.0 config set msvs_version 2015 --global' // run developer build as a smoke-test for windows // bat 'npm run dev-build' - bat 'npm run ci:install' + bat 'npx yarn@1.7.0' bat 'npm run libdweb:build' bat 'dir /s /b /o:gn build' } @@ -93,7 +94,7 @@ parallel( sh 'rm -rf node_modules/' // run developer build as a smoke-test // sh 'npm run dev-build' - sh 'npm run ci:install' + sh 'npx yarn@1.7.0' sh 'npm run libdweb:build' sh 'ls -Rlh build' } diff --git a/package.json b/package.json index ccf5f315e..0c109ab04 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "precommit": "run-s lint:standard", "prepush": "run-s clean build lint test", "firefox": "web-ext run --browser-console --url about:debugging", - "libdweb": "npm run ci:install && npm run libdweb:build && npm run libdweb:firefox", + "libdweb": "npx yarn@1.7.0 && npm run libdweb:build && npm run libdweb:firefox", "libdweb:build": "git submodule update --init --checkout --depth 1 libdweb && cross-env-shell RELEASE_CHANNEL=libdweb npm run dev-build", "libdweb:firefox": "npm run get-firefox-nightly && cross-env MOZ_DISABLE_CONTENT_SANDBOX=1 web-ext run --firefox=./firefox/firefox --browser-console --url about:debugging", "get-firefox-nightly": "shx test -e ./firefox/firefox || get-firefox -b nightly -e", diff --git a/yarn.lock b/yarn.lock index 94962282b..9d753b6d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -191,8 +191,8 @@ samsam "1.3.0" "@types/node@*": - version "10.5.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707" + version "10.5.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.5.tgz#8e84d24e896cd77b0d4f73df274027e3149ec2ba" "@webassemblyjs/ast@1.5.13": version "1.5.13" @@ -779,8 +779,10 @@ asn1.js@^5.0.0: minimalistic-assert "^1.0.0" asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + dependencies: + safer-buffer "~2.1.0" assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" @@ -1753,11 +1755,12 @@ bs58@=2.0.0: resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.0.tgz#72b713bed223a0ac518bbda0e3ce3f4817f39eb5" bs58check@<3.0.0, bs58check@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.1.tgz#8a5d0e587af97b784bf9cbf1b29f454d82bc0222" + version "2.1.2" + resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc" dependencies: bs58 "^4.0.0" create-hash "^1.1.0" + safe-buffer "^5.1.2" buffer-alloc-unsafe@^1.0.0, buffer-alloc-unsafe@^1.1.0: version "1.1.0" @@ -1787,8 +1790,8 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" buffer-from@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04" + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" buffer-indexof@~0.0.0: version "0.0.2" @@ -1833,8 +1836,8 @@ buffer@^4.3.0: isarray "^1.0.0" buffer@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe" + version "5.2.0" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.0.tgz#53cf98241100099e9eeae20ee6d51d21b16e541e" dependencies: base64-js "^1.0.2" ieee754 "^1.1.4" @@ -1969,8 +1972,8 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" caniuse-lite@^1.0.30000844: - version "1.0.30000865" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz#70026616e8afe6e1442f8bb4e1092987d81a2f25" + version "1.0.30000874" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000874.tgz#a641b1f1c420d58d9b132920ef6ba87bbdcd2223" capture-stack-trace@^1.0.0: version "1.0.0" @@ -2432,8 +2435,8 @@ crc32-stream@^2.0.0: readable-stream "^2.0.0" crc@^3.4.4: - version "3.7.0" - resolved "https://registry.yarnpkg.com/crc/-/crc-3.7.0.tgz#58b7083e32ba4b276e1f4cbce1a78b39a6ab63f9" + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" dependencies: buffer "^5.1.0" @@ -3034,10 +3037,11 @@ duplexify@^3.4.2, duplexify@^3.6.0: stream-shift "^1.0.0" ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" dependencies: jsbn "~0.1.0" + safer-buffer "^2.1.0" ecdsa-sig-formatter@1.0.10: version "1.0.10" @@ -3061,8 +3065,8 @@ ejs@^2.5.7: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" electron-to-chromium@^1.3.47: - version "1.3.52" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.52.tgz#d2d9f1270ba4a3b967b831c40ef71fb4d9ab5ce0" + version "1.3.55" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz#f150e10b20b77d9d41afcca312efe0c3b1a7fdce" elegant-spinner@^1.0.1: version "1.0.1" @@ -3567,8 +3571,8 @@ ethereumjs-block@^1.7.1: merkle-patricia-tree "^2.1.2" ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.3: - version "1.3.6" - resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.6.tgz#d581c1703b7b250b2e54892031626534d53e0a79" + version "1.3.7" + resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz#88323a2d875b10549b8347e09f4862b546f3d89a" dependencies: ethereum-common "^0.0.18" ethereumjs-util "^5.0.0" @@ -4374,8 +4378,8 @@ global-dirs@^0.1.0: ini "^1.3.4" global-modules-path@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.2.0.tgz#24648267c65d02604c5549f04b46ac8973b4ba40" + version "2.3.0" + resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.0.tgz#b0e2bac6beac39745f7db5c59d26a36a0b94f7dc" global@^4.3.1, global@^4.3.2: version "4.3.2" @@ -4719,8 +4723,8 @@ husky@0.14.3: strip-indent "^2.0.0" hyperscript-attribute-to-property@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/hyperscript-attribute-to-property/-/hyperscript-attribute-to-property-1.0.1.tgz#06ecb885bd64424de889df545899fcf0015e4787" + version "1.0.2" + resolved "https://registry.yarnpkg.com/hyperscript-attribute-to-property/-/hyperscript-attribute-to-property-1.0.2.tgz#66ad4164f88beefacf46ec884bd3d1173c1c382a" hyperx@^2.3.2: version "2.4.0" @@ -4948,11 +4952,11 @@ ip@^1.1.4, ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" -ipaddr.js@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b" +ipaddr.js@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" -ipfs-api@22.2.4, ipfs-api@^22.2.4: +ipfs-api@22.2.4: version "22.2.4" resolved "https://registry.yarnpkg.com/ipfs-api/-/ipfs-api-22.2.4.tgz#226ebe5caffb5c58ae8d96d1ed3870a694b24cc7" dependencies: @@ -4993,6 +4997,47 @@ ipfs-api@22.2.4, ipfs-api@^22.2.4: streamifier "~0.1.1" tar-stream "^1.6.1" +ipfs-api@^22.2.4: + version "22.3.0" + resolved "https://registry.yarnpkg.com/ipfs-api/-/ipfs-api-22.3.0.tgz#29935c5d9ca533cefef62288e00a8b7eab412ab7" + dependencies: + async "^2.6.1" + big.js "^5.1.2" + bs58 "^4.0.1" + cids "~0.5.3" + concat-stream "^1.6.2" + debug "^3.1.0" + detect-node "^2.0.3" + flatmap "0.0.3" + glob "^7.1.2" + ipfs-block "~0.7.1" + ipfs-unixfs "~0.1.15" + ipld-dag-cbor "~0.12.1" + ipld-dag-pb "~0.14.6" + is-ipfs "~0.4.2" + is-pull-stream "0.0.0" + is-stream "^1.1.0" + libp2p-crypto "~0.13.0" + lru-cache "^4.1.3" + multiaddr "^5.0.0" + multibase "~0.4.0" + multihashes "~0.4.13" + ndjson "^1.5.0" + once "^1.4.0" + peer-id "~0.11.0" + peer-info "~0.14.1" + promisify-es6 "^1.0.3" + pull-defer "~0.2.2" + pull-pushable "^2.2.0" + pull-stream-to-stream "^1.3.4" + pump "^3.0.0" + qs "^6.5.2" + readable-stream "^2.3.6" + stream-http "^2.8.3" + stream-to-pull-stream "^1.7.2" + streamifier "~0.1.1" + tar-stream "^1.6.1" + ipfs-bitswap@~0.20.3: version "0.20.3" resolved "https://registry.yarnpkg.com/ipfs-bitswap/-/ipfs-bitswap-0.20.3.tgz#eb7f5e959da9d0e841a5aaef725fddea186a4e51" @@ -5042,7 +5087,7 @@ ipfs-css@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/ipfs-css/-/ipfs-css-0.5.2.tgz#5aa5620bd6df1b838b0f0fbce7e18b5ec4b39f6d" -ipfs-http-response@0.1.2, ipfs-http-response@~0.1.2: +ipfs-http-response@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/ipfs-http-response/-/ipfs-http-response-0.1.2.tgz#4a131892fc0394b8d0255b0538da22155add4148" dependencies: @@ -5057,9 +5102,25 @@ ipfs-http-response@0.1.2, ipfs-http-response@~0.1.2: promisify-es6 "^1.0.3" readable-stream-node-to-web "^1.0.1" +ipfs-http-response@~0.1.2: + version "0.1.4" + resolved "https://registry.yarnpkg.com/ipfs-http-response/-/ipfs-http-response-0.1.4.tgz#b27303bb7430978b0a182379189900a034bda9d9" + dependencies: + async "^2.6.0" + cids "^0.5.3" + debug "^3.1.0" + file-type "^8.0.0" + filesize "^3.6.1" + get-stream "^3.0.0" + ipfs-unixfs "^0.1.14" + mime-types "^2.1.18" + multihashes "^0.4.13" + promisify-es6 "^1.0.3" + stream-to-blob "^1.0.1" + ipfs-mfs@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/ipfs-mfs/-/ipfs-mfs-0.2.3.tgz#56e680abdea7dce644d08103fd878dfa110b0061" + version "0.2.5" + resolved "https://registry.yarnpkg.com/ipfs-mfs/-/ipfs-mfs-0.2.5.tgz#d093c6d2dd5060b2ac29febe0dbae98bc2460ec8" dependencies: async "^2.6.1" blob "~0.0.4" @@ -5290,24 +5351,7 @@ ipld-dag-cbor@~0.12.1: multihashing-async "~0.5.1" traverse "~0.6.6" -ipld-dag-pb@^0.14.4, ipld-dag-pb@~0.14.5: - version "0.14.5" - resolved "https://registry.yarnpkg.com/ipld-dag-pb/-/ipld-dag-pb-0.14.5.tgz#bec6417401b32a80818190636a08edc0048dccec" - dependencies: - async "^2.6.1" - bs58 "^4.0.1" - buffer-loader "~0.0.1" - cids "~0.5.3" - class-is "^1.1.0" - is-ipfs "~0.3.2" - multihashes "~0.4.13" - multihashing-async "~0.5.1" - protons "^1.0.1" - pull-stream "^3.6.8" - pull-traverse "^1.0.3" - stable "~0.1.8" - -ipld-dag-pb@~0.14.6: +ipld-dag-pb@^0.14.4, ipld-dag-pb@~0.14.5, ipld-dag-pb@~0.14.6: version "0.14.6" resolved "https://registry.yarnpkg.com/ipld-dag-pb/-/ipld-dag-pb-0.14.6.tgz#1b0357c7db8c1a75f8eef6e89505ddc614a7faaa" dependencies: @@ -5760,8 +5804,8 @@ istanbul-lib-hook@^1.1.0: append-transform "^0.4.0" istanbul-lib-instrument@^2.1.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.1.tgz#406406730a395acb2e50f0d98137ace16bd4a970" + version "2.3.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.2.tgz#b287cbae2b5f65f3567b05e2e29b275eaf92d25e" dependencies: "@babel/generator" "7.0.0-beta.51" "@babel/parser" "7.0.0-beta.51" @@ -5837,8 +5881,8 @@ joi@^11.1.0: topo "2.x.x" joi@^13.4.0: - version "13.4.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-13.4.0.tgz#afc359ee3d8bc5f9b9ba6cdc31b46d44af14cecc" + version "13.5.2" + resolved "https://registry.yarnpkg.com/joi/-/joi-13.5.2.tgz#32207c85fa76d889f1e971c7eaaf69b232259a91" dependencies: hoek "5.x.x" isemail "3.x.x" @@ -6444,8 +6488,8 @@ libp2p-switch@~0.40.7: pull-stream "^3.6.7" libp2p-tcp@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/libp2p-tcp/-/libp2p-tcp-0.12.0.tgz#a41737cb999485299df9fff3f692750f0428adea" + version "0.12.1" + resolved "https://registry.yarnpkg.com/libp2p-tcp/-/libp2p-tcp-0.12.1.tgz#fcb7ade07d95dd3552e9c71402edf34f00c37102" dependencies: class-is "^1.1.0" debug "^3.1.0" @@ -7107,13 +7151,13 @@ mime-db@~1.33.0: version "1.33.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" -mime-types@2.1.18, mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.18: +mime-types@2.1.18: version "2.1.18" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" dependencies: mime-db "~1.33.0" -mime-types@^2.1.19: +mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.19, mime-types@~2.1.17, mime-types@~2.1.18: version "2.1.19" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0" dependencies: @@ -7783,8 +7827,8 @@ npm-bundled@^1.0.1: resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" npm-packlist@^1.1.6: - version "1.1.10" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a" + version "1.1.11" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de" dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" @@ -7930,7 +7974,7 @@ on-load@^3.3.4: global "^4.3.2" nanoassert "^1.1.0" -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: @@ -8601,11 +8645,11 @@ protons@^1.0.0, protons@^1.0.1: varint "^5.0.0" proxy-addr@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341" + version "2.0.4" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" dependencies: forwarded "~0.1.2" - ipaddr.js "1.6.0" + ipaddr.js "1.8.0" proxy-agent@^2.0.0: version "2.3.1" @@ -9343,7 +9387,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2: +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -10185,8 +10229,8 @@ stream-combiner@~0.0.4: duplexer "~0.1.1" stream-each@^1.1.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd" + version "1.2.3" + resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" dependencies: end-of-stream "^1.1.0" stream-shift "^1.0.0" @@ -10217,6 +10261,12 @@ stream-to-array@~2.3.0: dependencies: any-promise "^1.1.0" +stream-to-blob@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-to-blob/-/stream-to-blob-1.0.1.tgz#2dc1e09b71677a234d00445f8eb7ff70c4fe9948" + dependencies: + once "^1.3.3" + stream-to-promise@2.2.0, stream-to-promise@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/stream-to-promise/-/stream-to-promise-2.2.0.tgz#b1edb2e1c8cb11289d1b503c08d3f2aef51e650f" @@ -10453,8 +10503,8 @@ tar-stream@^1.1.2, tar-stream@^1.5.0, tar-stream@^1.5.2, tar-stream@^1.6.1: xtend "^4.0.0" tar@^4: - version "4.4.4" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd" + version "4.4.6" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b" dependencies: chownr "^1.0.1" fs-minipass "^1.2.5" @@ -10511,8 +10561,7 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" -terser@3.8.0, uglify-es@^3.3.4, "uglify-es@npm:terser": - name uglify-es +terser@3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.0.tgz#66a4f4f500d2c829faab840f318c49cc471d73ae" dependencies: @@ -10780,6 +10829,14 @@ typeforce@^1.11.3: version "1.12.0" resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.12.0.tgz#ca40899919f1466d7819e37be039406beb912a2e" +uglify-es@^3.3.4, "uglify-es@npm:terser": + version "3.8.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.1.tgz#cb70070ac9e0a71add169dfb63c0a64fca2738ac" + dependencies: + commander "~2.16.0" + source-map "~0.6.1" + source-map-support "~0.5.6" + uglify-js@^2.6: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"