From 3b0a2b9b3e2e30f5b2413c04435a7d9c73576d70 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Mon, 11 Feb 2019 10:37:36 -0500
Subject: [PATCH] feat(embark/generation): remove generation of web3instance.js

---
 .../src/lib/modules/code_generator/index.js   | 33 +------------------
 .../embark/src/lib/modules/pipeline/index.js  | 16 ---------
 2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/packages/embark/src/lib/modules/code_generator/index.js b/packages/embark/src/lib/modules/code_generator/index.js
index 43fe1b41e..673b17059 100644
--- a/packages/embark/src/lib/modules/code_generator/index.js
+++ b/packages/embark/src/lib/modules/code_generator/index.js
@@ -312,7 +312,7 @@ class CodeGenerator {
       function getImports(web3Location, next) {
         web3Location = web3Location.replace(/\\/g, '/'); // Import paths must always have forward slashes
         code += `\nimport Web3 from '${web3Location}';\n`;
-        code += "\nimport web3 from 'Embark/web3';\n";
+        code += `\nglobal.Web3 = Web3;`;
         code += "\nimport IpfsApi from 'ipfs-api';\n";
 
         next();
@@ -376,37 +376,6 @@ class CodeGenerator {
 
     this.generateArtifact(contractCode, contractName + '.js', constants.dappConfig.contractsJs, cb);
   }
-
-  buildWeb3JS(cb) {
-    const self = this;
-    let code = "";
-
-    async.waterfall([
-      function getWeb3Location(next) {
-        self.events.request("version:get:web3", function(web3Version) {
-          if (web3Version === "1.0.0-beta") {
-            return next(null, require.resolve("web3", {paths: [self.fs.embarkPath("node_modules")]}));
-          }
-          self.events.request("version:getPackageLocation", "web3", web3Version, function(err, location) {
-            return next(null, self.fs.dappPath(location));
-          });
-        });
-      },
-      function getImports(web3Location, next) {
-        web3Location = web3Location.replace(/\\/g, '/'); // Import paths must always have forward slashes
-        code += `\nimport Web3 from '${web3Location}';\n`;
-        code += "\nglobal.Web3 = Web3;\n";
-
-        code += "\nconsole.log('GLOBAL WEB3', global.web3);";
-        code += "\nif (typeof web3 === 'undefined') {";
-        code += "\n  var web3 = new Web3();";
-        code += "\n}";
-
-        code += "\nexport default web3;\n";
-        next(null, code);
-      }
-    ], cb);
-  }
 }
 
 module.exports = CodeGenerator;
diff --git a/packages/embark/src/lib/modules/pipeline/index.js b/packages/embark/src/lib/modules/pipeline/index.js
index c59a88dec..644bb8751 100644
--- a/packages/embark/src/lib/modules/pipeline/index.js
+++ b/packages/embark/src/lib/modules/pipeline/index.js
@@ -154,7 +154,6 @@ class Pipeline {
         self.events.request('placeholder:build', next);
       },
       (next) => self.buildContracts(next),
-      (next) => self.buildWeb3JS(next),
       function createImportList(next) {
         importsList["Embark/EmbarkJS"] = self.fs.dappPath(self.embarkConfig.generationDir, constants.dappConfig.embarkjs);
         importsList["Embark/web3"] = self.fs.dappPath(".embark", 'web3_instance.js');
@@ -372,21 +371,6 @@ class Pipeline {
     ], cb);
   }
 
-  buildWeb3JS(cb) {
-    const self = this;
-    async.waterfall([
-      function makeDirectory(next) {
-        self.fs.mkdirp(self.fs.dappPath(".embark"), err => next(err));
-      },
-      function getWeb3Code(next) {
-        self.events.request('code-generator:web3js', next);
-      },
-      function writeFile(code, next) {
-        self.fs.writeFile(self.fs.dappPath(".embark", 'web3_instance.js'), code, next);
-      }
-    ], cb);
-  }
-
   runPlugins(file, fileContent, fileCb) {
     const self = this;
     if (self.pipelinePlugins.length <= 0) {