Skip to content

Commit

Permalink
Merge a9415f8 into ee2b64e
Browse files Browse the repository at this point in the history
  • Loading branch information
@renovate
renovate[bot] committed Jun 1, 2019
2 parents ee2b64e + a9415f8 commit b6484d6
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 59 deletions.
2 changes: 1 addition & 1 deletion e2e-tests/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"react-scripts": "1.1.4",
"zipkin": "0.10.1",
"zipkin-javascript-opentracing": "file:../..",
"zipkin-transport-http": "0.10.1"
"zipkin-transport-http": "0.18.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
16 changes: 10 additions & 6 deletions e2e-tests/react/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4594,13 +4594,17 @@ node-fetch@2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"

node-fetch@^1.0.1, node-fetch@^1.5.3:
node-fetch@^1.0.1:
version "1.7.3"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
dependencies:
encoding "^0.1.11"
is-stream "^1.0.1"

node-fetch@^2.3.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"

node-forge@0.6.33:
version "0.6.33"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
Expand Down Expand Up @@ -7191,13 +7195,13 @@ yauzl@2.8.0:
fd-slicer "~1.0.1"

"zipkin-javascript-opentracing@file:../..":
version "1.5.1"
version "2.0.0"

zipkin-transport-http@0.10.1:
version "0.10.1"
resolved "https://registry.yarnpkg.com/zipkin-transport-http/-/zipkin-transport-http-0.10.1.tgz#615e2bbb3150b3ec0885caf98f6ad013a62ae5bb"
zipkin-transport-http@0.18.1:
version "0.18.1"
resolved "https://registry.yarnpkg.com/zipkin-transport-http/-/zipkin-transport-http-0.18.1.tgz#8dd53d81f4dd869eb12806ae8e1450171d19630b"
dependencies:
node-fetch "^1.5.3"
node-fetch "^2.3.0"

zipkin@0.10.1:
version "0.10.1"
Expand Down
74 changes: 41 additions & 33 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"opentracing": "0.14.3",
"prettier": "1.12.0",
"zipkin": "0.10.1",
"zipkin-transport-http": "0.10.1"
"zipkin-transport-http": "0.18.1"
},
"lint-staged": {
"*.{js,css,md}": [
Expand Down
27 changes: 9 additions & 18 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1364,12 +1364,6 @@ encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"

encoding@^0.1.11:
version "0.1.12"
resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
dependencies:
iconv-lite "~0.4.13"

error-ex@^1.2.0, error-ex@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
Expand Down Expand Up @@ -2039,7 +2033,7 @@ husky@0.14.3:
normalize-path "^1.0.0"
strip-indent "^2.0.0"

iconv-lite@0.4.19, iconv-lite@~0.4.13:
iconv-lite@0.4.19:
version "0.4.19"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"

Expand Down Expand Up @@ -2330,7 +2324,7 @@ is-retry-allowed@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"

is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
is-stream@^1.0.0, is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"

Expand Down Expand Up @@ -3336,12 +3330,9 @@ network-address@^1.1.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/network-address/-/network-address-1.1.2.tgz#4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"

node-fetch@^1.5.3:
version "1.7.3"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
dependencies:
encoding "^0.1.11"
is-stream "^1.0.1"
node-fetch@^2.3.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"

node-int64@^0.4.0:
version "0.4.0"
Expand Down Expand Up @@ -4935,11 +4926,11 @@ yargs@~3.10.0:
decamelize "^1.0.0"
window-size "0.1.0"

zipkin-transport-http@0.10.1:
version "0.10.1"
resolved "https://registry.yarnpkg.com/zipkin-transport-http/-/zipkin-transport-http-0.10.1.tgz#615e2bbb3150b3ec0885caf98f6ad013a62ae5bb"
zipkin-transport-http@0.18.1:
version "0.18.1"
resolved "https://registry.yarnpkg.com/zipkin-transport-http/-/zipkin-transport-http-0.18.1.tgz#8dd53d81f4dd869eb12806ae8e1450171d19630b"
dependencies:
node-fetch "^1.5.3"
node-fetch "^2.3.0"

zipkin@0.10.1:
version "0.10.1"
Expand Down

0 comments on commit b6484d6

Please sign in to comment.