Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-12-25 19:42:42 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:Eugeny/terminus

Browse Source
This commit is contained in:
Eugene Pankov 2019-06-27 10:54:24 +02:00
commit 3a9c69d828
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -9,13 +9,13 @@
"@types/webpack-env": "1.13.9", "@types/webpack-env": "1.13.9",
"@typescript-eslint/eslint-plugin": "^1.11.0", "@typescript-eslint/eslint-plugin": "^1.11.0",
"@typescript-eslint/parser": "^1.11.0", "@typescript-eslint/parser": "^1.11.0",
"app-builder-lib": "^21.0.2", "app-builder-lib": "^21.0.3",
"apply-loader": "2.0.0", "apply-loader": "2.0.0",
"awesome-typescript-loader": "^5.0.0", "awesome-typescript-loader": "^5.0.0",
"core-js": "^3.1.4", "core-js": "^3.1.4",
"cross-env": "5.2.0", "cross-env": "5.2.0",
"css-loader": "3.0.0", "css-loader": "3.0.0",
"electron": "^5.0.5", "electron": "^5.0.6",
"electron-builder": "^20.44.4", "electron-builder": "^20.44.4",
"electron-installer-snap": "^4.0.0", "electron-installer-snap": "^4.0.0",
"electron-notarize": "^0.1.1", "electron-notarize": "^0.1.1",

53
yarn.lock
View File

@ -472,10 +472,10 @@ app-builder-bin@2.7.1:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.7.1.tgz#9f690af65093821b8a6149aa29ce9f8c81fc554c" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.7.1.tgz#9f690af65093821b8a6149aa29ce9f8c81fc554c"
integrity sha512-ubIBeiL9XysjMW4HETBKxj3DC8ika6dGyC0vftPc0kZwGh1iXQ5bycsjoAqY/3t3BBEEIg0VruicvBaUl1pOSQ== integrity sha512-ubIBeiL9XysjMW4HETBKxj3DC8ika6dGyC0vftPc0kZwGh1iXQ5bycsjoAqY/3t3BBEEIg0VruicvBaUl1pOSQ==
app-builder-bin@3.0.1: app-builder-bin@3.0.3:
version "3.0.1" version "3.0.3"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.0.1.tgz#08ea930efcd374dfdbe50523c8abe7eee06fdcc9" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.0.3.tgz#6b82a82c0e855ae90db20b4f80563ce767cf36f4"
integrity sha512-eSC1ZxQIGuvhXKB9m7rRwTbou522FbQuc95XoqOMqMjf50//So1IjNPFOzXd6SDHcMx7f5SYEW5AYSs1Pwovtw== integrity sha512-e/mnAyzGC9q5OGnWbbiAZ429ECWYtHB2YUM42KEaoIJcEc1LNecA5MNAvFyB85znOKHPGpcOygBrcWPlGJcQgw==
app-builder-lib@20.44.4, app-builder-lib@~20.44.4: app-builder-lib@20.44.4, app-builder-lib@~20.44.4:
version "20.44.4" version "20.44.4"
@ -507,22 +507,21 @@ app-builder-lib@20.44.4, app-builder-lib@~20.44.4:
semver "^6.1.1" semver "^6.1.1"
temp-file "^3.3.3" temp-file "^3.3.3"
app-builder-lib@^21.0.2: app-builder-lib@^21.0.3:
version "21.0.2" version "21.0.3"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.2.tgz#7d4ddca1a6a7f4c69e3840b158db56d9a0c181d0" resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.3.tgz#103dddac859f267874d25ea562fee4c4da3f9e36"
integrity sha512-0sQJ8M1iBo3ng4HQjRsqtCI+RJQHDi8IyY/PkR7MyQqi91d4gWiLIfjKuV/b0PSNE4U+75oZOWh+wkR3+G4rrQ== integrity sha512-kAz355M7TA4/wgEpdVtPwb0n/wgx4P204RHQQipNeCujthMpOr02PxxLWV5K8QDczgF+MWCHE8W4pSe4o8OD5Q==
dependencies: dependencies:
"7zip-bin" "~4.1.0" "7zip-bin" "~4.1.0"
app-builder-bin "3.0.1"
async-exit-hook "^2.0.1" async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9" bluebird-lst "^1.0.9"
builder-util "10.2.0" builder-util "10.2.1"
builder-util-runtime "8.2.5" builder-util-runtime "8.2.5"
chromium-pickle-js "^0.2.0" chromium-pickle-js "^0.2.0"
debug "^4.1.1" debug "^4.1.1"
ejs "^2.6.2" ejs "^2.6.2"
electron-osx-sign "0.4.11" electron-osx-sign "0.4.11"
electron-publish "21.0.2" electron-publish "21.0.3"
fs-extra-p "^8.0.2" fs-extra-p "^8.0.2"
hosted-git-info "^2.7.1" hosted-git-info "^2.7.1"
is-ci "^2.0.0" is-ci "^2.0.0"
@ -968,16 +967,16 @@ builder-util@10.1.2, builder-util@~10.1.2:
stat-mode "^0.3.0" stat-mode "^0.3.0"
temp-file "^3.3.3" temp-file "^3.3.3"
builder-util@10.2.0, builder-util@~10.2.0: builder-util@10.2.1, builder-util@~10.2.1:
version "10.2.0" version "10.2.1"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.2.0.tgz#073db634b8c121650f98725fbde1b851081314fd" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.2.1.tgz#47db02a1dfea073284083f57a5ab1e58c0d40159"
integrity sha512-9x+RpqKl50VnestgFa+0r9atMq7NUF0b719W8NSzRg/WOrPI9z3oJiLJv0L+JOSzLiu80Fu97kvEb/1l3+/9TQ== integrity sha512-cotxXgsNL0kpgIwz/g6q9yfSbHIHlwfy2CR5VbMZg7WD0jCZCugSvICJjPjDkgYKK2EOn5tgCEZNfMIu77q45w==
dependencies: dependencies:
"7zip-bin" "~4.1.0" "7zip-bin" "~4.1.0"
"@types/debug" "^4.1.4" "@types/debug" "^4.1.4"
app-builder-bin "3.0.1" app-builder-bin "3.0.3"
bluebird-lst "^1.0.9" bluebird-lst "^1.0.9"
builder-util-runtime "^8.2.5" builder-util-runtime "8.2.5"
chalk "^2.4.2" chalk "^2.4.2"
debug "^4.1.1" debug "^4.1.1"
fs-extra-p "^8.0.2" fs-extra-p "^8.0.2"
@ -2038,14 +2037,14 @@ electron-publish@20.44.4:
lazy-val "^1.0.4" lazy-val "^1.0.4"
mime "^2.4.4" mime "^2.4.4"
electron-publish@21.0.2: electron-publish@21.0.3:
version "21.0.2" version "21.0.3"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.2.tgz#39e99ce8536a72b571f329eb67e86a3d7183ac83" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.3.tgz#328b92dcd1a34b0ebe3379913e9d9e1d2bc1fdcc"
integrity sha512-Wy/MbX501Z4OPeDz7u9N6ZtsPo6J4rMSxluj9KhqRftkMW9jcRVWmqs26NyBxE2l+aFRHMlGe0YtPfHPEDXHoQ== integrity sha512-uZtDckKBNOqUVW8oqkC64cG0phfAHOl4YTdCiqKW2c9MosCGVRAXgY0xCTtFcaChRYWpPTnuHQ/Tr9uzSLG1TA==
dependencies: dependencies:
bluebird-lst "^1.0.9" bluebird-lst "^1.0.9"
builder-util "~10.2.0" builder-util "~10.2.1"
builder-util-runtime "^8.2.5" builder-util-runtime "8.2.5"
chalk "^2.4.2" chalk "^2.4.2"
fs-extra-p "^8.0.2" fs-extra-p "^8.0.2"
lazy-val "^1.0.4" lazy-val "^1.0.4"
@ -2066,10 +2065,10 @@ electron-rebuild@^1.8.5:
spawn-rx "^3.0.0" spawn-rx "^3.0.0"
yargs "^13.2.2" yargs "^13.2.2"
electron@^5.0.5: electron@^5.0.6:
version "5.0.5" version "5.0.6"
resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.5.tgz#2d04499064d3f6c89c4642e47cfe9ea151d794eb" resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.6.tgz#e3ca4a58b5716fceef3fb64e1fd2222dd9c51de0"
integrity sha512-GzVQhImBX3rSCFPyJ1u1KbxquoidAHzGeCH2FTs3lzAh1H8m4vd7xh6CNC111mT/I8pxFk5D8s3atJlJQLPAeg== integrity sha512-0L53lv26eDhaaNxL6DqXGQrQOEAYbrQg40stRSb2pzrY06kwPbABzXEiaCvEsBuKUQ+9OQBbVyyvXRbLJlun/A==
dependencies: dependencies:
"@types/node" "^10.12.18" "@types/node" "^10.12.18"
electron-download "^4.1.0" electron-download "^4.1.0"