Mirrors/tabby
2
0
Fork 0
mirror of https://github.com/Eugeny/tabby synced 2024-11-16 01:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Electron 5 (#800)

Browse source 
Electron 5
This commit is contained in:
Eugene 2019-05-04 23:19:49 +02:00 committed by GitHub
commit 15a2662d10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 387 additions and 413 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/window.ts
View file

@ -12,7 +12,7 @@ let DwmEnableBlurBehindWindow: any
if (process.platform === 'win32') { if (process.platform === 'win32') {
SetWindowCompositionAttribute = require('windows-swca').SetWindowCompositionAttribute SetWindowCompositionAttribute = require('windows-swca').SetWindowCompositionAttribute
AccentState = require('windows-swca').ACCENT_STATE AccentState = require('windows-swca').ACCENT_STATE
DwmEnableBlurBehindWindow = require('windows-blurbehind').DwmEnableBlurBehindWindow DwmEnableBlurBehindWindow = require('@terminus-term/windows-blurbehind').DwmEnableBlurBehindWindow
} }
export interface WindowOptions { export interface WindowOptions {

2
app/package.json
View file

@ -35,7 +35,7 @@
"zone.js": "^0.8.26" "zone.js": "^0.8.26"
}, },
"optionalDependencies": { "optionalDependencies": {
"windows-blurbehind": "^1.0.0", "@terminus-term/windows-blurbehind": "^1.0.0",
"windows-swca": "^2.0.1" "windows-swca": "^2.0.1"
}, },
"devDependencies": { "devDependencies": {

2
app/webpack.main.config.js
View file

@ -42,7 +42,7 @@ module.exports = {
path: 'commonjs path', path: 'commonjs path',
yargs: 'commonjs yargs', yargs: 'commonjs yargs',
'windows-swca': 'commonjs windows-swca', 'windows-swca': 'commonjs windows-swca',
'windows-blurbehind': 'commonjs windows-blurbehind', '@terminus-term/windows-blurbehind': 'commonjs @terminus-term/windows-blurbehind',
}, },
plugins: [ plugins: [
new webpack.optimize.ModuleConcatenationPlugin(), new webpack.optimize.ModuleConcatenationPlugin(),

17
app/yarn.lock
View file

@ -58,6 +58,13 @@
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@terminus-term/windows-blurbehind@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@terminus-term/windows-blurbehind/-/windows-blurbehind-1.0.0.tgz#6621da2939180151f8ba0759a3e18246cfab8c05"
integrity sha512-ZRyCIrq6Nmoj+M9MGyECoTGJmIqHa3DBu1z+lpS7lGOfVk3dBSqlh5Pk+0q5lMq8MxvQikHXrF1TOxymi/cicg==
dependencies:
nan "^2.13.2"
"@types/mz@0.0.31": "@types/mz@0.0.31":
version "0.0.31" version "0.0.31"
resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.31.tgz#a4d80c082fefe71e40a7c0f07d1e6555bbbc7b52" resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.31.tgz#a4d80c082fefe71e40a7c0f07d1e6555bbbc7b52"
@ -391,6 +398,11 @@ mz@^2.6.0:
object-assign "^4.0.1" object-assign "^4.0.1"
thenify-all "^1.0.0" thenify-all "^1.0.0"
nan@^2.13.2:
version "2.13.2"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
ngx-toastr@^9.1.1: ngx-toastr@^9.1.1:
version "9.1.1" version "9.1.1"
resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-9.1.1.tgz#c7ec0284d13951422ccf47439a387372ddccc768" resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-9.1.1.tgz#c7ec0284d13951422ccf47439a387372ddccc768"
@ -620,11 +632,6 @@ which@^1.2.9:
dependencies: dependencies:
isexe "^2.0.0" isexe "^2.0.0"
windows-blurbehind@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/windows-blurbehind/-/windows-blurbehind-1.0.0.tgz#050efb988704c44335bdc3efefd757f6e463b8ac"
integrity sha512-lO+A7fhTHO7oy9zJM3o1AdzfSQrmtPkdwvleeuww840ghijjEA1f1Zp8bKA3mJu2DFNtVT40fwmqtgsCGat4UA==
windows-swca@^2.0.1: windows-swca@^2.0.1:
version "2.0.1" version "2.0.1"
resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-2.0.1.tgz#25d78ce25251292061494a0ad07c02282b28b4e3" resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-2.0.1.tgz#25d78ce25251292061494a0ad07c02282b28b4e3"

14
package.json
View file

@ -14,18 +14,18 @@
"core-js": "2.4.1", "core-js": "2.4.1",
"cross-env": "4.0.0", "cross-env": "4.0.0",
"css-loader": "0.28.0", "css-loader": "0.28.0",
"electron": "4.0.5", "electron": "^5.0.0",
"electron-builder": "^20.38.4", "electron-builder": "^20.38.4",
"electron-builder-squirrel-windows": "^20.28.3", "electron-builder-squirrel-windows": "^20.28.3",
"electron-installer-snap": "^3.0.0", "electron-installer-snap": "^3.0.0",
"electron-rebuild": "^1.8.2", "electron-rebuild": "^1.8.4",
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"graceful-fs": "^4.1.11", "graceful-fs": "^4.1.11",
"html-loader": "0.4.4", "html-loader": "0.4.4",
"json-loader": "0.5.4", "json-loader": "0.5.4",
"node-abi": "^2.4.4", "node-abi": "^2.8.0",
"node-gyp": "^3.8.0", "node-gyp": "^3.8.0",
"node-sass": "^4.5.3", "node-sass": "^4.12.0",
"npmlog": "4.1.0", "npmlog": "4.1.0",
"npx": "^10.2.0", "npx": "^10.2.0",
"pug": "^2.0.3", "pug": "^2.0.3",
@ -49,13 +49,13 @@
"typescript": "^3.1.3", "typescript": "^3.1.3",
"url-loader": "^1.1.1", "url-loader": "^1.1.1",
"val-loader": "0.5.0", "val-loader": "0.5.0",
"webpack": "^4.27.1", "webpack": "^4.30.0",
"webpack-cli": "^3.1.2", "webpack-cli": "^3.3.1",
"yaml-loader": "0.4.0", "yaml-loader": "0.4.0",
"yarn": "^1.10.1" "yarn": "^1.10.1"
}, },
"resolutions": { "resolutions": {
"*/node-abi": "^2.5.0" "*/node-abi": "^2.8.0"
}, },
"build": { "build": {
"appId": "org.terminus", "appId": "org.terminus",

1
terminus-plugin-manager/webpack.config.js
View file

@ -43,7 +43,6 @@ module.exports = {
}, },
externals: [ externals: [
'fs', 'fs',
'font-manager',
'npm', 'npm',
'path', 'path',
'mz/fs', 'mz/fs',

12
terminus-terminal/package.json
View file

@ -27,7 +27,7 @@
"file-loader": "^0.11.2", "file-loader": "^0.11.2",
"slug": "^0.9.3", "slug": "^0.9.3",
"uuid": "^3.3.2", "uuid": "^3.3.2",
"xterm": "3.10.1", "xterm": "3.12.2",
"xterm-addon-ligatures": "^0.1.0-beta-2" "xterm-addon-ligatures": "^0.1.0-beta-2"
}, },
"peerDependencies": { "peerDependencies": {
@ -41,17 +41,17 @@
"terminus-settings": "*" "terminus-settings": "*"
}, },
"dependencies": { "dependencies": {
"@terminus-term/node-pty": "^0.8.1", "@terminus-term/node-pty": "^0.8.2",
"font-manager": "0.3.0", "fontmanager-redux": "0.3.2",
"hterm-umdjs": "1.4.1", "hterm-umdjs": "1.4.1",
"mz": "^2.6.0", "mz": "^2.6.0",
"ps-node": "^0.1.6", "ps-node": "^0.1.6",
"runes": "^0.4.2" "runes": "^0.4.2"
}, },
"optionalDependencies": { "optionalDependencies": {
"macos-native-processlist": "^1.0.0", "macos-native-processlist": "^1.0.1",
"windows-native-registry": "^1.0.6", "windows-native-registry": "^1.0.14",
"windows-process-tree": "^0.2.3" "@terminus-term/windows-process-tree": "^0.2.4"
}, },
"false": {} "false": {}
} }

2
terminus-terminal/src/components/appearanceSettingsTab.component.ts
View file

@ -2,7 +2,7 @@ import { Observable } from 'rxjs'
import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators' import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'
import { exec } from 'mz/child_process' import { exec } from 'mz/child_process'
import deepEqual = require('deep-equal') import deepEqual = require('deep-equal')
const fontManager = require('font-manager') const fontManager = require('fontmanager-redux')
import { Component, Inject } from '@angular/core' import { Component, Inject } from '@angular/core'
import { ConfigService, HostAppService, Platform, ElectronService } from 'terminus-core' import { ConfigService, HostAppService, Platform, ElectronService } from 'terminus-core'

2
terminus-terminal/src/services/sessions.service.ts
View file

@ -15,7 +15,7 @@ try {
} catch { } // tslint:disable-line } catch { } // tslint:disable-line
try { try {
var windowsProcessTree = require('windows-process-tree') // tslint:disable-line var windowsProcessTree = require('@terminus-term/windows-process-tree') // tslint:disable-line
} catch { } // tslint:disable-line } catch { } // tslint:disable-line
export interface IChildProcess { export interface IChildProcess {

4
terminus-terminal/webpack.config.js
View file

@ -54,15 +54,15 @@ module.exports = {
}, },
externals: [ externals: [
'electron', 'electron',
'fontmanager-redux',
'fs', 'fs',
'font-manager',
'path', 'path',
'macos-native-processlist', 'macos-native-processlist',
'windows-process-tree',
'windows-native-registry', 'windows-native-registry',
'mz/fs', 'mz/fs',
'mz/child_process', 'mz/child_process',
'@terminus-term/node-pty', '@terminus-term/node-pty',
'@terminus-term/windows-process-tree',
'os', 'os',
/^rxjs/, /^rxjs/,
/^@angular/, /^@angular/,

70
terminus-terminal/yarn.lock
View file

@ -2,12 +2,19 @@
# yarn lockfile v1 # yarn lockfile v1
"@terminus-term/node-pty@^0.8.1": "@terminus-term/node-pty@^0.8.2":
version "0.8.1" version "0.8.2"
resolved "https://registry.yarnpkg.com/@terminus-term/node-pty/-/node-pty-0.8.1.tgz#49edd0fe85c21fa2b00c7216a2c0c6ca4839b979" resolved "https://registry.yarnpkg.com/@terminus-term/node-pty/-/node-pty-0.8.2.tgz#e2c2e1d8e25ec35da0df1598c930d37499fceb30"
integrity sha512-YbAiE1m+q8VC3BPPFuRzU5WsjG/giCMKYDmdyScfJmtAACA0TntiupQ2Zg8ZgOHn+aoAO2++ShaM4Gv8IakJtg== integrity sha512-vN3W34iB/bzBl1JaOZFhKq/9HYfrniYrXJcvCFTA0HQ8lfp/238Rs2vF2yhP8YoAJBhFovSRzm5ojKwtdQsFaA==
dependencies: dependencies:
nan "2.12.1" nan "^2.13.2"
"@terminus-term/windows-process-tree@^0.2.4":
version "0.2.4"
resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d"
integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg==
dependencies:
nan "^2.13.2"
"@types/deep-equal@^1.0.0": "@types/deep-equal@^1.0.0":
version "1.0.1" version "1.0.1"
@ -95,12 +102,10 @@ font-ligatures@^1.3.1:
lru-cache "^4.1.3" lru-cache "^4.1.3"
opentype.js "^0.8.0" opentype.js "^0.8.0"
font-manager@0.3.0: fontmanager-redux@0.3.2:
version "0.3.0" version "0.3.2"
resolved "https://registry.yarnpkg.com/font-manager/-/font-manager-0.3.0.tgz#9efdc13e521a3d8752e7ab56c3938818043a311f" resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.2.tgz#e5c8d8dc8fda98629eaef4201a27df9e56a122f4"
integrity sha512-6N3pzO+9kxE3yD9c4VN7reg5fqgFvjcUdxZmwauRzsExaeKRu0APfEi3DOISFakokybgKlZcLFQHawwc2TMpQQ== integrity sha512-NWmTbYfDijrx8qLJ2+O2VgYKhdfsMy/ec+Qf2DGxoLJDZHaRhBKd2Eufh4fFmfJUAwhzrkIgbKJsNT/IYJDbaA==
dependencies:
nan ">=2.10.0"
get-system-fonts@^2.0.0: get-system-fonts@^2.0.0:
version "2.0.0" version "2.0.0"
@ -136,12 +141,12 @@ lru-cache@^4.1.3:
pseudomap "^1.0.2" pseudomap "^1.0.2"
yallist "^2.1.2" yallist "^2.1.2"
macos-native-processlist@^1.0.0: macos-native-processlist@^1.0.1:
version "1.0.0" version "1.0.1"
resolved "https://registry.yarnpkg.com/macos-native-processlist/-/macos-native-processlist-1.0.0.tgz#1dcf1fac554e057f90c6451c39420e065d186a68" resolved "https://registry.yarnpkg.com/macos-native-processlist/-/macos-native-processlist-1.0.1.tgz#df48bbd114554bd69e7c2c76f976836ef8270ca8"
integrity sha512-FYA5DzCBvt+1wcCR8iFoCW2zZ8GZXtR6Ee/kpC9gVlqvEcM2ooma71KV8EIP2VaM+v2HOQAVvNoKSmFBd4z8dQ== integrity sha512-Kn8EUW8xOM+06GFMp8I2fxIK8iSaR/fraAU5ddfnKVRn6/+dmQ5VGBSG4k6ce3u/EOQxd/7paBCAz17nXqH0cg==
dependencies: dependencies:
nan "^2.10.0" nan "^2.13.2"
minimist@^1.2.0: minimist@^1.2.0:
version "1.2.0" version "1.2.0"
@ -157,10 +162,10 @@ mz@^2.6.0:
object-assign "^4.0.1" object-assign "^4.0.1"
thenify-all "^1.0.0" thenify-all "^1.0.0"
nan@2.12.1, nan@>=2.10.0, nan@^2.10.0, nan@^2.12.1: nan@^2.13.2:
version "2.12.1" version "2.13.2"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw== integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
object-assign@^4.0.1: object-assign@^4.0.1:
version "4.1.1" version "4.1.1"
@ -239,19 +244,12 @@ uuid@^3.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
windows-native-registry@^1.0.6: windows-native-registry@^1.0.14:
version "1.0.6" version "1.0.14"
resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.6.tgz#6271cef068ffb432337751fc1f971a25187cd8d5" resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.14.tgz#35c742b1278473127cbfb3b76e0db3d1ef626872"
integrity sha512-GTu4yRg4FOThNbBkuP/OeTOt8kZm+nTNCoZjmIol0HFefXoYCkzBZX0METJYZLL0nbgis+QzqRhJAKkMfy/VDA== integrity sha512-C2UgyZYJYcPFjkhfNuy09CUa6wXAti4x/tLPgzudDDrqpTyczcgnBEpiablmE6j7E7ownouWTqgVcHW8HJyqhw==
dependencies: dependencies:
nan "^2.12.1" nan "^2.13.2"
windows-process-tree@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.2.3.tgz#6b781f0a320e8a0d6434c9399add4389c709cf6e"
integrity sha512-SzPJSubVVsToz1g5lr2P+4mQT70gvJ9u/nlnpfkOeQcAhOuhKz5DiO1TARgR0OnVsv21LPzxbA2m/4JQkGh1wA==
dependencies:
nan "^2.10.0"
xterm-addon-ligatures@^0.1.0-beta-2: xterm-addon-ligatures@^0.1.0-beta-2:
version "0.1.0-beta-2" version "0.1.0-beta-2"
@ -261,10 +259,10 @@ xterm-addon-ligatures@^0.1.0-beta-2:
font-finder "^1.0.2" font-finder "^1.0.2"
font-ligatures "^1.3.1" font-ligatures "^1.3.1"
xterm@3.10.1: xterm@3.12.2:
version "3.10.1" version "3.12.2"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.10.1.tgz#14accf92772e5a6728f317a3c209ba714b73c8b5" resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.12.2.tgz#ec8563857c7b098973bab4dbf537f1a7c6a790c8"
integrity sha512-RHaUwJ8zwLiICu1QsXoxUHP+R2Pp8Rc8yVoNali/nKw3CVXwmXxT/4mgbk7U22psuNgOqLyI4Sg9nlQfYeTRQw== integrity sha512-FSXovDdsqIKqoayC6+zFzhaHi+A3NSceM5rgTW88DH7sS96HdwMToB2p1rW+FyNsSqfAgFwlXDRQk+fh/aHvPQ==
yallist@^2.1.2: yallist@^2.1.2:
version "2.1.2" version "2.1.2"

672
yarn.lock
View file

File diff suppressed because it is too large Load diff