Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-12-23 18:44:20 +03:00
Code Issues Projects Releases Wiki Activity

fixed #133

Browse Source
This commit is contained in:
Eugene Pankov 2017-09-28 20:27:16 +02:00
parent 766ab48e1a
commit eb2eef64fc
10 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/vars.js
View File

@ -15,5 +15,5 @@ exports.builtinPlugins = [
'terminus-community-color-schemes', 'terminus-community-color-schemes',
'terminus-plugin-manager', 'terminus-plugin-manager',
] ]
exports.nativeModules = ['node-pty', 'font-manager'] exports.nativeModules = ['node-pty-tmp', 'font-manager']
exports.electronVersion = pkgInfo.devDependencies.electron exports.electronVersion = pkgInfo.devDependencies.electron

2
terminus-core/package.json
View File

@ -20,7 +20,7 @@
"@types/js-yaml": "^3.9.0", "@types/js-yaml": "^3.9.0",
"@types/node": "^7.0.37", "@types/node": "^7.0.37",
"@types/webpack-env": "^1.13.0", "@types/webpack-env": "^1.13.0",
"axios": "^0.16.2", "axios": "0.16.2",
"bootstrap": "4.0.0-alpha.6", "bootstrap": "4.0.0-alpha.6",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"electron-updater": "^2.8.9", "electron-updater": "^2.8.9",

2
terminus-core/yarn.lock
View File

@ -20,7 +20,7 @@ argparse@^1.0.7:
dependencies: dependencies:
sprintf-js "~1.0.2" sprintf-js "~1.0.2"
axios@^0.16.2: axios@0.16.2:
version "0.16.2" version "0.16.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d" resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
dependencies: dependencies:

1
terminus-plugin-manager/webpack.config.js
View File

@ -39,7 +39,6 @@ module.exports = {
'fs', 'fs',
'font-manager', 'font-manager',
'path', 'path',
'node-pty',
'mz/fs', 'mz/fs',
'mz/child_process', 'mz/child_process',
'winreg', 'winreg',

6
terminus-plugin-manager/yarn.lock
View File

@ -8,11 +8,7 @@
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@types/node@*": "@types/node@*", "@types/node@7.0.12":
version "8.0.28"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.28.tgz#86206716f8d9251cf41692e384264cbd7058ad60"
"@types/node@7.0.12":
version "7.0.12" version "7.0.12"
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9"

1
terminus-settings/webpack.config.js
View File

@ -39,7 +39,6 @@ module.exports = {
externals: [ externals: [
'fs', 'fs',
'path', 'path',
'node-pty',
/^rxjs/, /^rxjs/,
/^@angular/, /^@angular/,
/^@ng-bootstrap/, /^@ng-bootstrap/,

2
terminus-terminal/package.json
View File

@ -42,7 +42,7 @@
"font-manager": "0.2.2", "font-manager": "0.2.2",
"hterm-umdjs": "1.1.3", "hterm-umdjs": "1.1.3",
"mz": "^2.6.0", "mz": "^2.6.0",
"node-pty": "0.6.8", "node-pty-tmp": "0.7.1",
"ps-node": "^0.1.6", "ps-node": "^0.1.6",
"runes": "^0.4.2", "runes": "^0.4.2",
"winreg": "^1.2.3" "winreg": "^1.2.3"

7
terminus-terminal/src/services/sessions.service.ts
View File

@ -1,5 +1,4 @@
const psNode = require('ps-node') const psNode = require('ps-node')
// import * as nodePTY from 'node-pty'
let nodePTY let nodePTY
import * as fs from 'mz/fs' import * as fs from 'mz/fs'
import { Subject } from 'rxjs' import { Subject } from 'rxjs'
@ -94,13 +93,13 @@ export class Session {
} }
resize (columns, rows) { resize (columns, rows) {
if (this.pty.writable) { if (this.pty._writable) {
this.pty.resize(columns, rows) this.pty.resize(columns, rows)
} }
} }
write (data) { write (data) {
if (this.pty.writable) { if (this.pty._writable) {
this.pty.write(Buffer.from(data, 'utf-8')) this.pty.write(Buffer.from(data, 'utf-8'))
} }
} }
@ -186,7 +185,7 @@ export class SessionsService {
electron: ElectronService, electron: ElectronService,
log: LogService, 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.logger = log.create('sessions')
this.persistenceProviders = this.persistenceProviders.filter(x => x.isAvailable()) this.persistenceProviders = this.persistenceProviders.filter(x => x.isAvailable())
} }

2
terminus-terminal/webpack.config.js
View File

@ -48,7 +48,7 @@ module.exports = {
'fs', 'fs',
'font-manager', 'font-manager',
'path', 'path',
'node-pty', 'node-pty-tmp',
'mz/fs', 'mz/fs',
'mz/child_process', 'mz/child_process',
'winreg', 'winreg',

16
terminus-terminal/yarn.lock
View File

@ -69,7 +69,7 @@ font-manager@0.2.2:
nan "~2.2.0" nan "~2.2.0"
hterm-umdjs@1.1.3: 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" resolved "https://registry.yarnpkg.com/hterm-umdjs/-/hterm-umdjs-1.1.3.tgz#8b57bcaded5ba9541d6c8e32a82b34abb93e885e"
json5@^0.5.0: json5@^0.5.0:
@ -92,19 +92,19 @@ mz@^2.6.0:
object-assign "^4.0.1" object-assign "^4.0.1"
thenify-all "^1.0.0" thenify-all "^1.0.0"
nan@2.5.0: nan@^2.6.2:
version "2.5.0" version "2.7.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8" resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
nan@~2.2.0: nan@~2.2.0:
version "2.2.1" version "2.2.1"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.2.1.tgz#d68693f6b34bb41d66bc68b3a4f9defc79d7149b" resolved "https://registry.yarnpkg.com/nan/-/nan-2.2.1.tgz#d68693f6b34bb41d66bc68b3a4f9defc79d7149b"
node-pty@0.6.8: node-pty-tmp@0.7.1:
version "0.6.8" version "0.7.1"
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.6.8.tgz#a7b145397bef23a719128a75b20d4821726dfe90" resolved "https://registry.yarnpkg.com/node-pty-tmp/-/node-pty-tmp-0.7.1.tgz#0a81179f9087b21f968206c886e543db20650d7a"
dependencies: dependencies:
nan "2.5.0" nan "^2.6.2"
object-assign@^4.0.1: object-assign@^4.0.1:
version "4.1.1" version "4.1.1"