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

98 Commits

Author SHA1 Message Date
Iuri Matias 448593b36f move asset files check from index to pipeline; index shouldn't know about the internals 2018-07-07 16:51:24 +03:00
Jonathan Rainville 812cefafb1 kill processes when they are over 2018-06-11 15:55:57 -04:00
Jonathan Rainville 0214447476 tigger build 2018-06-08 11:20:14 -04:00
Iuri Matias c8b52a1746 fix errors handling so it doesn't attempt to continue building when there are fatal errors compiling contracts 2018-06-08 07:07:27 -04:00
Jonathan Rainville 56f25ebba1 clonflict for silent 2018-05-30 10:57:25 -04:00
Jonathan Rainville 6145c0b92c start node only when no node is present 2018-05-23 11:17:02 -04:00
Eric Mastro ab1113fc31 Fixed bug where dist folder is created before placeholder page 
If dist folder did not already exist, the folder is created prior to creation of the placeholder page. Without this, the dapp files are never built.
 2018-05-23 13:35:18 +10:00
Eric Mastro f10abc8da1
Merge branch 'develop' into features/show-building-placeholder 2018-05-23 09:36:11 +10:00
emizzle ab738c05f9 Moved placeholder page html to code generator and ejs template. 2018-05-23 09:33:05 +10:00
emizzle db9fbef140 Add loading placeholder page while embark is building asset files. 
We could extend this further to launch the webserver with the placeholder page before building the contracts as well.
 2018-05-22 15:15:34 +10:00
emizzle 46e040f861 Merged in merge conflicts from remote 2018-05-22 12:16:13 +10:00
emizzle 85919a4f6d Update to make the imports 'shim' more readable as requested. 2018-05-22 12:11:45 +10:00
Eric Mastro 295152de82
Merge branch 'develop' into features/improve-imports 2018-05-21 21:46:14 +10:00
Eric Mastro d4c04bbed7 Improve dapp imports to allow alternate syntax for importing contracts 
* Now supports alternate import statements:
 * import {Token} from 'Embark/contracts';
 * import * as Contracts from 'Embark/contracts';
as well as the existing syntax:
 * import Token from 'Embark/contracts/Token';

* Contracts  js files moved from .embark to .embark/contracts
* .embark/contracts/index.js generated on the fly which requires all contracts in .embark/contract automatically and then creates a module.exports with each of them.
 2018-05-21 21:43:36 +10:00
Jonathan Rainville b829643f61 use once in pipeline 2018-05-18 14:25:20 -04:00
Jonathan Rainville c5c00fc3b4 conflict in solcW 2018-05-18 14:11:29 -04:00
Iuri Matias 01ae387c74
Merge pull request #418 from embark-framework/refactor_pipeline 
Refactor pipeline
 2018-05-16 18:15:51 -04:00
Iuri Matias b1fab3e77c remove console logs 2018-05-16 18:15:23 -04:00
Jonathan Rainville 1ffc9ffe08 enable events calling for request and on 2018-05-16 16:41:25 -04:00
Jonathan Rainville 953ce6659e reorg subscribe to message method 2018-05-16 16:41:25 -04:00
Jonathan Rainville 1c125a019c conflict in en.json 2018-05-16 16:41:15 -04:00
Jonathan Rainville 3c0fda5a40 add eventWrapper not tested 2018-05-16 16:40:17 -04:00
Iuri Matias 00e3af9012 lint is king 2018-05-16 15:18:12 -04:00
Iuri Matias 8ae6c6a646 simplify buildContracts and buildWeb3JS methodsgst 2018-05-16 15:07:47 -04:00
Iuri Matias 44d6cc32df remove old remove listener; fix callback 2018-05-16 13:56:23 -04:00
Iuri Matias b7fc3f9054 refactor write contracts 2018-05-16 12:48:17 -04:00
Iuri Matias d8a1894803 remove extra method 2018-05-16 10:09:46 -04:00
Iuri Matias 6544c2a999 move contracts generation from pipeline to code generator module 2018-05-16 10:00:56 -04:00
Iuri Matias 7271b00cf4 make file changes in the pipelins 2018-05-15 18:21:00 -04:00
Iuri Matias 1f6e386d9b build web3js generation from pipeline to code_generator 2018-05-15 18:05:44 -04:00
Iuri Matias 26187cfa1d add missing default from 2018-05-11 16:18:44 -04:00
Iuri Matias 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -04:00
Jonathan Rainville a35ce6f73e pass normalizeInput 2018-05-10 11:14:25 -04:00
Jonathan Rainville 83f97407e8 touch ups 2018-05-10 10:48:06 -04:00
Jonathan Rainville 31e82e31d0 do a process for each file 2018-05-10 10:43:10 -04:00
Jonathan Rainville ed1d0ce67c make only webpack in a separate process 2018-05-10 10:10:09 -04:00
Jonathan Rainville dc7a002c1e improve logging 2018-05-08 11:31:47 -04:00
Jonathan Rainville 7d64b705a3 touch ups 2018-05-08 09:52:06 -04:00
Jonathan Rainville a03777dc65 async buildContractJs 2018-05-08 09:41:19 -04:00
Jonathan Rainville 4ec7fbb9db async buildContracts 2018-05-08 09:36:50 -04:00
Jonathan Rainville 2dd9e8f2ea async contract write 2018-05-08 09:25:37 -04:00
Jonathan Rainville af38383e0f lint 2018-05-08 09:04:53 -04:00
Jonathan Rainville 1fe6f4ee2c more async 2018-05-08 09:02:46 -04:00
Jonathan Rainville 1d5f015aaa async some functions 2018-05-08 08:54:10 -04:00
Jonathan Rainville e85d8b1ae5 fix file writing, now working 2018-05-07 16:33:30 -04:00
Jonathan Rainville d2d29be334 fix getting web3 location and provider code 2018-05-07 15:48:01 -04:00
Jonathan Rainville 148a74f3d6 make pipeline js in a different process (still doesnt work) 2018-05-07 14:30:30 -04:00
Jonathan Rainville 3ecb195b38 move import list out of loop to accelerate build process 2018-04-09 16:29:49 -04:00
Jonathan Rainville f37b09a371 fix build process on windows 2018-04-09 16:14:07 -04:00
Iuri Matias 2ec7589f90 refactor to use dappPath 2018-04-02 15:30:16 -04:00