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

3375 Commits

Author SHA1 Message Date
emizzle 6cfc914a04 Update package.json for swarmjs 2018-09-10 22:42:10 +10:00
emizzle b759e9eed7 Add ‘defaultpath’ for upload 
Hardcode to ‘index.html’
 2018-09-10 22:42:10 +10:00
emizzle 9d39fa39ac Swarm updates for embark 
Change __embarkSwarm to use new SwarmJS and change over from promises.

Add note after upload that blockchain nodes needs to be running to access the swarm uploaded dapp.

Fix typo with swarm “on” available.

Linting / cleanup
 2018-09-10 22:42:10 +10:00
emizzle e44b62d550 SwarmJS browser support 2018-09-10 22:42:10 +10:00
emizzle 3f5fe21b90 change to ‘uploadDirectory’ 2018-09-10 22:42:10 +10:00
emizzle 2dc8d8c276 Fix issue with swarm isAvailable 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
Iuri Matias 8c3ac34fac
Merge pull request #794 from embark-framework/bug_fix/check-node-modules 
Check node modules before running
 2018-09-07 19:05:21 -04:00
Iuri Matias 833fcef22a
Merge pull request #795 from embark-framework/bug_fix/webserver-config-change 
Watch webserver config and restart it
 2018-09-07 19:04:17 -04:00
Iuri Matias 4128a96997
Merge pull request #796 from embark-framework/bug_fix/web3-location 
getWeb3Location should use require.resolve()
 2018-09-07 19:03:59 -04:00
Iuri Matias 2a41c7c310
Merge pull request #792 from embark-framework/feature/ens-configured-only-once 
Ens config is run only once
 2018-09-07 18:48:06 -04:00
Iuri Matias 12fbb46aeb
Merge pull request #793 from embark-framework/feature/metamask-eip-1102 
Ready for EIP 1102
 2018-09-07 18:46:39 -04:00
Michael Bradley, Jr 7549c1f8e6 require.resolve() should start by looking in embark's own node_modules 2018-09-07 16:28:03 -05:00
Michael Bradley, Jr 13e21702d2 getWeb3Location should use require.resolve() for "version:get:web3" event 2018-09-07 15:52:30 -05:00
Jonathan Rainville 3d37fe6362 catch webserver config and restart it 2018-09-07 14:54:15 -04:00
Jonathan Rainville fb7b98c055 make sure we are in a Dapp 2018-09-07 12:40:25 -04:00
Jonathan Rainville 5c973258a5 add pakcage 2018-09-07 12:37:30 -04:00
Jonathan Rainville 542462faed check deps before launching 2018-09-07 12:37:18 -04:00
Anthony Laibe 4c580dd54d Pr feedback using once 2018-09-07 14:57:49 +01:00
Anthony Laibe 93424f5c78 Ready for EIP 1102 2018-09-07 14:31:34 +01:00
Anthony Laibe 4481e6eb99 Ens config is run only once 2018-09-07 11:18:43 +01:00
Iuri Matias a622f22dcd update package lock 2018-09-06 16:35:32 -04:00
Iuri Matias 18ab1ce101
Merge pull request #790 from embark-framework/bugfix/solc-die 
Avoid Solc to die because of compilation
 2018-09-06 13:31:39 -04:00
Jonathan Rainville bee3aa1fde
Merge pull request #789 from eiselems/extendTemplateGenerator 
Extend template_generator to support git urls and branches
 2018-09-06 09:33:07 -04:00
Anthony Laibe 5957be9571 Avoid Solc to die because of compilation 2018-09-06 11:24:29 +01:00
eiselems c99d75c9f1 Extend template_generator to support git urls and branches 
This change will also:
* upgrade calls from HTTP to HTTPS
* update / add some tests
See: #765
 2018-09-06 02:09:46 +02:00
Iuri Matias 10035fe46b
Merge pull request #786 from embark-framework/bug_fix/upload-simple 
Fix uploading a simple app
 2018-09-05 18:23:27 -04:00
Iuri Matias 48a3d70df2
Merge pull request #785 from embark-framework/bug_fix/no-warning-dev 
No accounts warning in development
 2018-09-05 18:22:09 -04:00
Iuri Matias ebf3d9ba7e
Merge pull request #783 from embark-framework/bugfix/command-description-testrpc 
Remove testrpc option
 2018-09-05 18:21:44 -04:00
Iuri Matias 6f7c999091
Merge pull request #784 from embark-framework/bugfix/typo 
Fix typo
 2018-09-05 18:21:30 -04:00
Iuri Matias 428820f2c6
Merge pull request #781 from embark-framework/bug_fix/no-webserver-if-false 
Do not start webserver if set to false in embark.json
 2018-09-05 18:20:31 -04:00
Michael Bradley, Jr 7d29e53048 remove stray `?` in webpack.config.js 2018-09-05 16:49:26 -05:00
André Medeiros 81e9cf7ff0
Merge pull request #787 from embark-framework/fix/compiler-warnings-in-tests 
Fix compiler warnings when running test suite
 2018-09-05 13:05:52 -04:00
Andre Medeiros a93361f9fb Fix compiler warnings when running test suite 2018-09-05 12:38:42 -04:00
Jonathan Rainville 55bb028a13 add test too 2018-09-05 12:35:45 -04:00
Jonathan Rainville 74e9974c00 exit with 1 2018-09-05 11:48:14 -04:00
Jonathan Rainville 56147ba200 fix order and remove ? 2018-09-05 11:47:53 -04:00
Jonathan Rainville 75c15e478f
Merge pull request #782 from embark-framework/bugfix/ipc-stuck 
Fix dynamic IPC
 2018-09-05 11:38:47 -04:00
Jonathan Rainville 047286b46d skip webpack if no js files 2018-09-05 11:38:09 -04:00
Jonathan Rainville 3991880b44 no warning in development 2018-09-05 09:45:34 -04:00
Anthony Laibe ad118f42c0 Fix typo 2018-09-05 14:29:26 +01:00
Anthony Laibe caeb0c86b4 Remove testrpc option 2018-09-05 14:12:26 +01:00
Anthony Laibe c92f6f8865 Fix dynamic IPC 2018-09-05 10:40:37 +01:00
Jonathan Rainville e925200592 disable webserver if false 2018-09-04 16:44:42 -04:00
Iuri Matias 0f1f3a782a
Merge pull request #779 from embark-framework/chore/add-embarkjs-to-help 
Add embarkJS to help
 2018-09-04 15:26:31 -04:00
Jonathan Rainville 9351a12444 add embarkJS to help 2018-09-04 14:12:12 -04:00
Iuri Matias bf8183cf76
Merge pull request #778 from embark-framework/fix_deploy 
Fix issue with changes in config file not causing a proper reload
 2018-09-04 14:02:54 -04:00
Iuri Matias 7ee02525a7
Merge pull request #770 from embark-framework/features/open-browser 
open browser when Embark's webserver starts
 2018-09-04 13:51:57 -04:00
Michael Bradley, Jr d4be16ba3c move reporting to final callback 2018-09-04 08:20:58 -05:00