From 025cc68ad8bae286bec29bc7d28bff918ef59c08 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 6 Jan 2025 10:51:23 +0100 Subject: [PATCH] bump windows-process-tree --- app/package.json | 2 +- app/yarn.lock | 34 +++++++++---------- tabby-electron/src/pty.ts | 2 +- .../src/services/platform.service.ts | 2 +- webpack.plugin.config.mjs | 4 +-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/package.json b/app/package.json index 5875e3bd..81ec3330 100644 --- a/app/package.json +++ b/app/package.json @@ -42,7 +42,7 @@ "serialport": "11.0.1", "serialport-binding-webserialapi": "^1.0.3", "windows-native-registry": "^3.2.1", - "windows-process-tree": "^0.4.0" + "@tabby-gang/windows-process-tree": "^0.6.1" }, "devDependencies": { "@ngx-translate/core": "^14.0.0", diff --git a/app/yarn.lock b/app/yarn.lock index c69a2c46..cd10c752 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -178,13 +178,20 @@ dependencies: debug "^4.3.2" -"@tabby-gang/windows-blurbehind@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@tabby-gang/windows-blurbehind/-/windows-blurbehind-3.0.0.tgz#48d409c2eb14a12c867b70de5ee4d6769ef45e8f" - integrity sha512-ah6eJcoQZWOZfu9sd2pWlOJmfl1v+2EZQMeIp7MWvg+/16WS16UFNdnOtlV6AUiABHfZo2QKfCNUEuorCM+Q2A== +"@tabby-gang/windows-blurbehind@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@tabby-gang/windows-blurbehind/-/windows-blurbehind-3.1.0.tgz#bd1462f2a970d195e277d48cceb8b2c0a20f09bd" + integrity sha512-wTvyNrBDNxD4yq1bXv7lvXRQujJYRQ2Ke3LJyE9yzY9e/L9/fHVIuprIgAMiLsnW+BKPERq0k27iC38WnxUBZQ== dependencies: "@types/node" "^10.12.18" +"@tabby-gang/windows-process-tree@^0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@tabby-gang/windows-process-tree/-/windows-process-tree-0.6.1.tgz#2a5a5cbbee16f611fc61d53cbadf930c8d3d20a8" + integrity sha512-I7AwncTXTmo1+WPfV+O+jYRJzjCMJznIjC/ycl4dP/n2HAocuXCIjTZfoMmL+rgjN2nRFpTyn6P+EhuIPMACbQ== + dependencies: + node-addon-api "7.1.0" + "@types/mz@2.7.4": version "2.7.4" resolved "https://registry.yarnpkg.com/@types/mz/-/mz-2.7.4.tgz#f9d1535cb5171199b28ae6abd6ec29e856551401" @@ -2600,7 +2607,7 @@ mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@2.22.0, nan@^2.17.0: +nan@2.22.0: version "2.22.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3" integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw== @@ -2648,7 +2655,7 @@ node-abi@^3.3.0: dependencies: semver "^7.3.5" -node-addon-api@3.1.0, node-addon-api@6.1.0, node-addon-api@^3.0.2, node-addon-api@^3.1.0, node-addon-api@^4.0.0, node-addon-api@^4.3.0, node-addon-api@^7.1.0, node-addon-api@^8.3.0: +node-addon-api@3.1.0, node-addon-api@6.1.0, node-addon-api@7.1.0, node-addon-api@^3.0.2, node-addon-api@^3.1.0, node-addon-api@^4.0.0, node-addon-api@^4.3.0, node-addon-api@^7.1.0, node-addon-api@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.3.0.tgz#ec3763f18befc1cdf66d11e157ce44d5eddc0603" integrity sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg== @@ -3621,10 +3628,10 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -russh@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/russh/-/russh-0.1.4.tgz#89b9f4452f0a1a3673d4d5799cea17bdebd5e71a" - integrity sha512-8b78Gtd2D0b6HZ/2s2nGNv3VVTDmzR1fHXEY0g462kMicir2ChHgBIzdSzr1/HrMFdFqCGHnHBcdsuTp+Zshzw== +russh@0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/russh/-/russh-0.1.5.tgz#bd035345c0d118927af777c49ce93a32e54f87bc" + integrity sha512-9SLhOQYG+KBXWxVa4vD6/Ritl5XhBHnN3eTtEy0TNV5WBwETgQw4CWbV3R6Td3uqSyaKovxHqUnWIhoS3gOJeg== dependencies: "@napi-rs/cli" "^2.18.3" @@ -4445,13 +4452,6 @@ windows-native-registry@^3.2.1: dependencies: node-addon-api "^3.1.0" -windows-process-tree@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.4.0.tgz#31ac49c5da557e628ce7e37a5800972173d3349a" - integrity sha512-9LunDnc1WwuhyLeTAXMFX8wbActGJtDCBaiapQXFYk/nO4W4X9YxOKV5g/lQL3XX69QYxveDbjVVrdnTt1qqCQ== - dependencies: - nan "^2.17.0" - worker-farm@^1.6.0, worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" diff --git a/tabby-electron/src/pty.ts b/tabby-electron/src/pty.ts index d44f4e63..2d4e13b0 100644 --- a/tabby-electron/src/pty.ts +++ b/tabby-electron/src/pty.ts @@ -10,7 +10,7 @@ try { } catch { } try { - var windowsProcessTree = require('windows-process-tree') // eslint-disable-line @typescript-eslint/no-var-requires, no-var + var windowsProcessTree = require('@tabby-gang/windows-process-tree') // eslint-disable-line @typescript-eslint/no-var-requires, no-var } catch { } export class ElectronPTYInterface extends PTYInterface { diff --git a/tabby-electron/src/services/platform.service.ts b/tabby-electron/src/services/platform.service.ts index d08f07ef..e3d5d55e 100644 --- a/tabby-electron/src/services/platform.service.ts +++ b/tabby-electron/src/services/platform.service.ts @@ -18,7 +18,7 @@ const fontManager = require('fontmanager-redux') // eslint-disable-line try { // eslint-disable-next-line no-var - var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') + var windowsProcessTreeNative = require('@tabby-gang/windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-next-line no-var var wnr = require('windows-native-registry') } catch { } diff --git a/webpack.plugin.config.mjs b/webpack.plugin.config.mjs index e4cab027..d34536b4 100644 --- a/webpack.plugin.config.mjs +++ b/webpack.plugin.config.mjs @@ -161,8 +161,8 @@ export default options => { '@luminati-io/socksv5', 'stream', 'windows-native-registry', - 'windows-process-tree', - 'windows-process-tree/build/Release/windows_process_tree.node', + '@tabby-gang/windows-process-tree', + '@tabby-gang/windows-process-tree/build/Release/windows_process_tree.node', /^@angular(?!\/common\/locales)/, /^@ng-bootstrap/, /^rxjs/,