Update webpack.config.js

Bump electron-builder from 21.0.7 to 21.0.8

README.md

@@ -3,7 +3,7 @@
 
 <p align="center">
   <a href="https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/eugeny/terminus.svg?label=License&style=flat-square"></a> <a href="https://travis-ci.org/Eugeny/terminus"><img alt="Travis (.org)" src="https://img.shields.io/travis/Eugeny/terminus.svg?label=CI&logo=travis&logoColor=white&style=flat-square"></a>
-  <a href="https://ci.appveyor.com/project/Eugeny/terminus"><img alt="AppVeyor" src="https://img.shields.io/appveyor/ci/eugeny/terminus.svg?label=CI&logo=appveyor&logoColor=white&style=flat-square"></a>
+  <a href="https://ci.appveyor.com/project/Eugeny/terminus"><img alt="AppVeyor" src="https://img.shields.io/appveyor/ci/eugeny/terminus.svg?label=CI&logo=appveyor&logoColor=white&style=flat-square"></a><a href="https://dev.azure.com/epankov/Terminus/_build?definitionId=1"><img alt="Azure Pipelines" src="https://img.shields.io/azure-devops/build/epankov/Terminus/1.svg?label=CI&style=flat-square" /></a>
 </p>
 
 <p align="center">

azure-pipelines.yml

@@ -10,62 +10,62 @@ variables:
 - group: Vars
 
 jobs:
-- job: Windows
-  pool:
-    vmImage: 'vs2017-win2016'
+# - job: Windows
+#   pool:
+#     vmImage: 'vs2017-win2016'
 
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
+#   steps:
+#   - task: NodeTool@0
+#     inputs:
+#       versionSpec: '10.x'
+#     displayName: 'Install Node.js'
 
-  - script: yarn --network-timeout 100000
-    displayName: 'Install dependencies'
+#   - script: yarn --network-timeout 100000
+#     displayName: 'Install dependencies'
 
-  - script: node scripts/build-native.js
-    displayName: 'Rebuild native dependencies'
+#   - script: node scripts/build-native.js
+#     displayName: 'Rebuild native dependencies'
 
-  - script: yarn run build
-    displayName: 'Build'
+#   - script: yarn run build
+#     displayName: 'Build'
 
-  - script: node scripts/prepackage-plugins.js
-    displayName: 'Prepackage plugins'
+#   - script: node scripts/prepackage-plugins.js
+#     displayName: 'Prepackage plugins'
 
-  - script: node scripts/build-windows.js
-    displayName: 'Package'
-    env:
-      WIN_CSC_LINK: $(WIN_CSC_LINK)
-      WIN_CSC_KEY_PASSWORD: $(WIN_CSC_KEY_PASSWORD)
-      BT_TOKEN: $(BT_TOKEN)
-      GH_TOKEN: $(GH_TOKEN)
-      DEBUG: electron-builder
+#   - script: node scripts/build-windows.js
+#     displayName: 'Package'
+#     env:
+#       WIN_CSC_LINK: $(WIN_CSC_LINK)
+#       WIN_CSC_KEY_PASSWORD: $(WIN_CSC_KEY_PASSWORD)
+#       BT_TOKEN: $(BT_TOKEN)
+#       GH_TOKEN: $(GH_TOKEN)
+#       DEBUG: electron-builder
 
-  - task: CopyFiles@2
-    inputs:
-      contents: 'dist\\*-setup.exe'
-      targetFolder: $(Build.ArtifactStagingDirectory)
-      flattenFolders: true
-      cleanTargetFolder: true
+#   - task: CopyFiles@2
+#     inputs:
+#       contents: 'dist\\*-setup.exe'
+#       targetFolder: $(Build.ArtifactStagingDirectory)
+#       flattenFolders: true
+#       cleanTargetFolder: true
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: Windows - Installer
-      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+#   - task: PublishBuildArtifacts@1
+#     inputs:
+#       pathtoPublish: $(Build.ArtifactStagingDirectory)
+#       artifactName: Windows - Installer
+#       condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
-  - task: CopyFiles@2
-    inputs:
-      contents: 'dist\\*-portable.exe'
-      targetFolder: $(Build.ArtifactStagingDirectory)
-      flattenFolders: true
-      cleanTargetFolder: true
+#   - task: CopyFiles@2
+#     inputs:
+#       contents: 'dist\\*-portable.exe'
+#       targetFolder: $(Build.ArtifactStagingDirectory)
+#       flattenFolders: true
+#       cleanTargetFolder: true
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: Windows - Portable build
-      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+#   - task: PublishBuildArtifacts@1
+#     inputs:
+#       pathtoPublish: $(Build.ArtifactStagingDirectory)
+#       artifactName: Windows - Portable build
+#       condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
 - job: Linux
   pool:
@@ -147,61 +147,61 @@ jobs:
       artifactName: Linux - tar.gz
       condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
-- job: macOS
-  pool:
-    vmImage: 'macOS-10.14'
+# - job: macOS
+#   pool:
+#     vmImage: 'macOS-10.14'
 
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
+#   steps:
+#   - task: NodeTool@0
+#     inputs:
+#       versionSpec: '10.x'
+#     displayName: 'Install Node.js'
 
-  - script: yarn
-    displayName: 'Install dependencies'
+#   - script: yarn
+#     displayName: 'Install dependencies'
 
-  - script: node scripts/build-native.js
-    displayName: 'Rebuild native dependencies'
+#   - script: node scripts/build-native.js
+#     displayName: 'Rebuild native dependencies'
 
-  - script: yarn run build
-    displayName: 'Build'
+#   - script: yarn run build
+#     displayName: 'Build'
 
-  - script: node scripts/prepackage-plugins.js
-    displayName: 'Prepackage plugins'
+#   - script: node scripts/prepackage-plugins.js
+#     displayName: 'Prepackage plugins'
 
-  - script: node scripts/build-macos.js
-    displayName: 'Package'
-    env:
-      CSC_LINK: $(CSC_LINK)
-      CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD)
-      BT_TOKEN: $(BT_TOKEN)
-      GH_TOKEN: $(GH_TOKEN)
-      APPSTORE_USERNAME: $(APPSTORE_USERNAME)
-      APPSTORE_PASSWORD: $(APPSTORE_PASSWORD)
-      DEBUG: electron-builder
+#   - script: node scripts/build-macos.js
+#     displayName: 'Package'
+#     env:
+#       CSC_LINK: $(CSC_LINK)
+#       CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD)
+#       BT_TOKEN: $(BT_TOKEN)
+#       GH_TOKEN: $(GH_TOKEN)
+#       APPSTORE_USERNAME: $(APPSTORE_USERNAME)
+#       APPSTORE_PASSWORD: $(APPSTORE_PASSWORD)
+#       DEBUG: electron-builder
 
-  - task: CopyFiles@2
-    inputs:
-      contents: 'dist/*.dmg'
-      targetFolder: $(Build.ArtifactStagingDirectory)
-      flattenFolders: true
-      cleanTargetFolder: true
+#   - task: CopyFiles@2
+#     inputs:
+#       contents: 'dist/*.dmg'
+#       targetFolder: $(Build.ArtifactStagingDirectory)
+#       flattenFolders: true
+#       cleanTargetFolder: true
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: macOS - DMG
-      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+#   - task: PublishBuildArtifacts@1
+#     inputs:
+#       pathtoPublish: $(Build.ArtifactStagingDirectory)
+#       artifactName: macOS - DMG
+#       condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
-  - task: CopyFiles@2
-    inputs:
-      contents: 'dist/*.zip'
-      targetFolder: $(Build.ArtifactStagingDirectory)
-      flattenFolders: true
-      cleanTargetFolder: true
+#   - task: CopyFiles@2
+#     inputs:
+#       contents: 'dist/*.zip'
+#       targetFolder: $(Build.ArtifactStagingDirectory)
+#       flattenFolders: true
+#       cleanTargetFolder: true
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: macOS - app.zip
-      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+#   - task: PublishBuildArtifacts@1
+#     inputs:
+#       pathtoPublish: $(Build.ArtifactStagingDirectory)
+#       artifactName: macOS - app.zip
+#       condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')

package.json

@@ -5,18 +5,18 @@
     "@types/electron-debug": "^2.1.0",
     "@types/fs-promise": "1.0.3",
     "@types/js-yaml": "^3.12.1",
-    "@types/node": "^12.0.10",
+    "@types/node": "^12.0.12",
     "@types/webpack-env": "1.13.9",
     "@typescript-eslint/eslint-plugin": "^1.11.0",
     "@typescript-eslint/parser": "^1.11.0",
-    "app-builder-lib": "^21.0.6",
+    "app-builder-lib": "^21.0.8",
     "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
     "core-js": "^3.1.4",
     "cross-env": "5.2.0",
     "css-loader": "3.0.0",
     "electron": "^5.0.5",
-    "electron-builder": "^21.0.7",
+    "electron-builder": "^21.0.8",
     "electron-installer-snap": "^4.0.0",
     "electron-notarize": "^0.1.1",
     "electron-rebuild": "^1.8.5",

terminus-ssh/package.json

@@ -30,5 +30,8 @@
     "terminus-core": "*",
     "terminus-settings": "*",
     "terminus-terminal": "*"
+  },
+  "optionalDependencies": {
+    "@terminus-term/windows-process-tree": "^0.2.4"
   }
 }

terminus-ssh/src/services/ssh.service.ts

@@ -12,7 +12,7 @@ import { PasswordStorageService } from './passwordStorage.service'
 import { SSH2Stream } from 'ssh2-streams'
 
 try {
-    var windowsProcessTree = require('@terminus-term/windows-process-tree')  // eslint-disable-line @typescript-eslint/no-var-requires
+    var windowsProcessTreeNative = require('@terminus-term/windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires
 } catch { }
 
 @Injectable({ providedIn: 'root' })
@@ -138,7 +138,7 @@ export class SSHService {
             let agent: string = null
             if (this.hostApp.platform === Platform.Windows) {
                 const pageantRunning = new Promise<boolean>(resolve => {
-                    windowsProcessTree.getProcessList(list => {
+                    windowsProcessTreeNative.getProcessList(list => {
                         resolve(list.some(x => x.name === 'pageant.exe'))
                     }, 0)
                 })

terminus-ssh/webpack.config.js

@@ -49,10 +49,10 @@ module.exports = {
         'keytar',
         'path',
         'ngx-toastr',
-        '@terminus-term/windows-process-tree',
+        '@terminus-term/windows-process-tree/build/Release/windows_process_tree.node',
         /^rxjs/,
         /^@angular/,
         /^@ng-bootstrap/,
         /^terminus-/,
-    ],
+    ]
 }

terminus-terminal/package.json

@@ -28,7 +28,7 @@
     "runes": "^0.4.2",
     "slug": "^1.1.0",
     "uuid": "^3.3.2",
-    "xterm": "3.15.0-beta67",
+    "xterm": "3.15.0-beta68",
     "xterm-addon-fit": "^0.1.0-beta3",
     "xterm-addon-ligatures": "^0.1.0-beta-2",
     "xterm-addon-search": "^0.2.0-beta1",

terminus-terminal/yarn.lock

@@ -184,14 +184,14 @@ xterm-addon-search@^0.2.0-beta1:
   integrity sha512-XEcwi2TeFGk2MuIFjiI/OpVXSNO5dGQBvHH3o+9KzqG3ooVqhhDqzwxs092QGNcNCGh8hGn/PWZiczaBBnKm/g==
 
 xterm-addon-webgl@^0.2.0-beta1:
-  version "0.2.0-beta1"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta1.tgz#c688e4b26bbd01a8a0cd9143362bbe040fc98ef9"
-  integrity sha512-arDNdOyiGs0BCFUaQ0jEa1UgybqMsMRZwV9+/xc0D4vJi5STWtH8lRtTUAgvDxaTJQBo1frz56JkYpDddHDSXw==
+  version "0.2.0-beta3"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta3.tgz#ee4aec568d570287788dce11edfdf4a15715884a"
+  integrity sha512-YR300FBK/6gOgs69blz0tIGmL40F4T/hvvfYAS2ztjLgKgeKaUJfuBQhvrVvOnNsCFevssAvf6WAQfgXgKan3A==
 
-xterm@3.15.0-beta67:
-  version "3.15.0-beta67"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta67.tgz#71973e174bdc08df620945eecd3f87912f1ac550"
-  integrity sha512-qLfo9GHVlu/IxgDI3vRGObWZM7UL4eLhMfjZhprx2aXNMpzmrOW6l3JDRsCjUWm93EoVavbULtnDhGSiTlKitQ==
+xterm@3.15.0-beta68:
+  version "3.15.0-beta68"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta68.tgz#8a17872825cc27a890fdb0057d6803781d8e5434"
+  integrity sha512-k2LF3fv8nhyE9S863lN7FyDYOAjl+eNwxRBLusQ/IiWHBbF0Yjy74rfm7M3yidUzadRKA7V9SFyonLRlSff9gg==
 
 yallist@^2.1.2:
   version "2.1.2"

yarn.lock

@@ -132,10 +132,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^12.0.10":
-  version "12.0.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031"
-  integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ==
+"@types/node@*", "@types/node@^12.0.12":
+  version "12.0.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.12.tgz#cc791b402360db1eaf7176479072f91ee6c6c7ca"
+  integrity sha512-Uy0PN4R5vgBUXFoJrKryf5aTk3kJ8Rv3PdlHjl6UaX+Cqp1QE0yPQ68MPXGrZOfG7gZVNDIJZYyot0B9ubXUrQ==
 
 "@types/node@^10.12.18":
   version "10.12.26"
@@ -467,20 +467,15 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-builder-bin@3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.1.4.tgz#7f13ce5ba677286fe443758c73ff7dfdb0b0f6de"
-  integrity sha512-W72acDbPD99SvwttRDh2aD7Q02HYleGJewGXER2rmloajLbbLSM8tZ/K5+znwu1bCRPI/at0W35qmNjXjN8Kdg==
-
 app-builder-bin@3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.1.5.tgz#235c42dddee88045c8b6efec8ba7a7abdcaa81e9"
   integrity sha512-WShO6mkz3Syvxzylg8JftHyILnWWPL/vrEwZSGy366QFvD3X1lvMuyKeIffmpFEXemveziamFOl/3rBLMaNfPg==
 
-app-builder-lib@21.0.7, app-builder-lib@~21.0.7:
-  version "21.0.7"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.7.tgz#4dfa3b7d7877915aca52411a36b33065797f29cc"
-  integrity sha512-2+1dUrZsLRmizFod9PEuA4ZpjJPV0IrGQdTQ5pFKZsR4ue0JxvTT2A2+DgCGwKLMfe9Fk0y0pLTeMeD0HmF47g==
+app-builder-lib@21.0.8, app-builder-lib@^21.0.8, app-builder-lib@~21.0.7:
+  version "21.0.8"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.8.tgz#f9c0f69ae2684a6b73f6fe37cddb8287fad07112"
+  integrity sha512-CgmXKgywl4+/6q4z9K+kFczDWiT+qaZyZGi6ov06/SSRwFb1CdVzFk8gQNzMu99+CMvnPdRBfVuO3BiOtMnTgg==
   dependencies:
     "7zip-bin" "~4.1.0"
     async-exit-hook "^2.0.1"
@@ -506,35 +501,6 @@ app-builder-lib@21.0.7, app-builder-lib@~21.0.7:
     semver "^6.2.0"
     temp-file "^3.3.3"
 
-app-builder-lib@^21.0.6:
-  version "21.0.6"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.6.tgz#b1b2e4e437f58348bc8a2db71bdbcaaa15a0a3ca"
-  integrity sha512-ErALlC3XSFxaJYRPtUAo4raUaKaUigKLKSF16mUJRxYpRFDVtqZJRr+z1Hqgx+Xpzn764PZ/ETPFfZ26oAP9jA==
-  dependencies:
-    "7zip-bin" "~4.1.0"
-    async-exit-hook "^2.0.1"
-    bluebird-lst "^1.0.9"
-    builder-util "10.3.1"
-    builder-util-runtime "8.3.0"
-    chromium-pickle-js "^0.2.0"
-    debug "^4.1.1"
-    ejs "^2.6.2"
-    electron-osx-sign "0.4.11"
-    electron-publish "21.0.6"
-    fs-extra "^8.1.0"
-    fs-extra-p "^8.1.0"
-    hosted-git-info "^2.7.1"
-    is-ci "^2.0.0"
-    isbinaryfile "^4.0.1"
-    js-yaml "^3.13.1"
-    lazy-val "^1.0.4"
-    minimatch "^3.0.4"
-    normalize-package-data "^2.5.0"
-    read-config-file "4.0.0"
-    sanitize-filename "^1.6.1"
-    semver "^6.2.0"
-    temp-file "^3.3.3"
-
 apply-loader@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/apply-loader/-/apply-loader-2.0.0.tgz#9cedf84f12ad89399dc9e7b91f4bb183ecea05b9"
@@ -945,25 +911,6 @@ builder-util-runtime@8.3.0:
     debug "^4.1.1"
     sax "^1.2.4"
 
-builder-util@10.3.1, builder-util@~10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.3.1.tgz#fe88ca7ac99042c36509ef6bf5c575430657930b"
-  integrity sha512-52EYK1qMYQXRq507MnijFjcjOicpSRrC49+aOdY5hT7wbhfGa6EJzQV0oCPOdzWN4Q/gjfa1HS9VanjR7ViUyg==
-  dependencies:
-    "7zip-bin" "~4.1.0"
-    "@types/debug" "^4.1.4"
-    app-builder-bin "3.1.4"
-    bluebird-lst "^1.0.9"
-    builder-util-runtime "8.3.0"
-    chalk "^2.4.2"
-    debug "^4.1.1"
-    fs-extra "^8.1.0"
-    is-ci "^2.0.0"
-    js-yaml "^3.13.1"
-    source-map-support "^0.5.12"
-    stat-mode "^0.3.0"
-    temp-file "^3.3.3"
-
 builder-util@10.3.2, builder-util@~10.3.2:
   version "10.3.2"
   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.3.2.tgz#3bc50e31207fa14f6174f071f6aa5493be80f2d2"
@@ -1893,12 +1840,12 @@ ejs@^2.6.2:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6"
   integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==
 
-electron-builder@^21.0.7:
-  version "21.0.7"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.0.7.tgz#7f9d47e79320ed7e395608f14b9343108ae7e314"
-  integrity sha512-mNpGwZQ/kIEsevZ8FIUmP/mO/QlGf6iFPTL/xYkqozT5jgJkJSb5/a0mkA4oD8P3LYyuhKJ993oBOKx0oMDUwg==
+electron-builder@^21.0.8:
+  version "21.0.8"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.0.8.tgz#3311695c5c2c12db2a70eefcaabee90da2f122f4"
+  integrity sha512-4B4AyDwjY0sBYa3YWvH06+RL+ucnrR1w865QuAzRsnYxyBokQ0NphIuP/nTNuDp/8u/tF+lGIYxIKFrmMMza0w==
   dependencies:
-    app-builder-lib "21.0.7"
+    app-builder-lib "21.0.8"
     bluebird-lst "^1.0.9"
     builder-util "10.3.2"
     builder-util-runtime "8.3.0"
@@ -2013,19 +1960,6 @@ electron-osx-sign@0.4.11:
     minimist "^1.2.0"
     plist "^3.0.1"
 
-electron-publish@21.0.6:
-  version "21.0.6"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.6.tgz#ab9bc97536b7d5f03d710259288c8893e15ce182"
-  integrity sha512-VN5+PgrK9yQxggY22z0nyC9cT+522E5Jdw8bcEbvlSH9LhPrLo44Da3GPNBRjnb1UF0yfEZdbYig2Ut+g1WHJg==
-  dependencies:
-    bluebird-lst "^1.0.9"
-    builder-util "~10.3.1"
-    builder-util-runtime "8.3.0"
-    chalk "^2.4.2"
-    fs-extra-p "^8.1.0"
-    lazy-val "^1.0.4"
-    mime "^2.4.4"
-
 electron-publish@21.0.7:
   version "21.0.7"
   resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.7.tgz#3ae28dbff45210b0cc802c558ffe80331eccd241"