From 1be8ac5af0bc9d152bf221282a1db722ef925558 Mon Sep 17 00:00:00 2001 From: Nathan White Date: Sat, 7 Jan 2017 10:30:30 -0500 Subject: [PATCH 1/3] changed pty package and update references --- app/package.json | 2 +- app/session.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/package.json b/app/package.json index 4d534c640144..6001937879e9 100644 --- a/app/package.json +++ b/app/package.json @@ -23,7 +23,7 @@ "mkdirp": "0.5.1", "ms": "0.7.1", "node-fetch": "1.6.3", - "pty.js": "https://github.com/Tyriar/pty.js/tarball/c75c2dcb6dcad83b0cb3ef2ae42d0448fb912642", + "node-pty": "0.4.1", "semver": "5.3.0", "shell-env": "0.2.0", "uuid": "3.0.0", diff --git a/app/session.js b/app/session.js index 58dbf6299c7f..9a07ed80ce26 100644 --- a/app/session.js +++ b/app/session.js @@ -8,11 +8,11 @@ const {getDecoratedEnv} = require('./plugins'); const {productName, version} = require('./package'); const config = require('./config'); -const createPtyJsError = () => new Error('`pty.js` failed to load. Typically this means that it was built incorrectly. Please check the `README.me` to more info.'); +const createPtyJsError = () => new Error('`node-pty` failed to load. Typically this means that it was built incorrectly. Please check the `README.me` to more info.'); let spawn; try { - spawn = require('pty.js').spawn; + spawn = require('node-pty').spawn; } catch (err) { throw createPtyJsError(); } From fd8d31c191c02d3cf28dbd252848f75bd3c65157 Mon Sep 17 00:00:00 2001 From: Nathan White Date: Sat, 7 Jan 2017 11:14:36 -0500 Subject: [PATCH 2/3] fixed linting issues --- lib/components/tabs.js | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/components/tabs.js b/lib/components/tabs.js index 26150b244503..076a3c81c2b9 100644 --- a/lib/components/tabs.js +++ b/lib/components/tabs.js @@ -29,35 +29,35 @@ export default class Tabs extends Component { } { tabs.length > 1 ? - [ - , - isMac &&
- ] : - null + [ +
    + { + tabs.map((tab, i) => { + const {uid, title, isActive, hasActivity} = tab; + const props = getTabProps(tab, this.props, { + text: title === '' ? 'Shell' : title, + isFirst: i === 0, + isLast: tabs.length - 1 === i, + borderColor, + isActive, + hasActivity, + onSelect: onChange.bind(null, uid), + onClose: onClose.bind(null, uid) + }); + return ; + }) + } +
, + isMac &&
+ ] : + null } { this.props.customChildren } ); From a8238bdeca199c2b0fe2939ef47e45f1b9caff5d Mon Sep 17 00:00:00 2001 From: Nathan White Date: Sat, 7 Jan 2017 11:15:35 -0500 Subject: [PATCH 3/3] added npm clean script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4184667e902c..9354d9f3ee0c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "prepush": "npm test", "postinstall": "install-app-deps", "pack": "npm run build && build --dir && babel --no-comments --compact --minified --out-file app/dist/bundle.js app/dist/bundle.js", - "dist": "npm run build && build" + "dist": "npm run build && build", + "clean": "npm cache clear && rm -rf node_modules && rm -rf app/node_modules && rm -rf app/dist" }, "xo": { "extends": "xo-react",