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

427 Commits

Author SHA1 Message Date
Michael Bradley, Jr da4ccc133a
deps -- from babel-preset-react-app 2018-10-22 19:35:51 +02:00
Michael Bradley, Jr e4bba25cd7
deps -- bump versions of existing deps 2018-10-22 19:35:51 +02:00
Michael Bradley, Jr 665856f838
change back/to exact versions after master/develop rebase 2018-10-22 19:25:14 +02:00
Iuri Matias 4b81968482
restore ws functionality to webserver 2018-10-22 19:24:41 +02:00
Iuri Matias 091c535f80
update ws package 2018-10-22 19:23:16 +02:00
Jonathan Rainville fef793c5ef 3.2.3 2018-10-11 15:50:07 -04:00
Jonathan Rainville b773c83eea downgrade to web3 beta 34 2018-10-11 15:31:50 -04:00
Iuri Matias cbf70710e5 update to 3.2.2 2018-10-01 08:58:58 -04:00
Iuri Matias 4462745539 update to 3.2.1 2018-09-26 19:33:00 -04:00
Iuri Matias d734c0b2d3 update to 3.2.0 2018-09-26 19:08:25 -04:00
Iuri Matias a0d3dc2850 update to embarkjs 0.4.3 2018-09-26 18:51:05 -04:00
Michael Bradley, Jr 9a78301ac1 deps -- hosted-git-info 2018-09-24 17:44:53 -05:00
Michael Bradley, Jr 373a67b4a3 rev testdapp scripts -- INIT_CWD compat 2018-09-21 17:00:08 -05:00
Michael Bradley, Jr 6b48726ec3 deps -- cross-env 2018-09-21 16:57:56 -05:00
Michael Bradley, Jr bf61fe2757 deps -- npm-run-all 2018-09-21 16:43:04 -05:00
Michael Bradley, Jr f33962954a alpha sort devDeps 2018-09-21 16:41:53 -05:00
Michael Bradley, Jr c23868f95b spec exact versions per `npm ls --depth=0` 2018-09-20 14:51:32 -05:00
Iuri Matias c4de5fb512
Merge pull request #870 from embark-framework/features/engine-strict 
engine-strict
 2018-09-19 12:09:05 -04:00
Michael Bradley, Jr d8b9e1f6d8 spec node, npm in "engines" of package.json 2018-09-18 16:28:50 -05:00
Andre Medeiros 71f14778c2 Update web.js to 1.0.0-beta.36 2018-09-18 15:02:35 -04:00
Anthony Laibe bdcefbe269 Add coverage to webserver 2018-09-18 14:28:17 +01:00
Iuri Matias bab6f75862 update to embarkjs 0.4.2 2018-09-17 13:09:56 -04:00
Iuri Matias c8cf53fcde use solc 0.4.25 by default 2018-09-14 18:50:46 -04:00
Iuri Matias 9b2fa9402b
Merge pull request #822 from embark-framework/bugfix/circular-json 
Fix circular JSON and swarm api require
 2018-09-14 18:11:34 -04:00
Jonathan Rainville 43a9640297 add option to generate the coverage 2018-09-13 14:30:15 -04:00
Anthony Laibe c22901ab95 Fix circular JSON and swarm api require 2018-09-13 11:21:17 +01:00
emizzle 680db4d575 Change over to published swarm-api library 2018-09-12 12:43:10 +10:00
emizzle 6cfc914a04 Update package.json for swarmjs 2018-09-10 22:42:10 +10:00
emizzle fcb75dee11 Move to swarmjs and await geth ready 
Move to swarmjs library (in embark-framework).

Wait for geth to start before start of swarm check.
 2018-09-10 22:42:10 +10:00
emizzle b5e8546ebd Converted upload procedure to local SwarmGW lib 
# Conflicts:
#	package-lock.json
 2018-09-10 22:42:00 +10:00
Jonathan Rainville 5c973258a5 add pakcage 2018-09-07 12:37:30 -04:00
Iuri Matias a622f22dcd update package lock 2018-09-06 16:35:32 -04:00
Michael Bradley, Jr b47435cc45 opn dep 2018-09-03 10:17:45 -05:00
Michael Bradley, Jr 0ac384c478 web3@1.0.0-beta.35 2018-09-02 19:23:12 -05:00
Iuri Matias f94fd7b18f update embarkjs version 2018-09-01 09:35:14 -04:00
Iuri Matias 9cd3cb6891 update embark.js version 2018-09-01 09:35:14 -04:00
Iuri Matias 262a6d3aef move older code to embarkjs & refactor 2018-09-01 09:35:13 -04:00
Michael Bradley, Jr d6aafa17be compression-webpack-plugin dep 2018-08-24 15:04:16 -05:00
Michael Bradley, Jr 25cb0a572c lodash.clonedeep (there's a bug in clone-deep pkg re: regex) 2018-08-24 15:04:15 -05:00
Michael Bradley, Jr 81acad30c7 babel-plugin-webpack-aliases -> babel-plugin-module-resolver 2018-08-24 15:04:15 -05:00
hodlbank a834ca71de [m] Updated ganache-cli from broken 6.1.0 to 6.1.6 in order to fix simulatorBlocktime blockchain option. 2018-08-21 16:11:07 -04:00
Michael Bradley, Jr 30d075380b bump embarkjs to 0.3.4 2018-08-21 16:11:07 -04:00
Jonathan Rainville 8e50bfd976 conflict in package json 2018-08-21 16:11:06 -04:00
Iuri Matias 951246da70 update version to avoid confusion with stable version 2018-08-21 16:10:22 -04:00
Michael Bradley, Jr 1852809cb0 bump embarkjs dep (to ver w/ corresponding babel7rc1 fixes) 2018-08-21 16:09:49 -04:00
Michael Bradley, Jr c4e0eda1f9 no caret range for babel-loader (beta) 2018-08-21 16:09:49 -04:00
Michael Bradley, Jr 7bd9a5f81d bump @babel deps to 7.0.0-rc.1, no caret ranges 2018-08-21 16:09:48 -04:00
Michael Bradley, Jr 2a00fd824f pkg-up dependency 2018-08-21 16:09:48 -04:00
Andre Medeiros 8e396a17d8 Progress 2018-08-21 16:09:13 -04:00
Michael Bradley, Jr 314edadb57 Revert "Merge pull request #663 from embark-framework/revert-656-bug_fix/dot.embark_versions_modules" 
This reverts commit 7859c384ca, reversing
changes made to a58f21c303.
 2018-08-21 16:05:58 -04:00
Jonathan Rainville dd510ff6a1 add associate event in ens (not yet tested) 2018-08-21 16:05:58 -04:00
Anthony Laibe 70f777f0b0 Update embarkjs version 2018-08-21 16:05:58 -04:00
Anthony Laibe e57a13809a Revert package change 2018-08-21 16:05:58 -04:00
Iuri Matias 63b01a32d4 Revert ".embark/versions modules" 2018-08-21 16:05:58 -04:00
Anthony Laibe b548f9efae PR feedback 2018-08-21 16:05:39 -04:00
Anthony Laibe d6849bf04f Add IPNS demo 2018-08-21 16:05:39 -04:00
Michael Bradley, Jr aae20ac1ad spec glob as dep 2018-08-21 16:04:22 -04:00
Michael Bradley, Jr d13e8ac062 @babel/runtime should be a dep 2018-08-21 16:04:22 -04:00
Michael Bradley, Jr 5fe3b9e7ba spec caret ranges re: babel deps 2018-08-21 16:04:22 -04:00
Jonathan Rainville f5e3f2f274 up embarkJS version 2018-08-21 15:54:45 -04:00
Michael Bradley, Jr 78c3b1307a webpack-bundle-analyzer doesn't need to be a dep 2018-08-21 15:47:05 -04:00
Michael Bradley, Jr 7ea7234024 use embarkjs 0.2.0 2018-08-21 15:47:05 -04:00
Michael Bradley, Jr b08e035412 upgrade HardSource 2018-08-21 15:47:05 -04:00
Michael Bradley, Jr cef1958193 webpack bundle analyzer 2018-08-21 15:47:05 -04:00
Michael Bradley, Jr 359da86875 webpack 4 2018-08-21 15:47:05 -04:00
Michael Bradley, Jr b3ee25d697 babel deps to latest 7 beta 2018-08-21 15:47:05 -04:00
Michael Bradley, Jr 6a86af8020 bump babel related deps 2018-08-21 15:47:05 -04:00
Michael Bradley, Jr 71919dc3d9 embarkjs dep -- pre-pub pkg spec usable by auto testers (for PR rev) 2018-08-21 15:47:05 -04:00
Anthony Laibe b679d3031a Remove code dependencies to underscore 2018-08-21 15:47:05 -04:00
Anthony Laibe e8f6f2adf6 Update package.json url 2018-08-21 15:46:14 -04:00
Michael Bradley, Jr 8fe2109338 no need for ganache-cli "bin" entry 2018-08-21 15:42:05 -04:00
Iuri Matias 791ea2bf1b remove unused dev dependencies 2018-08-21 15:34:32 -04:00
Michael Bradley, Jr e0ff8a735d embark-ganache-cli -> ganache-cli-embark 2018-08-21 15:34:32 -04:00
Andre Medeiros 6d1dfd3581 Bump grunt-contrib-coffee 2018-08-21 15:33:00 -04:00
Andre Medeiros 058e81f61d Remove node-http-proxy as we don't use it anywhere 2018-08-21 15:33:00 -04:00
Andre Medeiros 1743083689 Tell Mocha to exit 2018-08-21 15:33:00 -04:00
Michael Bradley, Jr c9b2aa14b6 "embark-" prefixed bin entry in package.json for ganache-cli 2018-08-21 15:31:55 -04:00
Andre Medeiros 9c2208edd6 Bump Mocha to 5.2.0 2018-08-21 15:31:55 -04:00
Iuri Matias c0bc6e1b7c add support to download a template 2018-08-21 15:28:03 -04:00
Jonathan Rainville 26243e21e0 remove provider-engine as it has been creating lots of issues 2018-08-21 15:28:02 -04:00
Jonathan Rainville 5581964fab conflict in package json 2018-08-21 15:17:05 -04:00
emizzle efe649e4e6 Removed p-iteration from embark altogether. 
Replaced usage in storage module (on dapp side) with async.js `detectSeries`
 2018-08-21 15:12:07 -04:00
Jonathan Rainville eb9017bd2f update provider version 2018-08-21 15:08:25 -04:00
Iuri Matias d04f7622ce update to 3.1.10 2018-08-20 10:03:13 -04:00
Jonathan Rainville 6da4f7527e 3.1.9 2018-08-15 09:51:10 -04:00
Iuri Matias e3a48fd46a update to 3.1.8 2018-08-14 13:45:09 -04:00
Iuri Matias c577ad6b16 update to 3.1.7 2018-07-30 07:01:36 -04:00
Iuri Matias 0310d53b41 lock ethereumjs-wallet version due to breaking change in 0.6.1 patch 2018-07-30 06:44:27 -04:00
Iuri Matias 258358558b update to 3.1.6 2018-07-19 11:18:48 +03:00
Jonathan Rainville 446787447d 3.1.5 2018-07-06 10:50:41 -04:00
Iuri Matias 5bb1d33739 update to 3.1.4 2018-07-04 17:05:01 +03:00
Jonathan Rainville 3228ff2086 3.1.3 2018-07-03 15:12:27 -04:00
Iuri Matias 8800da6b42 update to 3.1.2 2018-06-25 13:37:36 -04:00
Iuri Matias bb21490d87 update to 3.1.1 2018-06-21 21:24:37 -04:00
Iuri Matias 6a5020402f update to 3.1 2018-06-19 17:54:10 -04:00
Iuri Matias 1f49c71850 re-add mocha to dependencies 2018-06-18 13:18:54 -04:00
Jonathan Rainville f517cc104f use new npm package instead of fork 2018-06-18 09:13:09 -04:00
Iuri Matias 37ab60d6de
Merge pull request #538 from embark-framework/features/ws-node 
Enable connection to websocket node
 2018-06-15 18:01:12 -04:00
emizzle 5e20f27c99 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:06:59 -04:00
Iuri Matias 0ca9446a4c use neo-blessed 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
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
Richard Ramos a9065b1eae Websocket handling 2018-06-12 08:50:49 -04:00
Richard Ramos 339ffa5869 Adding proxy for simulator 2018-06-11 16:38:29 -04:00
Iuri Matias b16c06025b use ipc for compiler 2018-06-04 18:15:37 -04:00
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias 8d985ce60a fix tests; put back solc 0.4.24 2018-06-01 18:09:54 -04:00
Jonathan Rainville 2d1a37d63b conflict in pakcgae lock 2018-06-01 13:44:49 -04:00
Jonathan Rainville c234655acd resolve conflict in test.js 2018-06-01 13:33:11 -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 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
VoR0220 73720b6978 add eth ens namehash package 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:50:55 -05: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
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
Jonathan Rainville 1ffc9ffe08 enable events calling for request and on 2018-05-16 16:41:25 -04:00
Jonathan Rainville b7908a3797 conflict in package lock 2018-05-14 11:18:48 -04:00
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