From eb2eef64fca3d7b456100c2fb3636ed6496a550c Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Thu, 28 Sep 2017 20:27:16 +0200 Subject: [PATCH] fixed #133 --- scripts/vars.js | 2 +- terminus-core/package.json | 2 +- terminus-core/yarn.lock | 2 +- terminus-plugin-manager/webpack.config.js | 1 - terminus-plugin-manager/yarn.lock | 6 +----- terminus-settings/webpack.config.js | 1 - terminus-terminal/package.json | 2 +- .../src/services/sessions.service.ts | 7 +++---- terminus-terminal/webpack.config.js | 2 +- terminus-terminal/yarn.lock | 16 ++++++++-------- 10 files changed, 17 insertions(+), 24 deletions(-) diff --git a/scripts/vars.js b/scripts/vars.js index 0fc9454b..d1cbedf9 100755 --- a/scripts/vars.js +++ b/scripts/vars.js @@ -15,5 +15,5 @@ exports.builtinPlugins = [ 'terminus-community-color-schemes', 'terminus-plugin-manager', ] -exports.nativeModules = ['node-pty', 'font-manager'] +exports.nativeModules = ['node-pty-tmp', 'font-manager'] exports.electronVersion = pkgInfo.devDependencies.electron diff --git a/terminus-core/package.json b/terminus-core/package.json index e0ce016b..caa0f32a 100644 --- a/terminus-core/package.json +++ b/terminus-core/package.json @@ -20,7 +20,7 @@ "@types/js-yaml": "^3.9.0", "@types/node": "^7.0.37", "@types/webpack-env": "^1.13.0", - "axios": "^0.16.2", + "axios": "0.16.2", "bootstrap": "4.0.0-alpha.6", "core-js": "^2.4.1", "electron-updater": "^2.8.9", diff --git a/terminus-core/yarn.lock b/terminus-core/yarn.lock index 09ac10c3..891a2829 100644 --- a/terminus-core/yarn.lock +++ b/terminus-core/yarn.lock @@ -20,7 +20,7 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -axios@^0.16.2: +axios@0.16.2: version "0.16.2" resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d" dependencies: diff --git a/terminus-plugin-manager/webpack.config.js b/terminus-plugin-manager/webpack.config.js index 086543fb..b9928b40 100644 --- a/terminus-plugin-manager/webpack.config.js +++ b/terminus-plugin-manager/webpack.config.js @@ -39,7 +39,6 @@ module.exports = { 'fs', 'font-manager', 'path', - 'node-pty', 'mz/fs', 'mz/child_process', 'winreg', diff --git a/terminus-plugin-manager/yarn.lock b/terminus-plugin-manager/yarn.lock index 65c59bd3..6c9f4efd 100644 --- a/terminus-plugin-manager/yarn.lock +++ b/terminus-plugin-manager/yarn.lock @@ -8,11 +8,7 @@ dependencies: "@types/node" "*" -"@types/node@*": - version "8.0.28" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.28.tgz#86206716f8d9251cf41692e384264cbd7058ad60" - -"@types/node@7.0.12": +"@types/node@*", "@types/node@7.0.12": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" diff --git a/terminus-settings/webpack.config.js b/terminus-settings/webpack.config.js index 0bcfd12f..2f1f5308 100644 --- a/terminus-settings/webpack.config.js +++ b/terminus-settings/webpack.config.js @@ -39,7 +39,6 @@ module.exports = { externals: [ 'fs', 'path', - 'node-pty', /^rxjs/, /^@angular/, /^@ng-bootstrap/, diff --git a/terminus-terminal/package.json b/terminus-terminal/package.json index 46a39639..ef7bd6dd 100644 --- a/terminus-terminal/package.json +++ b/terminus-terminal/package.json @@ -42,7 +42,7 @@ "font-manager": "0.2.2", "hterm-umdjs": "1.1.3", "mz": "^2.6.0", - "node-pty": "0.6.8", + "node-pty-tmp": "0.7.1", "ps-node": "^0.1.6", "runes": "^0.4.2", "winreg": "^1.2.3" diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts index f639b6fd..6dd6aa3c 100644 --- a/terminus-terminal/src/services/sessions.service.ts +++ b/terminus-terminal/src/services/sessions.service.ts @@ -1,5 +1,4 @@ const psNode = require('ps-node') -// import * as nodePTY from 'node-pty' let nodePTY import * as fs from 'mz/fs' import { Subject } from 'rxjs' @@ -94,13 +93,13 @@ export class Session { } resize (columns, rows) { - if (this.pty.writable) { + if (this.pty._writable) { this.pty.resize(columns, rows) } } write (data) { - if (this.pty.writable) { + if (this.pty._writable) { this.pty.write(Buffer.from(data, 'utf-8')) } } @@ -186,7 +185,7 @@ export class SessionsService { electron: ElectronService, log: LogService, ) { - nodePTY = electron.remoteRequirePluginModule('terminus-terminal', 'node-pty', global as any) + nodePTY = electron.remoteRequirePluginModule('terminus-terminal', 'node-pty-tmp', global as any) this.logger = log.create('sessions') this.persistenceProviders = this.persistenceProviders.filter(x => x.isAvailable()) } diff --git a/terminus-terminal/webpack.config.js b/terminus-terminal/webpack.config.js index 52546f03..5312559a 100644 --- a/terminus-terminal/webpack.config.js +++ b/terminus-terminal/webpack.config.js @@ -48,7 +48,7 @@ module.exports = { 'fs', 'font-manager', 'path', - 'node-pty', + 'node-pty-tmp', 'mz/fs', 'mz/child_process', 'winreg', diff --git a/terminus-terminal/yarn.lock b/terminus-terminal/yarn.lock index e2fd330a..06540ca2 100644 --- a/terminus-terminal/yarn.lock +++ b/terminus-terminal/yarn.lock @@ -69,7 +69,7 @@ font-manager@0.2.2: nan "~2.2.0" hterm-umdjs@1.1.3: - version "1.1.3" + version "1.1.3+1.58.sha.15ed490" resolved "https://registry.yarnpkg.com/hterm-umdjs/-/hterm-umdjs-1.1.3.tgz#8b57bcaded5ba9541d6c8e32a82b34abb93e885e" json5@^0.5.0: @@ -92,19 +92,19 @@ mz@^2.6.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8" +nan@^2.6.2: + version "2.7.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" nan@~2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.2.1.tgz#d68693f6b34bb41d66bc68b3a4f9defc79d7149b" -node-pty@0.6.8: - version "0.6.8" - resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.6.8.tgz#a7b145397bef23a719128a75b20d4821726dfe90" +node-pty-tmp@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/node-pty-tmp/-/node-pty-tmp-0.7.1.tgz#0a81179f9087b21f968206c886e543db20650d7a" dependencies: - nan "2.5.0" + nan "^2.6.2" object-assign@^4.0.1: version "4.1.1"