diff --git a/package.json b/package.json index 908fd8464d..efb61e2df8 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "s3": "^4.4.0", "semver": "^5.3.0", "sudo-prompt": "^8.0.0", - "tabtab": "^2.2.1", "username": "^3.0.0", "yarn-or-npm": "^2.0.2", "zip-folder": "^1.0.0" diff --git a/packages/api/cli/package.json b/packages/api/cli/package.json index 174a6ad950..26bdbc0eed 100644 --- a/packages/api/cli/package.json +++ b/packages/api/cli/package.json @@ -25,10 +25,9 @@ "commander": "^2.9.0", "debug": "^3.0.0", "fs-extra": "^5.0.0", - "semver": "^5.3.0", - "tabtab": "^2.2.1" + "semver": "^5.3.0" }, "engines": { "node": ">= 6.0" } -} \ No newline at end of file +} diff --git a/packages/api/cli/src/electron-forge.js b/packages/api/cli/src/electron-forge.js index d82ae49ce8..644a6343ee 100644 --- a/packages/api/cli/src/electron-forge.js +++ b/packages/api/cli/src/electron-forge.js @@ -2,7 +2,6 @@ import 'colors'; import { asyncOra } from '@electron-forge/async-ora'; import program from 'commander'; -import tabtab from 'tabtab'; import './util/terminate'; @@ -37,36 +36,17 @@ program .command('publish', 'Publish the current Electron application to GitHub') .command('install', 'Install an Electron application from GitHub'); -const tab = tabtab({ - name: 'electron-forge', -}); -tab.on('electron-forge', (data, done) => { - if (data.line.split(' ').length <= 2) { - done( - null, - program.commands - .filter(cmd => cmd._name.startsWith(data.lastPartial)) - .map(cmd => `${cmd._name}:${cmd._description}`).sort() - ); - } else { - done(null, []); - } -}); -tab.start(); - -if (process.argv[2] !== 'completion') { - (async () => { - let goodSystem; - await asyncOra('Checking your system', async (ora) => { - goodSystem = await checkSystem(ora); - }); +(async () => { + let goodSystem; + await asyncOra('Checking your system', async (ora) => { + goodSystem = await checkSystem(ora); + }); - if (!goodSystem) { - console.error(('It looks like you are missing some dependencies you need to get Electron running.\n' + - 'Make sure you have git installed and Node.js version 6.0.0+').red); - process.exit(1); - } + if (!goodSystem) { + console.error(('It looks like you are missing some dependencies you need to get Electron running.\n' + + 'Make sure you have git installed and Node.js version 6.0.0+').red); + process.exit(1); + } - program.parse(process.argv); - })(); -} + program.parse(process.argv); +})(); diff --git a/packages/api/core/tabtab-install.js b/packages/api/core/tabtab-install.js deleted file mode 100644 index 4802f2ed25..0000000000 --- a/packages/api/core/tabtab-install.js +++ /dev/null @@ -1,21 +0,0 @@ -try { - const Complete = require('tabtab/src/complete'); - const Installer = require('tabtab/src/installer'); - - const options = { auto: true, name: 'electron-forge' }; - const complete = new Complete(options); - const installer = new Installer(options, complete); - - let shell = process.env.SHELL; - if (shell) shell = shell.split((process.platform !== 'win32') ? '/' : '\\').slice(-1)[0]; - - if (installer[shell]) { - installer.handle(options.name, options) - .catch(e => console.warn(`Failed to install tab completion: ${e}`)); - } else { - console.warn(`User shell ${shell} not supported, skipping completion install`); - } -} catch (err) { - console.log('tabtab install went wrong', err); - process.exit(0); -} diff --git a/yarn.lock b/yarn.lock index cf25bac465..4892e5ed80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -591,14 +591,14 @@ ansi-escapes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92" -ansi-regex@*, ansi-regex@^3.0.0, ansi-regex@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" +ansi-regex@^3.0.0, ansi-regex@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -1980,7 +1980,7 @@ debug@3.1.0, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0: dependencies: ms "2.0.0" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -3894,7 +3894,7 @@ imul@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/imul/-/imul-1.0.1.tgz#9d5867161e8b3de96c2c38d5dc7cb102f35e2ac9" -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -3949,7 +3949,7 @@ init-package-json@~1.9.4: validate-npm-package-license "^3.0.1" validate-npm-package-name "^3.0.0" -inquirer@1.2.3, inquirer@^1.0.2: +inquirer@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" dependencies: @@ -4678,10 +4678,6 @@ lockfile@~1.0.1, lockfile@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.3.tgz#2638fc39a0331e9cac1a04b71799931c9c50df79" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -4689,28 +4685,10 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -4743,10 +4721,6 @@ lodash.defaults@^4.0.1, lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" -lodash.difference@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" - lodash.endswith@^4.0.1, lodash.endswith@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09" @@ -4823,10 +4797,6 @@ lodash.reject@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - lodash.some@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" @@ -4852,7 +4822,7 @@ lodash.union@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" -lodash.uniq@^4.5.0, lodash.uniq@~4.5.0: +lodash.uniq@~4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -5738,7 +5708,7 @@ npmi@1.0.1: gauge "~2.7.3" set-blocking "~2.0.0" -"npmlog@0.1 || 1 || 2", npmlog@^2.0.3, npmlog@~2.0.4: +"npmlog@0.1 || 1 || 2", npmlog@~2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" dependencies: @@ -6579,7 +6549,7 @@ readable-stream@~2.1.5: string_decoder "~0.10.x" util-deprecate "~1.0.1" -readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0: +readdir-scoped-modules@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" dependencies: @@ -7535,19 +7505,6 @@ table@^3.7.8: slice-ansi "0.0.4" string-width "^2.0.0" -tabtab@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz#7a047f143b010b4cbd31f857e82961512cbf4e14" - dependencies: - debug "^2.2.0" - inquirer "^1.0.2" - lodash.difference "^4.5.0" - lodash.uniq "^4.5.0" - minimist "^1.2.0" - mkdirp "^0.5.1" - npmlog "^2.0.3" - object-assign "^4.1.0" - taffydb@2.7.2: version "2.7.2" resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.7.2.tgz#7bf8106a5c1a48251b3e3bc0a0e1732489fd0dc8" @@ -8115,13 +8072,6 @@ uuid@^3.0.0, uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" -validate-npm-package-license@*, validate-npm-package-license@~3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - validate-npm-package-license@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" @@ -8129,6 +8079,13 @@ validate-npm-package-license@^3.0.1: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" +validate-npm-package-license@~3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"