embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,966 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

128 Commits

Author SHA1 Message Date
Iuri Matias a75dded16d update references to package 2018-06-15 17:02:54 -04:00
Iuri Matias 5f839a829b point to a forked npm package (for now), to avoid the npm install issues some users are reporting 2018-06-15 17:02:54 -04:00
emizzle eedcdc77a7 Solc loading issue now fully resolved 
Added better error checking for solidity compilation errors

Extracted timer functionality for downloading packages so it works across the main process and child processes.

Npm class is instantiated only once and reused for event commands.

Npm class can handle concurrent requests for the same package and callback the installation result for each request.
 2018-06-15 17:02:53 -04:00
Eric Mastro a046acb732 package-lock conflict 2018-06-15 17:02:53 -04:00
Iuri Matias daf2eba36d lock version to avoid suprises 2018-06-15 16:58:39 -04:00
Iuri Matias c367ac2c88 use neo-blessed 2018-06-15 16:58:39 -04:00
Iuri Matias 6946883490 point to a forked npm package (for now), to avoid the npm install issues some users are reporting 2018-06-15 16:56:41 -04:00
emizzle 62f3b85bc4 Finally fixed the solc loading issue. 
Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
 2018-06-15 16:54:08 -04:00
Jonathan Rainville c8c0a5c42f enable websocket provider 2018-06-15 14:35:50 -04:00
Iuri Matias 0429703790 lock version to avoid suprises 2018-06-13 12:03:00 -04:00
Iuri Matias 3335483b1a
Merge pull request #520 from embark-framework/dashboard_performance_fix 
use neo blessed
 2018-06-13 11:44:47 -04:00
Iuri Matias daaee7d828 use neo-blessed 2018-06-13 11:17:55 -04:00
Iuri Matias 19aa117503 update references to package 2018-06-13 09:40:19 -04:00
Iuri Matias e8b11d9841 point to a forked npm package (for now), to avoid the npm install issues some users are reporting 2018-06-13 09:05:51 -04:00
Jonathan Rainville ef5e1e2707 stop test execution if file doesn't exist 2018-06-12 15:12:50 -04:00
Iuri Matias e6ed016cc0
Merge pull request #510 from embark-framework/gastimation 
Gastimation
 2018-06-12 14:11:28 -04:00
VoR0220 335670f2ca package lock update and linting errors fixed 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:39:45 -05:00
Richard Ramos 610b6de008 Updating branch with changes from 
'develop'
 2018-06-08 15:36:11 -04:00
Richard Ramos 586e7c7bbc Moved proxy to core libraries, and logging on console methods invoked 2018-06-08 11:05:51 -04:00
Jonathan Rainville eecd719515 put message if swarm or ipfs is not installed 2018-06-08 10:40:01 -04:00
Jonathan Rainville e902c86ed2 conflicts in tests 2018-06-07 16:14:42 -04:00
VoR0220 f8b79904cb package lock update 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
Jonathan Rainville e49a474380 Ping parent and die when 3 errors 2018-06-05 12:09:57 -04:00
Jonathan Rainville b32c90b56e compile tests only once 2018-06-04 10:45:50 -04:00
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias 061ff51f83
Merge pull request #475 from embark-framework/fix/pipeline-not-building 
fix pipeline not building by removing the `once`s
 2018-06-01 18:12:23 -04:00
Iuri Matias 8d985ce60a fix tests; put back solc 0.4.24 2018-06-01 18:09:54 -04:00
Jonathan Rainville 876a9a3103 fix pipeline not building by removing the `once`s 2018-06-01 15:48:10 -04:00
Jonathan Rainville b727d85358 small fixes 2018-06-01 13:53:09 -04:00
Jonathan Rainville 33bd52e9ec add id to solc process to avoid multiple callback calls 2018-06-01 13:44:35 -04:00
Iuri Matias 9a1eefc838
Merge branch 'develop' into features/improve-storage-config 2018-06-01 12:01:51 -04:00
Iuri Matias f3e7d03204 remove orbit 2018-06-01 10:15:41 -04:00
emizzle 927f562a41 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes. 
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
 2018-06-01 13:35:25 +10:00
emizzle f6667b6948 Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase. 
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
 2018-06-01 13:28:05 +10:00
Jonathan Rainville ff0d24aa1f Merge branch 'features/ipfs-process' of https://github.com/embark-framework/embark into features/ipfs-process 
# Conflicts:
#	lib/contracts/blockchain.js
 2018-05-30 12:02:30 -04:00
Jonathan Rainville b5d9a86680 start blockchain process at false and deploy on ready 2018-05-30 12:00:44 -04:00
Jonathan Rainville fe34d84ff4 put back package lock 2018-05-30 11:03:33 -04:00
Jonathan Rainville 64bebc2bbf remove package lock 2018-05-30 11:03:33 -04:00
Jonathan Rainville a6ee63d7aa package json pls fix this 2018-05-30 11:03:33 -04:00
Jonathan Rainville bc853ef899 conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville df9907d8f4 put back package lock 2018-05-29 08:24:11 -04:00
Jonathan Rainville cfcf40c81a remove package lock 2018-05-29 08:20:44 -04:00
Jonathan Rainville cccb391fb4 package json pls fix this 2018-05-28 17:04:11 -04:00
Jonathan Rainville 21a0042d00 conflict in en.json 2018-05-28 11:50:39 -04:00
VoR0220 55b659c233 new package lock 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:52:07 -05:00
VoR0220 73720b6978 add eth ens namehash package 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:50:55 -05:00
Jonathan Rainville 29a50ea9cd refactor assertNodeConnection to use it in watch 2018-05-23 11:17:02 -04:00
Iuri Matias 3e9376138b move runCode 2018-05-23 11:16:17 -04:00
Iuri Matias 31833579a7 finish converting afterDeploy module 2018-05-23 11:15:06 -04:00
Iuri Matias 2064d26914 update package lock 2018-05-23 11:15:06 -04:00
Jonathan Rainville c3652da371 add line to compile .vy 2018-05-23 11:15:04 -04:00
Iuri Matias a0f6c96d89 update to 3.0.4 2018-05-23 11:15:04 -04:00
Iuri Matias 14c046954e update to 3.0.3 2018-05-23 11:15:04 -04:00
Iuri Matias 7d9389655e update to 3.0.2 2018-05-23 11:15:04 -04:00
Iuri Matias f3fb487d2e update package lock 2018-05-23 11:15:04 -04:00
Jonathan Rainville 1ffc9ffe08 enable events calling for request and on 2018-05-16 16:41:25 -04:00
Jonathan Rainville fdf8791c1c fix mnemonic accounts 2018-05-15 11:33:19 -04:00
Jonathan Rainville 37ca90ad9b add wallet and clean up 2018-05-14 12:08:03 -04:00
Iuri Matias 2793432b87 convert test_app contracts.json to contracts.js 2018-05-11 18:11:05 -04:00
Iuri Matias 517a3bf234 move i18n and locales to its own folder; abstract it a bit; detect at initialization; add cmd line option 2018-05-10 15:01:34 -04:00
Iuri Matias 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -04:00
Jonathan Rainville 986ef520fc add plugin that caches 2018-05-10 12:22:58 -04:00
Jonathan Rainville 31e82e31d0 do a process for each file 2018-05-10 10:43:10 -04:00
Iuri Matias 9d9d498e9a update package.json 2018-05-09 17:31:30 -04:00
Jonathan Rainville 74dc8e3f27 update package lock 2018-05-08 13:23:11 -04:00
VoR0220 d8c1418042 add ascii table dependencies and update the lock 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-08 10:31:02 -05:00
Iuri Matias 221281c182 update package-lock 2018-05-03 20:27:03 -04:00
Jonathan Rainville 2ad852667e add early returns and lint 2018-05-01 09:38:13 -04:00
Eric Mastro 2bb977df76 WIP to merge in other swarm changes 
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
 2018-04-30 15:56:43 +10:00
emizzle 6fe162a8da Fix issues with missing web3 dependencies 
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.
 2018-04-26 15:08:37 +10:00
Jonathan Rainville df5b647ecb fix and add tests 2018-04-19 15:25:27 -04:00
Jonathan Rainville 5ca9dd73de package locks 2018-04-18 15:04:04 -04:00
Jonathan Rainville 2568ec1aec implement the download function 2018-04-17 16:34:37 -04:00
Richard Ramos f56b42d91f Linting 2018-04-05 11:41:28 -04:00
Iuri Matias 94887f933d update finalhandler npm package 2018-03-30 12:47:15 -04:00
Iuri Matias 6cafb319ac update commander, css-loader, ejs packages 2018-03-30 12:07:58 -04:00
Iuri Matias 66187aef9a update eslint version 2018-03-30 11:48:35 -04:00
Iuri Matias a8e22ec45c move demo and boilerplate to a templates folder 2018-03-29 19:23:24 -04:00