diff --git a/lib/pipeline/pipeline.js b/lib/pipeline/pipeline.js index b7568522..8f8e4d67 100644 --- a/lib/pipeline/pipeline.js +++ b/lib/pipeline/pipeline.js @@ -437,6 +437,7 @@ class Pipeline { //let EmbarkJSLib = fs.readFileSync(fs.embarkPath("js/embark.js")).toString(); let contractCode = ""; + contractCode += "import web3 from 'Embark/web3';\n"; contractCode += "import EmbarkJS from 'Embark/EmbarkJS';\n"; contractCode += "let " + contractName + "JSONConfig = " + contractJSON + ";\n"; //contractCode += contractName + "JSONConfig.web3 = window.web3;\n"; diff --git a/test_app/app/js/foo.js b/test_app/app/js/foo.js index 0b80d116..54bfec74 100644 --- a/test_app/app/js/foo.js +++ b/test_app/app/js/foo.js @@ -1,6 +1,6 @@ -import web3 from 'Embark/web3'; -console.log("foo"); -console.log(web3); +//import web3 from 'Embark/web3'; +//console.log("foo"); +//console.log(web3); const FOO = "dude"; diff --git a/test_app/app/js/new_index.js b/test_app/app/js/new_index.js index e2b968d0..fb423dd5 100644 --- a/test_app/app/js/new_index.js +++ b/test_app/app/js/new_index.js @@ -1,13 +1,14 @@ /*globals $, SimpleStorage, document*/ import $ from './_vendor/jquery.min'; -import web3 from 'Embark/web3'; -console.log("new_index"); -console.log(web3); +//import web3 from 'Embark/web3'; +//console.log("new_index"); +//console.log(web3); //window.web3 = web3; //console.log("finished importing web3"); import EmbarkJS from 'Embark/EmbarkJS'; import SimpleStorage from 'Embark/contracts/SimpleStorage'; +//import web3 from 'Embark/web3'; console.log("SimpleStorage") console.log(SimpleStorage);