build fix

Start an interactive logon shell for Git Bash

.gitlab-ci.yml

@@ -1,108 +0,0 @@
-cache:
-  untracked: true
-  key: "$CI_BUILD_REF_NAME"
-  paths:
-    - app/node_modules
-    - node_modules
-    - typings
-
-stages:
-    - Build
-    - Test
-    - Package
-    - Upload
-
-Build:
-  stage: Build
-  script:
-    - npm prune
-    - npm install
-    - cd app; npm prune && npm install; cd ..
-    - ./node_modules/.bin/typings install
-  tags:
-    - Linux
-  artifacts:
-    paths:
-      - node_modules
-      - typings
-      - app
-
-Test:
-  stage: Test
-  dependencies:
-    - Build
-  script:
-    - apt-get install -y xvfb libxtst6 libxss1 libgconf2-4 libnss3 libasound2
-    - xvfb-run -a make coverage
-  tags:
-    - Linux
-
-Windows package:
-  stage: Package
-  dependencies:
-    - Build
-  script:
-    - call npm install
-    - call npm install webpack # regenerate the .cmd launcher
-    - cd app
-    - call npm install
-    - cd ..
-    - call ./node_modules/.bin/webpack.cmd --progress
-    - call make package-windows
-    - call copy dist\Elements-Electron.exe Elements-Windows-%CI_BUILD_REF_NAME%.exe
-  artifacts:
-    name: Elements-Windows-%CI_BUILD_REF_NAME%
-    paths:
-    - Elements-Windows-%CI_BUILD_REF_NAME%.exe
-  tags:
-    - Windows
-
-macOS package:
-  stage: Package
-  dependencies:
-    - Build
-  script:
-    - npm install
-    - rm -rf node_modules/electron-macos-sign || true
-    - cp -r node_modules/electron-osx-sign node_modules/electron-macos-sign
-    - cd app; npm install; cd ..
-    - ./node_modules/.bin/webpack --progress
-    - security unlock-keychain -p rjvg login.keychain
-    - make package-mac
-    - cp dist/Elements-Electron.pkg ./Elements-macOS-$CI_BUILD_REF_NAME.pkg
-  artifacts:
-    name: Elements-macOS-$CI_BUILD_REF_NAME
-    paths:
-    - Elements-macOS-$CI_BUILD_REF_NAME.pkg
-  tags:
-    - macOS
-
-Linux package:
-  stage: Package
-  dependencies:
-    - Build
-  script:
-    - npm install
-    - cd app; npm install; cd ..
-    - ./node_modules/.bin/webpack --progress
-    - make build-linux
-    - cp dist/ELEMENTS*.AppImage ./Elements-Linux-$CI_BUILD_REF_NAME.AppImage
-  artifacts:
-    name: Elements-Linux-$CI_BUILD_REF_NAME
-    paths:
-    - Elements-Linux-$CI_BUILD_REF_NAME.AppImage
-  tags:
-    - Linux
-
-Upload packages:
-  stage: Upload
-  dependencies:
-    - Windows package
-    - macOS package
-    - Linux package
-  script:
-    - scp Elements-Windows-$CI_BUILD_REF_NAME.exe root@cloud.elements.tv:/mnt/elements/www/clients/
-    - scp Elements-macOS-$CI_BUILD_REF_NAME.pkg root@cloud.elements.tv:/mnt/elements/www/clients/
-    - scp Elements-Linux-$CI_BUILD_REF_NAME.AppImage root@cloud.elements.tv:/mnt/elements/www/clients/
-  tags:
-    - Local

.travis.yml

@@ -32,12 +32,3 @@ addons:
     - rpm
     - wine
     - mono-runtime
-
-deploy:
-  provider: releases
-  api_key: $GITHUB_TOKEN
-  file_glob: true
-  file: "dist/terminus*"
-  skip_cleanup: true
-  on:
-    tags: true

HACKING.md

@@ -10,12 +10,14 @@ First, install the dependencies:
 
 ```
 # macOS/Linux:
-npm i
+sudo npm -g install yarn node-gyp
+yarn install
 ./scripts/install-deps.js
 ./scripts/build-native.js
 
 # Windows:
-npm i
+npm -g install yarn node-gyp windows-build-tools
+yarn install
 node scripts\install-deps.js
 node scripts\build-native.js
 ```

README.md

@@ -1,7 +1,16 @@
-# Terminus α
-*A terminal for a more modern age*
+<div align="center">
+    <img src="https://raw.githubusercontent.com/Eugeny/terminus/master/build/icons/128x128.png">
+    <h1>Terminus α</h1>
+    <p>
+        <i>A terminal for a more modern age</i>
+    </p>
+    <br/>
+    <br/>
+    <br/>
+</div>
 
 [![Build Status](https://travis-ci.org/Eugeny/terminus.svg?branch=master)](https://travis-ci.org/Eugeny/terminus) [![Build status](https://ci.appveyor.com/api/projects/status/wnnq4hm5mbd9rgoy?svg=true)](https://ci.appveyor.com/project/Eugeny/terminus) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE) [![Downloads](https://img.shields.io/badge/downloads-latest_release-brightgreen.svg)](https://github.com/Eugeny/terminus/releases/latest)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_shield)
 
 ----
 
@@ -18,6 +27,7 @@
   * Tab persistence on macOS and Linux
   * Proper shell-like experience on Windows including tab completion (thanks, Clink!)
   * CMD, PowerShell, Cygwin, Git-Bash and Bash on Windows support
+  * Default Linux style hotkeys for copy (`Ctrl`+`Shift`+`C`) and paste (`Ctrl`+`Shift`+`V`)
 
 ---
 
@@ -27,6 +37,7 @@ Plugins can be installed directly from the Settings view inside Terminus.
 
   * [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
   * [theme-hype](https://github.com/Eugeny/terminus-theme-hype) - a Hyper inspired theme
+  * [shell-selector](https://github.com/Eugeny/terminus-shell-selector) - a quick shell selector pane
 
 ---
 
@@ -35,3 +46,7 @@ Plugins can be installed directly from the Settings view inside Terminus.
 Pull requests and plugins are welcome! Publish your plugin on NPM with a `terminus-plugin` keyword to make them appear in the Plugin Manager.
 
 See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) for a very brief plugin development tutorial!
+
+
+## License
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_large)

app/index.pug

@@ -13,22 +13,9 @@ html
         app-root
             .preload-logo
                 div
-                    .terminus-logo.animated
-                        .part(style='transform: rotateZ(0deg)')
-                            div
-                        .part(style='transform: rotateZ(51deg)')
-                            div
-                        .part(style='transform: rotateZ(102deg)')
-                            div
-                        .part(style='transform: rotateZ(154deg)')
-                            div
-                        .part(style='transform: rotateZ(205deg)')
-                            div
-                        .part(style='transform: rotateZ(257deg)')
-                            div
-                        .part(style='transform: rotateZ(308deg)')
-                            div
+                    .terminus-logo
                     h1.terminus-title Terminus
+                        sup α 
                     .progress
                         .bar(style='width: 0%')
 

app/main.js

@@ -8,8 +8,8 @@ if (process.argv.indexOf('--debug') !== -1) {
 
 let app = electron.app
 
-let secondInstance = app.makeSingleInstance((argv) => {
-  app.window.webContents.send('host:second-instance')
+let secondInstance = app.makeSingleInstance((argv, cwd) => {
+  app.window.webContents.send('host:second-instance', argv, cwd)
 })
 
 if (secondInstance) {
@@ -30,28 +30,18 @@ if (!process.env.TERMINUS_PLUGINS) {
 }
 
 setupWindowManagement = () => {
-    let windowCloseable
-
     app.window.on('show', () => {
       app.window.webContents.send('host:window-shown')
     })
 
     app.window.on('close', (e) => {
         windowConfig.set('windowBoundaries', app.window.getBounds())
-        if (!windowCloseable) {
-            app.window.minimize()
-            e.preventDefault()
-        }
     })
 
     app.window.on('closed', () => {
         app.window = null
     })
 
-    electron.ipcMain.on('window-closeable', (event, flag) => {
-        windowCloseable = flag
-    })
-
     electron.ipcMain.on('window-focus', () => {
         app.window.focus()
     })
@@ -86,6 +76,8 @@ setupWindowManagement = () => {
 
     electron.ipcMain.on('window-set-bounds', (event, bounds) => {
         let actualBounds = app.window.getBounds()
+        actualBounds.width -= bounds.x - actualBounds.x
+        actualBounds.height -= bounds.y - actualBounds.y
         actualBounds.x = bounds.x
         actualBounds.y = bounds.y
         app.window.setBounds(actualBounds)
@@ -102,31 +94,83 @@ setupWindowManagement = () => {
     electron.ipcMain.on('window-set-always-on-top', (event, flag) => {
         app.window.setAlwaysOnTop(flag)
     })
-
-    app.on('before-quit', () => windowCloseable = true)
 }
 
 
 setupMenu = () => {
-    var template = [{
+    let template = [{
         label: "Application",
         submenu: [
-            { type: "separator" },
-            { label: "Quit", accelerator: "CmdOrCtrl+Q", click: () => {
-                app.window.webContents.send('host:quit-request')
-            }}
+            { role: 'about', label: 'About Terminus' },
+            { type: 'separator' },
+            {
+                label: 'Preferences',
+                accelerator: 'Cmd+,',
+                click () {
+                    app.window.webContents.send('host:preferences-menu')
+                }
+            },
+            { type: 'separator' },
+            { role: 'services', submenu: [] },
+            { type: 'separator' },
+            { role: 'hide' },
+            { role: 'hideothers' },
+            { role: 'unhide' },
+            { type: 'separator' },
+            {
+                label: 'Quit',
+                accelerator: 'Cmd+Q',
+                click () {
+                    app.quit()
+                }
+            }
         ]
-      },
-      {
+    },
+    {
         label: "Edit",
         submenu: [
-            { label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
-            { label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
-            { type: "separator" },
-            { label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
-            { label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
-            { label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
-            { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
+            {role: 'undo'},
+            {role: 'redo'},
+            {type: 'separator'},
+            {role: 'cut'},
+            {role: 'copy'},
+            {role: 'paste'},
+            {role: 'pasteandmatchstyle'},
+            {role: 'delete'},
+            {role: 'selectall'}
+        ]
+    },
+    {
+        label: 'View',
+        submenu: [
+            {role: 'reload'},
+            {role: 'forcereload'},
+            {role: 'toggledevtools'},
+            {type: 'separator'},
+            {role: 'resetzoom'},
+            {role: 'zoomin'},
+            {role: 'zoomout'},
+            {type: 'separator'},
+            {role: 'togglefullscreen'}
+        ]
+    },
+    {
+        role: 'window',
+        submenu: [
+            {role: 'close'},
+            {role: 'minimize'},
+            {role: 'zoom'},
+            {type: 'separator'},
+            {role: 'front'}
+        ]
+    },
+    {
+        role: 'help',
+        submenu: [
+            {
+                label: 'Website',
+                click () { electron.shell.openExternal('https://eugeny.github.io/terminus') }
+            }
         ]
     }]
 
@@ -148,7 +192,6 @@ start = () => {
     let options = {
         width: 800,
         height: 600,
-        //icon: `${app.getAppPath()}/assets/img/icon.png`,
         title: 'Terminus',
         minWidth: 400,
         minHeight: 300,

app/package.json

@@ -12,14 +12,14 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "4.0.1",
-    "@angular/common": "4.0.1",
-    "@angular/compiler": "4.0.1",
-    "@angular/core": "4.0.1",
-    "@angular/forms": "4.0.1",
-    "@angular/platform-browser": "4.0.1",
-    "@angular/platform-browser-dynamic": "4.0.1",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
+    "@angular/animations": "4.3.0",
+    "@angular/common": "4.3.0",
+    "@angular/compiler": "4.3.0",
+    "@angular/core": "4.3.0",
+    "@angular/forms": "4.3.0",
+    "@angular/platform-browser": "4.3.0",
+    "@angular/platform-browser-dynamic": "4.3.0",
+    "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.2",
     "devtron": "1.4.0",
     "electron-config": "0.2.1",
     "electron-debug": "^1.0.1",
@@ -29,7 +29,7 @@
     "mz": "^2.6.0",
     "path": "0.12.7",
     "rxjs": "5.3.0",
-    "zone.js": "0.8.4"
+    "zone.js": "0.8.12"
   },
   "devDependencies": {
     "@types/mz": "0.0.31"

app/src/app.module.ts

@@ -2,10 +2,10 @@ import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
-export async function getRootModule (plugins: any[]): Promise<any> {
+export function getRootModule (plugins: any[]) {
     let imports = [
         BrowserModule,
-        ...(plugins.map(x => x.default.forRoot ? x.default.forRoot() : x.default)),
+        ...plugins,
         NgbModule.forRoot(),
     ]
     let bootstrap = [

app/src/entry.preload.ts

@@ -31,3 +31,7 @@ process.on('uncaughtException', (err) => {
     Raven.captureException(err)
     console.error(err)
 })
+
+const childProcess = require('child_process')
+childProcess.spawn = require('electron').remote.require('child_process').spawn
+childProcess.exec = require('electron').remote.require('child_process').exec

app/src/entry.ts

@@ -6,11 +6,15 @@ import 'rxjs'
 // Always land on the start view
 location.hash = ''
 
-import { enableProdMode } from '@angular/core'
+import { enableProdMode, NgModuleRef } from '@angular/core'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 
 import { getRootModule } from './app.module'
-import { findPlugins, loadPlugins } from './plugins'
+import { findPlugins, loadPlugins, IPluginInfo } from './plugins'
+
+if (process.platform === 'win32') {
+    process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
+}
 
 if (require('electron-is-dev')) {
     console.warn('Running in debug mode')
@@ -18,10 +22,30 @@ if (require('electron-is-dev')) {
     enableProdMode()
 }
 
-findPlugins().then(async plugins => {
+async function bootstrap (plugins: IPluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
+    if (safeMode) {
+        plugins = plugins.filter(x => x.isBuiltin)
+    }
     let pluginsModules = await loadPlugins(plugins, (current, total) => {
         (document.querySelector('.progress .bar') as HTMLElement).style.width = 100 * current / total + '%'
     })
-    let module = await getRootModule(pluginsModules)
-    platformBrowserDynamic().bootstrapModule(module)
+    let module = getRootModule(pluginsModules)
+    window['rootModule'] = module
+    return await platformBrowserDynamic().bootstrapModule(module)
+}
+
+findPlugins().then(async plugins => {
+    console.log('Starting with plugins:', plugins)
+    try {
+        await bootstrap(plugins)
+    } catch (error) {
+        console.error('Angular bootstrapping error:', error)
+        console.warn('Trying safe mode')
+        window['safeModeReason'] = error
+        try {
+            await bootstrap(plugins, true)
+        } catch (error) {
+            console.error('Bootstrap failed:', error)
+        }
+    }
 })

app/src/logo.svg

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150mm"
+   height="150mm"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/home/eugene/Work/term/build/icons/16x16.png"
+   inkscape:export-xdpi="2.7093334"
+   inkscape:export-ydpi="2.7093334">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="134.39743"
+     inkscape:cy="340.43068"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="692"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-10.356544,-82.309525)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path138"
+       style="opacity:0.9;fill:#ccccff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39.305965,108.47713 60.922105,35.13225 0.0945,21.68327 -61.016595,-37.11662 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path116"
+       style="opacity:0.9;fill:#6666cc;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 136.19445,144.4429 0.0455,20.67266 -78.028381,44.11611 -0.0031,-19.78119 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path118"
+       style="opacity:0.9;fill:#ccccff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39.471179,178.6501 18.737341,10.818 0.0031,19.78099 -18.740409,-10.88245 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:0.9;fill:#b4e2ff;fill-rule:evenodd;stroke:none;stroke-width:1.00546169px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 56.43263,98.242186 -17.391087,10.041014 61.186527,35.32618 -61.020778,35.23005 18.839694,10.87703 61.020784,-35.23005 17.39108,-10.04102 z"
+       id="path134"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>

app/src/plugins.ts

@@ -20,7 +20,7 @@ if (process.env.DEV) {
     nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
 }
 
-const builtinPluginsPath = path.join((process as any).resourcesPath, 'builtin-plugins')
+const builtinPluginsPath = process.env.DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
 
 const userPluginsPath = path.join(
     require('electron').remote.app.getPath('appData'),
@@ -44,6 +44,7 @@ export interface IPluginInfo {
     packageName: string
     isBuiltin: boolean
     version: string
+    author: string
     homepage?: string
     path?: string
     info?: any
@@ -81,7 +82,7 @@ nodeRequire('module').prototype.require = function (query) {
 export async function findPlugins (): Promise<IPluginInfo[]> {
     let paths = nodeModule.globalPaths
     let foundPlugins: IPluginInfo[] = []
-    let candidateLocations: { pluginDir: string, pluginName: string }[] = []
+    let candidateLocations: { pluginDir: string, packageName: string }[] = []
 
     for (let pluginDir of paths) {
         pluginDir = normalizePath(pluginDir)
@@ -92,41 +93,47 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
         if (await fs.exists(path.join(pluginDir, 'package.json'))) {
             candidateLocations.push({
                 pluginDir: path.dirname(pluginDir),
-                pluginName: path.basename(pluginDir)
+                packageName: path.basename(pluginDir)
             })
         }
-        for (let pluginName of pluginNames) {
-            candidateLocations.push({ pluginDir, pluginName })
+        for (let packageName of pluginNames) {
+            candidateLocations.push({ pluginDir, packageName })
         }
     }
 
-    for (let { pluginDir, pluginName } of candidateLocations) {
-        let pluginPath = path.join(pluginDir, pluginName)
+    for (let { pluginDir, packageName } of candidateLocations) {
+        let pluginPath = path.join(pluginDir, packageName)
         let infoPath = path.join(pluginPath, 'package.json')
         if (!await fs.exists(infoPath)) {
             continue
         }
 
-        if (foundPlugins.some(x => x.name === pluginName)) {
-            console.info(`Plugin ${pluginName} already exists`)
+        let name = packageName.substring('terminus-'.length)
+
+        if (foundPlugins.some(x => x.name === name)) {
+            console.info(`Plugin ${packageName} already exists, overriding`)
+            foundPlugins = foundPlugins.filter(x => x.name !== name)
         }
 
         try {
             let info = JSON.parse(await fs.readFile(infoPath, {encoding: 'utf-8'}))
-            if (!info.keywords || info.keywords.indexOf('terminus-plugin') === -1) {
+            if (!info.keywords || !(info.keywords.includes('terminus-plugin') || info.keywords.includes('terminus-builtin-plugin'))) {
                 continue
             }
+            let author = info.author
+            author = author.name || author
             foundPlugins.push({
-                name: pluginName.substring('terminus-'.length),
-                packageName: pluginName,
+                name: name,
+                packageName: packageName,
                 isBuiltin: pluginDir === builtinPluginsPath,
                 version: info.version,
                 description: info.description,
+                author,
                 path: pluginPath,
                 info,
             })
         } catch (error) {
-            console.error('Cannot load package info for', pluginName)
+            console.error('Cannot load package info for', packageName)
         }
     }
 
@@ -142,7 +149,10 @@ export async function loadPlugins (foundPlugins: IPluginInfo[], progress: Progre
         console.info(`Loading ${foundPlugin.name}: ${nodeRequire.resolve(foundPlugin.path)}`)
         progress(index, foundPlugins.length)
         try {
-            let pluginModule = nodeRequire(foundPlugin.path)
+            let packageModule = nodeRequire(foundPlugin.path)
+            let pluginModule = packageModule.default.forRoot ? packageModule.default.forRoot() : packageModule.default
+            pluginModule['pluginName'] = foundPlugin.name
+            pluginModule['bootstrap'] = packageModule.bootstrap
             plugins.push(pluginModule)
         } catch (error) {
             console.error(`Could not load ${foundPlugin.name}:`, error)

app/src/preload.scss

@@ -1,6 +1,3 @@
-$color: rgba(66, 142, 173, 0.75);
-
-
 .preload-logo {
   -webkit-app-region: drag;
   position: fixed;
@@ -24,7 +21,7 @@ $color: rgba(66, 142, 173, 0.75);
 
       .bar {
         transition: 1s ease-out width;
-        background: $color;
+        background: #a1c5e4;
         height: 3px;
       }
     }
@@ -42,63 +39,26 @@ $color: rgba(66, 142, 173, 0.75);
 .terminus-logo {
   width: 160px;
   height: 160px;
+  background: url('./logo.svg');
+  background-repeat: none;
+  background-size: contain;
   margin: auto;
-  position: relative;
-  transform: rotateZ(-14.5deg);
-
-  .part {
-    position: absolute;
-    width: 160px;
-    height: 160px;
-
-    div {
-      position: absolute;
-      top: 33px;
-      left: 24px;
-      width: 44px;
-      height: 44px;
-      background: $color;
-      transform: rotateX(52deg) rotateY(-42deg);
-      animation: terminusLogoPartOnce ease-out 1s;
-    }
-  }
-
-  &.animated .part div {
-    animation: terminusLogoPart infinite ease-out 2s;
-  }
 }
 
 
 .terminus-title {
-  color: $color;
+  color: #a1c5e4;
   font-family: 'Source Sans Pro';
   text-align: center;
   font-weight: normal;
   font-size: 42px;
   margin: 0;
-}
 
-
-@keyframes terminusLogoPart {
-  0% {
-    transform: rotateX(90deg) rotateY(-90deg);
-  }
-  25% {
-    transform: rotateX(52deg) rotateY(-42deg);
-  }
-  75% {
-    transform: rotateX(52deg) rotateY(-42deg);
-  }
-  100% {
-    transform: rotateX(-90deg) rotateY(-90deg);
+  sup {
+      color: #842fe0;
   }
 }
 
-@keyframes terminusLogoPartOnce {
-  0% {
-    transform: rotateX(90deg) rotateY(-90deg);
-  }
-  100% {
-    transform: rotateX(52deg) rotateY(-42deg);
-  }
+.modal-dialog {
+  -webkit-app-region: no-drag;
 }

app/webpack.config.js

@@ -55,6 +55,7 @@ module.exports = {
     '@angular/forms': 'commonjs @angular/forms',
     '@angular/common': 'commonjs @angular/common',
     '@ng-bootstrap/ng-bootstrap': 'commonjs @ng-bootstrap/ng-bootstrap',
+    'child_process': 'commonjs child_process',
     'electron': 'commonjs electron',
     'electron-is-dev': 'commonjs electron-is-dev',
     'module': 'commonjs module',

app/yarn.lock

@@ -0,0 +1,273 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@angular/animations@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.3.0.tgz#56f34b84649379202ac359929b82eb0b915e9c72"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/common@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.3.0.tgz#13a54a6929dd52f9729b16ae446fad58fe163053"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/compiler@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.3.0.tgz#55503bf27a1f062f71b9495393f3311903a8fc43"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/core@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.3.0.tgz#bd2249c3de1224a7c6536c4aba728d6565329334"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/forms@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.3.0.tgz#7d0c7a854737e9a30a5fd9665f8d4f56a1b91bd8"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/platform-browser-dynamic@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.0.tgz#551fb18851b27ee8f3e4b0ee25aad10bd7b312e3"
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/platform-browser@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.3.0.tgz#02389489185185c3becf06359346100e5479c7e1"
+  dependencies:
+    tslib "^1.7.1"
+
+"@ng-bootstrap/ng-bootstrap@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-beta.2.tgz#3d4b567b0334a9ee631b73c72156cd3a9d3cd29f"
+
+"@types/mz@0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.31.tgz#a4d80c082fefe71e40a7c0f07d1e6555bbbc7b52"
+  dependencies:
+    "@types/node" "*"
+
+"@types/node@*":
+  version "8.0.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.13.tgz#530f0f9254209b0335bf5cc6387822594ef47093"
+
+accessibility-developer-tools@^2.11.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz#3da0cce9d6ec6373964b84f35db7cfc3df7ab514"
+
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+conf@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/conf/-/conf-0.11.2.tgz#879f479267600483e502583462ca4063fc9779b2"
+  dependencies:
+    dot-prop "^3.0.0"
+    env-paths "^0.3.0"
+    mkdirp "^0.5.1"
+    pkg-up "^1.0.0"
+
+debug@^2.2.0, debug@^2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
+devtron@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/devtron/-/devtron-1.4.0.tgz#b5e748bd6e95bbe70bfcc68aae6fe696119441e1"
+  dependencies:
+    accessibility-developer-tools "^2.11.0"
+    highlight.js "^9.3.0"
+    humanize-plus "^1.8.1"
+
+dot-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  dependencies:
+    is-obj "^1.0.0"
+
+electron-config@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/electron-config/-/electron-config-0.2.1.tgz#7e12c26412d06bf3ed3896d0479df162986b95ba"
+  dependencies:
+    conf "^0.11.1"
+
+electron-debug@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.2.0.tgz#22e51a73e1bf095d0bb51a6c3d97a203364c4222"
+  dependencies:
+    electron-is-dev "^0.1.0"
+    electron-localshortcut "^2.0.0"
+
+electron-is-accelerator@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
+
+electron-is-dev@0.1.2, electron-is-dev@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3"
+
+electron-localshortcut@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-2.0.2.tgz#6a1adcd6514c957328ec7912f5ccb5e1c10706db"
+  dependencies:
+    debug "^2.6.8"
+    electron-is-accelerator "^0.1.0"
+
+electron-squirrel-startup@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/electron-squirrel-startup/-/electron-squirrel-startup-1.0.0.tgz#19b4e55933fa0ef8f556784b9c660f772546a0b8"
+  dependencies:
+    debug "^2.2.0"
+
+env-paths@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-0.3.1.tgz#c30ccfcbc30c890943dc08a85582517ef00da463"
+
+esprima@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+highlight.js@^9.3.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
+
+humanize-plus@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/humanize-plus/-/humanize-plus-1.8.2.tgz#a65b34459ad6367adbb3707a82a3c9f916167030"
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
+js-yaml@3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^3.1.1"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mz@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce"
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+object-assign@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path@0.12.7:
+  version "0.12.7"
+  resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
+  dependencies:
+    process "^0.11.1"
+    util "^0.10.3"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pkg-up@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26"
+  dependencies:
+    find-up "^1.0.0"
+
+process@^0.11.1:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
+rxjs@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.3.0.tgz#d88ccbdd46af290cbdb97d5d8055e52453fabe2d"
+  dependencies:
+    symbol-observable "^1.0.1"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+symbol-observable@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
+  dependencies:
+    any-promise "^1.0.0"
+
+tslib@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
+
+util@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  dependencies:
+    inherits "2.0.1"
+
+zone.js@0.8.12:
+  version "0.8.12"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.12.tgz#86ff5053c98aec291a0bf4bbac501d694a05cfbb"

appveyor.yml

@@ -24,14 +24,3 @@ build_script:
 
 artifacts:
   - path: 'dist\win\*.exe'
-deploy:
-  provider: GitHub
-  auth_token:
-    secure: wvxHVlprvhfdOHgmVEDIwjCHYlmuDykteIEHpAfpi807+1lJD3ld2/OS6+0fgU4e
-  artifact: /.*\.exe/
-  draft: false
-  prerelease: false
-  force_update: true
-  on:
-    branch: master
-    appveyor_repo_tag: true

build/icons/icon.svg

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150mm"
+   height="150mm"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4649">
+      <stop
+         style="stop-color:#000916;stop-opacity:1"
+         offset="0"
+         id="stop4645" />
+      <stop
+         style="stop-color:#004565;stop-opacity:1"
+         offset="1"
+         id="stop4647" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4649"
+       id="linearGradient4651"
+       x1="89.26284"
+       y1="85.146751"
+       x2="89.26284"
+       y2="229.47229"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="134.39743"
+     inkscape:cy="340.43068"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="692"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-10.356544,-82.309525)">
+    <rect
+       id="rect168"
+       width="150"
+       height="150"
+       x="10.356544"
+       y="82.309525"
+       style="fill:url(#linearGradient4651);fill-opacity:1;stroke-width:0.26458332"
+       rx="10"
+       ry="10" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path138"
+       style="opacity:0.9;fill:#ccccff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39.305965,108.47713 60.922105,35.13225 0.0945,21.68327 -61.016595,-37.11662 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path116"
+       style="opacity:0.9;fill:#6666cc;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 136.19445,144.4429 0.0455,20.67266 -78.028381,44.11611 -0.0031,-19.78119 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path118"
+       style="opacity:0.9;fill:#ccccff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39.471179,178.6501 18.737341,10.818 0.0031,19.78099 -18.740409,-10.88245 z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:0.9;fill:#b4e2ff;fill-rule:evenodd;stroke:none;stroke-width:1.00546169px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 56.43263,98.242186 -17.391087,10.041014 61.186527,35.32618 -61.020778,35.23005 18.839694,10.87703 61.020784,-35.23005 17.39108,-10.04102 z"
+       id="path134"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>

package.json

@@ -9,18 +9,19 @@
     "core-js": "2.4.1",
     "cross-env": "4.0.0",
     "css-loader": "0.28.0",
-    "electron": "1.7.2",
+    "electron": "1.6.11",
     "electron-builder": "17.1.1",
     "electron-builder-squirrel-windows": "17.0.1",
     "electron-rebuild": "1.5.11",
     "file-loader": "0.9.0",
     "font-awesome": "4.7.0",
+    "graceful-fs": "^4.1.11",
     "html-loader": "0.4.4",
     "json-loader": "0.5.4",
     "less": "2.7.1",
     "less-loader": "2.2.3",
     "node-abi": "2.0.3",
-    "node-gyp": "3.4.0",
+    "node-gyp": "^3.6.2",
     "node-sass": "^4.5.3",
     "npmlog": "4.1.0",
     "pug": "2.0.0-beta11",
@@ -52,31 +53,59 @@
       "clink"
     ],
     "win": {
-      "icon": "./build/windows/icon.ico"
+      "icon": "./build/windows/icon.ico",
+      "publish": [
+        "github"
+      ]
     },
     "squirrelWindows": {
-      "iconUrl": "https://github.com/Eugeny/terminus/raw/master/build/windows/icon.ico"
+      "iconUrl": "https://github.com/Eugeny/terminus/raw/master/build/windows/icon.ico",
+      "artifactName": "terminus-${version}-${os}-${arch}.exe"
     },
     "mac": {
       "category": "public.app-category.video",
       "icon": "./build/mac/icon.icns",
-      "identity": null
+      "identity": null,
+      "publish": [
+        "github"
+      ]
+    },
+    "dmg": {
+      "artifactName": "terminus-${version}-${os}-${arch}.dmg"
     },
     "linux": {
       "category": "Utilities",
-      "icon": "./build/icons"
+      "icon": "./build/icons",
+      "publish": [
+        "github"
+      ]
     },
     "deb": {
-      "depends": ["screen", "gconf2", "gconf-service", "libnotify4", "libappindicator1", "libxtst6", "libnss3"]
+      "depends": [
+        "screen",
+        "gconf2",
+        "gconf-service",
+        "libnotify4",
+        "libappindicator1",
+        "libxtst6",
+        "libnss3",
+        "python-gnomekeyring",
+        "tmux"
+      ],
+      "artifactName": "terminus-${version}-${os}-${arch}.deb"
     },
     "rpm": {
-      "depends": ["screen"]
+      "depends": [
+        "screen"
+      ],
+      "artifactName": "terminus-${version}-${os}-${arch}.rpm"
     }
   },
   "scripts": {
-    "build": "webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js",
+    "build": "webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
     "watch": "webpack --progress --color --watch",
     "start": "cross-env DEV=1 electron --js-flags='--ignition' app --debug",
+    "prod": "cross-env DEV=1 electron --js-flags='--ignition' app",
     "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts",
     "postinstall": "install-app-deps"
   },

scripts/build-linux.js

@@ -8,4 +8,6 @@ builder({
   extraMetadata: {
     version: vars.version,
   },
+  publish: 'onTag',
+  draft: false
 })

scripts/build-macos.js

@@ -8,4 +8,6 @@ builder({
   extraMetadata: {
     version: vars.version,
   },
+  publish: 'onTag',
+  draft: false
 })

scripts/build-native.js

@@ -3,7 +3,5 @@ const rebuild = require('electron-rebuild').default
 const path = require('path')
 const vars = require('./vars')
 
-let buildPath = path.resolve(__dirname, '../terminus-terminal')
-rebuild(buildPath, vars.electronVersion, process.arch, [], true).then(() => {
-  console.log('Done')
-})
+rebuild(path.resolve(__dirname, '../terminus-ssh'), vars.electronVersion, process.arch, [], true)
+rebuild(path.resolve(__dirname, '../terminus-terminal'), vars.electronVersion, process.arch, [], true)

scripts/build-windows.js

@@ -8,4 +8,6 @@ builder({
   extraMetadata: {
     version: vars.version,
   },
+  publish: 'onTag',
+  draft: false
 })

scripts/install-deps.js

@@ -5,21 +5,15 @@ const vars = require('./vars')
 const log = require('npmlog')
 
 log.info('deps', 'app')
-sh.exec('npm prune')
-sh.exec('npm install')
-sh.exec('npm update --dev')
+sh.exec('yarn install')
 
 sh.cd('app')
-sh.exec('npm prune')
-sh.exec('npm install')
-sh.exec('npm update --dev')
+sh.exec('yarn install')
 sh.cd('..')
 
 vars.builtinPlugins.forEach(plugin => {
   log.info('deps', plugin)
   sh.cd(plugin)
-  sh.exec('npm prune')
-  sh.exec('npm install')
-  sh.exec('npm update --dev')
+  sh.exec('yarn install')
   sh.cd('..')
 })

scripts/vars.js

@@ -14,6 +14,7 @@ exports.builtinPlugins = [
   'terminus-terminal',
   'terminus-community-color-schemes',
   'terminus-plugin-manager',
+  'terminus-ssh',
 ]
-exports.nativeModules = ['node-pty', 'font-manager']
+exports.nativeModules = ['node-pty-tmp', 'font-manager', 'xkeychain']
 exports.electronVersion = pkgInfo.devDependencies.electron

terminus-community-color-schemes/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.36",
   "description": "Community color schemes for Terminus",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-builtin-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {

terminus-community-color-schemes/schemes/Base16 Default Dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xreources.py
+!
+*.foreground:  #d8d8d8
+*.background:  #181818
+*.cursorColor: #d8d8d8
+!
+! Black
+*.color0:      #181818
+*.color8:      #585858
+!
+! Red
+*.color1:      #ab4642
+*.color9:      #ab4642
+!
+! Green
+*.color2:      #a1b56c
+*.color10:     #a1b56c
+!
+! Yellow
+*.color3:      #f7ca88
+*.color11:     #f7ca88
+!
+! Blue
+*.color4:      #7cafc2
+*.color12:     #7cafc2
+!
+! Magenta
+*.color5:      #ba8baf
+*.color13:     #ba8baf
+!
+! Cyan
+*.color6:      #86c1b9
+*.color14:     #86c1b9
+!
+! White
+*.color7:      #d8d8d8
+*.color15:     #f8f8f8
+!
+! Bold, Italic, Underline
+*.colorBD:     #d8d8d8
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-cave-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #9f999b
+*.background:  #222021
+*.cursorColor: #996e00
+!
+! Black
+*.color0:      #222021
+*.color8:      #635f60
+!
+! Red
+*.color1:      #936c7a
+*.color9:      #ddaf3c
+!
+! Green
+*.color2:      #cca133
+*.color10:     #2f2d2e
+!
+! Yellow
+*.color3:      #ffcc4d
+*.color11:     #565254
+!
+! Blue
+*.color4:      #9c818b
+*.color12:     #706b6d
+!
+! Magenta
+*.color5:      #cca133
+*.color13:     #f0a8c1
+!
+! Cyan
+*.color6:      #d27998
+*.color14:     #c39622
+!
+! White
+*.color7:      #9f999b
+*.color15:     #ffebf2
+!
+! Bold, Italic, Underline
+*.colorBD:     #9f999b
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-desert-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #ada594
+*.background:  #292724
+*.cursorColor: #bc672f
+!
+! Black
+*.color0:      #292724
+*.color8:      #7e7767
+!
+! Red
+*.color1:      #816f4b
+*.color9:      #f29d63
+!
+! Green
+*.color2:      #ec9255
+*.color10:     #3d3a34
+!
+! Yellow
+*.color3:      #ffb380
+*.color11:     #615c51
+!
+! Blue
+*.color4:      #957e50
+*.color12:     #908774
+!
+! Magenta
+*.color5:      #ec9255
+*.color13:     #ddcba6
+!
+! Cyan
+*.color6:      #ac8e53
+*.color14:     #e58748
+!
+! White
+*.color7:      #ada594
+*.color15:     #f2ead9
+!
+! Bold, Italic, Underline
+*.colorBD:     #ada594
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-drawbridge-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #9094a7
+*.background:  #1b1f32
+*.cursorColor: #289dbd
+!
+! Black
+*.color0:      #1b1f32
+*.color8:      #51587b
+!
+! Red
+*.color1:      #627af4
+*.color9:      #75d5f0
+!
+! Green
+*.color2:      #67c9e4
+*.color10:     #252a41
+!
+! Yellow
+*.color3:      #99e9ff
+*.color11:     #444b6f
+!
+! Blue
+*.color4:      #7289fd
+*.color12:     #5e6587
+!
+! Magenta
+*.color5:      #67c9e4
+*.color13:     #c3cdfe
+!
+! Cyan
+*.color6:      #8b9efd
+*.color14:     #5cbcd6
+!
+! White
+*.color7:      #9094a7
+*.color15:     #e1e6ff
+!
+! Bold, Italic, Underline
+*.colorBD:     #9094a7
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-evening-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #a4a1b5
+*.background:  #2a2734
+*.cursorColor: #b37537
+!
+! Black
+*.color0:      #2a2734
+*.color8:      #6c6783
+!
+! Red
+*.color1:      #8a75f5
+*.color9:      #ffb870
+!
+! Green
+*.color2:      #ffad5c
+*.color10:     #363342
+!
+! Yellow
+*.color3:      #ffcc99
+*.color11:     #545167
+!
+! Blue
+*.color4:      #9a86fd
+*.color12:     #787391
+!
+! Magenta
+*.color5:      #ffad5c
+*.color13:     #d9d2fe
+!
+! Cyan
+*.color6:      #afa0fe
+*.color14:     #ffa142
+!
+! White
+*.color7:      #a4a1b5
+*.color15:     #eeebff
+!
+! Bold, Italic, Underline
+*.colorBD:     #a4a1b5
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-forest-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #a1b5a1
+*.background:  #2a2d2a
+*.cursorColor: #656b47
+!
+! Black
+*.color0:      #2a2d2a
+*.color8:      #535f53
+!
+! Red
+*.color1:      #5c705c
+*.color9:      #cbe25a
+!
+! Green
+*.color2:      #bfd454
+*.color10:     #353b35
+!
+! Yellow
+*.color3:      #e5fb79
+*.color11:     #485148
+!
+! Blue
+*.color4:      #687d68
+*.color12:     #5e6e5e
+!
+! Magenta
+*.color5:      #bfd454
+*.color13:     #c8e4c8
+!
+! Cyan
+*.color6:      #8fae8f
+*.color14:     #b1c44f
+!
+! White
+*.color7:      #a1b5a1
+*.color15:     #f0fff0
+!
+! Bold, Italic, Underline
+*.colorBD:     #a1b5a1
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-heath-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #9e999f
+*.background:  #222022
+*.cursorColor: #995900
+!
+! Black
+*.color0:      #222022
+*.color8:      #635f63
+!
+! Red
+*.color1:      #8f6c93
+*.color9:      #d9b98c
+!
+! Green
+*.color2:      #cc8c33
+*.color10:     #2f2d2f
+!
+! Yellow
+*.color3:      #ffd599
+*.color11:     #575158
+!
+! Blue
+*.color4:      #9a819c
+*.color12:     #6f6b70
+!
+! Magenta
+*.color5:      #cc8c33
+*.color13:     #eaa8f0
+!
+! Cyan
+*.color6:      #cb79d2
+*.color14:     #c38022
+!
+! White
+*.color7:      #9e999f
+*.color15:     #fdebff
+!
+! Bold, Italic, Underline
+*.colorBD:     #9e999f
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-heath-light

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #575158
+*.background:  #fbfaf9
+*.cursorColor: #eaa8f0
+!
+! Black
+*.color0:      #222022
+*.color8:      #635f63
+!
+! Red
+*.color1:      #8f6c93
+*.color9:      #d9b98c
+!
+! Green
+*.color2:      #cc8c33
+*.color10:     #2f2d2f
+!
+! Yellow
+*.color3:      #ffd599
+*.color11:     #575158
+!
+! Blue
+*.color4:      #9a819c
+*.color12:     #6f6b70
+!
+! Magenta
+*.color5:      #b87414
+*.color13:     #eaa8f0
+!
+! Cyan
+*.color6:      #cb79d2
+*.color14:     #c38022
+!
+! White
+*.color7:      #9e999f
+*.color15:     #fbfaf9
+!
+! Bold, Italic, Underline
+*.colorBD:     #575158
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-lake-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #7ba8b7
+*.background:  #192d34
+*.cursorColor: #84740b
+!
+! Black
+*.color0:      #192d34
+*.color8:      #3d6876
+!
+! Red
+*.color1:      #3e91ac
+*.color9:      #d6c65c
+!
+! Green
+*.color2:      #cbbb4d
+*.color10:     #223c44
+!
+! Yellow
+*.color3:      #ffeb66
+*.color11:     #335966
+!
+! Blue
+*.color4:      #499fbc
+*.color12:     #467686
+!
+! Magenta
+*.color5:      #cbbb4d
+*.color13:     #a5d8e9
+!
+! Cyan
+*.color6:      #62b1cb
+*.color14:     #c4b031
+!
+! White
+*.color7:      #7ba8b7
+*.color15:     #e1f7ff
+!
+! Bold, Italic, Underline
+*.colorBD:     #7ba8b7
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-meadow-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #7b9eb7
+*.background:  #192834
+*.cursorColor: #4d8217
+!
+! Black
+*.color0:      #192834
+*.color8:      #3d5e76
+!
+! Red
+*.color1:      #277fbe
+*.color9:      #8cdd3c
+!
+! Green
+*.color2:      #80bf40
+*.color10:     #223644
+!
+! Yellow
+*.color3:      #a6f655
+*.color11:     #335166
+!
+! Blue
+*.color4:      #4299d7
+*.color12:     #466b86
+!
+! Magenta
+*.color5:      #80bf40
+*.color13:     #afddfe
+!
+! Cyan
+*.color6:      #47adf5
+*.color14:     #73b234
+!
+! White
+*.color7:      #7b9eb7
+*.color15:     #d1ecff
+!
+! Bold, Italic, Underline
+*.colorBD:     #7b9eb7
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-morning-light

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #4f5664
+*.background:  #faf8f5
+*.cursorColor: #b7c9eb
+!
+! Black
+*.color0:      #232834
+*.color8:      #656e81
+!
+! Red
+*.color1:      #1659df
+*.color9:      #c6b28b
+!
+! Green
+*.color2:      #b29762
+*.color10:     #31363f
+!
+! Yellow
+*.color3:      #e5ddcd
+*.color11:     #4f5664
+!
+! Blue
+*.color4:      #3d75e6
+*.color12:     #707a8f
+!
+! Magenta
+*.color5:      #896724
+*.color13:     #b7c9eb
+!
+! Cyan
+*.color6:      #728fcb
+*.color14:     #9a7c42
+!
+! White
+*.color7:      #8d95a5
+*.color15:     #faf8f5
+!
+! Bold, Italic, Underline
+*.colorBD:     #4f5664
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-pool-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #9a90a7
+*.background:  #2a2433
+*.cursorColor: #cf504a
+!
+! Black
+*.color0:      #2a2433
+*.color8:      #635775
+!
+! Red
+*.color1:      #aa75f5
+*.color9:      #fc8983
+!
+! Green
+*.color2:      #f87972
+*.color10:     #372f42
+!
+! Yellow
+*.color3:      #ffb6b3
+*.color11:     #574b68
+!
+! Blue
+*.color4:      #b886fd
+*.color12:     #706383
+!
+! Magenta
+*.color5:      #f87972
+*.color13:     #e4d2fe
+!
+! Cyan
+*.color6:      #c7a0fe
+*.color14:     #f36f68
+!
+! White
+*.color7:      #9a90a7
+*.color15:     #f3ebff
+!
+! Bold, Italic, Underline
+*.colorBD:     #9a90a7
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-sea-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #a1aab5
+*.background:  #1d262f
+*.cursorColor: #067953
+!
+! Black
+*.color0:      #1d262f
+*.color8:      #4a5f78
+!
+! Red
+*.color1:      #34659d
+*.color9:      #14e19d
+!
+! Green
+*.color2:      #0fc78a
+*.color10:     #27323f
+!
+! Yellow
+*.color3:      #47ebb4
+*.color11:     #405368
+!
+! Blue
+*.color4:      #57718e
+*.color12:     #738191
+!
+! Magenta
+*.color5:      #0fc78a
+*.color13:     #afd4fe
+!
+! Cyan
+*.color6:      #6e9bcf
+*.color14:     #0db57d
+!
+! White
+*.color7:      #a1aab5
+*.color15:     #ebf4ff
+!
+! Bold, Italic, Underline
+*.colorBD:     #a1aab5
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/schemes/base2tone-space-dark

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xrecources.py
+!
+*.foreground:  #a1a1b5
+*.background:  #24242e
+*.cursorColor: #b25424
+!
+! Black
+*.color0:      #24242e
+*.color8:      #5b5b76
+!
+! Red
+*.color1:      #7676f4
+*.color9:      #f37b3f
+!
+! Green
+*.color2:      #ec7336
+*.color10:     #333342
+!
+! Yellow
+*.color3:      #fe8c52
+*.color11:     #515167
+!
+! Blue
+*.color4:      #767693
+*.color12:     #737391
+!
+! Magenta
+*.color5:      #ec7336
+*.color13:     #cecee3
+!
+! Cyan
+*.color6:      #8a8aad
+*.color14:     #e66e33
+!
+! White
+*.color7:      #a1a1b5
+*.color15:     #ebebff
+!
+! Bold, Italic, Underline
+*.colorBD:     #a1a1b5
+!*.colorIT:
+!*.colorUL:

terminus-community-color-schemes/src/colorSchemes.ts

@@ -19,29 +19,19 @@ export class ColorSchemes extends TerminalColorSchemeProvider {
                     values[key] = value
                 })
 
+            let colors: string[] = []
+            let colorIndex = 0
+            while (values[`color${colorIndex}`]) {
+                colors.push(values[`color${colorIndex}`])
+                colorIndex++
+            }
+
             schemes.push({
                 name: schemeFile.split('/')[1].trim(),
                 foreground: values.foreground,
                 background: values.background,
                 cursor: values.cursorColor,
-                colors: [
-                    values.color0,
-                    values.color1,
-                    values.color2,
-                    values.color3,
-                    values.color4,
-                    values.color5,
-                    values.color6,
-                    values.color7,
-                    values.color8,
-                    values.color9,
-                    values.color10,
-                    values.color11,
-                    values.color12,
-                    values.color13,
-                    values.color14,
-                    values.color15,
-                ],
+                colors,
             })
         })
 

terminus-community-color-schemes/yarn.lock

@@ -0,0 +1,11 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/node@7.0.12":
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9"
+
+"@types/webpack-env@^1.13.0":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.1.tgz#b45c222e24301bd006e3edfc762cc6b51bda236a"

terminus-core/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-core",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.36",
   "description": "Terminus core",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-builtin-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -15,14 +17,16 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
-    "@types/js-yaml": "^3.5.29",
-    "@types/node": "^7.0.12",
+    "@types/js-yaml": "^3.9.0",
+    "@types/node": "^7.0.37",
     "@types/webpack-env": "^1.13.0",
+    "@types/winston": "^2.3.6",
+    "axios": "0.16.2",
     "bootstrap": "4.0.0-alpha.6",
     "core-js": "^2.4.1",
+    "electron-updater": "^2.8.9",
     "ngx-perfect-scrollbar": "4.0.0",
-    "typescript": "^2.4.0"
+    "typescript": "^2.4.1"
   },
   "peerDependencies": {
     "@angular/animations": "4.0.1",
@@ -35,8 +39,9 @@
     "zone.js": "0.8.4"
   },
   "dependencies": {
-    "deepmerge": "^1.4.4",
-    "js-yaml": "^3.8.4"
+    "deepmerge": "^1.5.0",
+    "js-yaml": "^3.9.0",
+    "winston": "^2.4.0"
   },
   "false": {}
 }

terminus-core/src/api/index.ts

@@ -1,5 +1,5 @@
 export { BaseTabComponent } from '../components/baseTab.component'
-export { TabRecoveryProvider } from './tabRecovery'
+export { TabRecoveryProvider, RecoveredTab } from './tabRecovery'
 export { ToolbarButtonProvider, IToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
 export { HotkeyProvider, IHotkeyDescription } from './hotkeyProvider'

terminus-core/src/api/tabRecovery.ts

@@ -1,3 +1,10 @@
-export abstract class TabRecoveryProvider {
-    abstract async recover (recoveryToken: any): Promise<void>
+import { TabComponentType } from '../services/app.service'
+
+export interface RecoveredTab {
+    type: TabComponentType,
+    options?: any,
+}
+
+export abstract class TabRecoveryProvider {
+    abstract async recover (recoveryToken: any): Promise<RecoveredTab|null>
 }

terminus-core/src/components/appRoot.component.pug

@@ -19,7 +19,6 @@ title-bar(
                 [class.drag-region]='hostApp.platform == Platform.macOS',
                 @animateTab,
                 (click)='app.selectTab(tab)',
-                (closeClicked)='app.closeTab(tab)',
             )
         
         .btn-group
@@ -30,7 +29,7 @@ title-bar(
             )
                 i.fa([class]='"fa fa-" + button.icon')
                 
-        .drag-space
+        .drag-space(*ngIf='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
             
         .btn-group
             button.btn.btn-secondary.btn-tab-bar(
@@ -39,6 +38,13 @@ title-bar(
                 (click)='button.click()',
             )
                 i.fa([class]='"fa fa-" + button.icon')
+            button.btn.btn-secondary.btn-tab-bar(
+                *ngIf='appUpdate',
+                title='Update available',
+                (click)='updateApp()',
+            )
+                i.fa.fa-arrow-up.text-info
+                span.text-info Update
 
         window-controls(
             *ngIf='config.store.appearance.frame == "thin" && (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',

terminus-core/src/components/appRoot.component.ts

@@ -1,16 +1,18 @@
 import { Component, Inject, Input, HostListener } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 import { ElectronService } from '../services/electron.service'
 import { HostAppService, Platform } from '../services/hostApp.service'
 import { HotkeysService } from '../services/hotkeys.service'
 import { Logger, LogService } from '../services/log.service'
-import { QuitterService } from '../services/quitter.service'
 import { ConfigService } from '../services/config.service'
 import { DockingService } from '../services/docking.service'
 import { TabRecoveryService } from '../services/tabRecovery.service'
 import { ThemesService } from '../services/themes.service'
+import { UpdaterService, Update } from '../services/updater.service'
 
+import { SafeModeModalComponent } from './safeModeModal.component'
 import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
 
 @Component({
@@ -28,9 +30,16 @@ import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
                     'flex-basis': '1px',
                     'width': '1px',
                 }),
-                animate('250ms ease-in-out')
+                animate('250ms ease-in-out', style({
+                    'flex-basis': '200px',
+                    'width': '200px',
+                }))
             ]),
             transition(':leave', [
+                style({
+                    'flex-basis': '200px',
+                    'width': '200px',
+                }),
                 animate('250ms ease-in-out', style({
                     'flex-basis': '1px',
                     'width': '1px',
@@ -45,19 +54,21 @@ export class AppRootComponent {
     @Input() leftToolbarButtons: IToolbarButton[]
     @Input() rightToolbarButtons: IToolbarButton[]
     private logger: Logger
+    private appUpdate: Update
 
     constructor (
         private docking: DockingService,
         private electron: ElectronService,
         private tabRecovery: TabRecoveryService,
+        private hotkeys: HotkeysService,
+        private updater: UpdaterService,
         public hostApp: HostAppService,
-        public hotkeys: HotkeysService,
         public config: ConfigService,
         public app: AppService,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
         log: LogService,
+        ngbModal: NgbModal,
         _themes: ThemesService,
-        _quitter: QuitterService,
     ) {
         this.logger = log.create('main')
         this.logger.info('v', electron.app.getVersion())
@@ -74,7 +85,7 @@ export class AppRootComponent {
             }
             if (this.app.activeTab) {
                 if (hotkey === 'close-tab') {
-                    this.app.closeTab(this.app.activeTab)
+                    this.app.closeTab(this.app.activeTab, true)
                 }
                 if (hotkey === 'toggle-last-tab') {
                     this.app.toggleLastTab()
@@ -93,12 +104,20 @@ export class AppRootComponent {
             this.docking.dock()
         })
 
-        this.hostApp.secondInstance.subscribe(() => {
+        this.hostApp.secondInstance$.subscribe(() => {
             this.onGlobalHotkey()
         })
         this.hotkeys.globalHotkey.subscribe(() => {
             this.onGlobalHotkey()
         })
+
+        if (window['safeModeReason']) {
+            ngbModal.open(SafeModeModalComponent)
+        }
+
+        this.updater.check().then(update => {
+            this.appUpdate = update
+        })
     }
 
     onGlobalHotkey () {
@@ -131,16 +150,8 @@ export class AppRootComponent {
         if (this.app.tabs.length === 0) {
             this.app.openDefaultTab()
         }
-    }
 
-    private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
-        let buttons: IToolbarButton[] = []
-        this.toolbarButtonProviders.forEach((provider) => {
-            buttons = buttons.concat(provider.provide())
-        })
-        return buttons
-            .filter((button) => (button.weight > 0) === aboveZero)
-            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
+        this.app.emitReady()
     }
 
     @HostListener('dragover')
@@ -152,4 +163,18 @@ export class AppRootComponent {
     onDrop () {
         return false
     }
+
+    updateApp () {
+        this.electron.shell.openExternal(this.appUpdate.url)
+    }
+
+    private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
+        let buttons: IToolbarButton[] = []
+        this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
+            buttons = buttons.concat(provider.provide())
+        })
+        return buttons
+            .filter((button) => (button.weight > 0) === aboveZero)
+            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
+    }
 }

terminus-core/src/components/baseTab.component.ts

@@ -1,10 +1,11 @@
-import { Subject, BehaviorSubject } from 'rxjs'
+import { Subject } from 'rxjs'
 import { ViewRef } from '@angular/core'
 
 export abstract class BaseTabComponent {
     private static lastTabID = 0
     id: number
-    title$ = new BehaviorSubject<string>(null)
+    title: string
+    customTitle: string
     scrollable: boolean
     hasActivity = false
     focused$ = new Subject<void>()
@@ -30,9 +31,12 @@ export abstract class BaseTabComponent {
         return null
     }
 
+    async canClose (): Promise<boolean> {
+        return true
+    }
+
     destroy (): void {
         this.focused$.complete()
         this.blurred$.complete()
-        this.title$.complete()
     }
 }

terminus-core/src/components/renameTabModal.component.pug

@@ -0,0 +1,6 @@
+.modal-body
+    input.form-control(type='text', [(ngModel)]='value', (keyup.enter)='save()', autofocus)
+
+.modal-footer
+    button.btn.btn-outline-primary((click)='save()') Save
+    button.btn.btn-outline-secondary((click)='close()') Cancel

terminus-core/src/components/renameTabModal.component.ts

@@ -0,0 +1,22 @@
+import { Component, Input } from '@angular/core'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+
+@Component({
+    selector: 'rename-tab-modal',
+    template: require('./renameTabModal.component.pug'),
+})
+export class RenameTabModalComponent {
+    @Input() value: string
+
+    constructor (
+        private modalInstance: NgbActiveModal
+    ) { }
+
+    save () {
+        this.modalInstance.close(this.value)
+    }
+
+    close () {
+        this.modalInstance.dismiss()
+    }
+}

terminus-core/src/components/safeModeModal.component.pug

@@ -0,0 +1,7 @@
+.modal-body
+    .alert.alert-danger Terminus could not start with your plugins, so all third party plugins have been disabled in this session. The error was:
+        
+    pre {{error}}
+
+.modal-footer
+    button.btn.btn-outline-primary((click)='close()') Close

terminus-core/src/components/safeModeModal.component.ts

@@ -0,0 +1,19 @@
+import { Component, Input } from '@angular/core'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+
+@Component({
+    template: require('./safeModeModal.component.pug'),
+})
+export class SafeModeModalComponent {
+    @Input() error: Error
+
+    constructor (
+        public modalInstance: NgbActiveModal,
+    ) {
+        this.error = window['safeModeReason']
+    }
+
+    close () {
+        this.modalInstance.dismiss()
+    }
+}

terminus-core/src/components/startPage.component.pug

@@ -1,30 +1,20 @@
 div
     .terminus-logo
-        .part(style='transform: rotateZ(0deg)')
-            div
-        .part(style='transform: rotateZ(51deg)')
-            div
-        .part(style='transform: rotateZ(102deg)')
-            div
-        .part(style='transform: rotateZ(154deg)')
-            div
-        .part(style='transform: rotateZ(205deg)')
-            div
-        .part(style='transform: rotateZ(257deg)')
-            div
-        .part(style='transform: rotateZ(308deg)')
-            div
     h1.terminus-title Terminus
-        span.text-muted α 
+        sup α 
 
-    button.btn.btn-primary.btn-lg.btn-block(
-        *ngFor='let button of getButtons()',
-        (click)='button.click()',
-    )
-        i.fa([class]='"fa fa-" + button.icon')
-        span {{button.title}}
+    .list-group
+        a.list-group-item.list-group-item-action(
+            *ngFor='let button of getButtons()',
+            (click)='button.click()',
+        )
+            i([class]='"fa fa-fw fa-" + button.icon')
+            span {{button.title}}
 
 footer
+    .pull-right
+        .form-control-static Version: {{version}}
+            
     .btn-group
         button.btn.btn-secondary((click)='openGitHub()')
             i.fa.fa-github

terminus-core/src/components/startPage.component.scss

@@ -24,6 +24,6 @@ footer {
     background: rgba(0,0,0,.5);
 }
 
-button {
+a, button {
     -webkit-app-region: no-drag;
 }

terminus-core/src/components/startPage.component.ts

@@ -1,5 +1,7 @@
+import * as os from 'os'
 import { Component, Inject } from '@angular/core'
 import { ElectronService } from '../services/electron.service'
+import { ConfigService } from '../services/config.service'
 import { IToolbarButton, ToolbarButtonProvider } from '../api'
 
 @Component({
@@ -8,13 +10,18 @@ import { IToolbarButton, ToolbarButtonProvider } from '../api'
     styles: [require('./startPage.component.scss')],
 })
 export class StartPageComponent {
+    version: string
+
     constructor (
         private electron: ElectronService,
+        private config: ConfigService,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
-    ) { }
+    ) {
+        this.version = electron.app.getVersion()
+    }
 
     getButtons (): IToolbarButton[] {
-        return this.toolbarButtonProviders
+        return this.config.enabledServices(this.toolbarButtonProviders)
             .map(provider => provider.provide())
             .reduce((a, b) => a.concat(b))
             .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
@@ -25,6 +32,13 @@ export class StartPageComponent {
     }
 
     reportBug () {
-        this.electron.shell.openExternal('https://github.com/eugeny/terminus/issues/new')
+        let body = `Version: ${this.version}\n`
+        body += `Platform: ${os.platform()} ${os.release()}\n\n`
+        let label = {
+            darwin: 'macOS',
+            windows: 'Windows',
+            linux: 'Linux',
+        }[os.platform()]
+        this.electron.shell.openExternal(`https://github.com/eugeny/terminus/issues/new?body=${encodeURIComponent(body)}&labels=${label}`)
     }
 }

terminus-core/src/components/tabHeader.component.pug

@@ -1,3 +1,3 @@
 .index {{index + 1}}
-.name {{tab.title$ | async}}
-button((click)='closeClicked.emit()') ×
+.name([title]='tab.customTitle || tab.title') {{tab.customTitle || tab.title}}
+button((click)='app.closeTab(tab, true)') ×

terminus-core/src/components/tabHeader.component.scss

@@ -1,7 +1,6 @@
 $tabs-height: 36px;
 
 :host {
-    line-height: $tabs-height - 2px;
     cursor: pointer;
 
     flex: 1000 1 200px;
@@ -24,9 +23,9 @@ $tabs-height: 36px;
         margin-left: 10px;
         width: 20px;
         border-radius: 10px;
-        line-height: 35px;
         text-align: center;
         transition: 0.25s all;
+        align-self: center;
     }
 
     .name {
@@ -36,6 +35,7 @@ $tabs-height: 36px;
         white-space: nowrap;
         text-overflow: ellipsis;
         min-width: 0;
+        align-self: center;
     }
 
     button {
@@ -49,11 +49,15 @@ $tabs-height: 36px;
         height: $button-size;
         border-radius: $button-size / 2;
         line-height: $button-size * 0.87;
-        margin-top: ($tabs-height - $button-size) * 0.5;
+        align-self: center;
         margin-right: 10px;
 
         text-align: center;
         font-size: 20px;
+
+        &:focus {
+          outline: 0;
+        }
     }
 
     &:hover button {

terminus-core/src/components/tabHeader.component.ts

@@ -1,5 +1,9 @@
-import { Component, Input, Output, EventEmitter, HostBinding } from '@angular/core'
-import { BaseTabComponent } from '../components/baseTab.component'
+import { Component, Input, HostBinding, HostListener, NgZone } from '@angular/core'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { BaseTabComponent } from './baseTab.component'
+import { RenameTabModalComponent } from './renameTabModal.component'
+import { ElectronService } from '../services/electron.service'
+import { AppService } from '../services/app.service'
 
 @Component({
     selector: 'tab-header',
@@ -11,5 +15,75 @@ export class TabHeaderComponent {
     @Input() @HostBinding('class.active') active: boolean
     @Input() @HostBinding('class.has-activity') hasActivity: boolean
     @Input() tab: BaseTabComponent
-    @Output() closeClicked = new EventEmitter()
+    private contextMenu: any
+
+    constructor (
+        zone: NgZone,
+        electron: ElectronService,
+        public app: AppService,
+        private ngbModal: NgbModal,
+    ) {
+        this.contextMenu = electron.remote.Menu.buildFromTemplate([
+            {
+                label: 'Close',
+                click: () => {
+                    zone.run(() => {
+                        app.closeTab(this.tab, true)
+                    })
+                }
+            },
+            {
+                label: 'Close other tabs',
+                click: () => {
+                    zone.run(() => {
+                        for (let tab of app.tabs.filter(x => x !== this.tab)) {
+                            app.closeTab(tab, true)
+                        }
+                    })
+                }
+            },
+            {
+                label: 'Close tabs to the right',
+                click: () => {
+                    zone.run(() => {
+                        for (let tab of app.tabs.slice(app.tabs.indexOf(this.tab) + 1)) {
+                            app.closeTab(tab, true)
+                        }
+                    })
+                }
+            },
+            {
+                label: 'Close tabs to the left',
+                click: () => {
+                    zone.run(() => {
+                        for (let tab of app.tabs.slice(0, app.tabs.indexOf(this.tab))) {
+                            app.closeTab(tab, true)
+                        }
+                    })
+                }
+            },
+        ])
+    }
+
+    @HostListener('dblclick') onDoubleClick (): void {
+        let modal = this.ngbModal.open(RenameTabModalComponent)
+        modal.componentInstance.value = this.tab.customTitle || this.tab.title
+        modal.result.then(result => {
+            this.tab.customTitle = result
+        }).catch(() => null)
+    }
+
+    @HostListener('auxclick', ['$event']) onAuxClick ($event: MouseEvent): void {
+        if ($event.which === 2) {
+            this.app.closeTab(this.tab, true)
+        }
+        if ($event.which === 3) {
+            this.contextMenu.popup({
+                x: $event.pageX,
+                y: $event.pageY,
+                async: true,
+            })
+            event.preventDefault()
+        }
+    }
 }

terminus-core/src/configDefaults.linux.yaml

@@ -43,3 +43,4 @@ hotkeys:
   tab-10:
     - 'Alt-0'
     - ['Ctrl-A', '0']
+pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.macos.yaml

@@ -43,3 +43,4 @@ hotkeys:
   tab-10:
     - '⌘-0'
     - ['Ctrl-A', '0']
+pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.windows.yaml

@@ -43,3 +43,4 @@ hotkeys:
   tab-10:
     - 'Alt-0'
     - ['Ctrl-A', '0']
+pluginBlacklist: []

terminus-core/src/index.ts

@@ -11,23 +11,25 @@ import { ElectronService } from './services/electron.service'
 import { HostAppService } from './services/hostApp.service'
 import { LogService } from './services/log.service'
 import { HotkeysService, AppHotkeyProvider } from './services/hotkeys.service'
-import { QuitterService } from './services/quitter.service'
 import { DockingService } from './services/docking.service'
 import { TabRecoveryService } from './services/tabRecovery.service'
 import { ThemesService } from './services/themes.service'
+import { UpdaterService } from './services/updater.service'
 
 import { AppRootComponent } from './components/appRoot.component'
 import { TabBodyComponent } from './components/tabBody.component'
+import { SafeModeModalComponent } from './components/safeModeModal.component'
 import { StartPageComponent } from './components/startPage.component'
 import { TabHeaderComponent } from './components/tabHeader.component'
 import { TitleBarComponent } from './components/titleBar.component'
 import { WindowControlsComponent } from './components/windowControls.component'
+import { RenameTabModalComponent } from './components/renameTabModal.component'
 
 import { HotkeyProvider } from './api/hotkeyProvider'
 import { ConfigProvider } from './api/configProvider'
 import { Theme } from './api/theme'
 
-import { StandardTheme } from './theme'
+import { StandardTheme, StandardCompactTheme } from './theme'
 import { CoreConfigProvider } from './config'
 
 import 'perfect-scrollbar/dist/css/perfect-scrollbar.css'
@@ -42,9 +44,10 @@ const PROVIDERS = [
     LogService,
     TabRecoveryService,
     ThemesService,
-    QuitterService,
+    UpdaterService,
     { provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },
     { provide: Theme, useClass: StandardTheme, multi: true },
+    { provide: Theme, useClass: StandardCompactTheme, multi: true },
     { provide: ConfigProvider, useClass: CoreConfigProvider, multi: true },
 ]
 
@@ -53,7 +56,7 @@ const PROVIDERS = [
         BrowserModule,
         BrowserAnimationsModule,
         FormsModule,
-        NgbModule,
+        NgbModule.forRoot(),
         PerfectScrollbarModule.forRoot({
             suppressScrollX: true,
         }),
@@ -65,7 +68,13 @@ const PROVIDERS = [
         TabHeaderComponent,
         TitleBarComponent,
         WindowControlsComponent,
+        RenameTabModalComponent,
+        SafeModeModalComponent,
     ],
+    entryComponents: [
+        RenameTabModalComponent,
+        SafeModeModalComponent,
+    ]
 })
 export default class AppModule {
     static forRoot (): ModuleWithProviders {

terminus-core/src/services/app.service.ts

@@ -1,4 +1,4 @@
-import { Subject } from 'rxjs'
+import { Subject, AsyncSubject } from 'rxjs'
 import { Injectable, ComponentFactoryResolver, Injector, Optional } from '@angular/core'
 import { DefaultTabProvider } from '../api/defaultTabProvider'
 import { BaseTabComponent } from '../components/baseTab.component'
@@ -12,7 +12,8 @@ export class AppService {
     activeTab: BaseTabComponent
     lastTabIndex = 0
     logger: Logger
-    tabsChanged$ = new Subject()
+    tabsChanged$ = new Subject<void>()
+    ready$ = new AsyncSubject<void>()
 
     constructor (
         private componentFactoryResolver: ComponentFactoryResolver,
@@ -82,13 +83,24 @@ export class AppService {
         }
     }
 
-    closeTab (tab: BaseTabComponent) {
+    async closeTab (tab: BaseTabComponent, checkCanClose?: boolean): Promise<void> {
+        if (!this.tabs.includes(tab)) {
+            return
+        }
+        if (checkCanClose && !await tab.canClose()) {
+            return
+        }
+        this.tabs = this.tabs.filter((x) => x !== tab)
         tab.destroy()
         let newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
-        this.tabs = this.tabs.filter((x) => x !== tab)
         if (tab === this.activeTab) {
             this.selectTab(this.tabs[newIndex])
         }
         this.tabsChanged$.next()
     }
+
+    emitReady () {
+        this.ready$.next(null)
+        this.ready$.complete()
+    }
 }

terminus-core/src/services/config.service.ts

@@ -6,6 +6,7 @@ import { Injectable, Inject } from '@angular/core'
 import { ConfigProvider } from '../api/configProvider'
 import { ElectronService } from './electron.service'
 import { HostAppService } from './hostApp.service'
+import * as Reflect from 'core-js/es7/reflect'
 
 const configMerge = (a, b) => require('deepmerge')(a, b, { arrayMerge: (_d, s) => s })
 
@@ -38,7 +39,7 @@ export class ConfigProxy {
                     {
                         enumerable: true,
                         configurable: false,
-                        get: () => real[key] || defaults[key],
+                        get: () => (real[key] !== undefined) ? real[key] : defaults[key],
                         set: (value) => {
                             real[key] = value
                         }
@@ -57,6 +58,7 @@ export class ConfigService {
     private _store: any
     private path: string
     private defaults: any
+    private servicesCache: { [id: string]: Function[] } = null
 
     constructor (
         electron: ElectronService,
@@ -67,7 +69,7 @@ export class ConfigService {
         this.defaults = configProviders.map(provider => {
             let defaults = {}
             if (provider.platformDefaults) {
-                defaults = configMerge(defaults, provider.platformDefaults[hostApp.platform])
+                defaults = configMerge(defaults, provider.platformDefaults[hostApp.platform] || {})
             }
             if (provider.defaults) {
                 defaults = configMerge(defaults, provider.defaults)
@@ -98,4 +100,28 @@ export class ConfigService {
     requestRestart (): void {
         this.restartRequested = true
     }
+
+    enabledServices<T> (services: T[]): T[] {
+        if (!this.servicesCache) {
+            this.servicesCache = {}
+            let ngModule = Reflect.getMetadata('annotations', window['rootModule'])[0]
+            for (let imp of ngModule.imports) {
+                let module = imp['module'] || imp
+                let annotations = Reflect.getMetadata('annotations', module)
+                if (annotations) {
+                    this.servicesCache[module['pluginName']] = annotations[0].providers.map(provider => {
+                        return provider['useClass'] || provider
+                    })
+                }
+            }
+        }
+        return services.filter(service => {
+            for (let pluginName in this.servicesCache) {
+                if (this.servicesCache[pluginName].includes(service.constructor)) {
+                    return !this.store.pluginBlacklist.includes(pluginName)
+                }
+            }
+            return true
+        })
+    }
 }

terminus-core/src/services/docking.service.ts

@@ -14,7 +14,10 @@ export class DockingService {
         private electron: ElectronService,
         private config: ConfigService,
         private hostApp: HostAppService,
-    ) {}
+    ) {
+        electron.screen.on('display-removed', () => this.repositionWindow())
+        electron.screen.on('display-metrics-changed', () => this.repositionWindow())
+    }
 
     dock () {
         let display = this.electron.screen.getAllDisplays()
@@ -40,12 +43,12 @@ export class DockingService {
             newBounds.height = Math.round(fill * display.bounds.height)
         }
         if (dockSide === 'right') {
-            newBounds.x = display.bounds.x + Math.round(display.bounds.width * (1.0 - fill))
+            newBounds.x = display.bounds.x + display.bounds.width - newBounds.width
         } else {
             newBounds.x = display.bounds.x
         }
         if (dockSide === 'bottom') {
-            newBounds.y = display.bounds.y + Math.round(display.bounds.height * (1.0 - fill))
+            newBounds.y = display.bounds.y + display.bounds.height - newBounds.height
         } else {
             newBounds.y = display.bounds.y
         }
@@ -71,4 +74,20 @@ export class DockingService {
             }
         })
     }
+
+    getWindow () {
+        return this.electron.app.window
+    }
+
+    repositionWindow () {
+        let [x, y] = this.getWindow().getPosition()
+        for (let screen of this.electron.screen.getAllDisplays()) {
+            let bounds = screen.bounds
+            if (x >= bounds.x && x <= bounds.x + bounds.width && y >= bounds.y && y <= bounds.y + bounds.height) {
+                return
+            }
+        }
+        let screen = this.electron.screen.getPrimaryDisplay()
+        this.getWindow().setPosition(screen.bounds.x, screen.bounds.y)
+    }
 }

terminus-core/src/services/electron.service.ts

@@ -9,22 +9,26 @@ export class ElectronService {
     clipboard: any
     globalShortcut: any
     screen: any
+    remote: any
     private electron: any
-    private remoteElectron: any
 
     constructor () {
         this.electron = require('electron')
-        this.remoteElectron = this.remoteRequire('electron')
-        this.app = this.electron.remote.app
-        this.screen = this.electron.remote.screen
-        this.dialog = this.electron.remote.dialog
+        this.remote = this.electron.remote
+        this.app = this.remote.app
+        this.screen = this.remote.screen
+        this.dialog = this.remote.dialog
         this.shell = this.electron.shell
         this.clipboard = this.electron.clipboard
         this.ipcRenderer = this.electron.ipcRenderer
-        this.globalShortcut = this.electron.remote.globalShortcut
+        this.globalShortcut = this.remote.globalShortcut
     }
 
     remoteRequire (name: string): any {
-        return this.electron.remote.require(name)
+        return this.remote.require(name)
+    }
+
+    remoteRequirePluginModule (plugin: string, module: string, globals: any): any {
+        return this.remoteRequire(globals.require.resolve(`${plugin}/node_modules/${module}`))
     }
 }

terminus-core/src/services/hostApp.service.ts

@@ -1,3 +1,4 @@
+import { Subject } from 'rxjs'
 import { Injectable, NgZone, EventEmitter } from '@angular/core'
 import { ElectronService } from '../services/electron.service'
 import { Logger, LogService } from '../services/log.service'
@@ -17,10 +18,10 @@ export interface Bounds {
 export class HostAppService {
     platform: Platform
     nodePlatform: string
-    quitRequested = new EventEmitter<any>()
+    preferencesMenu$ = new Subject<void>()
     ready = new EventEmitter<any>()
     shown = new EventEmitter<any>()
-    secondInstance = new EventEmitter<any>()
+    secondInstance$ = new Subject<{ argv: string[], cwd: string }>()
 
     private logger: Logger
 
@@ -37,18 +38,18 @@ export class HostAppService {
             linux: Platform.Linux
         }[this.nodePlatform]
 
-        electron.ipcRenderer.on('host:quit-request', () => this.zone.run(() => this.quitRequested.emit()))
+        electron.ipcRenderer.on('host:preferences-menu', () => this.zone.run(() => this.preferencesMenu$.next()))
 
-        electron.ipcRenderer.on('uncaughtException', (err) => {
+        electron.ipcRenderer.on('uncaughtException', ($event, err) => {
             this.logger.error('Unhandled exception:', err)
         })
 
         electron.ipcRenderer.on('host:window-shown', () => {
-            this.shown.emit()
+            this.zone.run(() => this.shown.emit())
         })
 
-        electron.ipcRenderer.on('host:second-instance', () => {
-            this.secondInstance.emit()
+        electron.ipcRenderer.on('host:second-instance', ($event, argv: string[], cwd: string) => {
+            this.zone.run(() => this.secondInstance$.next({ argv, cwd }))
         })
 
         this.ready.subscribe(() => {
@@ -76,10 +77,6 @@ export class HostAppService {
         this.getWindow().webContents.openDevTools()
     }
 
-    setCloseable (flag: boolean) {
-        this.electron.ipcRenderer.send('window-set-closeable', flag)
-    }
-
     focusWindow () {
         this.electron.ipcRenderer.send('window-focus')
     }

terminus-core/src/services/hotkeys.service.ts

@@ -42,7 +42,7 @@ export class HotkeysService {
                 }
             })
         })
-        this.hotkeyDescriptions = hotkeyProviders.map(x => x.hotkeys).reduce((a, b) => a.concat(b))
+        this.hotkeyDescriptions = this.config.enabledServices(hotkeyProviders).map(x => x.hotkeys).reduce((a, b) => a.concat(b))
         this.config.changed$.subscribe(() => {
             this.registerGlobalHotkey()
         })
@@ -178,10 +178,6 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'toggle-window',
             name: 'Toggle terminal window',
         },
-        {
-            id: 'new-tab',
-            name: 'New tab',
-        },
         {
             id: 'close-tab',
             name: 'Close tab',

terminus-core/src/services/hotkeys.util.ts

@@ -45,7 +45,9 @@ export function stringifyKeySequence (events: NativeKeyEvent[]): string[] {
                 // TODO make this optional?
                 continue
             }
-            if (event.key.length === 1) {
+            if (event.key === ' ') {
+                itemKeys.push('Space')
+            } else if (event.key.length === 1) {
                 itemKeys.push(event.key.toUpperCase())
             } else {
                 itemKeys.push(event.key)

terminus-core/src/services/log.service.ts

@@ -1,23 +1,65 @@
 import { Injectable } from '@angular/core'
+import { ElectronService } from './electron.service'
+import * as winston from 'winston'
+import * as fs from 'fs'
+import * as path from 'path'
+
+const initializeWinston = (electron: ElectronService) => {
+    const logDirectory = electron.app.getPath('userData')
+
+    if (!fs.existsSync(logDirectory)) {
+        fs.mkdirSync(logDirectory)
+    }
+
+    return new winston.Logger({
+        transports: [
+            new winston.transports.File({
+                level: 'debug',
+                filename: path.join(logDirectory, 'log.txt'),
+                handleExceptions: false,
+                json: false,
+                maxsize: 5242880,
+                maxFiles: 5,
+                colorize: false
+            }),
+            new winston.transports.Console({
+                level: 'info',
+                handleExceptions: false,
+                json: false,
+                colorize: true
+            })
+        ],
+        exitOnError: false
+    })
+}
 
 export class Logger {
     constructor (
+        private winstonLogger: any,
         private name: string,
     ) {}
 
-    log (level: string, ...args: any[]) {
+    doLog (level: string, ...args: any[]) {
         console[level](`%c[${this.name}]`, 'color: #aaa', ...args)
+        this.winstonLogger[level](...args)
     }
 
-    debug (...args: any[]) { this.log('debug', ...args) }
-    info (...args: any[]) { this.log('info', ...args) }
-    warn (...args: any[]) { this.log('warn', ...args) }
-    error (...args: any[]) { this.log('error', ...args) }
+    debug (...args: any[]) { this.doLog('debug', ...args) }
+    info (...args: any[]) { this.doLog('info', ...args) }
+    warn (...args: any[]) { this.doLog('warn', ...args) }
+    error (...args: any[]) { this.doLog('error', ...args) }
+    log (...args: any[]) { this.doLog('log', ...args) }
 }
 
 @Injectable()
 export class LogService {
+    private log: any
+
+    constructor (electron: ElectronService) {
+        this.log = initializeWinston(electron)
+    }
+
     create (name: string): Logger {
-        return new Logger(name)
+        return new Logger(this.log, name)
     }
 }

terminus-core/src/services/quitter.service.ts

@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core'
-import { HostAppService } from '../services/hostApp.service'
-
-@Injectable()
-export class QuitterService {
-    constructor (
-        private hostApp: HostAppService,
-    ) {
-        hostApp.quitRequested.subscribe(() => {
-            this.quit()
-        })
-    }
-
-    quit () {
-        this.hostApp.setCloseable(true)
-        this.hostApp.quit()
-    }
-}

terminus-core/src/services/tabRecovery.service.ts

@@ -1,8 +1,9 @@
 import { Injectable, Inject } from '@angular/core'
-import { TabRecoveryProvider } from '../api/tabRecovery'
+import { TabRecoveryProvider, RecoveredTab } from '../api/tabRecovery'
 import { BaseTabComponent } from '../components/baseTab.component'
 import { Logger, LogService } from '../services/log.service'
 import { AppService } from '../services/app.service'
+import { ConfigService } from '../services/config.service'
 
 @Injectable()
 export class TabRecoveryService {
@@ -10,7 +11,8 @@ export class TabRecoveryService {
 
     constructor (
         @Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider[],
-        app: AppService,
+        private app: AppService,
+        private config: ConfigService,
         log: LogService
     ) {
         this.logger = log.create('tabRecovery')
@@ -29,15 +31,22 @@ export class TabRecoveryService {
 
     async recoverTabs (): Promise<void> {
         if (window.localStorage.tabsRecovery) {
+            let tabs: RecoveredTab[] = []
             for (let token of JSON.parse(window.localStorage.tabsRecovery)) {
-                for (let provider of this.tabRecoveryProviders) {
+                for (let provider of this.config.enabledServices(this.tabRecoveryProviders)) {
                     try {
-                        await provider.recover(token)
+                        let tab = await provider.recover(token)
+                        if (tab) {
+                            tabs.push(tab)
+                        }
                     } catch (error) {
                         this.logger.warn('Tab recovery crashed:', token, provider, error)
                     }
                 }
             }
+            tabs.forEach(tab => {
+                this.app.openNewTab(tab.type, tab.options)
+            })
         }
     }
 

terminus-core/src/services/themes.service.ts

@@ -13,12 +13,11 @@ export class ThemesService {
         this.applyCurrentTheme()
         config.changed$.subscribe(() => {
             this.applyCurrentTheme()
-            document.querySelector('style#custom-css').innerHTML = config.store.appearance.css
         })
     }
 
     findTheme (name: string): Theme {
-        return this.themes.find(x => x.name === name)
+        return this.config.enabledServices(this.themes).find(x => x.name === name)
     }
 
     findCurrentTheme (): Theme {
@@ -32,6 +31,7 @@ export class ThemesService {
             document.querySelector('head').appendChild(this.styleElement)
         }
         this.styleElement.textContent = theme.css
+        document.querySelector('style#custom-css').innerHTML = this.config.store.appearance.css
     }
 
     applyCurrentTheme (): void {

terminus-core/src/services/updater.service.ts

@@ -0,0 +1,36 @@
+import axios from 'axios'
+import { Injectable } from '@angular/core'
+import { Logger, LogService } from './log.service'
+import { ElectronService } from './electron.service'
+
+const UPDATES_URL = 'https://api.github.com/repos/eugeny/terminus/releases/latest'
+
+export interface Update {
+    version: string
+    url: string
+}
+
+@Injectable()
+export class UpdaterService {
+    private logger: Logger
+
+    constructor (
+        log: LogService,
+        private electron: ElectronService,
+    ) {
+        this.logger = log.create('updater')
+    }
+
+    async check (): Promise<Update> {
+        this.logger.debug('Checking for updates')
+        let response = await axios.get(UPDATES_URL)
+        let data = response.data
+        let version = data.tag_name.substring(1)
+        if (this.electron.app.getVersion() !== version) {
+            this.logger.info('Update available:', version)
+            return { version, url: data.html_url }
+        }
+        this.logger.info('No updates')
+        return null
+    }
+}

terminus-core/src/theme.compact.scss

@@ -0,0 +1,15 @@
+@import './theme.scss';
+
+app-root {
+    .tab-bar {
+        height: 27px !important;
+
+        .btn-tab-bar {
+            line-height: 29px !important;
+        }
+    }
+
+    terminaltab .content {
+        margin: 5px !important;
+    }
+}

terminus-core/src/theme.scss

@@ -23,6 +23,7 @@ $body-color: #aaa;
 $font-family-sans-serif: "Source Sans Pro";
 $font-size-base: 14rem / 16;
 
+$btn-border-radius: 0;
 $btn-secondary-color:            #ccc;
 $btn-secondary-bg:               #222;
 $btn-secondary-border:           #444;
@@ -70,7 +71,18 @@ $dropdown-link-disabled-color:   #333;
 $dropdown-header-color:          #333;
 
 $list-group-color: $body-color;
-$list-group-bg: $body-bg2;
+$list-group-bg: rgba(255,255,255,.05);
+$list-group-border-color:  rgba(255,255,255,.1);
+$list-group-hover-bg: rgba(255,255,255,.1);
+$list-group-link-active-bg: rgba(255,255,255,.2);
+
+$pre-bg: $dropdown-bg;
+$pre-color: $dropdown-link-color;
+
+$alert-danger-bg: $body-bg2;
+$alert-danger-text: $red;
+$alert-danger-border: $red;
+
 
 @import '~bootstrap/scss/bootstrap.scss';
 
@@ -119,6 +131,7 @@ app-root  {
                     background: $body-bg2;
                     border-left: 1px solid transparent;
                     border-right: 1px solid transparent;
+                    border-top: 1px solid transparent;
 
                     .index {
                         color: #555;
@@ -147,10 +160,12 @@ app-root  {
 
             tab-header {
                 border-top: 1px solid transparent;
+                border-bottom: 1px solid $border-color;
+                margin-bottom: -1px;
 
                 &.active {
                     border-top: 1px solid $teal;
-                    margin-bottom: -1px;
+                    border-bottom-color: transparent;
                 }
 
                 &.has-activity:not(.active) {
@@ -164,6 +179,8 @@ app-root  {
 
             tab-header {
                 border-bottom: 1px solid transparent;
+                border-top: 1px solid $border-color;
+                margin-top: -1px;
 
                 &.active {
                     border-bottom: 1px solid $teal;
@@ -270,12 +287,6 @@ hotkey-input-modal {
     }
 }
 
-start-page {
-    .terminus-title {
-        color: $blue;
-    }
-}
-
 .form-group label {
     margin-bottom: 2px;
 }
@@ -313,3 +324,11 @@ ngb-tabset .tab-content {
 .input-group > select.form-control {
     flex-direction: row;
 }
+
+.list-group-item {
+    transition: 0.25s background;
+
+    i + * {
+        margin-left: 10px;
+    }
+}

terminus-core/src/theme.ts

@@ -7,3 +7,10 @@ export class StandardTheme extends Theme {
     css = require('./theme.scss')
     terminalBackground = '#1D272D'
 }
+
+@Injectable()
+export class StandardCompactTheme extends Theme {
+    name = 'Compact'
+    css = require('./theme.compact.scss')
+    terminalBackground = '#1D272D'
+}

terminus-core/webpack.config.js

@@ -45,6 +45,7 @@ module.exports = {
     'path',
     'deepmerge',
     'untildify',
+    'winston',
     'js-yaml',
     /^rxjs/,
     /^@angular/,

terminus-core/yarn.lock

@@ -0,0 +1,257 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/js-yaml@^3.9.0":
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.9.1.tgz#2f3c142771bb345829ce690c5838760b6b9ba553"
+
+"@types/node@*", "@types/node@^7.0.37":
+  version "7.0.43"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
+
+"@types/webpack-env@^1.13.0":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.1.tgz#b45c222e24301bd006e3edfc762cc6b51bda236a"
+
+"@types/winston@^2.3.6":
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/@types/winston/-/winston-2.3.6.tgz#0f0954b9e16abd40598dc6e9cc2ea43044237997"
+  dependencies:
+    "@types/node" "*"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+async@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
+
+axios@0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
+  dependencies:
+    follow-redirects "^1.2.3"
+    is-buffer "^1.1.5"
+
+bluebird-lst@^1.0.2, bluebird-lst@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.3.tgz#cc56c18660eff0a0b86e2c33d1659618f7005158"
+  dependencies:
+    bluebird "^3.5.0"
+
+bluebird@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
+
+bootstrap@4.0.0-alpha.6:
+  version "4.0.0-alpha.6"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz#4f54dd33ac0deac3b28407bc2df7ec608869c9c8"
+  dependencies:
+    jquery ">=1.9.1"
+    tether "^1.4.0"
+
+colors@1.0.x:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
+core-js@^2.4.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
+
+cycle@1.0.x:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
+
+debug@^2.4.5:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64"
+  dependencies:
+    ms "2.0.0"
+
+deepmerge@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.1.tgz#c053bf06fd7276f1994f70c09a0760cb61a56237"
+
+electron-builder-http@~19.27.5:
+  version "19.27.5"
+  resolved "https://registry.yarnpkg.com/electron-builder-http/-/electron-builder-http-19.27.5.tgz#800865df2e618ffab9e5b3b895c15b4ce7fd7f17"
+  dependencies:
+    bluebird-lst "^1.0.3"
+    debug "^3.0.1"
+    fs-extra-p "^4.4.0"
+
+electron-is-dev@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
+
+electron-updater@^2.8.9:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.8.9.tgz#e2525dcbd7c27ff173bdfd2e87056d67310e2555"
+  dependencies:
+    bluebird-lst "^1.0.3"
+    debug "^3.0.1"
+    electron-builder-http "~19.27.5"
+    electron-is-dev "^0.3.0"
+    fs-extra-p "^4.4.0"
+    js-yaml "^3.9.1"
+    lazy-val "^1.0.2"
+    lodash.isequal "^4.5.0"
+    semver "^5.4.1"
+    source-map-support "^0.4.16"
+    uuid-1345 "^0.99.6"
+    xelement "^1.0.16"
+
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+eyes@0.1.x:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+
+follow-redirects@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.4.tgz#355e8f4d16876b43f577b0d5ce2668b9723214ea"
+  dependencies:
+    debug "^2.4.5"
+
+fs-extra-p@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.4.0.tgz#729c601c4f4c701328921adc7cfe9b236f100660"
+  dependencies:
+    bluebird-lst "^1.0.2"
+    fs-extra "^4.0.0"
+
+fs-extra@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.1.tgz#7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+is-buffer@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+
+isstream@0.1.x:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+jquery@>=1.9.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
+
+js-yaml@^3.9.0, js-yaml@^3.9.1:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsonfile@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+lazy-val@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.2.tgz#d9b07fb1fce54cbc99b3c611de431b83249369b6"
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+
+macaddress@^0.2.7:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+ngx-perfect-scrollbar@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-4.0.0.tgz#f1e19449fa97d7f16e1ceb1fe1739e4bb646bebe"
+  dependencies:
+    perfect-scrollbar "~0.6.0"
+
+perfect-scrollbar@~0.6.0:
+  version "0.6.16"
+  resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-0.6.16.tgz#b1d61a5245cf3962bb9a8407a3fc669d923212fc"
+
+sax@^1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+semver@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+
+source-map-support@^0.4.16:
+  version "0.4.17"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.17.tgz#6f2150553e6375375d0ccb3180502b78c18ba430"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+stack-trace@0.0.x:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+
+tether@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a"
+
+typescript@^2.4.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
+
+universalify@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+
+uuid-1345@^0.99.6:
+  version "0.99.6"
+  resolved "https://registry.yarnpkg.com/uuid-1345/-/uuid-1345-0.99.6.tgz#b1270ae015a7721c7adec6c46ec169c6098aed40"
+  dependencies:
+    macaddress "^0.2.7"
+
+winston@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.0.tgz#808050b93d52661ed9fb6c26b3f0c826708b0aee"
+  dependencies:
+    async "~1.0.0"
+    colors "1.0.x"
+    cycle "1.0.x"
+    eyes "0.1.x"
+    isstream "0.1.x"
+    stack-trace "0.0.x"
+
+xelement@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/xelement/-/xelement-1.0.16.tgz#900bb46c20fc2dffadff778a9d2dc36699d0ff7e"
+  dependencies:
+    sax "^1.2.1"

terminus-plugin-manager/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-plugin-manager",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.36",
   "description": "Terminus' plugin manager",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-builtin-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -17,10 +19,10 @@
   "devDependencies": {
     "@types/mz": "0.0.31",
     "@types/node": "7.0.12",
-    "@types/semver": "^5.3.31",
+    "@types/semver": "^5.3.32",
     "@types/webpack-env": "1.13.0",
-    "ngx-pipes": "^1.6.1",
     "css-loader": "^0.28.0",
+    "ngx-pipes": "^1.6.1",
     "semver": "^5.3.0"
   },
   "peerDependencies": {
@@ -34,7 +36,8 @@
     "rxjs": "5.3.0"
   },
   "dependencies": {
-    "axios": "^0.16.2"
+    "axios": "^0.16.2",
+    "mz": "^2.6.0"
   },
   "false": {}
 }

terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug

@@ -10,28 +10,23 @@ h3 Installed
 
 .list-group
     ng-container(*ngFor='let plugin of pluginManager.installedPlugins|orderBy:"name"')
-        .list-group-item.flex-column.align-items-start(*ngIf='knownUpgrades[plugin.name]')
+        .list-group-item.flex-column.align-items-start
             .d-flex.w-100
                 .mr-auto.d-flex.flex-column
                     strong {{plugin.name}}
-                    small.text-muted.mb-0 {{plugin.description}}
-                p.mb-0.mr-3 {{plugin.version}}
+                    a.text-muted.mb-0((click)='showPluginInfo(plugin)')
+                        small {{plugin.description}}
+                .d-flex.flex-column.align-items-end.mr-3
+                    div {{plugin.version}}
+                    small.text-muted {{plugin.author}}
                 button.btn.btn-outline-primary(
-                    *ngIf='npmInstalled',
+                    *ngIf='npmInstalled && knownUpgrades[plugin.name]',
                     (click)='upgradePlugin(plugin)',
                     [disabled]='busy[plugin.name] != undefined'
                 )
                     i.fa.fa-fw.fa-arrow-up(*ngIf='busy[plugin.name] != BusyState.Installing')
                     i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing')
                     span Upgrade ({{knownUpgrades[plugin.name].version}})
-
-    ng-container(*ngFor='let plugin of pluginManager.installedPlugins|orderBy:"name"')
-        .list-group-item.flex-column.align-items-start(*ngIf='!knownUpgrades[plugin.name]')
-            .d-flex.w-100
-                .mr-auto.d-flex.flex-column
-                    strong {{plugin.name}}
-                    small.text-muted.mb-0 {{plugin.description}}
-                p.mb-0.mr-3 {{plugin.version}}
                 button.btn.btn-outline-danger(
                     (click)='uninstallPlugin(plugin)', 
                     *ngIf='!plugin.isBuiltin && npmInstalled',
@@ -39,14 +34,24 @@ h3 Installed
                 )
                     i.fa.fa-fw.fa-trash-o(*ngIf='busy[plugin.name] != BusyState.Uninstalling')
                     i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Uninstalling')
+                button.btn.btn-outline-danger(
+                    *ngIf='config.store.pluginBlacklist.includes(plugin.name)',
+                    (click)='enablePlugin(plugin)'
+                )
+                    i.fa.fa-fw.fa-play
+                button.btn.btn-outline-primary(
+                    *ngIf='!config.store.pluginBlacklist.includes(plugin.name)',
+                    (click)='disablePlugin(plugin)'
+                )
+                    i.fa.fa-fw.fa-pause
 
 .text-center.mt-5(*ngIf='npmMissing')
-    h4 NPM not installed
-    p.mb-2 The Node Package Manager is required to install Terminus plugins.
+    h4 npm not installed
+    p.mb-2 npm is required to install Terminus plugins.
     .btn-group
         button.btn.btn-outline-primary((click)='downloadNPM()')
             i.fa.fa-download
-            span Download NPM
+            span Get npm
         button.btn.btn-outline-info((click)='checkNPM()')
             i.fa.fa-refresh
             span Try again
@@ -72,8 +77,12 @@ div(*ngIf='npmInstalled')
                 .d-flex.w-100
                     .mr-auto.d-flex.flex-column
                         strong {{plugin.name}}
-                        small.text-muted.mb-0 {{plugin.description}}
-                    p.mb-0.mr-3 {{plugin.version}}
+                        a.text-muted.mb-0((click)='showPluginInfo(plugin)')
+                            small {{plugin.description}}
+                    .d-flex.flex-column.align-items-end.mr-3 
+                        div {{plugin.version}}
+                        small.text-muted {{plugin.author}}
+                            i.fa.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official')
                     button.btn.btn-outline-primary(
                         (click)='installPlugin(plugin)',
                         [disabled]='busy[plugin.name] != undefined'

terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts

@@ -2,7 +2,7 @@ import { BehaviorSubject, Observable } from 'rxjs'
 import * as semver from 'semver'
 
 import { Component, Input } from '@angular/core'
-import { ConfigService, HostAppService } from 'terminus-core'
+import { ConfigService, HostAppService, ElectronService } from 'terminus-core'
 import { IPluginInfo, PluginManagerService } from '../services/pluginManager.service'
 
 enum BusyState { Installing, Uninstalling }
@@ -24,6 +24,7 @@ export class PluginsSettingsTabComponent {
     @Input() npmMissing = false
 
     constructor (
+        private electron: ElectronService,
         private config: ConfigService,
         private hostApp: HostAppService,
         public pluginManager: PluginManagerService
@@ -100,4 +101,20 @@ export class PluginsSettingsTabComponent {
     async upgradePlugin (plugin: IPluginInfo): Promise<void> {
         return this.installPlugin(this.knownUpgrades[plugin.name])
     }
+
+    showPluginInfo (plugin: IPluginInfo) {
+        this.electron.shell.openExternal('https://www.npmjs.com/package/' + plugin.packageName)
+    }
+
+    enablePlugin (plugin: IPluginInfo) {
+        this.config.store.pluginBlacklist = this.config.store.pluginBlacklist.filter(x => x !== plugin.name)
+        this.config.save()
+        this.config.requestRestart()
+    }
+
+    disablePlugin (plugin: IPluginInfo) {
+        this.config.store.pluginBlacklist.push(plugin.name)
+        this.config.save()
+        this.config.requestRestart()
+    }
 }

terminus-plugin-manager/src/config.ts

@@ -0,0 +1,7 @@
+import { ConfigProvider } from 'terminus-core'
+
+export class PluginsConfigProvider extends ConfigProvider {
+    defaults = {
+        npm: 'npm',
+    }
+}

terminus-plugin-manager/src/index.ts

@@ -4,10 +4,12 @@ import { FormsModule } from '@angular/forms'
 import { NgPipesModule } from 'ngx-pipes'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
+import { ConfigProvider } from 'terminus-core'
 import { SettingsTabProvider } from 'terminus-settings'
 
 import { PluginsSettingsTabComponent } from './components/pluginsSettingsTab.component'
 import { PluginManagerService } from './services/pluginManager.service'
+import { PluginsConfigProvider } from './config'
 import { PluginsSettingsTabProvider } from './settings'
 
 @NgModule({
@@ -19,6 +21,7 @@ import { PluginsSettingsTabProvider } from './settings'
     ],
     providers: [
         { provide: SettingsTabProvider, useClass: PluginsSettingsTabProvider, multi: true },
+        { provide: ConfigProvider, useClass: PluginsConfigProvider, multi: true },
         PluginManagerService,
     ],
     entryComponents: [

terminus-plugin-manager/src/services/pluginManager.service.ts

@@ -1,19 +1,24 @@
-import { Observable } from 'rxjs'
-import { Injectable } from '@angular/core'
-import { Logger, LogService } from 'terminus-core'
+import * as path from 'path'
+import * as fs from 'mz/fs'
 import { exec } from 'mz/child_process'
 import axios from 'axios'
+import { Observable } from 'rxjs'
+import { Injectable } from '@angular/core'
+import { Logger, LogService, ConfigService, HostAppService, Platform } from 'terminus-core'
 
 const NAME_PREFIX = 'terminus-'
 const KEYWORD = 'terminus-plugin'
+const OFFICIAL_NPM_ACCOUNT = 'eugenepankov'
 
 export interface IPluginInfo {
     name: string
     description: string
     packageName: string
     isBuiltin: boolean
+    isOfficial: boolean
     version: string
     homepage?: string
+    author: string
     path?: string
 }
 
@@ -23,17 +28,38 @@ export class PluginManagerService {
     builtinPluginsPath: string = (window as any).builtinPluginsPath
     userPluginsPath: string = (window as any).userPluginsPath
     installedPlugins: IPluginInfo[] = (window as any).installedPlugins
-    npmBinary = 'npm'
+    npmPath: string
 
     constructor (
         log: LogService,
+        private config: ConfigService,
+        private hostApp: HostAppService,
     ) {
         this.logger = log.create('pluginManager')
+        this.detectPath()
+    }
+
+    async detectPath () {
+        this.npmPath = this.config.store.npm
+        if (await fs.exists(this.npmPath)) {
+            return
+        }
+        if (this.hostApp.platform !== Platform.Windows) {
+            let searchPaths = (await exec('bash -c -l "echo $PATH"'))[0].toString().trim().split(':')
+            for (let searchPath of searchPaths) {
+                if (await fs.exists(path.join(searchPath, 'npm'))) {
+                    this.logger.debug('Found npm in', searchPath)
+                    this.npmPath = path.join(searchPath, 'npm')
+                    return
+                }
+            }
+        }
     }
 
     async isNPMInstalled (): Promise<boolean> {
+        await this.detectPath()
         try {
-            await exec(`${this.npmBinary} -v`)
+            await exec(`${this.npmPath} -v`)
             return true
         } catch (_) {
             return false
@@ -51,19 +77,20 @@ export class PluginManagerService {
                 description: item.package.description,
                 version: item.package.version,
                 homepage: item.package.links.homepage,
+                author: (item.package.author || {}).name,
+                isOfficial: item.package.publisher.username === OFFICIAL_NPM_ACCOUNT,
             })))
             .map(plugins => plugins.filter(x => x.packageName.startsWith(NAME_PREFIX)))
     }
 
     async installPlugin (plugin: IPluginInfo) {
-        let result = await exec(`${this.npmBinary} --prefix "${this.userPluginsPath}" install ${plugin.packageName}@${plugin.version}`)
-        console.log(result)
+        await exec(`${this.npmPath} --prefix "${this.userPluginsPath}" install ${plugin.packageName}@${plugin.version}`)
         this.installedPlugins = this.installedPlugins.filter(x => x.packageName !== plugin.packageName)
         this.installedPlugins.push(plugin)
     }
 
     async uninstallPlugin (plugin: IPluginInfo) {
-        await exec(`${this.npmBinary} --prefix "${this.userPluginsPath}" remove ${plugin.packageName}`)
+        await exec(`${this.npmPath} --prefix "${this.userPluginsPath}" remove ${plugin.packageName}`)
         this.installedPlugins = this.installedPlugins.filter(x => x.packageName !== plugin.packageName)
     }
 }

terminus-plugin-manager/src/settings.ts

@@ -1,13 +1,14 @@
 import { Injectable } from '@angular/core'
-import { SettingsTabProvider, ComponentType } from 'terminus-settings'
+import { SettingsTabProvider } from 'terminus-settings'
 
 import { PluginsSettingsTabComponent } from './components/pluginsSettingsTab.component'
 
 @Injectable()
 export class PluginsSettingsTabProvider extends SettingsTabProvider {
+    id = 'plugins'
     title = 'Plugins'
 
-    getComponentType (): ComponentType {
+    getComponentType (): any {
         return PluginsSettingsTabComponent
     }
 }

terminus-plugin-manager/webpack.config.js

@@ -37,10 +37,9 @@ module.exports = {
   },
   externals: [
     'fs',
-    'fs-promise',
     'font-manager',
     'path',
-    'node-pty',
+    'mz/fs',
     'mz/child_process',
     'winreg',
     /^rxjs/,

terminus-plugin-manager/yarn.lock

@@ -0,0 +1,853 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/mz@0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.31.tgz#a4d80c082fefe71e40a7c0f07d1e6555bbbc7b52"
+  dependencies:
+    "@types/node" "*"
+
+"@types/node@*", "@types/node@7.0.12":
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9"
+
+"@types/semver@^5.3.32":
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.4.0.tgz#f3658535af7f1f502acd6da7daf405ffeb1f7ee4"
+
+"@types/webpack-env@1.13.0":
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.0.tgz#3044381647e11ee973c5af2e925323930f691d80"
+
+alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
+axios@^0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
+  dependencies:
+    follow-redirects "^1.2.3"
+    is-buffer "^1.1.5"
+
+babel-code-frame@^6.11.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+balanced-match@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+big.js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
+
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  dependencies:
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
+
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000726"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000726.tgz#9bb742f8d026a62df873bc03c06843d2255b60d7"
+
+chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
+clap@^1.0.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.0.tgz#59c90fe3e137104746ff19469a27a634ff68c857"
+  dependencies:
+    chalk "^1.1.3"
+
+clone@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+
+coa@~1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
+  dependencies:
+    q "^1.1.2"
+
+color-convert@^1.3.0, color-convert@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.0.0, color-name@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+color-string@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  dependencies:
+    color-name "^1.0.0"
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+
+colormin@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  dependencies:
+    color "^0.11.0"
+    css-color-names "0.0.4"
+    has "^1.0.1"
+
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
+css-color-names@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+
+css-loader@^0.28.0:
+  version "0.28.7"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
+  dependencies:
+    babel-code-frame "^6.11.0"
+    css-selector-tokenizer "^0.7.0"
+    cssnano ">=2.6.1 <4"
+    icss-utils "^2.1.0"
+    loader-utils "^1.0.2"
+    lodash.camelcase "^4.3.0"
+    object-assign "^4.0.1"
+    postcss "^5.0.6"
+    postcss-modules-extract-imports "^1.0.0"
+    postcss-modules-local-by-default "^1.0.1"
+    postcss-modules-scope "^1.0.0"
+    postcss-modules-values "^1.1.0"
+    postcss-value-parser "^3.3.0"
+    source-list-map "^2.0.0"
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+cssesc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+
+"cssnano@>=2.6.1 <4":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  dependencies:
+    autoprefixer "^6.3.1"
+    decamelize "^1.1.2"
+    defined "^1.0.0"
+    has "^1.0.1"
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-calc "^5.2.0"
+    postcss-colormin "^2.1.8"
+    postcss-convert-values "^2.3.4"
+    postcss-discard-comments "^2.0.4"
+    postcss-discard-duplicates "^2.0.1"
+    postcss-discard-empty "^2.0.1"
+    postcss-discard-overridden "^0.1.1"
+    postcss-discard-unused "^2.2.1"
+    postcss-filter-plugins "^2.0.0"
+    postcss-merge-idents "^2.1.5"
+    postcss-merge-longhand "^2.0.1"
+    postcss-merge-rules "^2.0.3"
+    postcss-minify-font-values "^1.0.2"
+    postcss-minify-gradients "^1.0.1"
+    postcss-minify-params "^1.0.4"
+    postcss-minify-selectors "^2.0.4"
+    postcss-normalize-charset "^1.1.0"
+    postcss-normalize-url "^3.0.7"
+    postcss-ordered-values "^2.1.0"
+    postcss-reduce-idents "^2.2.2"
+    postcss-reduce-initial "^1.0.0"
+    postcss-reduce-transforms "^1.0.3"
+    postcss-svgo "^2.1.1"
+    postcss-unique-selectors "^2.0.2"
+    postcss-value-parser "^3.2.3"
+    postcss-zindex "^2.0.1"
+
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  dependencies:
+    clap "^1.0.9"
+    source-map "^0.5.3"
+
+debug@^2.4.5:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
+  dependencies:
+    ms "2.0.0"
+
+decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+
+electron-to-chromium@^1.2.7:
+  version "1.3.21"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz#a967ebdcfe8ed0083fc244d1894022a8e8113ea2"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+esprima@^2.6.0:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+fastparse@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+
+flatten@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
+follow-redirects@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.4.tgz#355e8f4d16876b43f577b0d5ce2668b9723214ea"
+  dependencies:
+    debug "^2.4.5"
+
+function-bind@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+
+has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+html-comment-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+
+icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+
+icss-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  dependencies:
+    postcss "^6.0.1"
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+
+is-buffer@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+is-svg@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  dependencies:
+    html-comment-regex "^1.1.0"
+
+js-base64@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+
+js-yaml@~3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+
+json5@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+loader-utils@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+
+macaddress@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+
+math-expression-evaluator@^1.2.14:
+  version "1.2.17"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mz@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce"
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+ngx-pipes@^1.6.1:
+  version "1.6.5"
+  resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.5.tgz#7dfe7bf1425b2e661ecde0e8a419e82be575dfa1"
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-url@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+postcss-calc@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+
+postcss-colormin@^2.1.8:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  dependencies:
+    colormin "^1.0.5"
+    postcss "^5.0.13"
+    postcss-value-parser "^3.2.3"
+
+postcss-convert-values@^2.3.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  dependencies:
+    postcss "^5.0.11"
+    postcss-value-parser "^3.1.2"
+
+postcss-discard-comments@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-duplicates@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-discard-empty@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-overridden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-discard-unused@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  dependencies:
+    postcss "^5.0.14"
+    uniqs "^2.0.0"
+
+postcss-filter-plugins@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  dependencies:
+    postcss "^5.0.4"
+    uniqid "^4.0.0"
+
+postcss-merge-idents@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.10"
+    postcss-value-parser "^3.1.1"
+
+postcss-merge-longhand@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-merge-rules@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
+    postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
+    vendors "^1.0.0"
+
+postcss-message-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+
+postcss-minify-font-values@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-minify-gradients@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  dependencies:
+    postcss "^5.0.12"
+    postcss-value-parser "^3.3.0"
+
+postcss-minify-params@^1.0.4:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.2"
+    postcss-value-parser "^3.0.2"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  dependencies:
+    alphanum-sort "^1.0.2"
+    has "^1.0.1"
+    postcss "^5.0.14"
+    postcss-selector-parser "^2.0.0"
+
+postcss-modules-extract-imports@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
+  dependencies:
+    postcss "^6.0.1"
+
+postcss-modules-local-by-default@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-scope@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-values@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  dependencies:
+    icss-replace-symbols "^1.1.0"
+    postcss "^6.0.1"
+
+postcss-normalize-charset@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  dependencies:
+    postcss "^5.0.5"
+
+postcss-normalize-url@^3.0.7:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^1.4.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+
+postcss-ordered-values@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.1"
+
+postcss-reduce-idents@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-reduce-initial@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-reduce-transforms@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.8"
+    postcss-value-parser "^3.0.1"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-svgo@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  dependencies:
+    is-svg "^2.0.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    svgo "^0.7.0"
+
+postcss-unique-selectors@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss-zindex@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
+  version "5.2.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+postcss@^6.0.1:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.11.tgz#f48db210b1d37a7f7ab6499b7a54982997ab6f72"
+  dependencies:
+    chalk "^2.1.0"
+    source-map "^0.5.7"
+    supports-color "^4.4.0"
+
+prepend-http@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+
+q@^1.1.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
+
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+reduce-css-calc@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  dependencies:
+    balanced-match "^0.4.2"
+    math-expression-evaluator "^1.2.14"
+    reduce-function-call "^1.0.1"
+
+reduce-function-call@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  dependencies:
+    balanced-match "^0.4.2"
+
+regenerate@^1.2.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
+
+regexpu-core@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  dependencies:
+    jsesc "~0.5.0"
+
+sax@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+semver@^5.3.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+
+source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^4.0.0, supports-color@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+  dependencies:
+    has-flag "^2.0.0"
+
+svgo@^0.7.0:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
+  dependencies:
+    any-promise "^1.0.0"
+
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+
+uniqid@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  dependencies:
+    macaddress "^0.2.8"
+
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+
+vendors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+
+whet.extend@~0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"

terminus-settings/package.json

@@ -1,8 +1,10 @@
 {
   "name": "terminus-settings",
-  "version": "1.0.0-alpha.14",
+  "version": "1.0.0-alpha.36",
   "description": "Terminus terminal settings page",
-  "keywords": ["terminus-plugin"],
+  "keywords": [
+    "terminus-builtin-plugin"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {

terminus-settings/src/api.ts

@@ -1,11 +1,8 @@
-import { Component } from '@angular/core'
-
-export declare type ComponentType = new (...args: any[]) => Component
-
 export abstract class SettingsTabProvider {
+    id: string
     title: string
 
-    getComponentType (): ComponentType {
+    getComponentType (): any {
         return null
     }
 }

terminus-settings/src/buttonProvider.ts

@@ -1,14 +1,16 @@
 import { Injectable } from '@angular/core'
-import { ToolbarButtonProvider, IToolbarButton, AppService } from 'terminus-core'
+import { ToolbarButtonProvider, IToolbarButton, AppService, HostAppService } from 'terminus-core'
 
 import { SettingsTabComponent } from './components/settingsTab.component'
 
 @Injectable()
 export class ButtonProvider extends ToolbarButtonProvider {
     constructor (
+        hostApp: HostAppService,
         private app: AppService,
     ) {
         super()
+        hostApp.preferencesMenu$.subscribe(() => this.open())
     }
 
     provide (): IToolbarButton[] {
@@ -16,14 +18,16 @@ export class ButtonProvider extends ToolbarButtonProvider {
             icon: 'sliders',
             title: 'Settings',
             weight: 10,
-            click: () => {
-                let settingsTab = this.app.tabs.find((tab) => tab instanceof SettingsTabComponent)
-                if (settingsTab) {
-                    this.app.selectTab(settingsTab)
-                } else {
-                    this.app.openNewTab(SettingsTabComponent)
-                }
-            }
+            click: () => this.open(),
         }]
     }
+
+    open (): void {
+        let settingsTab = this.app.tabs.find((tab) => tab instanceof SettingsTabComponent)
+        if (settingsTab) {
+            this.app.selectTab(settingsTab)
+        } else {
+            this.app.openNewTab(SettingsTabComponent)
+        }
+    }
 }

terminus-settings/src/components/hotkeyInputModal.component.ts

@@ -73,6 +73,8 @@ export class HotkeyInputModalComponent {
     }
 
     ngOnDestroy () {
+        this.keySubscription.unsubscribe()
+        this.hotkeys.clearCurrentKeystrokes()
         this.hotkeys.enable()
         clearInterval(this.keyTimeoutInterval)
     }