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

Merge pull request #624 from embark-framework/use_package_web3 

remove custom web3 js; use packaged one instead
This commit is contained in:
RJ Catalano 2018-07-11 19:06:51 -05:00 committed by GitHub
parent 038d405af9 3ed4d28970
commit 4d473f0b34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/web3-1.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
lib/contracts/code_generator.js
View File

@ -292,7 +292,7 @@ class CodeGenerator {
function getWeb3Location(next) { function getWeb3Location(next) {
self.events.request("version:get:web3", function(web3Version) { self.events.request("version:get:web3", function(web3Version) {
if (web3Version === "1.0.0-beta") { if (web3Version === "1.0.0-beta") {
return next(null, fs.embarkPath("js/web3-1.0.min.js")); return next(null, fs.embarkPath("node_modules/web3"));
} else { } else {
self.events.request("version:getPackageLocation", "web3", web3Version, function(err, location) { self.events.request("version:getPackageLocation", "web3", web3Version, function(err, location) {
return next(null, fs.dappPath(location)); return next(null, fs.dappPath(location));
@ -352,7 +352,7 @@ class CodeGenerator {
function getWeb3Location(next) { function getWeb3Location(next) {
self.events.request("version:get:web3", function(web3Version) { self.events.request("version:get:web3", function(web3Version) {
if (web3Version === "1.0.0-beta") { if (web3Version === "1.0.0-beta") {
return next(null, utils.joinPath(fs.embarkPath("js/web3-1.0.min.js"))); return next(null, utils.joinPath(fs.embarkPath("node_modules/web3")));
} else { } else {
self.events.request("version:getPackageLocation", "web3", web3Version, function(err, location) { self.events.request("version:getPackageLocation", "web3", web3Version, function(err, location) {
return next(null, fs.dappPath(location)); return next(null, fs.dappPath(location));

2
test_apps/test_app/embark.json
View File

@ -16,7 +16,7 @@
"config": "config/", "config": "config/",
"versions": { "versions": {
"solc": "0.4.24", "solc": "0.4.24",
"web3": "1.0.0-beta.34", "web3": "1.0.0-beta",
"ipfs-api": "17.2.7" "ipfs-api": "17.2.7"
}, },
"plugins": { "plugins": {