diff --git a/app/package.json b/app/package.json index 6be531ec..2cbbf80c 100644 --- a/app/package.json +++ b/app/package.json @@ -40,10 +40,10 @@ "zone.js": "^0.8.29" }, "optionalDependencies": { - "@terminus-term/windows-process-tree": "^0.2.4", "macos-native-processlist": "^1.0.1", "windows-blurbehind": "^1.0.1", "windows-native-registry": "^1.0.14", + "windows-process-tree": "^0.2.4", "windows-swca": "^2.0.2" }, "devDependencies": { diff --git a/app/yarn.lock b/app/yarn.lock index b2cc0a16..d48eeb09 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -58,13 +58,6 @@ dependencies: tslib "^1.9.0" -"@terminus-term/windows-process-tree@^0.2.4": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d" - integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg== - dependencies: - nan "^2.13.2" - "@types/mz@0.0.32": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.32.tgz#e8248b4e41424c052edc1725dd33650c313a3659" @@ -3396,6 +3389,13 @@ windows-native-registry@^1.0.14: dependencies: nan "^2.13.2" +windows-process-tree@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.2.4.tgz#747af587b54cc6c996f2be0836cc8a8fd0dc038f" + integrity sha512-9gag9AHm3Iin/4YC1EwoIfZlqW/rG2eV7rJZ4Fy5NnAMGdewmnwsie5Rz+CJo2vSolqzzfw7hPeu3oOdniNejg== + dependencies: + nan "^2.13.2" + windows-swca@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-2.0.2.tgz#66807012f73f5d3c0f0cb49bfa61be297aaabb50" diff --git a/terminus-ssh/package.json b/terminus-ssh/package.json index 09096eca..4739d93e 100644 --- a/terminus-ssh/package.json +++ b/terminus-ssh/package.json @@ -32,6 +32,6 @@ "terminus-terminal": "*" }, "optionalDependencies": { - "@terminus-term/windows-process-tree": "^0.2.4" + "windows-process-tree": "^0.2.4" } } diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts index 124bea5a..fe98d56f 100644 --- a/terminus-ssh/src/services/ssh.service.ts +++ b/terminus-ssh/src/services/ssh.service.ts @@ -12,7 +12,7 @@ import { PasswordStorageService } from './passwordStorage.service' import { SSH2Stream } from 'ssh2-streams' try { - var windowsProcessTreeNative = require('@terminus-term/windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires + var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires } catch { } @Injectable({ providedIn: 'root' }) diff --git a/terminus-ssh/webpack.config.js b/terminus-ssh/webpack.config.js index 9279e401..4cbafc74 100644 --- a/terminus-ssh/webpack.config.js +++ b/terminus-ssh/webpack.config.js @@ -49,7 +49,7 @@ module.exports = { 'keytar', 'path', 'ngx-toastr', - '@terminus-term/windows-process-tree/build/Release/windows_process_tree.node', + 'windows-process-tree/build/Release/windows_process_tree.node', /^rxjs/, /^@angular/, /^@ng-bootstrap/, diff --git a/terminus-ssh/yarn.lock b/terminus-ssh/yarn.lock index b7620315..76b25299 100644 --- a/terminus-ssh/yarn.lock +++ b/terminus-ssh/yarn.lock @@ -2,13 +2,6 @@ # yarn lockfile v1 -"@terminus-term/windows-process-tree@^0.2.4": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d" - integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg== - dependencies: - nan "^2.13.2" - "@types/node@*": version "9.3.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5" @@ -78,3 +71,10 @@ tweetnacl@^0.14.3: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +windows-process-tree@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.2.4.tgz#747af587b54cc6c996f2be0836cc8a8fd0dc038f" + integrity sha512-9gag9AHm3Iin/4YC1EwoIfZlqW/rG2eV7rJZ4Fy5NnAMGdewmnwsie5Rz+CJo2vSolqzzfw7hPeu3oOdniNejg== + dependencies: + nan "^2.13.2" diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts index c066aadf..98d09e7c 100644 --- a/terminus-terminal/src/services/sessions.service.ts +++ b/terminus-terminal/src/services/sessions.service.ts @@ -18,7 +18,7 @@ try { } catch { } try { - var windowsProcessTree = require('@terminus-term/windows-process-tree') // eslint-disable-line @typescript-eslint/no-var-requires + var windowsProcessTree = require('windows-process-tree') // eslint-disable-line @typescript-eslint/no-var-requires } catch { }