embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

support specifying web3.js separetly

This commit is contained in:
Iuri Matias 2017-07-02 14:55:35 -04:00
parent 31ecaf0837
commit 61e44b31e9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/core/config.js
View File

@ -256,6 +256,9 @@ Config.prototype.loadFiles = function(files) {
readFiles.push({filename: file, content: web3Content, path: fs.embarkPath("js/web3.js")}); readFiles.push({filename: file, content: web3Content, path: fs.embarkPath("js/web3.js")});
}); });
} }
if (file === "web3.js") {
readFiles.push({filename: 'web3.js', content: fs.readFileSync(fs.embarkPath("js/web3.js")).toString(), path: fs.embarkPath("js/web3.js")});
}
}); });
// get plugins // get plugins
@ -290,6 +293,8 @@ Config.prototype.loadFiles = function(files) {
return; return;
} else if (file.indexOf("web3-") === 0) { } else if (file.indexOf("web3-") === 0) {
return; return;
} else if (file.indexOf("web3") === 0) {
return;
} else if (file === 'abi.js') { } else if (file === 'abi.js') {
readFiles.push({filename: file, content: "", path: file}); readFiles.push({filename: file, content: "", path: file});
} else { } else {

3
test_app/embark.json
View File

@ -11,7 +11,8 @@
"index.html": "app/index.html", "index.html": "app/index.html",
"test.html": "app/test.html", "test.html": "app/test.html",
"test2.html": "app/test2.html", "test2.html": "app/test2.html",
"js/myweb3.js": "web3-0.18.js" "js/myweb3.js": "web3-0.18.js",
"js/web3.js": "web3.js"
}, },
"buildDir": "dist/", "buildDir": "dist/",
"config": "config/", "config": "config/",