From 307f598be0261bcfbffde678d5bec74caf817630 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Fri, 25 Jun 2021 19:08:45 +0200 Subject: [PATCH] compile ssh2 into the bundle again --- app/package.json | 1 - app/yarn.lock | 24 +++--------------------- electron-builder.yml | 1 - terminus-ssh/package.json | 1 + terminus-ssh/webpack.config.js | 4 ++++ terminus-ssh/yarn.lock | 27 +++++++++++++++++++++++++-- web/polyfills.ts | 2 -- webpack.plugin.config.js | 2 -- 8 files changed, 33 insertions(+), 29 deletions(-) diff --git a/app/package.json b/app/package.json index 187f38d1..a1d3562c 100644 --- a/app/package.json +++ b/app/package.json @@ -37,7 +37,6 @@ "ngx-toastr": "^14.0.0", "npm": "6", "rxjs": "^7.1.0", - "ssh2": "^1.1.0", "yargs": "^17.0.1", "zone.js": "^0.11.4" }, diff --git a/app/yarn.lock b/app/yarn.lock index 7952f7bb..841562ef 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -295,7 +295,7 @@ asap@^2.0.0: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= -asn1@^0.2.4, asn1@~0.2.3: +asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz" integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== @@ -332,7 +332,7 @@ base64-js@^1.3.1: resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: +bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz" integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= @@ -686,13 +686,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cpu-features@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.2.tgz#9f636156f1155fd04bdbaa028bb3c2fbef3cea7a" - integrity sha512-/2yieBqvMcRj8McNzkycjW2v3OIUOibBfd2dLEJ0nWts8NobAxwiyw9phVNS6oDL8x8tz9F7uNVFEVpJncQpeA== - dependencies: - nan "^2.14.1" - create-error-class@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" @@ -2088,7 +2081,7 @@ mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.13.2, nan@^2.14.0, nan@^2.14.1, nan@^2.14.2: +nan@^2.13.2, nan@^2.14.0, nan@^2.14.2: version "2.14.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== @@ -3207,17 +3200,6 @@ split-on-first@^1.0.0: resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== -ssh2@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.1.0.tgz#43dd24930e15e317687f519d6b40270d9cd00d00" - integrity sha512-CidQLG2ZacoT0Z7O6dOyisj4JdrOrLVJ4KbHjVNz9yI1vO08FAYQPcnkXY9BP8zeYo+J/nBgY6Gg4R7w4WFWtg== - dependencies: - asn1 "^0.2.4" - bcrypt-pbkdf "^1.0.2" - optionalDependencies: - cpu-features "0.0.2" - nan "^2.14.2" - sshpk@^1.7.0: version "1.16.1" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz" diff --git a/electron-builder.yml b/electron-builder.yml index 06948518..4241f685 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -34,7 +34,6 @@ extraResources: - extras asarUnpack: - 'dist/*.map' -- '**/node_modules/ssh2' publish: - provider: github diff --git a/terminus-ssh/package.json b/terminus-ssh/package.json index b4402654..d851f347 100644 --- a/terminus-ssh/package.json +++ b/terminus-ssh/package.json @@ -26,6 +26,7 @@ "ansi-colors": "^4.1.1", "cli-spinner": "^0.2.10", "clone-deep": "^4.0.1", + "ssh2": "^1.1.0", "sshpk": "Eugeny/node-sshpk#89ed17dfae425a8b629873c8337e77d26838c04f", "strip-ansi": "^7.0.0" }, diff --git a/terminus-ssh/webpack.config.js b/terminus-ssh/webpack.config.js index b4da8e9b..9519fcd5 100644 --- a/terminus-ssh/webpack.config.js +++ b/terminus-ssh/webpack.config.js @@ -2,4 +2,8 @@ const config = require('../webpack.plugin.config') module.exports = config({ name: 'ssh', dirname: __dirname, + externals: [ + './crypto/build/Release/sshcrypto.node', + '../build/Release/cpufeatures.node', + ], }) diff --git a/terminus-ssh/yarn.lock b/terminus-ssh/yarn.lock index 6e39061a..88c6a317 100644 --- a/terminus-ssh/yarn.lock +++ b/terminus-ssh/yarn.lock @@ -37,7 +37,7 @@ ansi-regex@^6.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.0.tgz#ecc7f5933cbe5ac7b33e209a5ff409ab1669c6b2" integrity sha512-tAaOSrWCHF+1Ear1Z4wnJCXA9GGox4K6Ic85a5qalES2aeEwQGr7UC93mwef49536PkCYjzkp0zIxfFvexJ6zQ== -asn1@~0.2.3: +asn1@^0.2.4, asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== @@ -59,7 +59,7 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -bcrypt-pbkdf@^1.0.0: +bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= @@ -119,6 +119,13 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +cpu-features@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.2.tgz#9f636156f1155fd04bdbaa028bb3c2fbef3cea7a" + integrity sha512-/2yieBqvMcRj8McNzkycjW2v3OIUOibBfd2dLEJ0nWts8NobAxwiyw9phVNS6oDL8x8tz9F7uNVFEVpJncQpeA== + dependencies: + nan "^2.14.1" + cycle@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" @@ -224,6 +231,11 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +nan@^2.14.1, nan@^2.14.2: + version "2.14.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" + integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -270,6 +282,17 @@ sprintf@0.1.x: resolved "https://registry.yarnpkg.com/sprintf/-/sprintf-0.1.5.tgz#8f83e39a9317c1a502cb7db8050e51c679f6edcf" integrity sha1-j4PjmpMXwaUCy324BQ5Rxnn27c8= +ssh2@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.1.0.tgz#43dd24930e15e317687f519d6b40270d9cd00d00" + integrity sha512-CidQLG2ZacoT0Z7O6dOyisj4JdrOrLVJ4KbHjVNz9yI1vO08FAYQPcnkXY9BP8zeYo+J/nBgY6Gg4R7w4WFWtg== + dependencies: + asn1 "^0.2.4" + bcrypt-pbkdf "^1.0.2" + optionalDependencies: + cpu-features "0.0.2" + nan "^2.14.2" + sshpk@Eugeny/node-sshpk#89ed17dfae425a8b629873c8337e77d26838c04f: version "1.16.1" resolved "https://codeload.github.com/Eugeny/node-sshpk/tar.gz/89ed17dfae425a8b629873c8337e77d26838c04f" diff --git a/web/polyfills.ts b/web/polyfills.ts index 1878bcf5..c0eb1d9c 100644 --- a/web/polyfills.ts +++ b/web/polyfills.ts @@ -188,6 +188,4 @@ mocks.assert.notStrictEqual = () => true // Late mocks and builtins -builtins['ssh2'] = require('ssh2') -builtins['ssh2/lib/protocol/constants'] = require('ssh2/lib/protocol/constants') builtins['stream'] = require('stream-browserify') diff --git a/webpack.plugin.config.js b/webpack.plugin.config.js index c8001901..59594655 100644 --- a/webpack.plugin.config.js +++ b/webpack.plugin.config.js @@ -100,8 +100,6 @@ module.exports = options => { 'path', 'readline', 'serialport', - 'ssh2', - 'ssh2/lib/protocol/constants', 'socksv5', 'stream', 'windows-native-registry',