Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/exact version dependencies #1130

Merged
merged 8 commits into from Nov 14, 2017
Merged

Feature/exact version dependencies #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9dcb44
Specify the "--exact" flag when running `lerna publish` to pin depend…
dacarley Oct 21, 2017
7a8809d
Fixed package versioning.
dacarley Oct 21, 2017
4c89f47
Merge branch '1.0' into feature/exactVersionDependencies
dacarley Oct 23, 2017
b8bcd14
Merge branch '1.0' of https://github.com/ethereum/web3.js into featur…
dacarley Oct 24, 2017
fb3bcae
Simplified the `npm run release` script, removed version update of me…
dacarley Oct 24, 2017
b69b7dc
Discovered a more global way of ensuring that lerna always publishes …
dacarley Oct 26, 2017
8dcc83c
Merge branch '1.0' of https://github.com/ethereum/web3.js into featur…
dacarley Nov 14, 2017
a60a3f5
Fixed blocking test in eth.sendTransaction.js
dacarley Nov 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 56 additions & 51 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

'use strict';

var version = require('./lerna.json');
var lernaJSON = require('./lerna.json');
var path = require('path');

var del = require('del');
Expand All @@ -24,74 +24,74 @@ var packages = [{
fileName: 'web3',
expose: 'Web3',
src: './packages/web3/src/index.js',
ignore: ['xmlhttprequest','websocket']
},{
ignore: ['xmlhttprequest', 'websocket']
}, {
fileName: 'web3-utils',
expose: 'Web3Utils',
src: './packages/web3-utils/src/index.js'
},{
}, {
fileName: 'web3-eth',
expose: 'Web3Eth',
src: './packages/web3-eth/src/index.js'
},{
}, {
fileName: 'web3-eth-accounts',
expose: 'Web3EthAccounts',
src: './packages/web3-eth-accounts/src/index.js'
},{
}, {
fileName: 'web3-eth-contract',
expose: 'Web3EthContract',
src: './packages/web3-eth-contract/src/index.js'
},{
}, {
fileName: 'web3-eth-personal',
expose: 'Web3EthPersonal',
src: './packages/web3-eth-personal/src/index.js'
},{
}, {
fileName: 'web3-eth-iban',
expose: 'Web3EthIban',
src: './packages/web3-eth-iban/src/index.js'
},{
}, {
fileName: 'web3-eth-abi',
expose: 'Web3EthAbi',
src: './packages/web3-eth-abi/src/index.js'
},{
}, {
fileName: 'web3-net',
expose: 'Web3Net',
src: './packages/web3-net/src/index.js'
},{
}, {
fileName: 'web3-shh',
expose: 'Web3Shh',
src: './packages/web3-shh/src/index.js'
},{
}, {
fileName: 'web3-bzz',
expose: 'Web3Bzz',
src: './packages/web3-bzz/src/index.js'
},{
}, {
fileName: 'web3-providers-ipc',
expose: 'Web3IpcProvider',
src: './packages/web3-providers-ipc/src/index.js'
},{
}, {
fileName: 'web3-providers-http',
expose: 'Web3HttpProvider',
src: './packages/web3-providers-http/src/index.js',
ignore: ['xmlhttprequest']
},{
}, {
fileName: 'web3-providers-ws',
expose: 'Web3WsProvider',
src: './packages/web3-providers-ws/src/index.js',
ignore: ['websocket']
},{
}, {
fileName: 'web3-core-subscriptions',
expose: 'Web3Subscriptions',
src: './packages/web3-core-subscriptions/src/index.js'
},{
}, {
fileName: 'web3-core-requestmanager',
expose: 'Web3RequestManager',
src: './packages/web3-core-requestmanager/src/index.js'
},{
}, {
fileName: 'web3-core-promievent',
expose: 'Web3PromiEvent',
src: './packages/web3-core-promievent/src/index.js'
},{
}, {
fileName: 'web3-core-method',
expose: 'Web3Method',
src: './packages/web3-core-method/src/index.js'
Expand All @@ -107,88 +107,93 @@ var browserifyOptions = {
};

var ugliyOptions = {
compress:{
dead_code : true, // jshint ignore:line
drop_debugger : true, // jshint ignore:line
global_defs : { // jshint ignore:line
compress: {
dead_code: true, // jshint ignore:line
drop_debugger: true, // jshint ignore:line
global_defs: { // jshint ignore:line
"DEBUG": false // matters for some libraries
}
}
};

gulp.task('version', function(){
if(!version.version) return;

gulp.src(['./package.json'])
.pipe(replace(/\"version\"\: \"([\.0-9\-a-z]*)\"/, '"version": "'+ version.version + '"'))
.pipe(gulp.dest('./'));
gulp.src(['./bower.json'])
.pipe(replace(/\"version\"\: \"([\.0-9\-a-z]*)\"/, '"version": "'+ version.version + '"'))
.pipe(gulp.dest('./'));
gulp.src(['./package.js'])
.pipe(replace(/version\: \'([\.0-9\-a-z]*)\'/, "version: '"+ version.version + "'"))
.pipe(gulp.dest('./'));
gulp.task('version', function () {
if (!lernaJSON.version) {
throw new Error("version property is missing from lerna.json");
}

var version = lernaJSON.version;
var jsonPattern = /"version": "[.0-9\-a-z]*"/;
var jsPattern = /version: '[.0-9\-a-z]*'/;
var glob = [
'./package.json',
'./bower.json',
'./package.js'
];

gulp.src(glob, {base: './'})
.pipe(replace(jsonPattern, '"version": "' + version + '"'))
.pipe(replace(jsPattern, "version: '" + version + "'"))
.pipe(gulp.dest('./'));
});

gulp.task('bower', ['version'], function(cb){
bower.commands.install().on('end', function (installed){
gulp.task('bower', ['version'], function (cb) {
bower.commands.install().on('end', function (installed) {
console.log(installed);
cb();
});
});

gulp.task('lint', [], function(){
gulp.task('lint', [], function () {
return gulp.src(['./*.js', './lib/*.js'])
.pipe(jshint())
.pipe(jshint.reporter('default'));
});

gulp.task('clean', ['lint'], function(cb) {
del([ DEST ]).then(cb.bind(null, null));
gulp.task('clean', ['lint'], function (cb) {
del([DEST]).then(cb.bind(null, null));
});

packages.forEach(function(pckg, i){
var prevPckg = (!i) ? 'clean' : packages[i-1].fileName;
packages.forEach(function (pckg, i) {
var prevPckg = (!i) ? 'clean' : packages[i - 1].fileName;

gulp.task(pckg.fileName, [prevPckg], function () {
browserifyOptions.standalone = pckg.expose;

var pipe = browserify(browserifyOptions)
.require(pckg.src, {expose: pckg.expose})
.require('bn.js', {expose: 'BN'}) // expose it to dapp developers
.require(pckg.src, { expose: pckg.expose })
.require('bn.js', { expose: 'BN' }) // expose it to dapp developers
.add(pckg.src);

if(pckg.ignore) {
if (pckg.ignore) {
pckg.ignore.forEach(function (ignore) {
pipe.ignore(ignore);
});
}

return pipe.bundle()
.pipe(exorcist(path.join( DEST, pckg.fileName + '.js.map')))
.pipe(exorcist(path.join(DEST, pckg.fileName + '.js.map')))
.pipe(source(pckg.fileName + '.js'))
.pipe(streamify(babel({
compact: false,
presets: ['env']
})))
.pipe(gulp.dest( DEST ))
.pipe(gulp.dest(DEST))
.pipe(streamify(babel({
compact: true,
presets: ['env']
})))
.pipe(streamify(uglify(ugliyOptions)))
.on('error', function (err) { console.error(err); })
.pipe(rename(pckg.fileName + '.min.js'))
.pipe(gulp.dest( DEST ));
.pipe(gulp.dest(DEST));
});
});


gulp.task('watch', function() {
gulp.task('watch', function () {
gulp.watch(['./packages/web3/src/*.js'], ['lint', 'build']);
});

gulp.task('all', ['version', 'lint', 'clean', packages[packages.length-1].fileName]);
gulp.task('all', ['version', 'lint', 'clean', packages[packages.length - 1].fileName]);

gulp.task('default', ['version', 'lint', 'clean', packages[0].fileName]);

9 changes: 9 additions & 0 deletions lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"version": "1.0.0-beta.25",
"lerna": "2.0.0",
"command": {
"init": {
"exact": true
},
"publish": {
"exact": true,
"skipGit": true
}
},
"packages": [
"packages/*"
]
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"postinstall": "lerna bootstrap",
"build": "gulp",
"build-all": "gulp all",
"release": "lerna bootstrap; gulp; lerna publish --skip-git; gulp version;",
"release": "lerna bootstrap; lerna publish; gulp version; gulp",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, but now we basically publish before we change the version globally? and the --exact is missing, which is quite essential.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the changes in lerna.json.

"watch": "gulp watch",
"docs": "cd docs; make html;",
"lint": "jshint *.js packages",
Expand Down
24 changes: 22 additions & 2 deletions test/eth.sendTransaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,12 @@ describe(method, function () {
assert.deepEqual(payload.params, test.formattedArgs2 || []);
});
}

provider.injectResult(null);
provider.injectValidation(function (payload) {
assert.equal(payload.method, 'eth_getTransactionReceipt');
});


// if notification its sendTransaction, which needs two more results, subscription and receipt
if(test.notification) {
Expand Down Expand Up @@ -327,6 +327,26 @@ describe(method, function () {
}


provider.injectResult(null);
provider.injectValidation(function (payload) {
assert.equal(payload.method, 'eth_getTransactionReceipt');
});


// if notification its sendTransaction, which needs two more results, subscription and receipt
if(test.notification) {
// inject receipt
provider.injectResult({
"blockHash": "0x6fd9e2a26ab",
"blockNumber": "0x15df",
"transactionHash": "0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
"transactionIndex": "0x1",
"contractAddress": "0x407d73d8a49eeb85d32cf465507dd71d507100c1",
"cumulativeGasUsed": "0x7f110",
"gasUsed": "0x7f110"
});
}

var args = clone(test.args);

if(test.error) {
Expand Down