Updated dependencies to the latest version (#2146)

* Bumped dependencies to the latest version

* Bumped root lockfile

* Bumped app dependencies

* Fixed linting

* No command line switch needed anymore for native async/await

* Fixed color error

* Bumped Node.js versions for CI

* Downgraded hterm-umdjs

* Try to fix the AppVeyor build

* Made colors work again
This commit is contained in:
Leo Lamprecht 2017-08-31 15:20:39 +02:00 committed by GitHub
parent cfbae08e4f
commit 0ee4fb6104
15 changed files with 900 additions and 1108 deletions

View file

@ -6,7 +6,7 @@ language: node_js
matrix: matrix:
include: include:
- os: linux - os: linux
node_js: 7.9.0 node_js: 8.4.0
env: CC=clang CXX=clang++ npm_config_clang=1 env: CC=clang CXX=clang++ npm_config_clang=1
compiler: clang compiler: clang

View file

@ -16,7 +16,6 @@ const _syntaxValidation = function (cfg) {
} catch (err) { } catch (err) {
notify(`Error loading config: ${err.name}, see DevTools for more info`); notify(`Error loading config: ${err.name}, see DevTools for more info`);
console.error('Error loading config:', err); console.error('Error loading config:', err);
return;
} }
}; };

View file

@ -55,8 +55,6 @@ const isDev = require('electron-is-dev');
const AppMenu = require('./menus/menu'); const AppMenu = require('./menus/menu');
const config = require('./config'); const config = require('./config');
app.commandLine.appendSwitch('js-flags', '--harmony-async-await');
// set up config // set up config
config.setup(); config.setup();

View file

@ -13,22 +13,22 @@
"dependencies": { "dependencies": {
"async-retry": "1.1.3", "async-retry": "1.1.3",
"chokidar": "1.7.0", "chokidar": "1.7.0",
"color": "0.11.3", "color": "2.0.0",
"convert-css-color-name-to-hex": "0.1.1", "convert-css-color-name-to-hex": "0.1.1",
"default-shell": "1.0.1", "default-shell": "1.0.1",
"electron-config": "0.2.1", "electron-config": "1.0.0",
"electron-is-dev": "0.1.1", "electron-is-dev": "0.3.0",
"electron-squirrel-startup": "1.0.0", "electron-squirrel-startup": "1.0.0",
"file-uri-to-path": "0.0.2", "file-uri-to-path": "1.0.0",
"git-describe": "3.0.2", "git-describe": "4.0.2",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"ms": "0.7.1", "ms": "2.0.0",
"node-fetch": "1.6.3", "node-fetch": "1.7.2",
"node-pty": "0.7.0", "node-pty": "0.7.0",
"queue": "4.0.0", "queue": "4.4.0",
"semver": "5.3.0", "semver": "5.4.1",
"shell-env": "0.2.0", "shell-env": "0.3.0",
"uuid": "3.0.0", "uuid": "3.1.0",
"winreg": "1.2.2" "winreg": "1.2.4"
} }
} }

View file

@ -1,3 +1,4 @@
// Packages
const Color = require('color'); const Color = require('color');
// returns a background color that's in hex // returns a background color that's in hex
@ -5,11 +6,12 @@ const Color = require('color');
// input can be any css value (rgb, hsl, string…) // input can be any css value (rgb, hsl, string…)
module.exports = bgColor => { module.exports = bgColor => {
const color = Color(bgColor); const color = Color(bgColor);
if (color.alpha() === 1) { if (color.alpha() === 1) {
return color.hexString(); return color.hex().toString();
} }
// http://stackoverflow.com/a/11019879/1202488 // http://stackoverflow.com/a/11019879/1202488
const alphaHex = Math.round(color.alpha() * 255).toString(16); const alphaHex = Math.round(color.alpha() * 255).toString(16);
return '#' + alphaHex + color.hexString().substr(1); return '#' + alphaHex + color.hex().toString().substr(1);
}; };

View file

@ -94,8 +94,8 @@ bcrypt-pbkdf@^1.0.0:
tweetnacl "^0.14.3" tweetnacl "^0.14.3"
binary-extensions@^1.0.0: binary-extensions@^1.0.0:
version "1.9.0" version "1.10.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.9.0.tgz#66506c16ce6f4d6928a5b3cd6a33ca41e941e37b" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
block-stream@*: block-stream@*:
version "0.0.9" version "0.0.9"
@ -143,10 +143,6 @@ chokidar@1.7.0:
optionalDependencies: optionalDependencies:
fsevents "^1.0.0" fsevents "^1.0.0"
clone@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
co@^4.6.0: co@^4.6.0:
version "4.6.0" version "4.6.0"
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@ -155,7 +151,7 @@ code-point-at@^1.0.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
color-convert@^1.3.0: color-convert@^1.8.2:
version "1.9.0" version "1.9.0"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
dependencies: dependencies:
@ -165,19 +161,19 @@ color-name@^1.0.0, color-name@^1.1.1:
version "1.1.3" version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
color-string@^0.3.0: color-string@^1.4.0:
version "0.3.0" version "1.5.2"
resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9"
dependencies: dependencies:
color-name "^1.0.0" color-name "^1.0.0"
simple-swizzle "^0.2.2"
color@0.11.3: color@2.0.0:
version "0.11.3" version "2.0.0"
resolved "https://registry.yarnpkg.com/color/-/color-0.11.3.tgz#4bad1d0d52499dd00dbd6f0868442467e49394e6" resolved "https://registry.yarnpkg.com/color/-/color-2.0.0.tgz#e0c9972d1e969857004b101eaa55ceab5961d67d"
dependencies: dependencies:
clone "^1.0.2" color-convert "^1.8.2"
color-convert "^1.3.0" color-string "^1.4.0"
color-string "^0.3.0"
combined-stream@^1.0.5, combined-stream@~1.0.5: combined-stream@^1.0.5, combined-stream@~1.0.5:
version "1.0.5" version "1.0.5"
@ -189,14 +185,14 @@ concat-map@0.0.1:
version "0.0.1" version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
conf@^0.11.1: conf@^1.0.0:
version "0.11.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/conf/-/conf-0.11.2.tgz#879f479267600483e502583462ca4063fc9779b2" resolved "https://registry.yarnpkg.com/conf/-/conf-1.1.2.tgz#a164003022dd1643cd5abd9653071bd3b0a19f50"
dependencies: dependencies:
dot-prop "^3.0.0" dot-prop "^4.1.0"
env-paths "^0.3.0" env-paths "^1.0.0"
mkdirp "^0.5.1" make-dir "^1.0.0"
pkg-up "^1.0.0" pkg-up "^2.0.0"
console-control-strings@^1.0.0, console-control-strings@~1.1.0: console-control-strings@^1.0.0, console-control-strings@~1.1.0:
version "1.1.0" version "1.1.0"
@ -213,12 +209,12 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
cross-spawn-async@^2.1.1: cross-spawn@^4.0.0:
version "2.2.5" version "4.0.2"
resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
dependencies: dependencies:
lru-cache "^4.0.0" lru-cache "^4.0.1"
which "^1.2.8" which "^1.2.9"
cryptiles@2.x.x: cryptiles@2.x.x:
version "2.0.5" version "2.0.5"
@ -262,9 +258,9 @@ delegates@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
dot-prop@^3.0.0: dot-prop@^4.1.0:
version "3.0.0" version "4.2.0"
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
dependencies: dependencies:
is-obj "^1.0.0" is-obj "^1.0.0"
@ -274,15 +270,15 @@ ecc-jsbn@~0.1.1:
dependencies: dependencies:
jsbn "~0.1.0" jsbn "~0.1.0"
electron-config@0.2.1: electron-config@1.0.0:
version "0.2.1" version "1.0.0"
resolved "https://registry.yarnpkg.com/electron-config/-/electron-config-0.2.1.tgz#7e12c26412d06bf3ed3896d0479df162986b95ba" resolved "https://registry.yarnpkg.com/electron-config/-/electron-config-1.0.0.tgz#069d044cc794f04784ae72f12916725d3c8c39af"
dependencies: dependencies:
conf "^0.11.1" conf "^1.0.0"
electron-is-dev@0.1.1: electron-is-dev@0.3.0:
version "0.1.1" version "0.3.0"
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.1.tgz#6163c29bc34d4818acf8087d3db3e04895c13ff8" resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
electron-squirrel-startup@1.0.0: electron-squirrel-startup@1.0.0:
version "1.0.0" version "1.0.0"
@ -296,19 +292,20 @@ encoding@^0.1.11:
dependencies: dependencies:
iconv-lite "~0.4.13" iconv-lite "~0.4.13"
env-paths@^0.3.0: env-paths@^1.0.0:
version "0.3.1" version "1.0.0"
resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-0.3.1.tgz#c30ccfcbc30c890943dc08a85582517ef00da463" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
execa@^0.4.0: execa@^0.5.0:
version "0.4.0" version "0.5.1"
resolved "https://registry.yarnpkg.com/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3" resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
dependencies: dependencies:
cross-spawn-async "^2.1.1" cross-spawn "^4.0.0"
get-stream "^2.2.0"
is-stream "^1.1.0" is-stream "^1.1.0"
npm-run-path "^1.0.0" npm-run-path "^2.0.0"
object-assign "^4.0.1" p-finally "^1.0.0"
path-key "^1.0.0" signal-exit "^3.0.0"
strip-eof "^1.0.0" strip-eof "^1.0.0"
expand-brackets@^0.1.4: expand-brackets@^0.1.4:
@ -337,9 +334,9 @@ extsprintf@1.3.0, extsprintf@^1.2.0:
version "1.3.0" version "1.3.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
file-uri-to-path@0.0.2: file-uri-to-path@1.0.0:
version "0.0.2" version "1.0.0"
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-0.0.2.tgz#37cdd1b5b905404b3f05e1b23645be694ff70f82" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
filename-regex@^2.0.0: filename-regex@^2.0.0:
version "2.0.1" version "2.0.1"
@ -355,12 +352,11 @@ fill-range@^2.1.0:
repeat-element "^1.1.2" repeat-element "^1.1.2"
repeat-string "^1.5.2" repeat-string "^1.5.2"
find-up@^1.0.0: find-up@^2.1.0:
version "1.1.2" version "2.1.0"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
dependencies: dependencies:
path-exists "^2.0.0" locate-path "^2.0.0"
pinkie-promise "^2.0.0"
for-in@^1.0.1: for-in@^1.0.1:
version "1.0.2" version "1.0.2"
@ -425,18 +421,26 @@ gauge@~2.7.3:
strip-ansi "^3.0.1" strip-ansi "^3.0.1"
wide-align "^1.1.0" wide-align "^1.1.0"
get-stream@^2.2.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
dependencies:
object-assign "^4.0.1"
pinkie-promise "^2.0.0"
getpass@^0.1.1: getpass@^0.1.1:
version "0.1.7" version "0.1.7"
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
dependencies: dependencies:
assert-plus "^1.0.0" assert-plus "^1.0.0"
git-describe@3.0.2: git-describe@4.0.2:
version "3.0.2" version "4.0.2"
resolved "https://registry.yarnpkg.com/git-describe/-/git-describe-3.0.2.tgz#1e5e9aaf4b9b09880029c8a62d8f1d2190480f67" resolved "https://registry.yarnpkg.com/git-describe/-/git-describe-4.0.2.tgz#9ecc5e6df4658450c89ea35d10183c9f5f40dc73"
dependencies: dependencies:
lodash "^4.13.1" lodash "^4.16.6"
semver "^5.2.0" optionalDependencies:
semver "^5.3.0"
glob-base@^0.3.0: glob-base@^0.3.0:
version "0.3.0" version "0.3.0"
@ -521,6 +525,10 @@ ini@~1.3.0:
version "1.3.4" version "1.3.4"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
is-arrayish@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.1.tgz#c2dfc386abaa0c3e33c48db3fe87059e69065efd"
is-binary-path@^1.0.0: is-binary-path@^1.0.0:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
@ -660,17 +668,30 @@ kind-of@^4.0.0:
dependencies: dependencies:
is-buffer "^1.1.5" is-buffer "^1.1.5"
lodash@^4.13.1: locate-path@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
dependencies:
p-locate "^2.0.0"
path-exists "^3.0.0"
lodash@^4.16.6:
version "4.17.4" version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
lru-cache@^4.0.0: lru-cache@^4.0.1:
version "4.1.1" version "4.1.1"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
dependencies: dependencies:
pseudomap "^1.0.2" pseudomap "^1.0.2"
yallist "^2.1.2" yallist "^2.1.2"
make-dir@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
dependencies:
pify "^2.3.0"
micromatch@^2.1.5: micromatch@^2.1.5:
version "2.3.11" version "2.3.11"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@ -719,25 +740,17 @@ mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.1:
dependencies: dependencies:
minimist "0.0.8" minimist "0.0.8"
ms@0.7.1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
ms@2.0.0: ms@2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
nan@^2.3.0: nan@^2.3.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.6.2: node-fetch@1.7.2:
version "2.6.2" version "1.7.2"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.2.tgz#c54e9aac57e432875233525f3c891c4159ffefd7"
node-fetch@1.6.3:
version "1.6.3"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
dependencies: dependencies:
encoding "^0.1.11" encoding "^0.1.11"
is-stream "^1.0.1" is-stream "^1.0.1"
@ -775,11 +788,11 @@ normalize-path@^2.0.0, normalize-path@^2.0.1:
dependencies: dependencies:
remove-trailing-separator "^1.0.1" remove-trailing-separator "^1.0.1"
npm-run-path@^1.0.0: npm-run-path@^2.0.0:
version "1.0.0" version "2.0.2"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
dependencies: dependencies:
path-key "^1.0.0" path-key "^2.0.0"
npmlog@^4.0.2: npmlog@^4.0.2:
version "4.1.2" version "4.1.2"
@ -830,6 +843,20 @@ osenv@^0.1.4:
os-homedir "^1.0.0" os-homedir "^1.0.0"
os-tmpdir "^1.0.0" os-tmpdir "^1.0.0"
p-finally@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
p-limit@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
p-locate@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
dependencies:
p-limit "^1.1.0"
parse-glob@^3.0.4: parse-glob@^3.0.4:
version "3.0.4" version "3.0.4"
resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@ -839,24 +866,26 @@ parse-glob@^3.0.4:
is-extglob "^1.0.0" is-extglob "^1.0.0"
is-glob "^2.0.0" is-glob "^2.0.0"
path-exists@^2.0.0: path-exists@^3.0.0:
version "2.1.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
dependencies:
pinkie-promise "^2.0.0"
path-is-absolute@^1.0.0: path-is-absolute@^1.0.0:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
path-key@^1.0.0: path-key@^2.0.0:
version "1.0.0" version "2.0.1"
resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
performance-now@^0.2.0: performance-now@^0.2.0:
version "0.2.0" version "0.2.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
pify@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
pinkie-promise@^2.0.0: pinkie-promise@^2.0.0:
version "2.0.1" version "2.0.1"
resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@ -867,11 +896,11 @@ pinkie@^2.0.0:
version "2.0.4" version "2.0.4"
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
pkg-up@^1.0.0: pkg-up@^2.0.0:
version "1.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
dependencies: dependencies:
find-up "^1.0.0" find-up "^2.1.0"
preserve@^0.2.0: preserve@^0.2.0:
version "0.2.0" version "0.2.0"
@ -893,9 +922,9 @@ qs@~6.4.0:
version "6.4.0" version "6.4.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
queue@4.0.0: queue@4.4.0:
version "4.0.0" version "4.4.0"
resolved "https://registry.yarnpkg.com/queue/-/queue-4.0.0.tgz#e5b10fa5847c696c64149a40c58d270ad79ac713" resolved "https://registry.yarnpkg.com/queue/-/queue-4.4.0.tgz#bf9139e62f440a00de4a7d5e1907a91282e4560d"
dependencies: dependencies:
inherits "~2.0.0" inherits "~2.0.0"
@ -944,8 +973,8 @@ regex-cache@^0.4.2:
is-primitive "^2.0.0" is-primitive "^2.0.0"
remove-trailing-separator@^1.0.1: remove-trailing-separator@^1.0.1:
version "1.0.2" version "1.1.0"
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
repeat-element@^1.1.2: repeat-element@^1.1.2:
version "1.1.2" version "1.1.2"
@ -996,9 +1025,9 @@ safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.1" version "5.1.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
semver@5.3.0, semver@^5.2.0, semver@^5.3.0: semver@5.4.1, semver@^5.3.0:
version "5.3.0" version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
set-blocking@~2.0.0: set-blocking@~2.0.0:
version "2.0.0" version "2.0.0"
@ -1008,18 +1037,24 @@ set-immediate-shim@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
shell-env@0.2.0: shell-env@0.3.0:
version "0.2.0" version "0.3.0"
resolved "https://registry.yarnpkg.com/shell-env/-/shell-env-0.2.0.tgz#a84f6ea132e95587df85ed76a4dbfb8d07ac464f" resolved "https://registry.yarnpkg.com/shell-env/-/shell-env-0.3.0.tgz#2250339022989165bda4eb7bf383afeaaa92dc34"
dependencies: dependencies:
default-shell "^1.0.0" default-shell "^1.0.0"
execa "^0.4.0" execa "^0.5.0"
strip-ansi "^3.0.0" strip-ansi "^3.0.0"
signal-exit@^3.0.0: signal-exit@^3.0.0:
version "3.0.2" version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
simple-swizzle@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
dependencies:
is-arrayish "^0.3.1"
sntp@1.x.x: sntp@1.x.x:
version "1.0.9" version "1.0.9"
resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@ -1117,9 +1152,9 @@ util-deprecate@~1.0.1:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
uuid@3.0.0, uuid@^3.0.0: uuid@3.1.0, uuid@^3.0.0:
version "3.0.0" version "3.1.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.0.tgz#6728fc0459c450d796a99c31837569bdf672d728" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
verror@1.10.0: verror@1.10.0:
version "1.10.0" version "1.10.0"
@ -1129,7 +1164,7 @@ verror@1.10.0:
core-util-is "1.0.2" core-util-is "1.0.2"
extsprintf "^1.2.0" extsprintf "^1.2.0"
which@^1.2.8: which@^1.2.9:
version "1.3.0" version "1.3.0"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
dependencies: dependencies:
@ -1141,9 +1176,9 @@ wide-align@^1.1.0:
dependencies: dependencies:
string-width "^1.0.2" string-width "^1.0.2"
winreg@1.2.2: winreg@1.2.4:
version "1.2.2" version "1.2.4"
resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.2.tgz#8509afa3b71c5bbd110a6d7c6247ec67736c598f" resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b"
wrappy@1: wrappy@1:
version "1.0.2" version "1.0.2"

View file

@ -10,7 +10,7 @@ init:
- yarn config set msvs_version 2015 # we need this to build `pty.js` - yarn config set msvs_version 2015 # we need this to build `pty.js`
install: install:
- ps: Install-Product node 7.9.0 x64 - ps: Install-Product node 8 x64
- set CI=true - set CI=true
- yarn - yarn

View file

@ -72,8 +72,8 @@ export default class Notification extends Component {
const {backgroundColor} = this.props; const {backgroundColor} = this.props;
const opacity = this.state.dismissing ? 0 : 1; const opacity = this.state.dismissing ? 0 : 1;
return (<div return (<div
style={{opacity, backgroundColor}}
ref={this.onElement} ref={this.onElement}
style={{opacity, backgroundColor}}
className={css('indicator')} className={css('indicator')}
> >
{ this.props.customChildrenBefore } { this.props.customChildrenBefore }

View file

@ -47,12 +47,17 @@ export default class SplitPane extends Component {
onDrag(ev) { onDrag(ev) {
let {sizes} = this.props; let {sizes} = this.props;
let sizes_; let sizes_;
if (sizes) { if (sizes) {
sizes_ = [].concat(sizes); sizes_ = [].concat(sizes);
} else { } else {
const total = this.props.children.length; const total = this.props.children.length;
sizes = sizes_ = new Array(total).fill(1 / total); const count = new Array(total).fill(1 / total);
sizes = count;
sizes_ = count;
} }
const i = this.paneIndex; const i = this.paneIndex;
const pos = ev[this.d3]; const pos = ev[this.d3];
const d = Math.abs(this.dragPanePosition - pos) / this.panesSize; const d = Math.abs(this.dragPanePosition - pos) / this.panesSize;

View file

@ -84,8 +84,8 @@ class TermGroup_ extends Component {
// which is inefficient. Should maybe do something similar // which is inefficient. Should maybe do something similar
// to this.bind. // to this.bind.
return (<Term return (<Term
ref_={term => this.props.ref_(uid, term)}
key={uid} key={uid}
ref_={term => this.props.ref_(uid, term)}
{...props} {...props}
/>); />);
} }

View file

@ -69,7 +69,10 @@ export default class Term extends Component {
this.term.onTerminalReady = () => { this.term.onTerminalReady = () => {
const io = this.term.io.push(); const io = this.term.io.push();
io.onVTKeystroke = io.sendString = props.onData;
io.onVTKeystroke = props.onData;
io.sendString = props.onData;
io.onTerminalResize = (cols, rows) => { io.onTerminalResize = (cols, rows) => {
if (cols !== this.props.cols || rows !== this.props.rows) { if (cols !== this.props.cols || rows !== this.props.rows) {
props.onResize(cols, rows); props.onResize(cols, rows);
@ -247,7 +250,7 @@ export default class Term extends Component {
`; `;
const selectCss = ` const selectCss = `
::selection { ::selection {
background: ${Color(this.props.cursorColor).alpha(0.4).rgbString()}; background: ${Color(this.props.cursorColor).alpha(0.4).rgb().toString()};
} }
`; `;
return URL.createObjectURL(new Blob([` return URL.createObjectURL(new Blob([`
@ -266,7 +269,7 @@ export default class Term extends Component {
validateColor(color, alternative = 'rgb(255,255,255)') { validateColor(color, alternative = 'rgb(255,255,255)') {
try { try {
return Color(color).rgbString(); return Color(color).rgb().toString();
} catch (err) { } catch (err) {
notify(`color "${color}" is invalid`); notify(`color "${color}" is invalid`);
} }
@ -404,7 +407,7 @@ export default class Term extends Component {
onMouseLeave={this.handleScrollLeave} onMouseLeave={this.handleScrollLeave}
/> />
} }
<div key="hyper-caret" contentEditable className="hyper-caret" ref={this.onHyperCaret}/> <div key="hyper-caret" ref={this.onHyperCaret} contentEditable className="hyper-caret"/>
{ this.props.customChildren } { this.props.customChildren }
</div>); </div>);
} }

View file

@ -101,20 +101,22 @@ class Hyper extends Component {
const borderWidth = isMac ? '' : const borderWidth = isMac ? '' :
`${maximized ? '0' : '1'}px`; `${maximized ? '0' : '1'}px`;
return (<div> return (
<div <div>
style={{fontFamily: uiFontFamily, borderColor, borderWidth}} <div
className={css('main', isMac && 'mainRounded')} style={{fontFamily: uiFontFamily, borderColor, borderWidth}}
className={css('main', isMac && 'mainRounded')}
> >
<HeaderContainer/> <HeaderContainer/>
<TermsContainer ref_={this.onTermsRef}/> <TermsContainer ref_={this.onTermsRef}/>
{ this.props.customInnerChildren } { this.props.customInnerChildren }
</div> </div>
<NotificationsContainer/> <NotificationsContainer/>
<style dangerouslySetInnerHTML={{__html: customCSS}}/> <style dangerouslySetInnerHTML={{__html: customCSS}}/>
{ this.props.customChildren } { this.props.customChildren }
</div>); </div>
);
} }
styles() { styles() {

View file

@ -72,7 +72,7 @@ lib.wc.strWidth = function (str) {
if (width < 0) { if (width < 0) {
return -1; return -1;
} }
rv += width * ((codePoint <= 0xffff) ? 1 : 2); rv += width * ((codePoint <= 0xFFFF) ? 1 : 2);
} }
if (shouldCache) { if (shouldCache) {
cache[str] = rv; cache[str] = rv;
@ -449,7 +449,7 @@ lib.colors.hexToRGB = function (arg) {
')'; ')';
} }
if (arg instanceof Array) { if (Array.isArray(arg)) {
for (let i = 0; i < arg.length; i++) { for (let i = 0; i < arg.length; i++) {
arg[i] = convert(arg[i]); arg[i] = convert(arg[i]);
} }

View file

@ -29,7 +29,10 @@
"react/prop-types": 0, "react/prop-types": 0,
"react/jsx-no-bind": 0, "react/jsx-no-bind": 0,
"linebreak-style": 0, "linebreak-style": 0,
"import/no-extraneous-dependencies": 0 "import/no-extraneous-dependencies": 0,
"capitalized-comments": 0,
"react/jsx-closing-tag-location": 0,
"react/jsx-closing-bracket-location": 0
}, },
"ignores": [ "ignores": [
"build/**", "build/**",
@ -118,45 +121,45 @@
}, },
"dependencies": { "dependencies": {
"aphrodite-simple": "0.4.1", "aphrodite-simple": "0.4.1",
"color": "0.11.4", "color": "2.0.0",
"hterm-umdjs": "1.1.3", "hterm-umdjs": "1.1.3",
"json-loader": "0.5.4", "json-loader": "0.5.7",
"mousetrap": "1.6.1", "mousetrap": "1.6.1",
"ms": "0.7.2", "ms": "2.0.0",
"php-escape-shell": "1.0.0", "php-escape-shell": "1.0.0",
"react": "15.6.1", "react": "15.6.1",
"react-deep-force-update": "2.0.1", "react-deep-force-update": "2.0.1",
"react-dom": "15.6.1", "react-dom": "15.6.1",
"react-redux": "5.0.5", "react-redux": "5.0.6",
"redux": "3.7.2", "redux": "3.7.2",
"redux-thunk": "2.2.0", "redux-thunk": "2.2.0",
"reselect": "3.0.1", "reselect": "3.0.1",
"runes": "0.4.2", "runes": "0.4.2",
"seamless-immutable": "6.1.3", "seamless-immutable": "7.1.2",
"semver": "5.4.1", "semver": "5.4.1",
"uuid": "3.0.1" "uuid": "3.1.0"
}, },
"devDependencies": { "devDependencies": {
"ava": "0.17.0", "ava": "0.22.0",
"babel-cli": "6.24.1", "babel-cli": "6.26.0",
"babel-core": "6.25.0", "babel-core": "6.26.0",
"babel-loader": "7.1.1", "babel-loader": "7.1.2",
"babel-preset-babili": "0.1.4", "babel-preset-babili": "0.1.4",
"babel-preset-react": "6.24.1", "babel-preset-react": "6.24.1",
"copy-webpack-plugin": "4.0.1", "copy-webpack-plugin": "4.0.1",
"cross-env": "5.0.1", "cross-env": "5.0.5",
"electron": "1.6.12", "electron": "1.7.5",
"electron-builder": "19.19.1", "electron-builder": "19.27.2",
"electron-builder-squirrel-windows": "19.19.1", "electron-builder-squirrel-windows": "19.25.0",
"electron-devtools-installer": "2.2.0", "electron-devtools-installer": "2.2.0",
"electron-rebuild": "1.6.0", "electron-rebuild": "1.6.0",
"eslint-config-xo-react": "0.10.0", "eslint-config-xo-react": "0.13.0",
"eslint-plugin-react": "6.7.1", "eslint-plugin-react": "7.3.0",
"husky": "0.14.3", "husky": "0.14.3",
"node-gyp": "3.6.2", "node-gyp": "3.6.2",
"redux-logger": "3.0.6", "redux-logger": "3.0.6",
"spectron": "3.6.4", "spectron": "3.7.2",
"webpack": "3.4.1", "webpack": "3.5.5",
"xo": "0.17.1" "xo": "0.18.2"
} }
} }

1617
yarn.lock

File diff suppressed because it is too large Load diff