Make web3 as package in lerna packages (web3#1045)

* make web3 as main package in lerna

* modify web3 require path for testcases

* change build process for web3

* change build process for web3 package

bower.json

@@ -29,30 +29,30 @@
     "API"
   ],
   "authors": [
-      {
-          "name": "Fabian Vogelsteller",
-          "email": "[email protected]",
-          "homepage": "http://frozeman.de"
-      },
-      {
-          "name": "Marek Kotewicz",
-          "email": "[email protected]",
-          "url": "https://github.com/debris"
-      },
-      {
-          "name": "Marian Oancea",
-          "url": "https://github.com/cubedro"
-      },
-      {
-          "name": "Gav Wood",
-          "email": "[email protected]",
-          "homepage": "http://gavwood.com"
-      },
-      {
-          "name": "Jeffery Wilcke",
-          "email": "[email protected]",
-          "url": "https://github.com/obscuren"
-      }
+    {
+      "name": "Fabian Vogelsteller",
+      "email": "[email protected]",
+      "homepage": "http://frozeman.de"
+    },
+    {
+      "name": "Marek Kotewicz",
+      "email": "[email protected]",
+      "url": "https://github.com/debris"
+    },
+    {
+      "name": "Marian Oancea",
+      "url": "https://github.com/cubedro"
+    },
+    {
+      "name": "Gav Wood",
+      "email": "[email protected]",
+      "homepage": "http://gavwood.com"
+    },
+    {
+      "name": "Jeffery Wilcke",
+      "email": "[email protected]",
+      "url": "https://github.com/obscuren"
+    }
   ],
   "ignore": [
     "test",

gulpfile.js

@@ -23,7 +23,7 @@ var DEST = path.join(__dirname, 'dist/');
 var packages = [{
     fileName: 'web3',
     expose: 'Web3',
-    src: './src/index.js',
+    src: './packages/web3/src/index.js',
     ignore: ['xmlhttprequest','websocket']
 },{
     fileName: 'web3-utils',
@@ -185,7 +185,7 @@ packages.forEach(function(pckg, i){
 
 
 gulp.task('watch', function() {
-    gulp.watch(['./src/*.js'], ['lint', 'build']);
+    gulp.watch(['./packages/web3/src/*.js'], ['lint', 'build']);
 });
 
 gulp.task('all', ['version', 'lint', 'clean', packages[packages.length-1].fileName]);

package.json

@@ -4,17 +4,15 @@
   "version": "1.0.0-beta.20",
   "description": "Ethereum JavaScript API",
   "license": "LGPL-3.0",
-  "main": "./src/index.js",
   "directories": {
-    "lib": "./src",
     "doc": "./doc",
     "test": "./test"
   },
   "scripts": {
     "postinstall": "lerna bootstrap",
     "build": "gulp",
     "build-all": "gulp all",
-    "release": "lerna bootstrap; gulp; lerna publish --skip-git; gulp version; npm publish",
+    "release": "lerna bootstrap; gulp; lerna publish --skip-git;",
     "watch": "gulp watch",
     "docs": "cd docs; make html;",
     "lint": "jshint *.js packages",
@@ -61,9 +59,6 @@
       "url": "https://github.com/obscuren"
     }
   ],
-  "dependencies": {
-    "lerna": "^2.0.0"
-  },
   "devDependencies": {
     "babel-preset-env": "^1.6.0",
     "bignumber.js": "^4.0.0",
@@ -86,6 +81,7 @@
     "gulp-uglify": "^3.0.0",
     "istanbul": "^0.4.4",
     "jshint": ">=2.5.0",
+    "lerna": "^2.0.0",
     "mocha": ">=2.3.3",
     "sandboxed-module": "^2.0.2",
     "underscore": "^1.8.3",

packages/web3-bzz/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-bzz",
-    "version": "1.0.0-beta.17",
+    "version": "1.0.0-beta.20",
     "description": "Web3 module to interact with the Swarm network.",
     "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-bzz",
     "license": "LGPL-3.0",

packages/web3-core-promievent/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-promievent",
-    "version": "1.0.0-beta.17",
+    "version": "1.0.0-beta.20",
     "description": "This package extends eventEmitters with promises to allow chaining as well as multiple final states of a function.",
     "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-promievent",
     "license": "LGPL-3.0",

packages/web3/README.md

@@ -0,0 +1,13 @@
+# web3
+
+This is a main package of [web3.js][repo]
+
+Please read the [documentation][docs] for more.
+
+## Installation
+
+### Node.js
+
+```bash
+npm install web3
+```

packages/web3/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "web3",
+  "version": "1.0.0-beta.20",
+  "description": "Web3 main package.",
+  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3",
+  "license": "LGPL-3.0",
+  "main": "src/index.js",
+  "dependencies": {
+    "web3-core": "^1.0.0-beta.20",
+    "web3-eth": "^1.0.0-beta.20",
+    "web3-net": "^1.0.0-beta.20",
+    "web3-eth-personal": "^1.0.0-beta.20",
+    "web3-shh": "^1.0.0-beta.20",
+    "web3-bzz": "^1.0.0-beta.20",
+    "web3-utils": "^1.0.0-beta.20"
+  }
+}

src/index.js → packages/web3/src/index.js

@@ -28,51 +28,43 @@
 "use strict";
 
 
-var version = require('../lerna.json');
-var core = require('../packages/web3-core');
-
-var Eth = require('../packages/web3-eth');
-var Net = require('../packages/web3-net');
-var Personal = require('../packages/web3-eth-personal');
-var Shh = require('../packages/web3-shh');
-var Bzz = require('../packages/web3-bzz');
-
-var utils = require('../packages/web3-utils');
-
-
+var version = require('../package.json').version;
+var core = require('web3-core');
+var Eth = require('web3-eth');
+var Net = require('web3-net');
+var Personal = require('web3-eth-personal');
+var Shh = require('web3-shh');
+var Bzz = require('web3-bzz');
+var utils = require('web3-utils');
 
 var Web3 = function Web3() {
     var _this = this;
 
     // sets _requestmanager etc
     core.packageInit(this, arguments);
 
-    this.version = version.version;
+    this.version = version;
     this.utils = utils;
 
     this.eth = new Eth(this);
     this.shh = new Shh(this);
     this.bzz = new Bzz(this);
 
-
     // overwrite package setProvider
     var setProvider = this.setProvider;
     this.setProvider = function (provider, net) {
         setProvider.apply(_this, arguments);
 
         this.eth.setProvider(provider, net);
-
         this.shh.setProvider(provider, net);
-
         this.bzz.setProvider(provider);
 
         return true;
     };
 };
 
-Web3.version = version.version;
+Web3.version = version;
 Web3.utils = utils;
-
 Web3.modules = {
     Eth: Eth,
     Net: Net,
@@ -83,8 +75,5 @@ Web3.modules = {
 
 core.addProviders(Web3);
 
-
-
-
 module.exports = Web3;
 

test/1_givenProvider-ethereumProvider.js

@@ -9,7 +9,7 @@ describe('Web3.providers.givenProvider', function () {
 
         it('when instantiating Web3', function () {
 
-            var Web3 = require('../src/index.js');
+            var Web3 = require('../packages/web3');
 
             assert.deepEqual(Web3.givenProvider, global.ethereumProvider);
 

test/2_givenProvider-currentProvider.js

@@ -11,7 +11,7 @@ describe('Web3.providers.givenProvider', function () {
 
         it('when instantiating Web3', function () {
 
-            var Web3 = require('../src/index.js');
+            var Web3 = require('../packages/web3');
 
             assert.deepEqual(Web3.givenProvider, global.web3.currentProvider);
 

test/async.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index');
+var Web3 = require('../packages/web3');
 var FakeHttpProvider = require('./helpers/FakeIpcProvider');
 
 var web3 = new Web3();

test/batch.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index');
+var Web3 = require('../packages/web3');
 var FakeIpcProvider = require('./helpers/FakeIpcProvider');
 
 

test/eth.abi.decodeLog.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [{

test/eth.abi.decodeParameter.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [{

test/eth.abi.decodeParameters.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [{

test/eth.abi.encodeEventSignature.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [{

test/eth.abi.encodeFunctionCall.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [{

test/eth.abi.encodeFunctionSignature.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [{

test/eth.abi.encodeParameter.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [{

test/eth.abi.encodeParameters.js

@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [{

test/eth.accounts.create.js

@@ -1,8 +1,8 @@
-var Accounts = require("./../packages/web3-eth-accounts/src/index.js");
+var Accounts = require("./../packages/web3-eth-accounts");
 var ethereumWallet = require('ethereumjs-wallet');
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [];

test/eth.accounts.encrypt-decrypt.js

@@ -2,7 +2,7 @@ var Accounts = require("./../packages/web3-eth-accounts/src/index.js");
 var ethereumWallet = require('ethereumjs-wallet');
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [];

test/eth.accounts.sign.js

@@ -1,7 +1,7 @@
-var Accounts = require("./../packages/web3-eth-accounts/src/index.js");
+var Accounts = require("./../packages/web3-eth-accounts");
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [

test/eth.accounts.signTransaction.js

@@ -1,6 +1,6 @@
 var FakeHttpProvider = require('./helpers/FakeIpcProvider');
-var Web3 = require('../src/index.js');
-var Accounts = require("./../packages/web3-eth-accounts/src/index.js");
+var Web3 = require('../packages/web3');
+var Accounts = require("./../packages/web3-eth-accounts");
 var ethjsSigner = require("ethjs-signer");
 var chai = require('chai');
 var assert = chai.assert;

test/eth.accounts.wallet.js

@@ -1,7 +1,7 @@
-var Accounts = require("./../packages/web3-eth-accounts/src/index.js");
+var Accounts = require("./../packages/web3-eth-accounts");
 var chai = require('chai');
 var assert = chai.assert;
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 var web3 = new Web3();
 
 var tests = [

test/eth.defaultAccount.js

@@ -1,7 +1,7 @@
 var chai = require('chai');
 var assert = chai.assert;
 var Eth = require('../packages/web3-eth');
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 
 var eth = new Eth();
 

test/eth.net.getNetworkType.js

@@ -1,7 +1,7 @@
 var chai = require('chai');
 var assert = chai.assert;
 var FakeHttpProvider = require('./helpers/FakeIpcProvider');
-var Web3 = require('../src/index.js');
+var Web3 = require('../packages/web3');
 
 var tests = [{
     hash: '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3',