Commit Graph

302 Commits

Author SHA1 Message Date
Jonathan Rainville a32c04c751 fix conflict in engine 2018-05-14 11:18:48 -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
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 451c0bf2de update to 3.0.1 2018-05-03 21:44:31 -04:00
iuri matias c34192c5f9 update default to solc 0.4.23 2018-05-03 17:30:43 -04:00
iuri matias 1f5f2c6d0d update version 2018-05-03 15:06:00 -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
Iuri Matias 782044ef7c
Merge pull request #375 from embark-framework/fix_package_management
Fix package management
2018-04-20 20:10:38 -04:00
Iuri Matias a63aa2ea0f remove commented line; use beta 34 2018-04-20 19:58:16 -04:00
Iuri Matias cf02a10656 use web3 naming instead of web3.js; check if package already exists 2018-04-20 19:45:57 -04:00
Iuri Matias 1b6d747dbd fixing package management test 2018-04-20 17:17:49 -04:00
Jonathan Rainville df5b647ecb fix and add tests 2018-04-19 15:25:27 -04:00
Jonathan Rainville cf14b3784f add getUrl function for external contracts + tests 2018-04-17 15:07:00 -04:00
Iuri Matias 1415ce0d62 upgrade to latest web3.js 2018-04-17 14:48:17 -04:00
Iuri Matias 82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts
Graphviz contracts
2018-04-13 11:29:23 -04:00
Iuri Matias 2ce86f8591 use node cmd so it works on windows 2018-04-11 09:17:43 -04:00
Iuri Matias 67bdcbb1c3 put cmds between "s so it works on windows 2018-04-11 09:12:24 -04:00
Richard Ramos d038ed414d Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts 2018-04-05 11:35:19 -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 a00119f5dc move test_app to test_apps 2018-03-29 18:20:45 -04:00
Richard Ramos 5d0e86bb72 Removed unneeded packages and added tooltips and colors 2018-03-23 11:27:21 -04:00
Richard Ramos 9e469cc83e Initial commit for graphviz functionality
- Added required packages
- Added command to cmd.js
- Created graph.js to contain graph logic
2018-03-23 10:02:23 -04:00
Iuri Matias be1c5badd8 improve full support for es6 2018-01-16 19:17:52 -05:00
Iuri Matias 728aea6e04 fix imports issue 2018-01-12 14:21:36 -05:00
Iuri Matias 59c3d82260 update web3.js 2018-01-05 15:10:47 -05:00
Iuri Matias 4976408c11 remove prepare command 2017-12-28 07:11:08 -05:00
Iuri Matias cd0fd94386 updatests; include options 2017-12-22 13:07:43 -05:00
Iuri Matias 02634d0bda warn is terminal window is too small 2017-12-19 15:14:09 -05:00
Iuri Matias c63c9b8728 warn user of typos 2017-12-19 13:29:48 -05:00
Iuri Matias bc34e00268 better errors when parsing invalid json 2017-12-19 12:57:03 -05:00
Iuri Matias 113bb25142 add webserver start/stop cmd 2017-12-17 18:34:41 -05:00
Iuri Matias 1cb6581fde better display error contract deployment errors in the dashbord 2017-12-14 15:03:08 -05:00
Iuri Matias c2c2635acd fix npm package group 2017-12-14 13:09:15 -05:00
Iuri Matias 2f5e6768ce remove jshint 2017-12-14 10:35:39 -05:00
Iuri Matias 84641f4056 add eslint to travis 2017-12-14 10:26:39 -05:00
Iuri Matias c0c0eb0550 fix eslint path 2017-12-14 10:20:07 -05:00
Iuri Matias 170143b52c update travis config 2017-12-14 10:12:14 -05:00
Iuri Matias b56a138b62 use eslint instead of jshint 2017-12-14 10:00:53 -05:00
Iuri Matias ccb77051f8 import bootstrap in test_app 2017-12-13 19:24:20 -05:00
Iuri Matias 12c8e223d6 update ipfs lib 2017-12-13 15:53:29 -05:00
Iuri Matias 0b00f99f09 include ipfs lib in embarkjs 2017-12-13 15:53:29 -05:00
Iuri Matias 33711c8db2 support imports 2017-12-13 15:53:29 -05:00
Iuri Matias aa0f774f1d Merge branch 'release/2.6.0' into develop 2017-12-13 12:17:29 -05:00
Iuri Matias 97231caad8 update to 2.6.1 2017-12-13 11:42:20 -05:00
Iuri Matias ed377d798f Revert "use custom repo for IPFS api"
This reverts commit bb0d674c65.
2017-12-06 10:34:13 -05:00
Antonio Tenorio Fornés bb0d674c65 use custom repo for IPFS api 2017-10-24 21:00:06 +02:00
Antonio Tenorio Fornés 4bb77ae8d5 Merge branch 'develop' into buildFixes 2017-10-24 20:56:57 +02:00
Iuri Matias 1cb0644f92 Revert "update solc version"
This reverts commit d23cd753ce.
2017-10-22 09:27:13 -04:00
Iuri Matias d23cd753ce update solc version 2017-10-21 15:16:11 -04:00
Iuri Matias 3b4e5f5b30 include test_app tests in ci 2017-10-21 08:13:28 -04:00
Iuri Matias 13ce054823 include test_app tests in ci 2017-10-21 08:07:51 -04:00
Iuri Matias 6157968c5e update default solc version; update spec; fix issue with compiler warnings 2017-10-17 06:51:52 -04:00
Iuri Matias d1762a0fb4 refactor code generation 2017-10-13 20:01:35 -04:00
Iuri Matias 3eb53ee6af Merge branch 'master' into develop 2017-07-26 07:35:57 -04:00
Iuri Matias bc2c6b637c update to 2.5.2 2017-07-25 07:31:24 -04:00
Iuri Matias f45ce963b4 add file type so files are loaded when needed; support to configure web3 and solc versions 2017-07-05 08:35:51 -04:00
Iuri Matias 31ecaf0837 support to download specified versions of web3 2017-07-02 13:33:11 -04:00
Iuri Matias ec9293af60 get rid of mocha requirement 2017-07-02 00:27:14 -04:00
Iuri Matias 9a8a8d7da2 first step at getting rid of mocha/embark on package.json 2017-07-01 23:11:42 -04:00
Iuri Matias a73f0868fc update to 2.5.1 2017-06-29 07:42:53 -04:00
Iuri Matias 886c5d879f update to 2.5.0 2017-06-26 16:48:16 -04:00
Michael Yeates b3067b5735 Update web3 version to 0.19.1, anything earlier is broken by bignumber.js removal 2017-06-25 13:04:02 +01:00
Antonio Tenorio Fornés 5b609411fb change prepublish scrpt to prepare 2017-06-21 19:16:43 +02:00
Antonio Tenorio Fornés c3a915e80c move webpack to dev dependency 2017-06-21 19:15:25 +02:00
Antonio Tenorio Fornés 362f1282a6 use npm dependencies management for ipfs, web3 and orbit, and remove them from js/ folder. 2017-06-21 19:12:07 +02:00
Antonio Tenorio Fornés 6f93d7e824 use npm dependencies management for ipfs, web3 and orbit, and remove them from js/ folder. 2017-06-21 18:58:15 +02:00
Antonio Tenorio Fornés 24b9763da5 move webpack to prepublish script 2017-06-21 18:57:25 +02:00
Antonio Tenorio Fornés 351b81e696 Automate embark.bundle.js generation 2017-06-21 18:57:25 +02:00
Nathan Hernandez 4202d5e832 Update solc to 0.4.11
The solidity compiler was at 0.4.8, 3 patches behind. At some point the
output of the compiler changed, `compiler.js` reflects those changes.
I'm not sure if other properties changed.
2017-06-02 21:20:27 -04:00
Todd Baur a6cd8b1292 change linter config for browser/node switching 2017-03-30 02:42:06 +09:00
Todd Baur e3b9c01205 fix linter complaints 2017-03-30 02:18:00 +09:00
Todd Baur 2f5c647c39 this changes Embark to an EventEmitter and adds more event handling for loading and fetching plugins. It introduces a dependency on underscore and underscore string. It adds defenses against null/invalid options objects. 2017-03-30 00:37:30 +09:00
Todd Baur cda54a8166 prompt for app name when one is not given. These tests are not completing in this commit and this is annoying me greatly. 2017-03-09 20:07:24 +09:00
Iuri Matias 71121cdc4b update to 2.4.0 2017-03-07 06:39:56 -05:00
Iuri Matias d44a68f176 remove no longer necessary bignumber package 2017-02-27 20:53:23 -05:00
Iuri Matias 4dc6924410 add globule 2017-02-19 08:59:51 -05:00
Iuri Matias 19d35a563e replace glob matching functionality 2017-02-19 00:00:01 -05:00
Iuri Matias 38c98f16fa use nodejs http lib directly to check service status 2017-02-18 23:17:43 -05:00
Iuri Matias 10b0f862a5 remove unused package 2017-02-18 23:05:50 -05:00
Iuri Matias c312943248 use saner library to deal with fs 2017-02-18 22:40:42 -05:00
Iuri Matias a25d225a8b remove unused packaes 2017-02-18 15:13:29 -05:00
Iuri Matias d0c020dce5 update to 2.3.0 2017-02-08 06:38:26 -05:00
Daniel Benton 630f94f707 Lock down `solc` dependency version because people can't semver worth shite 2017-02-04 18:25:11 -05:00
Iuri Matias fb6e930313 revert package back to previously version due to breaking changes 2017-01-15 08:52:23 -05:00
Iuri Matias c554e90b57 update solc and spec 2017-01-14 07:05:36 -05:00
Iuri Matias a4b6752482 update packages 2017-01-13 19:17:01 -05:00
Iuri Matias f7bbc1ddc2 update to 2.2.1 2017-01-13 07:46:36 -05:00
Iuri Matias 21750cf7f9 use web3.js ~0.18.2 2017-01-13 07:44:42 -05:00
Iuri Matias 97a49f3136 update to 2.2.0 2017-01-11 06:57:57 -05:00
Iuri Matias e8ef3ed8b7 update to web3js 0.18.0 2017-01-07 13:32:32 -05:00
Iuri Matias 6d369cd452 update solc + specs 2017-01-06 21:48:38 -05:00
Iuri Matias 4002856f89 update to solc 0.4.6 2016-12-02 07:06:04 -05:00
Iuri Matias 0524b17309 update to 2.1.3 2016-10-30 08:56:13 -04:00
Iuri Matias 215a823c35 update to 2.1.2 2016-10-29 11:16:43 -04:00
Iuri Matias c9a52c11b0 update to 2.1.1 2016-10-25 19:44:12 -04:00
Iuri Matias a6397b3fe9 update to 2.1.0 2016-10-24 06:14:35 -04:00
Iuri Matias 5c65608c27 add grunt-cli to dev 2016-10-22 18:32:05 -04:00
Iuri Matias c7ad88f4e3 add jshint and tests to npm task 2016-10-22 18:23:44 -04:00
Iuri Matias 4adf2e52a0 add jshint task 2016-10-22 17:22:58 -04:00
Iuri Matias f9c4b5f996 update to solc 0.4.0 2016-10-20 22:47:50 -04:00
Iuri Matias d6655004ff update to 2.0.1 2016-10-19 07:24:53 -04:00
Iuri Matias 9953e2ed5e add solc package 2016-10-19 07:23:17 -04:00
Iuri Matias e3d05af129 rename package name to embark, update to 2.0.0 2016-10-18 05:48:47 -04:00
Iuri Matias 23a7f03cc4 add more tests; fix issue with selecting selecting non-default environment contract configuration 2016-10-15 15:54:19 -04:00
greggdourgarian 1080c260a7 add request package 2016-10-06 07:40:24 -04:00
Iuri Matias 0c54b9aa69 update version 2016-10-06 07:40:24 -04:00
Iuri Matias d7656a111f remove unused files 2016-10-06 07:40:24 -04:00
Iuri Matias 2a8f0635b9 implement contract dependencies 2016-10-06 07:40:23 -04:00
Iuri Matias 03f81c47d7 implement contract tracking 2016-10-06 07:40:22 -04:00
Iuri Matias 7b45f8d6ea basic monitor 2016-10-06 07:40:21 -04:00
Iuri Matias 95615d14a7 some progress with new tests 2016-10-06 07:40:21 -04:00
Iuri Matias 421a0af41e implement watch functionality 2016-10-06 07:40:20 -04:00
Iuri Matias 00a7dbe2f1 add server functionality 2016-10-06 07:40:20 -04:00
Iuri Matias 2064b72ac6 redone deployment system 2016-10-06 07:40:20 -04:00
Iuri Matias 22f7e6d6d4 move some of the old code 2016-10-06 07:39:33 -04:00
Akhil Srinivasan c1bea0bc55 solc upgrade. 2016-09-13 23:22:52 -04:00
Akhil Srinivasan 8b25914135 Updating to latest solc dependency 2016-09-08 13:19:02 -04:00
Iuri Matias bed70b530b update to 1.2.0 2016-08-10 07:59:37 -04:00
Iuri Matias 2fbb41b113 update boilerplate to point to right version instead of repo 2016-05-31 22:19:34 -04:00
Iuri Matias b78b742ab4 fix solc input 2016-05-29 15:09:57 -04:00
Iuri Matias 8e9588173c update to latest solc 2016-05-23 19:01:40 -04:00
Iuri Matias 7b9de1b259 make ethersim optional 2016-05-23 16:00:54 -04:00
Iuri Matias 1affc9807a use ethersim 0.3.0 2016-05-20 22:04:46 -04:00
Iuri Matias 54eb8771f3 update web3 to 0.15.0 2016-02-29 09:48:51 -05:00
Iuri Matias bd76193ac8 add bignumber to dependencies so BigNumber can be used in onDeploy 2016-02-25 15:21:45 -05:00
RJ Catalano 0ec7c88cd9 updating solc 2016-02-08 21:57:59 -05:00
VoR0220 63a16961bf Update package.json 2016-02-08 21:53:13 -05:00
Iuri Matias 0e2573c69b update web3 2016-02-03 20:54:31 -05:00
Iuri Matias 4cd0669819 update to 1.0.2 2015-10-13 12:01:21 -04:00
Iuri Matias 8b44f4fbe0 update to 1.0.1 2015-10-12 19:27:33 -04:00
Iuri Matias 5cf4529113 update to 1.0.0 2015-10-12 18:52:30 -04:00
Iuri Matias 75da137549 update to 1.0.0-beta.1 2015-10-12 18:33:19 -04:00
Iuri Matias a7da9bc3c5 remove sync-me dependency 2015-10-09 11:09:26 -04:00
Iuri Matias 2be2a80c31 remove method missing dependency 2015-10-09 11:05:43 -04:00
Iuri Matias 0e867c2a03 remove jasmine dependency 2015-10-09 11:03:02 -04:00
Iuri Matias fb2fbca8f7 remove hashmerge dependency 2015-10-09 11:01:55 -04:00
Iuri Matias b4d659a3d1 move spec code to lib 2015-10-09 10:57:30 -04:00
Iuri Matias 32ac41a9cb compile using js solc 2015-10-01 23:04:15 -04:00
Iuri Matias 8539ff241f update to 0.9.3 2015-09-15 09:03:25 -04:00
Iuri Matias b383c24496 update to 0.9.2 2015-09-14 21:38:32 -04:00
Iuri Matias fc66ea9ede update to 0.9.1 2015-09-05 07:43:13 -04:00
Iuri Matias d468e43f6f update to 0.9.0 2015-08-31 22:10:50 -04:00
Iuri Matias 8de45a1bed update to 0.8.6 2015-08-09 16:42:31 -04:00
Iuri Matias 0252177a79 update to 0.8.5 2015-08-08 11:36:49 -04:00
Iuri Matias 76203e43e3 update to 0.8.4 2015-08-05 22:32:14 -04:00