From ad6ee1efade2db11ced57d7b71d9d96d22086f31 Mon Sep 17 00:00:00 2001 From: Ramesh Nair Date: Mon, 8 Aug 2016 13:10:34 +0800 Subject: [PATCH] fix build --- gulpfile.js | 15 +- npm-shrinkwrap.json | 584 +++++++++++++++----------------------------- package.json | 5 +- 3 files changed, 212 insertions(+), 392 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 041162b73..b3a5087a4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -7,7 +7,6 @@ var exec = require('child_process').exec; var del = require('del'); var replace = require('gulp-replace'); var runSeq = require('run-sequence'); -var packager = require('electron-packager'); var merge = require('merge-stream'); var rename = require("gulp-rename"); var download = require('gulp-download-stream'); @@ -84,7 +83,7 @@ if(_.contains(options.platform, 'all')) { options.platform = ['win', 'linux', 'mac']; } -console.log('Platform:', options.platform); +console.log('Selected platform:', options.platform); function platformIsActive(osArch) { @@ -264,9 +263,9 @@ gulp.task('copy-app-source-files', ['checkNodes', 'clean:dist'], function() { return gulp.src([ './tests/**/*.*', - './icons/'+ type +'/*.*', - './modules/**/*.*', - './sounds/*.*', + './icons/'+ type +'/*', + './modules/**/**/**/*', + './sounds/*', './*.js', '!gulpfile.js' ], { base: './' }) @@ -291,7 +290,7 @@ gulp.task('copy-app-folder-files', ['copy-app-source-files'], function(done) { gulp.task('copy-build-folder-files', ['clean:dist', 'copy-app-folder-files'], function() { return gulp.src([ - './icons/'+ type +'/*.*', + './icons/'+ type +'/*', './interface/public/images/bg-homestead.jpg', ], { base: './' }) .pipe(flatten()) @@ -483,10 +482,10 @@ gulp.task('release-dist', ['build-dist'], function(done) { shell.cp(path.join(distPath, 'mac', `${applicationName}-${version}.dmg`), releasePath); break; case 'linux-ia32': - shell.cp(path.join(distPath, `${applicationName}-${version}-ia32.deb`), releasePath); + shell.cp(path.join(distPath, `Mist-${version}-ia32.deb`), path.join(releasePath, `${applicationName}-${version}-ia32.deb`) ); break; case 'linux-x64': - shell.cp(path.join(distPath, `${applicationName}-${version}.deb`), releasePath); + shell.cp(path.join(distPath, `Mist-${version}.deb`), path.join(releasePath, `${applicationName}-${version}.deb`) ); break; } } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index c8cf8c9ce..49f322d35 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3,18 +3,18 @@ "version": "0.8.1", "dependencies": { "7zip-bin": { - "version": "1.0.5", - "from": "7zip-bin@>=1.0.5 <2.0.0", - "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-1.0.5.tgz" + "version": "1.0.6", + "from": "7zip-bin@>=1.0.6 <2.0.0", + "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-1.0.6.tgz" }, "7zip-bin-osx": { - "version": "0.1.0", - "from": "7zip-bin-osx@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/7zip-bin-osx/-/7zip-bin-osx-0.1.0.tgz" + "version": "1.0.0", + "from": "7zip-bin-osx@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/7zip-bin-osx/-/7zip-bin-osx-1.0.0.tgz" }, "abbrev": { "version": "1.0.9", - "from": "abbrev@>=1.0.0 <2.0.0", + "from": "abbrev@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" }, "align-text": { @@ -50,18 +50,20 @@ "appdmg": { "version": "0.4.5", "from": "appdmg@>=0.4.5 <0.5.0", - "resolved": "https://registry.npmjs.org/appdmg/-/appdmg-0.4.5.tgz" + "resolved": "https://registry.npmjs.org/appdmg/-/appdmg-0.4.5.tgz", + "dependencies": { + "async": { + "version": "1.5.2", + "from": "async@>=1.4.2 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + } + } }, "archiver": { "version": "1.0.1", "from": "archiver@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/archiver/-/archiver-1.0.1.tgz", "dependencies": { - "async": { - "version": "2.0.1", - "from": "async@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz" - }, "glob": { "version": "7.0.5", "from": "glob@>=7.0.0 <8.0.0", @@ -167,9 +169,9 @@ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz" }, "async": { - "version": "1.5.2", - "from": "async@>=1.5.2 <2.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + "version": "2.0.1", + "from": "async@>=0.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz" }, "atob": { "version": "1.1.3", @@ -211,11 +213,6 @@ "from": "bignumber.js@>=2.1.4 <3.0.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz" }, - "binary": { - "version": "0.3.0", - "from": "binary@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz" - }, "binaryextensions": { "version": "1.0.1", "from": "binaryextensions@>=1.0.0 <1.1.0", @@ -251,7 +248,19 @@ "boxen": { "version": "0.6.0", "from": "boxen@>=0.6.0 <0.7.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz" + "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz", + "dependencies": { + "camelcase": { + "version": "2.1.1", + "from": "camelcase@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" + }, + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + } + } }, "bplist-creator": { "version": "0.0.6", @@ -300,25 +309,27 @@ } } }, - "buffers": { - "version": "0.1.1", - "from": "buffers@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz" - }, "builtin-modules": { "version": "1.1.1", "from": "builtin-modules@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz" }, "camelcase": { - "version": "2.1.1", - "from": "camelcase@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" }, "camelcase-keys": { "version": "2.1.0", "from": "camelcase-keys@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz" + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "dependencies": { + "camelcase": { + "version": "2.1.1", + "from": "camelcase@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" + } + } }, "capture-stack-trace": { "version": "1.0.0", @@ -335,14 +346,9 @@ "from": "center-align@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz" }, - "chainsaw": { - "version": "0.1.0", - "from": "chainsaw@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz" - }, "chalk": { "version": "1.1.3", - "from": "chalk@>=1.1.1 <2.0.0", + "from": "chalk@>=1.1.3 <2.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" }, "chromium-pickle-js": { @@ -457,7 +463,14 @@ "configstore": { "version": "2.0.0", "from": "configstore@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.0.0.tgz", + "dependencies": { + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + } + } }, "convert-source-map": { "version": "1.3.0", @@ -484,6 +497,11 @@ "from": "isarray@>=1.0.0 <1.1.0", "resolved": "http://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + }, "readable-stream": { "version": "2.1.4", "from": "readable-stream@>=2.1.4 <3.0.0", @@ -550,11 +568,6 @@ "from": "css-value@>=0.0.1 <0.1.0", "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz" }, - "ctype": { - "version": "0.5.3", - "from": "ctype@0.5.3", - "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz" - }, "cuint": { "version": "0.2.1", "from": "cuint@>=0.2.1 <0.3.0", @@ -589,7 +602,7 @@ }, "decamelize": { "version": "1.2.0", - "from": "decamelize@>=1.1.2 <2.0.0", + "from": "decamelize@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" }, "decompress": { @@ -597,11 +610,6 @@ "from": "decompress@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz", "dependencies": { - "glob": { - "version": "5.0.15", - "from": "glob@>=5.0.3 <6.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" - }, "glob-stream": { "version": "5.3.2", "from": "glob-stream@>=5.3.2 <6.0.0", @@ -629,6 +637,11 @@ "from": "isarray@>=1.0.0 <1.1.0", "resolved": "http://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + }, "ordered-read-streams": { "version": "0.3.0", "from": "ordered-read-streams@>=0.3.0 <0.4.0", @@ -665,11 +678,6 @@ "version": "2.4.3", "from": "vinyl-fs@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.3.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0-0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -688,11 +696,6 @@ "from": "object-assign@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz" }, - "readable-stream": { - "version": "1.0.34", - "from": "readable-stream@>=1.0.33-1 <1.1.0-0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" - }, "through2": { "version": "0.6.5", "from": "through2@>=0.6.1 <0.7.0", @@ -702,11 +705,6 @@ "version": "0.4.6", "from": "vinyl@>=0.4.3 <0.5.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0-0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -725,11 +723,6 @@ "from": "object-assign@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz" }, - "readable-stream": { - "version": "1.0.34", - "from": "readable-stream@>=1.0.33-1 <1.1.0-0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" - }, "through2": { "version": "0.6.5", "from": "through2@>=0.6.1 <0.7.0", @@ -739,11 +732,6 @@ "version": "0.4.6", "from": "vinyl@>=0.4.3 <0.5.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0-0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -762,11 +750,6 @@ "from": "object-assign@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz" }, - "readable-stream": { - "version": "1.0.34", - "from": "readable-stream@>=1.0.33-1 <1.1.0-0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" - }, "through2": { "version": "0.6.5", "from": "through2@>=0.6.1 <0.7.0", @@ -776,11 +759,6 @@ "version": "0.4.6", "from": "vinyl@>=0.4.3 <0.5.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0-0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -808,19 +786,9 @@ "version": "1.2.0", "from": "vinyl@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, - "decompress-zip": { - "version": "0.3.0", - "from": "decompress-zip@0.3.0", - "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz" - }, "deep-eql": { "version": "0.1.3", "from": "deep-eql@>=0.1.3 <0.2.0", @@ -959,19 +927,21 @@ }, "electron-download": { "version": "2.1.2", - "from": "electron-download@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-2.1.2.tgz" + "from": "electron-download@>=2.1.2 <3.0.0", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-2.1.2.tgz", + "dependencies": { + "path-exists": { + "version": "1.0.0", + "from": "path-exists@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz" + } + } }, "electron-osx-sign": { "version": "0.4.0-beta4", "from": "electron-osx-sign@>=0.4.0-beta4 <0.5.0", "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.0-beta4.tgz" }, - "electron-prebuilt": { - "version": "1.2.5", - "from": "electron-prebuilt@1.2.5", - "resolved": "https://registry.npmjs.org/electron-prebuilt/-/electron-prebuilt-1.2.5.tgz" - }, "electron-winstaller-fixed": { "version": "3.1.0", "from": "electron-winstaller-fixed@>=3.1.0 <3.2.0", @@ -1039,7 +1009,14 @@ "execa": { "version": "0.4.0", "from": "execa@>=0.4.0 <0.5.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz" + "resolved": "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz", + "dependencies": { + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + } + } }, "exit-hook": { "version": "1.1.1", @@ -1083,7 +1060,7 @@ }, "extract-zip": { "version": "1.5.0", - "from": "extract-zip@>=1.0.3 <2.0.0", + "from": "extract-zip@>=1.5.0 <2.0.0", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz", "dependencies": { "debug": { @@ -1126,7 +1103,14 @@ "figures": { "version": "1.7.0", "from": "figures@>=1.3.5 <2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "dependencies": { + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + } + } }, "file-type": { "version": "3.8.0", @@ -1143,11 +1127,6 @@ "from": "fileset@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz", "dependencies": { - "glob": { - "version": "5.0.15", - "from": "glob@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" - }, "minimatch": { "version": "2.0.10", "from": "minimatch@>=2.0.0 <3.0.0", @@ -1173,26 +1152,12 @@ "find-up": { "version": "1.1.2", "from": "find-up@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "dependencies": { - "path-exists": { - "version": "2.1.0", - "from": "path-exists@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz" - } - } + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz" }, "findup-sync": { "version": "0.3.0", "from": "findup-sync@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", - "dependencies": { - "glob": { - "version": "5.0.15", - "from": "glob@>=5.0.0 <5.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" - } - } + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz" }, "fined": { "version": "1.0.1", @@ -1234,7 +1199,14 @@ "form-data": { "version": "1.0.0-rc4", "from": "form-data@>=1.0.0-rc4 <1.1.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz" + "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", + "dependencies": { + "async": { + "version": "1.5.2", + "from": "async@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + } + } }, "from": { "version": "0.1.3", @@ -1291,11 +1263,6 @@ "from": "get-caller-file@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.1.tgz" }, - "get-package-info": { - "version": "0.0.3", - "from": "get-package-info@>=0.0.3 <0.0.4", - "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-0.0.3.tgz" - }, "get-stdin": { "version": "4.0.1", "from": "get-stdin@>=4.0.1 <5.0.0", @@ -1319,9 +1286,9 @@ } }, "glob": { - "version": "6.0.4", - "from": "glob@>=6.0.1 <7.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz" + "version": "5.0.15", + "from": "glob@>=5.0.3 <6.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" }, "glob-base": { "version": "0.3.0", @@ -1348,20 +1315,10 @@ "from": "minimatch@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" }, - "readable-stream": { - "version": "1.0.34", - "from": "readable-stream@>=1.0.33-1 <1.1.0-0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" - }, "through2": { "version": "0.6.5", "from": "through2@>=0.6.1 <0.7.0", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0-0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -1390,15 +1347,10 @@ "from": "globby@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/globby/-/globby-2.1.0.tgz", "dependencies": { - "glob": { - "version": "5.0.15", - "from": "glob@>=5.0.3 <6.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" - }, - "object-assign": { - "version": "3.0.0", - "from": "object-assign@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz" + "async": { + "version": "1.5.2", + "from": "async@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } }, @@ -1488,11 +1440,6 @@ "version": "1.2.0", "from": "vinyl@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -1516,11 +1463,6 @@ "from": "lodash.templatesettings@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz" }, - "object-assign": { - "version": "3.0.0", - "from": "object-assign@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz" - }, "readable-stream": { "version": "2.0.6", "from": "readable-stream@>=2.0.0 <2.1.0", @@ -1530,11 +1472,6 @@ "version": "2.0.1", "from": "through2@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -1548,6 +1485,11 @@ "from": "handlebars@>=4.0.1 <5.0.0", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz", "dependencies": { + "async": { + "version": "1.5.2", + "from": "async@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + }, "source-map": { "version": "0.4.4", "from": "source-map@>=0.4.4 <0.5.0", @@ -1627,7 +1569,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@>=2.0.0 <3.0.0", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "ini": { @@ -1668,9 +1610,9 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" }, "is-buffer": { - "version": "1.1.3", + "version": "1.1.4", "from": "is-buffer@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.3.tgz" + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz" }, "is-builtin-module": { "version": "1.0.0", @@ -1729,15 +1671,8 @@ }, "is-my-json-valid": { "version": "2.13.1", - "from": "is-my-json-valid@>=2.12.4 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", - "dependencies": { - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" - } - } + "from": "is-my-json-valid@>=2.13.1 <3.0.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz" }, "is-natural-number": { "version": "2.1.1", @@ -1891,6 +1826,11 @@ "from": "istanbul@>=0.3.5 <0.4.0", "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.22.tgz", "dependencies": { + "async": { + "version": "1.5.2", + "from": "async@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + }, "supports-color": { "version": "3.1.2", "from": "supports-color@>=3.1.0 <4.0.0", @@ -2170,11 +2110,6 @@ "from": "lodash.escape@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz" }, - "lodash.get": { - "version": "4.4.1", - "from": "lodash.get@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.1.tgz" - }, "lodash.isarguments": { "version": "3.0.9", "from": "lodash.isarguments@>=3.0.0 <4.0.0", @@ -2262,11 +2197,6 @@ "from": "log4js@>=0.6.35 <0.7.0", "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", "dependencies": { - "readable-stream": { - "version": "1.0.34", - "from": "readable-stream@>=1.0.2 <1.1.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" - }, "semver": { "version": "4.3.6", "from": "semver@>=4.3.3 <4.4.0", @@ -2332,7 +2262,14 @@ "meow": { "version": "3.7.0", "from": "meow@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz" + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "dependencies": { + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + } + } }, "merge": { "version": "1.2.0", @@ -2383,7 +2320,7 @@ }, "minimist": { "version": "1.2.0", - "from": "minimist@>=1.2.0 <2.0.0", + "from": "minimist@>=1.1.3 <2.0.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" }, "minimongo-standalone": { @@ -2403,118 +2340,6 @@ } } }, - "mkpath": { - "version": "0.1.0", - "from": "mkpath@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz" - }, - "mksnapshot": { - "version": "0.3.0", - "from": "mksnapshot@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.0.tgz", - "dependencies": { - "asn1": { - "version": "0.1.11", - "from": "asn1@0.1.11", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" - }, - "assert-plus": { - "version": "0.1.5", - "from": "assert-plus@>=0.1.5 <0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" - }, - "async": { - "version": "0.9.2", - "from": "async@>=0.9.0 <0.10.0", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz" - }, - "aws-sign2": { - "version": "0.5.0", - "from": "aws-sign2@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" - }, - "bl": { - "version": "0.9.5", - "from": "bl@>=0.9.0 <0.10.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz" - }, - "bluebird": { - "version": "2.10.2", - "from": "bluebird@>=2.9.30 <3.0.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz" - }, - "caseless": { - "version": "0.9.0", - "from": "caseless@>=0.9.0 <0.10.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz" - }, - "combined-stream": { - "version": "0.0.7", - "from": "combined-stream@>=0.0.5 <0.1.0", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz" - }, - "delayed-stream": { - "version": "0.0.5", - "from": "delayed-stream@0.0.5", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" - }, - "form-data": { - "version": "0.2.0", - "from": "form-data@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz" - }, - "fs-extra": { - "version": "0.26.7", - "from": "fs-extra@0.26.7", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz" - }, - "har-validator": { - "version": "1.8.0", - "from": "har-validator@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz" - }, - "hawk": { - "version": "2.3.1", - "from": "hawk@>=2.3.0 <2.4.0", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz" - }, - "http-signature": { - "version": "0.10.1", - "from": "http-signature@>=0.10.0 <0.11.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz" - }, - "mime-db": { - "version": "1.12.0", - "from": "mime-db@>=1.12.0 <1.13.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz" - }, - "mime-types": { - "version": "2.0.14", - "from": "mime-types@>=2.0.1 <2.1.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz" - }, - "oauth-sign": { - "version": "0.6.0", - "from": "oauth-sign@>=0.6.0 <0.7.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz" - }, - "qs": { - "version": "2.4.2", - "from": "qs@>=2.4.0 <2.5.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz" - }, - "readable-stream": { - "version": "1.0.34", - "from": "readable-stream@>=1.0.26 <1.1.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" - }, - "request": { - "version": "2.55.0", - "from": "request@2.55.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz" - } - } - }, "mocha": { "version": "2.5.3", "from": "mocha@>=2.0.0 <3.0.0", @@ -2571,6 +2396,11 @@ "version": "0.0.2", "from": "duplexer2@0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz" + }, + "readable-stream": { + "version": "1.1.14", + "from": "readable-stream@>=1.1.9 <1.2.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" } } }, @@ -2582,7 +2412,19 @@ "mv": { "version": "2.1.1", "from": "mv@>=2.0.3 <3.0.0", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz" + "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "dependencies": { + "glob": { + "version": "6.0.4", + "from": "glob@>=6.0.1 <7.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz" + }, + "rimraf": { + "version": "2.4.5", + "from": "rimraf@>=2.4.0 <2.5.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz" + } + } }, "nan": { "version": "2.4.0", @@ -2621,12 +2463,12 @@ }, "nopt": { "version": "3.0.6", - "from": "nopt@>=3.0.1 <4.0.0", + "from": "nopt@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" }, "normalize-package-data": { "version": "2.3.5", - "from": "normalize-package-data@>=2.3.4 <3.0.0", + "from": "normalize-package-data@>=2.3.2 <3.0.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz" }, "normalize-path": { @@ -2665,9 +2507,9 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" }, "object-assign": { - "version": "4.1.0", - "from": "object-assign@>=4.0.1 <5.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + "version": "3.0.0", + "from": "object-assign@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz" }, "object-keys": { "version": "0.4.0", @@ -2773,6 +2615,11 @@ "from": "node-status-codes@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz" }, + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + }, "readable-stream": { "version": "2.1.4", "from": "readable-stream@>=2.0.5 <3.0.0", @@ -2806,9 +2653,9 @@ "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz" }, "path-exists": { - "version": "1.0.0", - "from": "path-exists@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz" + "version": "2.1.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz" }, "path-is-absolute": { "version": "1.0.0", @@ -2922,7 +2769,7 @@ }, "progress-stream": { "version": "1.2.0", - "from": "progress-stream@>=1.1.0 <2.0.0", + "from": "progress-stream@>=1.2.0 <2.0.0", "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz" }, "pseudomap": { @@ -2937,7 +2784,7 @@ }, "q": { "version": "1.4.1", - "from": "q@>=1.1.2 <2.0.0", + "from": "q@>=1.4.1 <1.5.0", "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz" }, "qs": { @@ -2988,9 +2835,9 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" }, "readable-stream": { - "version": "1.1.14", - "from": "readable-stream@>=1.1.9 <1.2.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" + "version": "1.0.34", + "from": "readable-stream@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" }, "rechoir": { "version": "0.6.2", @@ -3047,11 +2894,6 @@ "from": "isarray@>=1.0.0 <1.1.0", "resolved": "http://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, - "object-assign": { - "version": "3.0.0", - "from": "object-assign@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz" - }, "readable-stream": { "version": "2.1.4", "from": "readable-stream@>=2.0.1 <3.0.0", @@ -3110,20 +2952,22 @@ "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz" }, "rimraf": { - "version": "2.4.5", - "from": "rimraf@>=2.4.0 <2.5.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz" + "version": "2.5.4", + "from": "rimraf@>=2.2.8 <3.0.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", + "dependencies": { + "glob": { + "version": "7.0.5", + "from": "glob@>=7.0.5 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" + } + } }, "run-async": { "version": "2.2.0", "from": "run-async@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz" }, - "run-series": { - "version": "1.1.4", - "from": "run-series@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz" - }, "rx": { "version": "4.1.0", "from": "rx@>=4.1.0 <5.0.0", @@ -3337,7 +3181,7 @@ }, "strip-ansi": { "version": "3.0.1", - "from": "strip-ansi@>=3.0.0 <4.0.0", + "from": "strip-ansi@>=3.0.1 <4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" }, "strip-bom": { @@ -3406,11 +3250,6 @@ "version": "2.1.4", "from": "readable-stream@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -3449,7 +3288,19 @@ "through2": { "version": "0.2.3", "from": "through2@>=0.2.3 <0.3.0", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz" + "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", + "dependencies": { + "readable-stream": { + "version": "1.1.14", + "from": "readable-stream@>=1.1.9 <1.2.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" + }, + "xtend": { + "version": "2.1.2", + "from": "xtend@>=2.1.1 <2.2.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz" + } + } }, "through2-filter": { "version": "2.0.0", @@ -3470,11 +3321,6 @@ "version": "2.0.1", "from": "through2@>=2.0.0 <2.1.0", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -3513,28 +3359,11 @@ "from": "to-iso-string@0.0.2", "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz" }, - "touch": { - "version": "0.0.3", - "from": "touch@0.0.3", - "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz", - "dependencies": { - "nopt": { - "version": "1.0.10", - "from": "nopt@>=1.0.10 <1.1.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz" - } - } - }, "tough-cookie": { "version": "2.3.1", "from": "tough-cookie@>=2.3.0 <2.4.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz" }, - "traverse": { - "version": "0.3.9", - "from": "traverse@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz" - }, "trim-newlines": { "version": "1.0.0", "from": "trim-newlines@>=1.0.0 <2.0.0", @@ -3754,6 +3583,11 @@ "from": "isarray@>=1.0.0 <1.1.0", "resolved": "http://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + }, "readable-stream": { "version": "2.1.4", "from": "readable-stream@>=2.0.0 <3.0.0", @@ -3776,11 +3610,6 @@ "from": "graceful-fs@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz" }, - "readable-stream": { - "version": "1.0.34", - "from": "readable-stream@>=1.0.33-1 <1.1.0-0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" - }, "strip-bom": { "version": "1.0.0", "from": "strip-bom@>=1.0.0 <2.0.0", @@ -3795,11 +3624,6 @@ "version": "0.4.6", "from": "vinyl@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@>=4.0.0 <4.1.0-0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, @@ -3842,6 +3666,11 @@ "from": "archiver@1.0.0", "resolved": "https://registry.npmjs.org/archiver/-/archiver-1.0.0.tgz" }, + "async": { + "version": "1.5.2", + "from": "async@>=1.5.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + }, "glob": { "version": "7.0.5", "from": "glob@>=7.0.5 <8.0.0", @@ -3947,9 +3776,9 @@ "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz" }, "xtend": { - "version": "2.1.2", - "from": "xtend@>=2.1.1 <2.2.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz" + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" }, "y18n": { "version": "3.2.1", @@ -3969,14 +3798,7 @@ "yargs-parser": { "version": "2.4.1", "from": "yargs-parser@>=2.4.1 <3.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", - "dependencies": { - "camelcase": { - "version": "3.0.0", - "from": "camelcase@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" - } - } + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz" }, "yauzl": { "version": "2.4.1", diff --git a/package.json b/package.json index 5898e6dfa..6edd45a6f 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "bignumber.js": "^2.1.4", "bluebird": "^3.3.5", "deep-extend": "^0.4.1", - "electron-prebuilt": "^1.2.5", "got": "^6.3.0", "i18next": "^2.3.4", "log-rotate": "^0.2.7", @@ -38,8 +37,8 @@ "co-mocha": "^1.1.2", "del": "^1.2.1", "easy-zip": "0.0.4", - "electron-builder": "^5.22.1", - "electron-packager": "^7.0.4", + "electron-builder": "^5.23.2", + "electron-prebuilt": "^1.2.5", "genomatic": "^1.0.0", "geth-private": "^1.3.0", "gulp": "^3.9.0",