Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json
Current WIP is auto-starting storage processes defined in dappConnection config.
Adding swarm to embarkjs. WIP.
Add 'auto' setting for geth CORS and websockets origin
* 'auto' now supported for `rpcCorsDomain` and `wsOrigins` in the blockchain config.
* 'auto' set to the default value in blockchain config for test and demo apps.
test add config and contract and add test
addFileToPipeline test and registerBeforeDeploy with new arg
add more registers but generation one fails in run
WIP commit
Undo changes to test config.
Merge pull request #381 from embark-framework/features/cors-auto
Add 'auto' setting for geth CORS and websockets origin
fix a bug where upload cmd used plugin name
don't error if it's an empty dapp with no contracts yet
Merge pull request #383 from embark-framework/no_contracts
don't error if it's an empty dapp with no contracts yet
remove duplicated entry
force zepplein version for travis
Merge pull request #384 from embark-framework/chores/test-allpligin-apis
Small fixes for plugin APIs
intercept logs in the app itself - stopgap fix
Merge pull request #385 from embark-framework/console_logs_fix
intercept logs in the app itself - stopgap fix
* removed unneeded provider property.
* add 'swarm' as a provider in the storage.config
* update method for swarm service check
Merge branch 'develop' into features/add-swarm-to-embarkjs
More work to add swarm to embarkjs
* added eth-lib to parse result of swarm text
* changed "currentStorage" and "currentMessages" to "currentProvider" for consistency.
* added protocol to storage config
* selectively starts storage service depending on which one is configured in the storage config
* run service check for ipfs/swarm prior to uploaded
* added swarm methods for embarkjs
Updated code based on code review
check if testrpc is installed and warn if not
Merge pull request #386 from embark-framework/bug_fix/test-rpc-not-installed
check if testrpc is installed and warn if not
Removed timeout
Removed spacer
Merge pull request #382 from embark-framework/react-demo
Updating embark demo to use react instead of jquery
fix on contract add
Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp
Fix adding a contract
redeploy with right config on config change
fix tests
reset watchers after build to make sure files remain watch
Merge pull request #389 from embark-framework/bug_fix/file-changes-not-watched
Fix files not being watched
Merge pull request #388 from embark-framework/bug_fix/changing-contract-config
Redeploy with right config on config change
Added swarm support in embarkjs and isAvailable for messages/storage
* reverted currentProvider back to currentStorage and currentMessages
* added `EmbarkJS.Storage.isAvailable` and `EmbarkJS.Messages.isAvailable()` and underlying provider functions for Whisper, Orbit, IPFS, and Swarm
* Finished swarm implementation in embarkjs plus cleanup
* updated test app storage config to swarm to show swarm config option
Merge branch 'develop' into features/add-swarm-to-embarkjs
The issue was the npm dependency graph was causing the web3 dependencies to be nested inside the `node_modules/web3/node_modules` folder. After removing web3 from `package-lock.json`, and allowing npm to rebuild the graph with `npm install`, the web3 depedencies (ie web3-bzz) were correctly installed at the same level as web3.
However, this also introduced a new dependency issue in that web3-providers-ws required and depended on the websocket package at a specific github commit and was causing the same issue with websocket being installed at `node_modules/web3-providers-ws/node_modules/websocket`. Removing the web3-providers-ws dependency on websocket and replacing with version 1.0.25 requirement brought the websocket package back to the same level as web3.
Iuri Matias
emizzle
Jonathan Rainville
VoR0220
Richard Ramos