Skip to content

Commit

Permalink
Merge pull request #282 from reactotron/socket-io-170
Browse files Browse the repository at this point in the history 
Finish socket.io upgrade
  • Loading branch information
@skellock
skellock authored Nov 28, 2016
2 parents b4cb662 + 987d4d4 commit 0e3e19e
Show file tree
Hide file tree
Showing 11 changed files with 369 additions and 200 deletions.
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"test": "lerna run test",
"lint": "lerna run lint",
"copy-internal-deps": "lerna run copy-internal-deps",
"yarn": "lerna exec yarn",
"welcome": "./scripts/welcome.sh",
"e2e": "npm run bootstrap && npm run build && npm run lint && npm run copy-internal-deps && npm run test"
},
Expand Down
23 changes: 13 additions & 10 deletions packages/demo-react-native/copy-internal-deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,52 @@
# React Native doesn't properly support symlinks (or perhaps it does now?), so this
# script will recompile and copy everything over. It's pretty lame. But hey, it
# does the job.
#
# Another Awesome Note: The packager should be stopped before running this script.

# first, nuke the deps ... whether they be folders (from npm) or symlinks (from lerna)
rm -rf node_modules/reactotron-react-native
rm -rf node_modules/reactotron-redux-saga
rm -rf node_modules/reactotron-core-client
rm -rf node_modules/reactotron-redux
rm -rf node_modules/reactotron-apisauce
rm -f node_modules/reactotron-react-native
rm -f node_modules/reactotron-redux-saga
rm -f node_modules/reactotron-core-client
rm -f node_modules/reactotron-redux
rm -f node_modules/reactotron-apisauce

# reactotron-react-native
cd ../reactotron-react-native
yarn run build
cd ../demo-react-native
rm -f ./node_modules/reactotron-react-native
rm -rf ./node_modules/reactotron-react-native
mkdir -p ./node_modules/reactotron-react-native
cp ../reactotron-react-native/dist/index.js ./node_modules/reactotron-react-native/index.js

# reactotron-core-client
cd ../reactotron-core-client
yarn run build
cd ../demo-react-native
rm -f ./node_modules/reactotron-core-client
rm -rf ./node_modules/reactotron-core-client
mkdir -p ./node_modules/reactotron-react-native/node_modules/reactotron-core-client
cp ../reactotron-core-client/dist/index.js ./node_modules/reactotron-react-native/node_modules/reactotron-core-client/index.js

# reactotron-redux
cd ../reactotron-redux
yarn run build
cd ../demo-react-native
rm -f ./node_modules/reactotron-redux
rm -rf ./node_modules/reactotron-redux
mkdir -p ./node_modules/reactotron-redux
cp ../reactotron-redux/dist/index.js ./node_modules/reactotron-redux/index.js

# reactotron-apisauce
cd ../reactotron-apisauce
yarn run build
cd ../demo-react-native
rm -f ./node_modules/reactotron-apisauce
rm -rf ./node_modules/reactotron-apisauce
mkdir -p ./node_modules/reactotron-apisauce
cp ../reactotron-apisauce/dist/index.js ./node_modules/reactotron-apisauce/index.js

# reactotron-redux-saga
cd ../reactotron-redux-saga
yarn run build
cd ../demo-react-native
rm -f ./node_modules/reactotron-redux-saga
rm -rf ./node_modules/reactotron-redux-saga
mkdir -p ./node_modules/reactotron-redux-saga
cp ../reactotron-redux-saga/dist/index.js ./node_modules/reactotron-redux-saga/index.js
2 changes: 1 addition & 1 deletion packages/demo-react-native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"redux-logger": "^2.6.1",
"redux-saga": "^0.13.0",
"seamless-immutable": "^6.0.1",
"socket.io": "^1.4.8"
"socket.io-client": "^1.7.1"
},
"standard": {
"parser": "babel-eslint",
Expand Down
145 changes: 105 additions & 40 deletions packages/demo-react-native/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,10 +818,6 @@ beeper@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"

[email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-1.0.0.tgz#2f1e2fa4c359f11122aa183082218e957e390c73"

better-assert@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
Expand Down Expand Up @@ -1108,6 +1104,10 @@ [email protected]:
version "1.2.0"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.0.tgz#ccd113a86388d06482d03de3fc7df98526ba8efe"

[email protected]:
version "1.2.1"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"

[email protected]:
version "0.0.3"
resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
Expand Down Expand Up @@ -1209,6 +1209,10 @@ [email protected]:
version "0.1.3"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.1.3.tgz#e734a5c1417fce472d5aef82c381cabb64d1a435"

[email protected]:
version "0.3.1"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"

core-js@^1.0.0:
version "1.2.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
Expand Down Expand Up @@ -1312,16 +1316,18 @@ debug-log@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"

[email protected]:
version "0.7.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"

[email protected], debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@~2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
dependencies:
ms "0.7.1"

[email protected]:
version "2.3.3"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
dependencies:
ms "0.7.2"

decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
Expand Down Expand Up @@ -1599,6 +1605,23 @@ [email protected]:
xmlhttprequest-ssl "1.5.1"
yeast "0.1.2"

[email protected]:
version "1.8.1"
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.1.tgz#71237e9bbce04862675d4d6bfbef351c8b6a35a3"
dependencies:
component-emitter "1.2.1"
component-inherit "0.0.3"
debug "2.3.3"
engine.io-parser "1.3.1"
has-cors "1.1.0"
indexof "0.0.1"
parsejson "0.0.3"
parseqs "0.0.5"
parseuri "0.0.5"
ws "1.1.1"
xmlhttprequest-ssl "1.5.3"
yeast "0.1.2"

[email protected]:
version "1.3.1"
resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.1.tgz#9554f1ae33107d6fbd170ca5466d2f833f6a07cf"
Expand All @@ -1610,13 +1633,14 @@ [email protected]:
has-binary "0.1.6"
wtf-8 "1.0.0"

engine.io@1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.7.2.tgz#877c14fa0486f8b664d46a8101bf74feef2e4e46"
engine.io@1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.1.tgz#20066ea903304f13ee37f10faaff6b4784f64373"
dependencies:
accepts "1.3.3"
base64id "0.1.0"
debug "2.2.0"
cookie "0.3.1"
debug "2.3.3"
engine.io-parser "1.3.1"
ws "1.1.1"

Expand Down Expand Up @@ -2745,10 +2769,6 @@ json-stringify-safe@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"

[email protected]:
version "3.2.6"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.2.6.tgz#f6efc93c06a04de9aec53053df2559bb19e2038b"

[email protected]:
version "3.3.2"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
Expand Down Expand Up @@ -3266,6 +3286,10 @@ number-is-nan@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"

[email protected], object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"

object-assign@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
Expand All @@ -3274,10 +3298,6 @@ object-assign@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"

object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"

[email protected]:
version "0.0.3"
resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
Expand Down Expand Up @@ -3395,18 +3415,36 @@ [email protected]:
dependencies:
better-assert "~1.0.0"

[email protected]:
version "0.0.3"
resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
dependencies:
better-assert "~1.0.0"

[email protected]:
version "0.0.2"
resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.2.tgz#9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"
dependencies:
better-assert "~1.0.0"

[email protected]:
version "0.0.5"
resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
dependencies:
better-assert "~1.0.0"

[email protected]:
version "0.0.4"
resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.4.tgz#806582a39887e1ea18dd5e2fe0e01902268e9350"
dependencies:
better-assert "~1.0.0"

[email protected]:
version "0.0.5"
resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
dependencies:
better-assert "~1.0.0"

parseurl@~1.3.0, parseurl@~1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
Expand Down Expand Up @@ -4100,14 +4138,30 @@ [email protected]:
version "0.0.4"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"

socket.io-adapter@0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz#fb9f82ab1aa65290bf72c3657955b930a991a24f"
socket.io-adapter@0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
dependencies:
debug "2.2.0"
socket.io-parser "2.2.2"
debug "2.3.3"
socket.io-parser "2.3.1"

[email protected], socket.io-client@^1.4.8:
[email protected]:
version "1.7.0"
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.0.tgz#d682bde6a83e2d01dd68b5a3696a88c640c4e897"
dependencies:
backo2 "1.0.2"
component-bind "1.0.0"
component-emitter "1.2.1"
debug "2.3.3"
engine.io-client "1.8.1"
has-binary "0.1.7"
indexof "0.0.1"
object-component "0.0.3"
parseuri "0.0.5"
socket.io-parser "2.3.1"
to-array "0.1.4"

socket.io-client@^1.4.8:
version "1.5.1"
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.5.1.tgz#0f366eae7de34bc880ebd71106e1ce8143775827"
dependencies:
Expand All @@ -4123,15 +4177,21 @@ [email protected], socket.io-client@^1.4.8:
socket.io-parser "2.3.1"
to-array "0.1.4"

socket.io-[email protected]:
version "2.2.2"
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.2.2.tgz#3d7af6b64497e956b7d9fe775f999716027f9417"
socket.io-client@^1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.1.tgz#6c23725edff804f3919c1ce4ebb25e591c6e61d7"
dependencies:
benchmark "1.0.0"
component-emitter "1.1.2"
debug "0.7.4"
isarray "0.0.1"
json3 "3.2.6"
backo2 "1.0.2"
component-bind "1.0.0"
component-emitter "1.2.1"
debug "2.3.3"
engine.io-client "1.8.1"
has-binary "0.1.7"
indexof "0.0.1"
object-component "0.0.3"
parseuri "0.0.5"
socket.io-parser "2.3.1"
to-array "0.1.4"

[email protected]:
version "2.3.1"
Expand All @@ -4143,14 +4203,15 @@ [email protected]:
json3 "3.3.2"

socket.io@^1.4.8:
version "1.5.1"
resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.5.1.tgz#c3ea8c4ed4164436bc56adef60e31ad366518ca9"
version "1.7.0"
resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.0.tgz#812790768e9eb43f4842f98606fb63b4dd13e343"
dependencies:
debug "2.2.0"
engine.io "1.7.2"
debug "2.3.3"
engine.io "1.8.1"
has-binary "0.1.7"
socket.io-adapter "0.4.0"
socket.io-client "1.5.1"
object-assign "4.1.0"
socket.io-adapter "0.5.0"
socket.io-client "1.7.0"
socket.io-parser "2.3.1"

source-map-support@^0.4.2:
Expand Down Expand Up @@ -4826,6 +4887,10 @@ [email protected]:
version "1.5.1"
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz#3b7741fea4a86675976e908d296d4445961faa67"

[email protected]:
version "1.5.3"
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"

"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
Expand Down
2 changes: 1 addition & 1 deletion packages/reactotron-core-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
"json-stringify-safe": "^5.0.1",
"ramda": "^0.22.1",
"ramdasauce": "^1.1.1",
"socket.io": "^1.4.8"
"socket.io": "^1.7.0"
}
}
Loading

0 comments on commit 0e3e19e

Please sign in to comment.