Merge branch 'master' of https://github.com/Eugeny/terminus

[Security] Bump https-proxy-agent from 2.0.0 to 2.2.4

app/package.json

@@ -22,7 +22,7 @@
     "@angular/platform-browser": "^11.1.1",
     "@angular/platform-browser-dynamic": "^11.1.1",
     "@ng-bootstrap/ng-bootstrap": "^6.1.0",
-    "@terminus-term/node-pty": "0.10.0-terminus.2",
+    "@terminus-term/node-pty": "0.10.0-terminus.3",
     "electron-config": "2.0.0",
     "electron-debug": "^3.2.0",
     "electron-is-dev": "1.2.0",

app/yarn.lock

@@ -3,51 +3,51 @@
 
 
 "@angular/animations@^11.1.1":
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.1.1.tgz#3ae6754e70ecf858322a432f6484a1bab1013315"
-  integrity sha512-okideoWvlTz6VqHXDWKlMGj1beWxq/ag4n/+7y8IENQFgrKQWu4m52Igr5sJUfT1W8rXqLPaSGEpp9h+1SCDcQ==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.0.tgz#383438758c61d98f43c5ea1078d8388eb8784387"
+  integrity sha512-orYrBPNAsF8VpvuOaXTtPltwK2nsje5R8sWJnRC2dh1RCRdyIqHwmRIU0Mi6qLMiEaLNrFPGEMyQ9gB+sC/vYg==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/common@^11.1.1":
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.1.1.tgz#fcf16d3d35cdc64c40458a51f879ab61ed2ecdf2"
-  integrity sha512-YHAmbjmwqIv43CdzRJkXJiT7p6Xm6DpsGKLuCGPoomUk7Nf5U5LsSZm/uvyTu0O+OQp2RUFUdGqW5DzSZZnKtQ==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.0.tgz#90d602c0e33bb95a4d0c4c597f08255d78ed580f"
+  integrity sha512-wsWI5F6Y2DNxne2D5uk8e9U/vn95UYZLMNBW+QXI9U/I9kDSXoa8yEvNcn1x0XfNXBMst5pi4iSF5M8mIck1eg==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/compiler@^11.1.1":
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.1.1.tgz#cafe43b52fb69f0b9493e597baec14fcffd13d7d"
-  integrity sha512-kybGddMBL6E2BFBOHIX39VsKVxH3yD7NA1g2mQUE9KIqLAavH0KLBr8B03R9MKb6+BElGpk/5yCyCkzkwQES7w==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.0.tgz#130bee57dd1daa1326d37bef4b63c02aa7309cc2"
+  integrity sha512-EW6LM/kUYhQkuFqGt03c/eRKZAYr0LLEdMOn//j1uIh+wSq9KLffBGpky6b63xdfWxsXi8OucXUOydTQBckNEQ==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/core@^11.1.1":
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.1.1.tgz#62bf9ad93d5d88afacce3ea5b03803ec5790d20b"
-  integrity sha512-yBBLekXeDviZ+KW3DmGeOK0CK/yQ9gCy2uHY47KUDI4UTRRLz0NI5nS9NdKwk5bpCPId6ZPNsJtHPBFXRhAnNA==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.0.tgz#309ae61d55b21fca0b644a6571109741d64b2467"
+  integrity sha512-jnbnJTW2GwfkRoXG8J4zs5FMcahMZwo6jrZGe9FiXjCYG9cLEuOXy4h99Z1s/o0vc/VXyWgym7SmeEgv+urf8g==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/forms@^11.1.1":
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.1.1.tgz#c8c468aba528f1f2764cf0bc7d9ab36636795473"
-  integrity sha512-MVysENcKonjMowdd2SxXQGcvNVpMTWVhwr5IZ2FBZKW/FNnSBq0R3nsr25zU0h8QWQHkROPtFF0+AEaENh/yAg==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.0.tgz#8ba7a98efdd464a4a6b901ba1f220162dd80c1ed"
+  integrity sha512-FgIG9ou27FbmyFv0n6pF95cQEz412/+iyY9OSlDnezD/7yU4fwk4NNPgP6Z/b1k7ClLYxP/YKC00WVhi1i8HdA==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/platform-browser-dynamic@^11.1.1":
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.1.1.tgz#2e05d719a1d134a9a22fb4e4a40234ac49ba122a"
-  integrity sha512-fI44VfQvwzNeZdSMGZEYqYZ6Q4Y1fSbyqh2hzbhVW4/Tq6s4qKdKn3TfAD6iK6te5ewZwbccfr4Y0zMbcwTSRA==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.0.tgz#647fe6d8dfa7651d38564240cbf75f97f11754b7"
+  integrity sha512-bBCtgtL87mvDT0K3HNBS19UC0BzIJUTGnYKJS9IugyfTEqlldB4juMmh/3FPjk30kxxJ8IB/ydaN2uVhBAxPVQ==
   dependencies:
     tslib "^2.0.0"
 
 "@angular/platform-browser@^11.1.1":
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.1.1.tgz#d9940e92664b06a3c6a10221f1b9438ba94b9b5f"
-  integrity sha512-z3OmXK9viTxNp2KpGdCiFkFCI69WVYyuMQerCwjuD2oymRpltc64uujIq3+j32UJ+sTGrjMSmgMo7ReAYMp7sg==
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.0.tgz#d1bbafd394ebfb600043060ec2d8543763041403"
+  integrity sha512-xd3O4svQ95BN/KpzQUFkSWfvwiCURuLJhLlDkxzLA58ElA0qodHOjQmQz/1vRFh/nXQQoWg8z9ixbmcRGzWTow==
   dependencies:
     tslib "^2.0.0"
 
@@ -3482,9 +3482,9 @@ tslib@^1.10.0, tslib@^1.9.0:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
+  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
 tunnel-agent@^0.6.0:
   version "0.6.0"

package.json

@@ -18,7 +18,7 @@
     "core-js": "^3.8.3",
     "cross-env": "7.0.3",
     "css-loader": "5.0.1",
-    "electron": "12.0.0-beta.22",
+    "electron": "12.0.0-beta.25",
     "electron-builder": "22.10.4",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",

terminus-community-color-schemes/webpack.config.js

@@ -1,51 +1,6 @@
-const path = require('path')
-
-module.exports = {
-    target: 'node',
-    entry: 'src/index.ts',
-    context: __dirname,
-    devtool: 'cheap-module-source-map',
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: 'index.js',
-        pathinfo: true,
-        libraryTarget: 'umd',
-        devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]',
-    },
-    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-    optimization:{
-        minimize: false,
-    },
-    resolve: {
-        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-        extensions: ['.ts', '.js'],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                use: {
-                    loader: 'awesome-typescript-loader',
-                    options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
-                        typeRoots: [
-                            path.resolve(__dirname, 'node_modules/@types'),
-                            path.resolve(__dirname, '../node_modules/@types'),
-                        ],
-                        paths: {
-                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
-                        },
-                    },
-                },
-            },
-            { test: /[\\\/]schemes[\\\/]/, use: "raw-loader" },
-        ],
-    },
-    externals: [
-        /^rxjs/,
-        /^@angular/,
-        /^@ng-bootstrap/,
-        /^terminus-/,
-    ],
-}
+const config = require('../webpack.plugin.config')
+module.exports = config({
+    name: 'community-color-schemes',
+    dirname: __dirname,
+})
+module.exports.module.rules.push({ test: /[\\\/]schemes[\\\/]/, use: 'raw-loader' })

terminus-core/package.json

@@ -20,7 +20,7 @@
     "@types/js-yaml": "^3.9.0",
     "@types/shell-escape": "^0.2.0",
     "@types/winston": "^2.3.6",
-    "axios": "^0.19.0",
+    "axios": "^0.21.1",
     "bootstrap": "^4.1.3",
     "core-js": "^3.1.2",
     "deepmerge": "^4.1.1",

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

@@ -85,6 +85,7 @@ $side-tab-width: 200px;
         cursor: pointer;
 
         display: flex;
+        align-items: center;
         padding: 0 15px;
         flex: 0 0 auto;
         border-bottom: 2px solid transparent;

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

@@ -7,6 +7,11 @@ $tabs-height: 38px;
     flex: 1000 1 200px;
     width: 200px;
 
+    &.flex-width {
+        flex: 1000 1 auto;
+        width: auto;
+    }
+
     display: flex;
     flex-direction: row;
     min-width: 0;

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

@@ -81,6 +81,10 @@ export class TabHeaderComponent {
         return items.slice(1)
     }
 
+    @HostBinding('class.flex-width') get isFlexWidthEnabled (): boolean {
+        return this.config.store.appearance.flexTabs
+    }
+
     @HostListener('dblclick') onDoubleClick (): void {
         this.showRenameTabModal()
     }

terminus-core/src/configDefaults.yaml

@@ -4,6 +4,7 @@ appearance:
   dockFill: 0.5
   dockHideOnBlur: false
   dockAlwaysOnTop: true
+  flexTabs: false
   tabsLocation: top
   cycleTabs: true
   theme: Standard

terminus-core/src/index.ts

@@ -44,8 +44,11 @@ import 'ng2-dnd/bundles/style.css'
 // PerfectScrollbar fix
 import { fromEvent } from 'rxjs/internal/observable/fromEvent'
 import { merge } from 'rxjs/internal/observable/merge'
-require('rxjs').fromEvent = fromEvent
-require('rxjs').merge = merge
+
+try {
+    require('rxjs').fromEvent = fromEvent
+    require('rxjs').merge = merge
+} catch {}
 
 const PROVIDERS = [
     { provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },

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

@@ -1,11 +1,13 @@
 import { Injectable } from '@angular/core'
 import { ElectronService } from './electron.service'
-import * as winston from 'winston'
+import type * as winston from 'winston'
 import * as fs from 'fs'
 import * as path from 'path'
 
 const initializeWinston = (electron: ElectronService) => {
     const logDirectory = electron.app.getPath('userData')
+    // eslint-disable-next-line
+    const winston = require('winston')
 
     if (!fs.existsSync(logDirectory)) {
         fs.mkdirSync(logDirectory)
@@ -64,7 +66,11 @@ export class LogService {
 
     /** @hidden */
     private constructor (electron: ElectronService) {
-        this.log = initializeWinston(electron)
+        if (!process.env.XWEB) {
+            this.log = initializeWinston(electron)
+        } else {
+            this.log = console as any
+        }
     }
 
     create (name: string): Logger {

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

@@ -1,24 +1,18 @@
-import { NativeImage, SegmentedControlSegment, TouchBarSegmentedControl } from 'electron'
-import { Injectable, Inject, NgZone } from '@angular/core'
+import { SegmentedControlSegment, TouchBarSegmentedControl } from 'electron'
+import { Injectable, NgZone } from '@angular/core'
 import { AppService } from './app.service'
-import { ConfigService } from './config.service'
 import { ElectronService } from './electron.service'
 import { HostAppService, Platform } from './hostApp.service'
-import { ToolbarButton, ToolbarButtonProvider } from '../api'
 
 /** @hidden */
 @Injectable({ providedIn: 'root' })
 export class TouchbarService {
     private tabsSegmentedControl: TouchBarSegmentedControl
-    private buttonsSegmentedControl: TouchBarSegmentedControl
     private tabSegments: SegmentedControlSegment[] = []
-    private nsImageCache: Record<string, NativeImage> = {}
 
     private constructor (
         private app: AppService,
         private hostApp: HostAppService,
-        @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
-        private config: ConfigService,
         private electron: ElectronService,
         private zone: NgZone,
     ) {
@@ -63,16 +57,6 @@ export class TouchbarService {
             return
         }
 
-        let buttons: ToolbarButton[] = []
-        this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
-            buttons = buttons.concat(provider.provide())
-        })
-        buttons = buttons.filter(x => !!x.touchBarNSImage)
-        buttons.sort((a, b) => (a.weight ?? 0) - (b.weight ?? 0))
-        this.tabSegments = this.app.tabs.map(tab => ({
-            label: this.shortenTitle(tab.title),
-        }))
-
         this.tabsSegmentedControl = new this.electron.TouchBar.TouchBarSegmentedControl({
             segments: this.tabSegments,
             selectedIndex: this.app.activeTab ? this.app.tabs.indexOf(this.app.activeTab) : undefined,
@@ -81,43 +65,14 @@ export class TouchbarService {
             }),
         })
 
-        this.buttonsSegmentedControl = new this.electron.TouchBar.TouchBarSegmentedControl({
-            segments: buttons.map(button => this.getButton(button)),
-            mode: 'buttons',
-            change: (selectedIndex) => this.zone.run(() => {
-                if (buttons[selectedIndex].click) {
-                    buttons[selectedIndex].click!()
-                }
-            }),
-        })
-
         const touchBar = new this.electron.TouchBar({
             items: [
                 this.tabsSegmentedControl,
-                new this.electron.TouchBar.TouchBarSpacer({ size: 'flexible' }),
-                new this.electron.TouchBar.TouchBarSpacer({ size: 'small' }),
-                this.buttonsSegmentedControl,
             ],
         })
         this.hostApp.setTouchBar(touchBar)
     }
 
-    private getButton (button: ToolbarButton): SegmentedControlSegment {
-        return {
-            label: button.touchBarNSImage ? undefined : this.shortenTitle(button.touchBarTitle ?? button.title),
-            icon: button.touchBarNSImage ? this.getCachedNSImage(button.touchBarNSImage) : undefined,
-            // click: () => this.zone.run(() => button.click()),
-        }
-    }
-
-    private getCachedNSImage (name: string) {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (!this.nsImageCache[name]) {
-            this.nsImageCache[name] = this.electron.nativeImage.createFromNamedImage(name, [0, 0, 1])
-        }
-        return this.nsImageCache[name]
-    }
-
     private shortenTitle (title: string): string {
         if (title.length > 15) {
             title = title.substring(0, 15) + '...'

terminus-core/src/theme.compact.scss

@@ -1,6 +1,10 @@
 @import './theme.scss';
 
 app-root {
+    .tabs-on-side .tab-bar {
+        height: 100% !important;
+    }
+
     .tab-bar {
         height: 27px !important;
 

terminus-core/webpack.config.js

@@ -1,60 +1,5 @@
-const path = require('path')
-
-module.exports = {
-    target: 'node',
-    entry: 'src/index.ts',
-    context: __dirname,
-    devtool: 'cheap-module-source-map',
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: 'index.js',
-        pathinfo: true,
-        libraryTarget: 'umd',
-        devtoolModuleFilenameTemplate: 'webpack-terminus-core:///[resource-path]',
-    },
-    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-    optimization:{
-        minimize: false,
-    },
-    resolve: {
-        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-        extensions: ['.ts', '.js'],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                use: {
-                    loader: 'awesome-typescript-loader',
-                    options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
-                        typeRoots: [
-                            path.resolve(__dirname, 'node_modules/@types'),
-                            path.resolve(__dirname, '../node_modules/@types'),
-                        ],
-                        paths: {
-                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
-                        },
-                    },
-                },
-            },
-            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
-            { test: /\.css$/, use: ['@terminus-term/to-string-loader', 'css-loader'], include: /component\.css/ },
-            { test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: /component\.css/ },
-            { test: /\.yaml$/, use: ['json-loader', 'yaml-loader'] },
-            { test: /\.svg/, use: ['svg-inline-loader'] },
-        ],
-    },
-    externals: [
-        'electron',
-        'fs',
-        'os',
-        'path',
-        'windows-native-registry',
-        /^rxjs/,
-        /^@angular/,
-        /^@ng-bootstrap/,
-    ],
-}
+const config = require('../webpack.plugin.config')
+module.exports = config({
+    name: 'core',
+    dirname: __dirname,
+})

terminus-core/yarn.lock

@@ -57,12 +57,12 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-axios@^0.19.0:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
   dependencies:
-    follow-redirects "1.5.10"
+    follow-redirects "^1.10.0"
 
 bootstrap@^4.1.3:
   version "4.5.3"
@@ -133,13 +133,6 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
@@ -209,12 +202,10 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
+follow-redirects@^1.10.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
 
 fs-extra@^9.0.1:
   version "9.0.1"
@@ -309,11 +300,6 @@ mixpanel@^0.10.2:
   dependencies:
     https-proxy-agent "3.0.0"
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
 ms@2.1.2, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"

terminus-plugin-manager/package.json

@@ -18,7 +18,7 @@
   "license": "MIT",
   "devDependencies": {
     "@types/semver": "^7.1.0",
-    "axios": "^0.19.0",
+    "axios": "^0.21.1",
     "electron-promise-ipc": "^2.2.4",
     "mz": "^2.6.0",
     "semver": "^7.1.1"

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

@@ -2,7 +2,6 @@
     strong Error in {{erroredPlugin}}:
     pre {{errorMessage}}
 
-
 .d-flex
     h3.mb-1 Installed
     button.btn.btn-outline-secondary.btn-sm.ml-auto((click)='openPluginsFolder()')
@@ -11,11 +10,16 @@
 
 .list-group.list-group-flush.mt-2
     .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins')
+        toggle(
+            [ngModel]='isPluginEnabled(plugin)',
+            (ngModelChange)='togglePlugin(plugin)'
+        )
+
         .mr-auto.d-flex.flex-column
             div
                 strong {{plugin.name}}
                 small.text-muted.ml-1(*ngIf='!plugin.isBuiltin') {{plugin.version}} / {{plugin.author}}
-                small.text-warning.ml-1(*ngIf='config.store.pluginBlacklist.includes(plugin.name)') Disabled
+                small.text-warning.ml-1(*ngIf='!isPluginEnabled(plugin)') Disabled
             a.text-muted.mb-0((click)='showPluginInfo(plugin)')
                 small {{plugin.description}}
 
@@ -28,18 +32,6 @@
             i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
             span Upgrade ({{knownUpgrades[plugin.name].version}})
 
-        button.btn.btn-link.text-primary.ml-2(
-            *ngIf='config.store.pluginBlacklist.includes(plugin.name)',
-            (click)='enablePlugin(plugin)'
-        )
-            i.fas.fa-fw.fa-play
-
-        button.btn.btn-link.ml-2(
-            *ngIf='!config.store.pluginBlacklist.includes(plugin.name)',
-            (click)='disablePlugin(plugin)'
-        )
-            i.fas.fa-fw.fa-pause
-
         button.btn.btn-link.text-danger.ml-2(
             (click)='uninstallPlugin(plugin)',
             *ngIf='!plugin.isBuiltin',

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

@@ -102,6 +102,18 @@ export class PluginsSettingsTabComponent {
         this.electron.shell.openExternal('https://www.npmjs.com/package/' + plugin.packageName)
     }
 
+    isPluginEnabled (plugin: PluginInfo) {
+        return !this.config.store.pluginBlacklist.includes(plugin.name)
+    }
+
+    togglePlugin (plugin: PluginInfo) {
+        if (this.isPluginEnabled(plugin)) {
+            this.disablePlugin(plugin)
+        } else {
+            this.enablePlugin(plugin)
+        }
+    }
+
     enablePlugin (plugin: PluginInfo) {
         this.config.store.pluginBlacklist = this.config.store.pluginBlacklist.filter(x => x !== plugin.name)
         this.config.save()

terminus-plugin-manager/src/index.ts

@@ -3,6 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
+import TerminusCorePlugin from 'terminus-core'
 import { SettingsTabProvider } from 'terminus-settings'
 
 import { PluginsSettingsTabComponent } from './components/pluginsSettingsTab.component'
@@ -14,6 +15,7 @@ import { PluginsSettingsTabProvider } from './settings'
         BrowserModule,
         FormsModule,
         NgbModule,
+        TerminusCorePlugin,
     ],
     providers: [
         { provide: SettingsTabProvider, useClass: PluginsSettingsTabProvider, multi: true },

terminus-plugin-manager/webpack.config.js

@@ -1,56 +1,5 @@
-const path = require('path')
-
-module.exports = {
-    target: 'node',
-    entry: 'src/index.ts',
-    context: __dirname,
-    devtool: 'cheap-module-source-map',
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: 'index.js',
-        pathinfo: true,
-        libraryTarget: 'umd',
-        devtoolModuleFilenameTemplate: 'webpack-terminus-plugin-manager:///[resource-path]',
-    },
-    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-    optimization:{
-        minimize: false,
-    },
-    resolve: {
-        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-        extensions: ['.ts', '.js'],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                use: {
-                    loader: 'awesome-typescript-loader',
-                    options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
-                        typeRoots: [
-                            path.resolve(__dirname, 'node_modules/@types'),
-                            path.resolve(__dirname, '../node_modules/@types'),
-                        ],
-                        paths: {
-                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
-                        },
-                    },
-                },
-            },
-            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
-        ],
-    },
-    externals: [
-        'fs',
-        'net',
-        'path',
-        'electron-promise-ipc',
-        /^rxjs/,
-        /^@angular/,
-        /^@ng-bootstrap/,
-        /^terminus-/,
-    ],
-}
+const config = require('../webpack.plugin.config')
+module.exports = config({
+    name: 'plugin-manager',
+    dirname: __dirname,
+})

terminus-plugin-manager/yarn.lock

@@ -12,12 +12,12 @@ any-promise@^1.0.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
 
-axios@^0.19.0:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
   dependencies:
-    follow-redirects "1.5.10"
+    follow-redirects "^1.10.0"
 
 call-bind@^1.0.0:
   version "1.0.0"
@@ -27,13 +27,6 @@ call-bind@^1.0.0:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.0"
 
-debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -78,12 +71,10 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
+follow-redirects@^1.10.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -145,11 +136,6 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.1"
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
 mz@^2.6.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"

terminus-serial/src/components/serialTab.component.pug

@@ -1,10 +1,10 @@
-.tab-toolbar
+.tab-toolbar([class.show]='!session || !session.open')
     .btn.btn-outline-secondary.reveal-button
         i.fas.fa-ellipsis-h
-    .toolbar([class.show]='!session || !session.open')
+    .toolbar
         i.fas.fa-circle.text-success.mr-2(*ngIf='session && session.open')
         i.fas.fa-circle.text-danger.mr-2(*ngIf='!session || !session.open')
-        strong(*ngIf='session') {{session.connection.port}} ({{session.connection.baudrate}})
+        strong {{connection.port}} ({{connection.baudrate}})
 
         .mr-auto
 

terminus-serial/src/components/serialTab.component.ts

@@ -44,6 +44,9 @@ export class SerialTabComponent extends BaseTerminalTabComponent {
                 case 'end':
                     this.sendInput('\x1b[F' )
                     break
+                case 'restart-serial-session':
+                    this.reconnect()
+                    break
             }
         })
 

terminus-serial/src/config.ts

@@ -12,6 +12,7 @@ export class SerialConfigProvider extends ConfigProvider {
             serial: [
                 'Alt-K',
             ],
+            'restart-serial-session': [],
         },
     }
 

terminus-serial/src/hotkeys.ts

@@ -9,6 +9,10 @@ export class SerialHotkeyProvider extends HotkeyProvider {
             id: 'serial',
             name: 'Show Serial connections',
         },
+        {
+            id: 'restart-serial-session',
+            name: 'Restart current serial session',
+        },
     ]
 
     async provide (): Promise<HotkeyDescription[]> {

terminus-serial/webpack.config.js

@@ -1,61 +1,5 @@
-const path = require('path')
-
-module.exports = {
-    target: 'node',
-    entry: 'src/index.ts',
-    context: __dirname,
-    devtool: 'source-map',
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: 'index.js',
-        pathinfo: true,
-        libraryTarget: 'umd',
-        devtoolModuleFilenameTemplate: 'webpack-terminus-serial:///[resource-path]',
-    },
-    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-    optimization:{
-        minimize: false,
-    },
-    resolve: {
-        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-        extensions: ['.ts', '.js', '.node'],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                use: {
-                    loader: 'awesome-typescript-loader',
-                    options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
-                        typeRoots: [
-                            path.resolve(__dirname, 'node_modules/@types'),
-                            path.resolve(__dirname, '../node_modules/@types'),
-                        ],
-                        paths: {
-                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
-                        },
-                    },
-                },
-            },
-            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
-            { test: /\.svg/, use: ['svg-inline-loader'] },
-        ],
-    },
-    externals: [
-        'fs',
-        'keytar',
-        'path',
-        'ngx-toastr',
-        'serialport',
-        'readline',
-        'stream',
-        'windows-process-tree/build/Release/windows_process_tree.node',
-        /^rxjs/,
-        /^@angular/,
-        /^@ng-bootstrap/,
-        /^terminus-/,
-    ],
-}
+const config = require('../webpack.plugin.config')
+module.exports = config({
+    name: 'serial',
+    dirname: __dirname,
+})

terminus-settings/src/components/settingsTab.component.pug

@@ -66,6 +66,29 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                         )
                         | Right
 
+            .form-line
+                .header
+                    .title Tabs width
+                .btn-group(
+                    [(ngModel)]='config.store.appearance.flexTabs',
+                    (ngModelChange)='config.save()',
+                    ngbRadioGroup
+                )
+                    label.btn.btn-secondary(ngbButtonLabel)
+                        input(
+                            type='radio',
+                            ngbButton,
+                            [value]='true'
+                        )
+                        | Dynamic
+                    label.btn.btn-secondary(ngbButtonLabel)
+                        input(
+                            type='radio',
+                            ngbButton,
+                            [value]='false'
+                        )
+                        | Fixed
+
             .form-line
                 .header
                     .title(*ngIf='hostApp.platform !== Platform.macOS') Acrylic background
@@ -327,7 +350,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
             .d-flex.flex-column.w-100.h-100
                 .h-100.d-flex
                     .w-100.d-flex.flex-column
-                        h3 Config file
+                        h3 Config File
                         textarea.form-control.h-100(
                             [(ngModel)]='configFile'
                         )

terminus-settings/webpack.config.js

@@ -1,57 +1,5 @@
-const path = require('path')
-
-module.exports = {
-    target: 'node',
-    entry: 'src/index.ts',
-    context: __dirname,
-    devtool: 'cheap-module-source-map',
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: 'index.js',
-        pathinfo: true,
-        libraryTarget: 'umd',
-        devtoolModuleFilenameTemplate: 'webpack-terminus-settings:///[resource-path]',
-    },
-    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-    optimization:{
-        minimize: false,
-    },
-    resolve: {
-        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-        extensions: ['.ts', '.js'],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                use: {
-                    loader: 'awesome-typescript-loader',
-                    options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
-                        typeRoots: [
-                            path.resolve(__dirname, 'node_modules/@types'),
-                            path.resolve(__dirname, '../node_modules/@types'),
-                        ],
-                        paths: {
-                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
-                        },
-                    },
-                },
-            },
-            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
-            { test: /\.css$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
-            { test: /\.svg/, use: ['svg-inline-loader'] },
-        ],
-    },
-    externals: [
-        'fs',
-        'path',
-        'os',
-        /^rxjs/,
-        /^@angular/,
-        /^@ng-bootstrap/,
-        /^terminus-/,
-    ],
-}
+const config = require('../webpack.plugin.config')
+module.exports = config({
+    name: 'settings',
+    dirname: __dirname,
+})

terminus-ssh/src/components/sshTab.component.pug

@@ -1,14 +1,14 @@
-.tab-toolbar
+.tab-toolbar([class.show]='!session || !session.open')
     .btn.btn-outline-secondary.reveal-button
         i.fas.fa-ellipsis-h
-    .toolbar(*ngIf='session', [class.show]='!session.open')
-        i.fas.fa-circle.text-success.mr-2(*ngIf='session.open')
-        i.fas.fa-circle.text-danger.mr-2(*ngIf='!session.open')
-        strong.mr-auto(*ngIf='session') {{session.connection.user}}@{{session.connection.host}}:{{session.connection.port}}
+    .toolbar
+        i.fas.fa-circle.text-success.mr-2(*ngIf='session && session.open')
+        i.fas.fa-circle.text-danger.mr-2(*ngIf='!session || !session.open')
+        strong.mr-auto {{connection.user}}@{{connection.host}}:{{connection.port}}
 
-        button.btn.btn-secondary.mr-2((click)='reconnect()', [class.btn-info]='!session.open')
+        button.btn.btn-secondary.mr-2((click)='reconnect()', [class.btn-info]='!session || !session.open')
             span Reconnect
 
-        button.btn.btn-secondary((click)='showPortForwarding()', *ngIf='session.open')
+        button.btn.btn-secondary((click)='showPortForwarding()', *ngIf='session && session.open')
             i.fas.fa-plug
             span Ports

terminus-ssh/src/components/sshTab.component.ts

@@ -54,6 +54,9 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
                 case 'end':
                     this.sendInput('\x1b[F' )
                     break
+                case 'restart-ssh-session':
+                    this.reconnect()
+                    break
             }
         })
 
@@ -143,7 +146,6 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
 
     protected attachSessionHandlers (): void {
         const session = this.session!
-        super.attachSessionHandlers()
         this.attachSessionHandler(session.destroyed$.subscribe(() => {
             if (
                 // Ctrl-D
@@ -158,12 +160,15 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
                 if (!this.reconnectOffered) {
                     this.reconnectOffered = true
                     this.write('Press any key to reconnect\r\n')
-                    this.attachSessionHandler(this.input$.pipe(first()).subscribe(() => {
-                        this.reconnect()
-                    }))
+                    this.input$.pipe(first()).subscribe(() => {
+                        if (!this.session?.open) {
+                            this.reconnect()
+                        }
+                    })
                 }
             }
         }))
+        super.attachSessionHandlers()
     }
 
     async initializeSession (): Promise<void> {

terminus-ssh/src/config.ts

@@ -13,6 +13,7 @@ export class SSHConfigProvider extends ConfigProvider {
             ssh: [
                 'Alt-S',
             ],
+            'restart-ssh-session': [],
         },
     }
 

terminus-ssh/src/hotkeys.ts

@@ -9,6 +9,10 @@ export class SSHHotkeyProvider extends HotkeyProvider {
             id: 'ssh',
             name: 'Show SSH connections',
         },
+        {
+            id: 'restart-ssh-session',
+            name: 'Restart current SSH session',
+        },
     ]
 
     async provide (): Promise<HotkeyDescription[]> {

terminus-ssh/webpack.config.js

@@ -1,61 +1,5 @@
-const path = require('path')
-
-module.exports = {
-    target: 'node',
-    entry: 'src/index.ts',
-    context: __dirname,
-    devtool: 'cheap-module-source-map',
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: 'index.js',
-        pathinfo: true,
-        libraryTarget: 'umd',
-        devtoolModuleFilenameTemplate: 'webpack-terminus-ssh:///[resource-path]',
-    },
-    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-    optimization:{
-        minimize: false,
-    },
-    resolve: {
-        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-        extensions: ['.ts', '.js'],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                use: {
-                    loader: 'awesome-typescript-loader',
-                    options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
-                        typeRoots: [
-                            path.resolve(__dirname, 'node_modules/@types'),
-                            path.resolve(__dirname, '../node_modules/@types'),
-                        ],
-                        paths: {
-                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
-                        },
-                    },
-                },
-            },
-            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
-            { test: /\.svg/, use: ['svg-inline-loader'] },
-        ],
-    },
-    externals: [
-        'child_process',
-        'fs',
-        'keytar',
-        'path',
-        'ngx-toastr',
-        'socksv5',
-        'windows-native-registry',
-        'windows-process-tree/build/Release/windows_process_tree.node',
-        /^rxjs/,
-        /^@angular/,
-        /^@ng-bootstrap/,
-        /^terminus-/,
-    ],
-}
+const config = require('../webpack.plugin.config')
+module.exports = config({
+    name: 'ssh',
+    dirname: __dirname,
+})

terminus-terminal/webpack.config.js

@@ -1,80 +1,8 @@
 const path = require('path')
-
-module.exports = {
-    target: 'node',
-    entry: 'src/index.ts',
-    context: __dirname,
-    devtool: 'cheap-module-source-map',
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: 'index.js',
-        pathinfo: true,
-        libraryTarget: 'umd',
-        devtoolModuleFilenameTemplate: 'webpack-terminus-terminal:///[resource-path]',
-    },
-    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-    optimization: {
-        minimize: false,
-    },
-    resolve: {
-        modules: ['.', 'src', 'node_modules', '../app/node_modules', 'node_modules/xterm/src'].map(x => path.join(__dirname, x)),
-        extensions: ['.ts', '.js'],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                use: {
-                    loader: 'awesome-typescript-loader',
-                    options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
-                        typeRoots: [
-                            path.resolve(__dirname, 'node_modules/@types'),
-                            path.resolve(__dirname, '../node_modules/@types'),
-                        ],
-                        paths: {
-                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-                            "*": [
-                                path.resolve(__dirname, '../app/node_modules/*'),
-                                path.resolve(__dirname, './node_modules/xterm/src/*'),
-                            ],
-                        },
-                    },
-                },
-            },
-            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
-            { test: /\.css$/, use: ['style-loader', 'css-loader'] },
-            { test: /\.svg/, use: ['svg-inline-loader'] },
-            {
-                test: /\.(ttf|eot|otf|woff|woff2|ogg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-                use: {
-                    loader: 'url-loader',
-                    options: {
-                        limit: 999999999999,
-                    },
-                },
-            },
-        ],
-    },
-    externals: [
-        'child_process',
-        'electron',
-        'fontmanager-redux',
-        'fs',
-        'path',
-        'macos-native-processlist',
-        'windows-native-registry',
-        '@terminus-term/node-pty',
-        'windows-process-tree',
-        'native-process-working-directory',
-        'os',
-        /^rxjs/,
-        /^@angular/,
-        /^@ng-bootstrap/,
-        'ngx-toastr',
-        /^terminus-/,
-    ],
-    // Ignore warnings due to yarg's dynamic module loading
-    ignoreWarnings: [/node_modules\/yargs/],
-}
+const config = require('../webpack.plugin.config')
+module.exports = config({
+    name: 'terminal',
+    dirname: __dirname,
+})
+module.exports.resolve.modules.push('node_modules/xterm/src')
+module.exports.module.rules.find(x => x.use.loader === 'awesome-typescript-loader').use.options.paths['*'].push(path.resolve(__dirname, './node_modules/xterm/src/*'))

webpack.plugin.config.js

@@ -0,0 +1,94 @@
+const path = require('path')
+
+module.exports = options => {
+    const isDev = !!process.env.TERMINUS_DEV
+    const devtool = isDev && process.platform === 'win32' ? 'eval-cheap-module-source-map' : 'cheap-module-source-map'
+    return {
+        target: 'node',
+        entry: 'src/index.ts',
+        context: options.dirname,
+        devtool,
+        output: {
+            path: path.resolve(options.dirname, 'dist'),
+            filename: 'index.js',
+            pathinfo: true,
+            libraryTarget: 'umd',
+            devtoolModuleFilenameTemplate: `webpack-terminus-${options.name}:///[resource-path]`,
+        },
+        mode: isDev ? 'development' : 'production',
+        optimization:{
+            minimize: false,
+        },
+        cache: !isDev ? false : {
+            type: 'filesystem',
+            cacheDirectory: path.resolve(options.dirname, 'node_modules', '.webpack-cache'),
+        },
+        resolve: {
+            modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(options.dirname, x)),
+            extensions: ['.ts', '.js'],
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.ts$/,
+                    use: {
+                        loader: 'awesome-typescript-loader',
+                        options: {
+                            configFileName: path.resolve(options.dirname, 'tsconfig.json'),
+                            typeRoots: [
+                                path.resolve(options.dirname, 'node_modules/@types'),
+                                path.resolve(options.dirname, '../node_modules/@types'),
+                            ],
+                            paths: {
+                                'terminus-*': [path.resolve(options.dirname, '../terminus-*')],
+                                '*': [path.resolve(options.dirname, '../app/node_modules/*')],
+                            },
+                        },
+                    },
+                },
+                { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
+                { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
+                { test: /\.css$/, use: ['@terminus-term/to-string-loader', 'css-loader'], include: /component\.css/ },
+                { test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: /component\.css/ },
+                { test: /\.yaml$/, use: ['json-loader', 'yaml-loader'] },
+                { test: /\.svg/, use: ['svg-inline-loader'] },
+                {
+                    test: /\.(ttf|eot|otf|woff|woff2|ogg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+                    use: {
+                        loader: 'url-loader',
+                        options: {
+                            limit: 999999999999,
+                        },
+                    },
+                },
+            ],
+        },
+        externals: [
+            '@terminus-term/node-pty',
+            'child_process',
+            'electron-promise-ipc',
+            'electron',
+            'fontmanager-redux',
+            'fs',
+            'keytar',
+            'macos-native-processlist',
+            'native-process-working-directory',
+            'net',
+            'ngx-toastr',
+            'os',
+            'path',
+            'readline',
+            'serialport',
+            'socksv5',
+            'stream',
+            'windows-native-registry',
+            'windows-process-tree',
+            'windows-process-tree/build/Release/windows_process_tree.node',
+            /^@angular/,
+            /^@ng-bootstrap/,
+            /^rxjs/,
+            /^terminus-/,
+        ],
+        ignoreWarnings: [/node_modules\/yargs/],
+    }
+}

yarn.lock

@@ -706,7 +706,7 @@ acorn@^8.0.4:
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz"
   integrity sha512-XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ==
 
-agent-base@4, agent-base@^4.0.1, agent-base@^4.1.0:
+agent-base@4, agent-base@^4.0.1, agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
   integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
@@ -1156,7 +1156,7 @@ bl@^1.0.0:
 
 block-stream@*:
   version "0.0.9"
-  resolved "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
   integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
@@ -2109,14 +2109,14 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
   dependencies:
     ms "2.1.2"
 
-debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.1, debug@^2.6.9:
+debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.0, debug@^3.2.6:
   version "3.2.7"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -2564,10 +2564,10 @@ electron-to-chromium@^1.3.621:
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.629.tgz"
   integrity sha512-iSPPJtPvHrMAvYOt+9cdbDmTasPqwnwz4lkP8Dn200gDNUBQOLQ96xUsWXBwXslAo5XxdoXAoQQ3RAy4uao9IQ==
 
-electron@12.0.0-beta.22:
-  version "12.0.0-beta.22"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.0-beta.22.tgz#6581bcc522392e547e84a6e5f629d972f82e96df"
-  integrity sha512-jiMeVNHxf4KPpFxLiMDX6wHHsQCE95tg6n399/SMxo/AFovgu99cKDRoiZZci/MUjHnJoH6IcPyoZ3eKqHcSZw==
+electron@12.0.0-beta.25:
+  version "12.0.0-beta.25"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.0-beta.25.tgz#c4f872040e19a54cbf47f139b33889b0c91021c0"
+  integrity sha512-BFWVb61urBW8EuLekpLE8KSDfi7j3P2Znap4evxFiJKvwwRYIhSl8cTj74HbCBNKnhEd1sXk8vvocqeU5SVYnA==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^14.6.2"
@@ -3362,7 +3362,7 @@ fstream-npm@~1.2.1:
     fstream-ignore "^1.0.0"
     inherits "2"
 
-fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.11:
+fstream@^1.0.0, fstream@^1.0.12, fstream@~1.0.11:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
   integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
@@ -3875,12 +3875,12 @@ http2-wrapper@^1.0.0-beta.5.2:
     resolve-alpn "^1.0.0"
 
 https-proxy-agent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz"
-  integrity sha1-/6pLb69YasNAwYoUBDHna31/KUQ=
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
-    agent-base "^4.1.0"
-    debug "^2.4.1"
+    agent-base "^4.3.0"
+    debug "^3.1.0"
 
 https-proxy-agent@^5.0.0:
   version "5.0.0"
@@ -5205,11 +5205,16 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.2, ms@^2.0.0, ms@^2.1.1:
+ms@2.1.2, ms@^2.0.0:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
@@ -6642,7 +6647,7 @@ pumpify@^1.3.3:
 
 punycode@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0, punycode@^2.1.1:
@@ -7838,12 +7843,12 @@ tar-stream@^1.1.2, tar-stream@^1.5.4:
     xtend "^4.0.0"
 
 tar@^2.0.0, tar@~2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
   dependencies:
     block-stream "*"
-    fstream "^1.0.2"
+    fstream "^1.0.12"
     inherits "2"
 
 tar@^4:
@@ -8069,9 +8074,9 @@ topo@2.x.x:
     hoek "4.x.x"
 
 tough-cookie@~2.3.0:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"
-  integrity sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"