Merge remote-tracking branch 'upstream/master' into 441_windows_support

diff --git a/demo/app.js b/demo/app.js
index a4122ace4e12d9597b7751ce142b55274de2cc33..3439ea99c9a52852d66ca790774be3013e13e0ef 100644 (file)
--- a/demo/app.js
+++ b/demo/app.js
@@ -2,7 +2,7 @@ var express = require('express');
 var app = express();
 var expressWs = require('express-ws')(app);
 var os = require('os');
-var pty = require('pty.js');
+var pty = require('node-pty');
 
 var terminals = {},
     logs = {};

diff --git a/package.json b/package.json
index 2a043a8515382e90d7603f3f188b211e67899a9a..67eb824dc90f2770af7274e505db4352a0bcb8d7 100644 (file)
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
     "jsdoc": "3.4.3",
     "merge-stream": "^1.0.1",
     "mocha": "2.5.3",
+    "node-pty": "^0.4.1",
     "nodemon": "1.10.2",
-    "pty.js": "0.3.1",
     "sleep": "^3.0.1",
     "sorcery": "^0.10.0",
     "tsify": "^3.0.0",

diff --git a/src/test/escape-sequences-test.js b/src/test/escape-sequences-test.js
index e9183ccf255a8df0d9c80f94323669961639a37d..6c64b562ef22b91826d84eb613b753a11baafd0e 100644 (file)
--- a/src/test/escape-sequences-test.js
+++ b/src/test/escape-sequences-test.js
@@ -1,6 +1,6 @@
 var glob = require('glob');
 var fs = require('fs');
-var pty = require('pty.js');
+var pty = require('node-pty');
 var sleep = require('sleep');
 var Terminal = require('../xterm');