Add Windows support and first-class Linux support

README.md

@@ -20,7 +20,9 @@ $ brew cask install hyper
 
 ## Contribute
 
-1. If you are running Linux, install "icnsutils", "graphicsmagick" and "xz-utils"
+1. Install the dependencies
+  * If you are running Linux, install `icnsutils`, `graphicsmagick` and `xz-utils`
+  * If you are running Windows, install [VC++ Build Tools Technical Preview](http://go.microsoft.com/fwlink/?LinkId=691126) using the **Default Install option**; Install Python 2.7 and add it to your `%PATH%`; Run `npm config set msvs_version 2015 --global`
 2. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device
 3. Install the dependencies: `npm install`
 4. Build the code, watch for changes and run the app: `npm start`

app/config-default.js

@@ -27,6 +27,16 @@ module.exports = {
     // custom css to embed in the terminal window
     termCSS: '',
 
+    // set to `true` if you're using a Linux set up
+    // that doesn't shows native menus
+    // default: `false` on Linux, `true` on Windows (ignored on macOS)
+    showHamburgerMenu: '',
+
+    // set to `false` if you want to hide the minimize, maximize and close buttons
+    // additionally, set to `'left'` if you want them on the left, like in Ubuntu
+    // default: `true` on windows and Linux (ignored on macOS)
+    showWindowControls: '',
+
     // custom padding (css format, i.e.: `top right bottom left`)
     padding: '12px 14px',
 

app/index.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line curly, unicorn/no-process-exit
+if (require('electron-squirrel-startup')) process.exit();
 // Native
 const {resolve} = require('path');
 
@@ -108,9 +110,11 @@ app.on('ready', () => installDevExtensions(isDev).then(() => {
       height,
       minHeight: 190,
       minWidth: 370,
-      titleBarStyle: 'hidden-inset',
+      titleBarStyle: 'hidden-inset', // macOS only
       title: 'Hyper.app',
       backgroundColor: toElectronBackgroundColor(cfg.backgroundColor || '#000'),
+      // we want to go frameless on windows and linux
+      frame: process.platform === 'darwin',
       transparent: true,
       icon: resolve(__dirname, 'static/icon.png'),
       // we only want to show when the prompt is ready for user input
@@ -235,6 +239,18 @@ app.on('ready', () => installDevExtensions(isDev).then(() => {
       rpc.emit('move');
     });
 
+    rpc.on('open hamburger menu', ({x, y}) => {
+      Menu.getApplicationMenu().popup(x, y);
+    });
+
+    rpc.on('minimize', () => {
+      win.minimize();
+    });
+
+    rpc.on('close', () => {
+      win.close();
+    });
+
     const deleteSessions = () => {
       sessions.forEach((session, key) => {
         session.removeAllListeners();
@@ -305,7 +321,7 @@ app.on('ready', () => installDevExtensions(isDev).then(() => {
     });
 
     win.on('closed', () => {
-      if (process.platform !== 'darwin') {
+      if (process.platform !== 'darwin' && windowSet.size === 0) {
         app.quit();
       }
     });

app/package.json

@@ -11,18 +11,19 @@
   "repository": "zeit/hyper",
   "xo": false,
   "dependencies": {
-    "child_pty": "3.0.1",
     "color": "0.11.3",
     "convert-css-color-name-to-hex": "0.1.1",
     "default-shell": "1.0.1",
     "electron-config": "0.2.1",
     "electron-is-dev": "0.1.1",
+    "electron-squirrel-startup": "1.0.0",
     "file-uri-to-path": "0.0.2",
     "gaze": "1.1.2",
     "git-describe": "3.0.2",
     "mkdirp": "0.5.1",
     "ms": "0.7.1",
     "node-fetch": "1.6.3",
+    "pty.js": "https://github.com/Tyriar/pty.js/tarball/c75c2dcb6dcad83b0cb3ef2ae42d0448fb912642",
     "semver": "5.3.0",
     "shell-env": "0.2.0",
     "uuid": "2.0.2"

app/plugins.js

@@ -236,7 +236,7 @@ function install(fn) {
     env.npm_config_target = '1.3.0';
     env.npm_config_disturl = 'https://atom.io/download/atom-shell';
     /* eslint-enable camelcase  */
-    exec('npm prune; npm install --production', {
+    exec('npm prune && npm install --production', {
       cwd: path,
       env,
       shell

app/session.js

@@ -8,16 +8,13 @@ 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.');
+
 let spawn;
 try {
-  spawn = require('child_pty').spawn;
+  spawn = require('pty.js').spawn;
 } catch (err) {
-  console.error(
-    'A native module failed to load. Typically this means ' +
-    'you installed the modules incorrectly.\n Use `scripts/install.sh` ' +
-    'to trigger the installation.\n ' +
-    'More information: https://github.com/zeit/hyper/issues/72'
-  );
+  throw createPtyJsError();
 }
 
 const envFromConfig = config.getConfig().env || {};
@@ -37,12 +34,20 @@ module.exports = class Session extends EventEmitter {
 
     const defaultShellArgs = ['--login'];
 
-    this.pty = spawn(shell || defaultShell, shellArgs || defaultShellArgs, {
-      columns,
-      rows,
-      cwd,
-      env: getDecoratedEnv(baseEnv)
-    });
+    try {
+      this.pty = spawn(shell || defaultShell, shellArgs || defaultShellArgs, {
+        columns,
+        rows,
+        cwd,
+        env: getDecoratedEnv(baseEnv)
+      });
+    } catch (err) {
+      if (/is not a function/.test(err.message)) {
+        throw createPtyJsError();
+      } else {
+        throw err;
+      }
+    }
 
     this.pty.stdout.on('data', data => {
       if (this.ended) {
@@ -69,17 +74,17 @@ module.exports = class Session extends EventEmitter {
     this.pty.stdin.write(data);
   }
 
-  resize({cols: columns, rows}) {
+  resize({cols, rows}) {
     try {
-      this.pty.stdout.resize({columns, rows});
+      this.pty.stdout.resize(cols, rows);
     } catch (err) {
       console.error(err.stack);
     }
   }
 
   destroy() {
     try {
-      this.pty.kill('SIGHUP');
+      this.pty.kill();
     } catch (err) {
       console.error('exit error', err.stack);
     }

appveyor.yml

@@ -0,0 +1,31 @@
+# https://github.com/sindresorhus/appveyor-node/blob/master/appveyor.yml
+
+environment:
+  matrix:
+    - platform: x64
+
+image: Visual Studio 2015
+
+init:
+  - npm config set msvs_version 2015 # we need this to build `pty.js`
+
+cache:
+  - node_modules
+
+install:
+  - ps: Install-Product node 6 x64
+  - set CI=true
+  - npm -g install npm@latest
+  - npm install
+
+build: off
+
+shallow_clone: true
+
+test_script:
+  - node --version
+  - npm --version
+  - npm run test
+
+on_success:
+  - npm run dist

lib/actions/header.js

@@ -1,5 +1,5 @@
 import {CLOSE_TAB, CHANGE_TAB} from '../constants/tabs';
-import {UI_WINDOW_MAXIMIZE, UI_WINDOW_UNMAXIMIZE} from '../constants/ui';
+import {UI_WINDOW_MAXIMIZE, UI_WINDOW_UNMAXIMIZE, UI_OPEN_HAMBURGER_MENU, UI_WINDOW_MINIMIZE, UI_WINDOW_CLOSE} from '../constants/ui';
 import rpc from '../rpc';
 import {userExitTermGroup, setActiveGroup} from './term-groups';
 
@@ -48,3 +48,36 @@ export function unmaximize() {
     });
   };
 }
+
+export function openHamburgerMenu(coordinates) {
+  return dispatch => {
+    dispatch({
+      type: UI_OPEN_HAMBURGER_MENU,
+      effect() {
+        rpc.emit('open hamburger menu', coordinates);
+      }
+    });
+  };
+}
+
+export function minimize() {
+  return dispatch => {
+    dispatch({
+      type: UI_WINDOW_MINIMIZE,
+      effect() {
+        rpc.emit('minimize');
+      }
+    });
+  };
+}
+
+export function close() {
+  return dispatch => {
+    dispatch({
+      type: UI_WINDOW_CLOSE,
+      effect() {
+        rpc.emit('close');
+      }
+    });
+  };
+}

lib/actions/ui.js

@@ -201,7 +201,12 @@ export function moveTo(i) {
 }
 
 export function showPreferences() {
-  const editorFallback = process.platform === 'win32' ? 'notepad' : 'nano';
+  // eslint-disable-next-line no-template-curly-in-string
+  const command = process.platform === 'win32' ? ' start notepad "%userprofile%\\.hyper.js"' : ' bash -c \'exec env ${EDITOR:=nano} ~/.hyper.js\'';
+  const message = process.platform === 'win32' ?
+    ' echo Attempting to open ^%userprofile^%\\.hyper.js with notepad' :
+    ' echo Attempting to open ~/.hyper.js with your \$EDITOR'; // eslint-disable-line no-useless-escape
+
   return dispatch => {
     dispatch({
       type: UI_SHOW_PREFERENCES,
@@ -212,12 +217,12 @@ export function showPreferences() {
           rpc.once('session data', () => {
             dispatch(sendSessionData(
               uid,
-              // Leading space prevents command to be stored in shell history
-              [' echo Attempting to open ~/.hyper.js with your \$EDITOR', // eslint-disable-line no-useless-escape
-               ' echo If it fails, open it manually with your favorite editor!',
-               ' bash -c \'exec env ${EDITOR:=' + editorFallback + '} ~/.hyper.js\'',
-               ''
-              ].join('\n')
+              [ // Leading space prevents command to be stored in shell history
+                ' echo Attempting to open ~/.hyper.js with your \$EDITOR', // eslint-disable-line no-useless-escape
+                message,
+                command,
+                ''
+              ].join('\n\r')
             ));
           });
         });