From 0174e1931ac7a80f7438c4e934bb9ed38ec32e85 Mon Sep 17 00:00:00 2001 From: CHaBou Date: Mon, 4 Sep 2017 21:13:07 +0200 Subject: [PATCH 1/6] Delete .DS_Store file (#2171) File inavertenty commited in #2114 --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index b2f14369402334ce5b9d6610e58ccf87fbe756e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8DBQ5S&dO#E`~iN?jp05XLz{E)bmO!eDS=hqSNCxpK73egZKMS0;^_h1E!_ z9SKeG_ALNgeT>h*62OA)h%X=J=KJn5yQ_$!`5EK!eZM&z_Or~(0p|`FvBMFkzx)S$ zVv7yKJDjln-QqnmDIf);fE17dQs4>&s+KMuuQ)?gDIf)IQvv@zG`eFioD$>H!68}z z;=phi=g~_Ln+J%!a7tu^W=SO`)vCp?q%+QF3hXS_u^tS4%e z0#e{yf%{x8z5c(@FZBQCB(0=?6u2n`Y*@dpSA0^{*4g8{);9VZ-E+R_Zkz{&LzH7; jlw&Tu96v=;<~5&lzZXu4L1#SZMEwl7E;1?b-wONyvBerW From f6bfbdf170a8414cbc6ca612c59579ceff14ace3 Mon Sep 17 00:00:00 2001 From: CHaBou Date: Wed, 6 Sep 2017 01:19:37 +0200 Subject: [PATCH 2/6] Fix session cleaning (#2176) Regression introduced by #2028 --- app/ui/window.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/ui/window.js b/app/ui/window.js index b46a2b30..09bd48c9 100644 --- a/app/ui/window.js +++ b/app/ui/window.js @@ -107,6 +107,7 @@ module.exports = class Window { session.on('exit', () => { rpc.emit('session exit', {uid}); + sessions.delete(uid); }); }); }); From be5786ef12e85a96e45d88f041e5ca262fb72d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Oko=C5=84ski?= Date: Wed, 6 Sep 2017 22:58:09 +0200 Subject: [PATCH 3/6] Get default config options when not specified in user config (#2126) --- app/config/init.js | 5 +++++ app/package.json | 1 + app/yarn.lock | 2 ++ yarn.lock | 16 ++++++++++++++++ 4 files changed, 24 insertions(+) diff --git a/app/config/init.js b/app/config/init.js index 155357f0..8cc446f7 100644 --- a/app/config/init.js +++ b/app/config/init.js @@ -1,4 +1,5 @@ const vm = require('vm'); +const merge = require('lodash/merge'); const notify = require('../notify'); const _extract = function (script) { @@ -35,6 +36,10 @@ const _init = function (cfg) { notify('Error reading configuration: `config` key is missing'); return _extractDefault(cfg.defaultCfg); } + + // Use options from default config when not specified in user config #1588 + _cfg.config = merge(_extractDefault(cfg.defaultCfg).config, _cfg.config); + // Ignore undefined values in plugin and localPlugins array Issue #1862 _cfg.plugins = (_cfg.plugins && _cfg.plugins.filter(Boolean)) || []; _cfg.localPlugins = (_cfg.localPlugins && _cfg.localPlugins.filter(Boolean)) || []; diff --git a/app/package.json b/app/package.json index d06dd3a2..b76a9b91 100644 --- a/app/package.json +++ b/app/package.json @@ -19,6 +19,7 @@ "electron-config": "1.0.0", "electron-is-dev": "0.3.0", "electron-squirrel-startup": "1.0.0", + "lodash": "4.17.4", "file-uri-to-path": "1.0.0", "git-describe": "4.0.2", "mkdirp": "0.5.1", diff --git a/app/yarn.lock b/app/yarn.lock index 9d5b6a22..d4d333a4 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -668,6 +668,7 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -676,6 +677,7 @@ locate-path@^2.0.0: path-exists "^3.0.0" lodash@^4.16.6: + version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" diff --git a/yarn.lock b/yarn.lock index 8f0b40b4..6e5cf725 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1049,6 +1049,7 @@ binary-extensions@^1.0.0: version "1.10.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0" + bl@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e" @@ -1191,6 +1192,7 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" + builder-util@1.0.1, builder-util@^1.0.0, builder-util@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-1.0.1.tgz#e47e82be0ab3ae5ebff4bb361b91b94e49e27a8b" @@ -1463,6 +1465,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" + commander@^2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" @@ -3997,6 +4000,11 @@ node-pre-gyp@^0.6.36: tar "^2.2.1" tar-pack "^3.4.0" + +node-status-codes@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" + "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -4761,6 +4769,10 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" +req-all@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/req-all/-/req-all-0.1.0.tgz#130051e2ace58a02eacbfc9d448577a736a9273a" + request@2, request@^2.45.0, request@^2.81.0, request@~2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" @@ -5399,6 +5411,10 @@ tough-cookie@~2.3.0: dependencies: punycode "^1.4.1" +traverse@^0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" + trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" From da395a8f3972f4e502e1e738cb4c24b441c6df9a Mon Sep 17 00:00:00 2001 From: Chris Chou Date: Thu, 7 Sep 2017 21:06:05 +1200 Subject: [PATCH 4/6] Add vscode debug config, update readme (#2181) --- .vscode/launch.json | 13 +++++++++++++ readme.md | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..4981a61b --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,13 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Launch Hyper", + "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron", + "program": "${workspaceRoot}/app/index.js", + "protocol": "inspector" + } + ] +} diff --git a/readme.md b/readme.md index 8c03555f..7457687f 100644 --- a/readme.md +++ b/readme.md @@ -37,8 +37,10 @@ choco install hyper 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: `yarn` 4. Build the code and watch for changes: `yarn run dev` -5. In another terminal tab/window/pane, run the app: `yarn run app` - +5. To run `hyper` + * `yarn run app` from another terminal tab/window/pane + * If you are using **Visual Studio Code**, select `Launch Hyper` in debugger configuration to launch a new Hyper instance with debugger attached. + To make sure that your code works in the finished application, you can generate the binaries like this: ```bash From 26a9823def43f08ba1565e713d6517a12fec0a2e Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 7 Sep 2017 05:10:04 -0700 Subject: [PATCH 5/6] Add category option under linux key in root package.json (#2184) Fix #2097 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index bd9c84dc..6e57e6ff 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "appId": "co.zeit.hyper", "extraResources": "./bin/yarn-standalone.js", "linux": { + "category": "TerminalEmulator", "target": [ { "target": "deb", From 6d68278b60d389596ed8c123e449897da6b60ec8 Mon Sep 17 00:00:00 2001 From: Junior Oliveira Date: Fri, 8 Sep 2017 18:05:07 -0300 Subject: [PATCH 6/6] Add default keymaps reference to documentation (#2185) --- website/index.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/website/index.html b/website/index.html index f8018d5c..7e87e3f0 100644 --- a/website/index.html +++ b/website/index.html @@ -698,6 +698,17 @@ }; +

Default keymaps:

+ + + + + + + + + +
WindowsLinuxmacOS

Configuration