Compare commits

...

10 Commits

Author SHA1 Message Date
Eugene Pankov
ccc34ae4d9 bumped angular to rc 2018-12-30 17:53:07 +01:00
Eugene Pankov
4362b5c50b bumped node-gyp 2018-12-30 17:44:52 +01:00
Eugene Pankov
2d6023446c bumped electron-builder 2018-12-30 17:35:09 +01:00
Eugene Pankov
dcd43dc019 fixed the Preferences menu item 2018-12-30 17:32:30 +01:00
Eugene Pankov
d8e70f9693 bumped nodejs on travis 2018-12-30 17:26:01 +01:00
Eugene Pankov
7a26e8bd65 ignore non-existent CWDs (fixes #586) 2018-12-30 15:59:40 +01:00
Eugene Pankov
d56287587c bumped electron to stable 2018-12-30 15:54:17 +01:00
Eugene Pankov
8793613117 potentially fixed #576 2018-12-29 13:27:45 +01:00
Eugene Pankov
92afec75e7 fixed plugin blacklisting 2018-12-29 12:50:14 +01:00
Eugene Pankov
ca71ec24f8 fixed #585 2018-12-29 12:41:32 +01:00
11 changed files with 172 additions and 84 deletions

View File

@@ -6,7 +6,7 @@ matrix:
env: BUILD_FOR=macos env: BUILD_FOR=macos
language: node_js language: node_js
node_js: 8 node_js: 10
cache: cache:
directories: directories:

View File

@@ -103,7 +103,7 @@ export class Application {
{ {
label: 'Preferences', label: 'Preferences',
accelerator: 'Cmd+,', accelerator: 'Cmd+,',
async click () { click: async () => {
if (!this.hasWindows()) { if (!this.hasWindows()) {
await this.newWindow() await this.newWindow()
} }

View File

@@ -1,4 +1,5 @@
import { Subject, Observable } from 'rxjs' import { Subject, Observable } from 'rxjs'
import { debounceTime } from 'rxjs/operators'
import { BrowserWindow, app, ipcMain, Rectangle } from 'electron' import { BrowserWindow, app, ipcMain, Rectangle } from 'electron'
import ElectronConfig = require('electron-config') import ElectronConfig = require('electron-config')
import * as os from 'os' import * as os from 'os'
@@ -143,6 +144,16 @@ export class Window {
this.visible.next(false) this.visible.next(false)
}) })
let moveSubscription = new Observable<void>(observer => {
this.window.on('move', () => observer.next())
}).pipe(debounceTime(250)).subscribe(() => {
this.window.webContents.send('host:window-moved')
})
this.window.on('closed', () => {
moveSubscription.unsubscribe()
})
this.window.on('enter-full-screen', () => this.window.webContents.send('host:window-enter-full-screen')) this.window.on('enter-full-screen', () => this.window.webContents.send('host:window-enter-full-screen'))
this.window.on('leave-full-screen', () => this.window.webContents.send('host:window-leave-full-screen')) this.window.on('leave-full-screen', () => this.window.webContents.send('host:window-leave-full-screen'))
@@ -250,7 +261,10 @@ export class Window {
this.window.moveTop() this.window.moveTop()
}) })
ipcMain.on('window-close', () => { ipcMain.on('window-close', event => {
if (event.sender !== this.window.webContents) {
return
}
this.closing = true this.closing = true
this.window.close() this.window.close()
}) })

View File

@@ -13,13 +13,13 @@
"watch": "webpack --progress --color --watch" "watch": "webpack --progress --color --watch"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "7.2.0-beta.1", "@angular/animations": "7.2.0-rc.0",
"@angular/common": "7.2.0-beta.1", "@angular/common": "7.2.0-rc.0",
"@angular/compiler": "7.2.0-beta.1", "@angular/compiler": "7.2.0-rc.0",
"@angular/core": "7.2.0-beta.1", "@angular/core": "7.2.0-rc.0",
"@angular/forms": "7.2.0-beta.1", "@angular/forms": "7.2.0-rc.0",
"@angular/platform-browser": "7.2.0-beta.1", "@angular/platform-browser": "7.2.0-rc.0",
"@angular/platform-browser-dynamic": "7.2.0-beta.1", "@angular/platform-browser-dynamic": "7.2.0-rc.0",
"@ng-bootstrap/ng-bootstrap": "^3.3.1", "@ng-bootstrap/ng-bootstrap": "^3.3.1",
"devtron": "1.4.0", "devtron": "1.4.0",
"electron-config": "0.2.1", "electron-config": "0.2.1",

View File

@@ -2,52 +2,52 @@
# yarn lockfile v1 # yarn lockfile v1
"@angular/animations@7.2.0-beta.1": "@angular/animations@7.2.0-rc.0":
version "7.2.0-beta.1" version "7.2.0-rc.0"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.0-beta.1.tgz#c288de4a89b0197ba53a8411173ec4085fbbd9c9" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.0-rc.0.tgz#12849f8ab104d309ec99c0ceb170a895c15d3d44"
integrity sha512-82u9L2poaREjkTJlYEKdOO1B1LaVBwqJBZvIXU04+21WQBJoi050sxUl6lmjVVs5rRc0e/y2gifyrb42pUEntA== integrity sha512-CRQNQ6QVTuf4nCHVLVpKQx7YPpNPfnTF79KVWzHefkkyS3URRuEgvE4jCED4oTJ4BEsmkjXyt51VeDV0FgqQFg==
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/common@7.2.0-beta.1": "@angular/common@7.2.0-rc.0":
version "7.2.0-beta.1" version "7.2.0-rc.0"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.0-beta.1.tgz#be9d14f239b7a390fc056e3bb540da181631fb1a" resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.0-rc.0.tgz#60d3540c6cdcf3440f67e2c15cf8f1c7b1160d9d"
integrity sha512-+aYfO20nrqurOLxM0w/UJkOHjGzNFOc2j52ggyj1vr62nTk+W63j4P8tcUsW6iHFCsOF5auSkclKUbNIliMf0A== integrity sha512-Xv60KEP1kpF74kpN1xtps0W++PUXLUMK/0tDblUZH7tBWvS0XwEwtuK5B6wcs+I5nqZkPgvlvOyiVZvOLraWOg==
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/compiler@7.2.0-beta.1": "@angular/compiler@7.2.0-rc.0":
version "7.2.0-beta.1" version "7.2.0-rc.0"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.0-beta.1.tgz#355a10a80615afdd1d6a5ed682222e9e57e65fd7" resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.0-rc.0.tgz#603dbec25d6c2beea08a293c68c39b40e2ea81e2"
integrity sha512-KxI93dLm1SPNbazfG41QcmxVS7T9VmQ8wzhMHOVJo4DP77g2E5xUB5nOInMCMI43lbZEIckBxo/ci4jwiiq8uA== integrity sha512-tvgGJx0urSz/qn6upmcjX3N3dyWQ9m5mQOwJxmN4qekxjOtSRml5yt2KtlaUTkGsjkEmEVfSHel+X1TwzBdhYw==
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/core@7.2.0-beta.1": "@angular/core@7.2.0-rc.0":
version "7.2.0-beta.1" version "7.2.0-rc.0"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.0-beta.1.tgz#32bef8f3d424333791d0e0bd4a3f3afee9b1349d" resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.0-rc.0.tgz#57c0e26130288c3b58466f079828c028bdf6221f"
integrity sha512-gJzQAauezAMU8vEEMh1PrXv52fA9ceUXac/tJ8KIi08zEjyIRXLvKggWr7YXAbt5LwgKsn27JwecqeS5h4K/BQ== integrity sha512-2u11TNlLorw3JhuczCPwl8UmxE+ja2Q/ghBl8iYi4SIBWiBO1K0wVT13Ts7eojk63yZcg60lyYYCegXBmHLTuw==
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/forms@7.2.0-beta.1": "@angular/forms@7.2.0-rc.0":
version "7.2.0-beta.1" version "7.2.0-rc.0"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.0-beta.1.tgz#399ea4585502027d53396eac935f8f20bd5ad2bf" resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.0-rc.0.tgz#4eb473018084bb81be3e2e1ae8afa8d2b2117a6c"
integrity sha512-1NQ2hw8Y4hjgr5qXoOvQJRjmQno/fhQUuIRx0SC7hYySur1E9vcI8rZDVDB+LwiGexALh8H70zwJ64lNxzwpvA== integrity sha512-OWP1zzYQiuqtoltdlhkcVjHxg78exbt7z1lr8RSjybr/Snc5zSFhnZF6byasd/4lzVySuujsMXkTK7D8x6hedA==
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/platform-browser-dynamic@7.2.0-beta.1": "@angular/platform-browser-dynamic@7.2.0-rc.0":
version "7.2.0-beta.1" version "7.2.0-rc.0"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.0-beta.1.tgz#4a95ee6d53fb02e529f1f1842ee8839a25ec4790" resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.0-rc.0.tgz#5ea47d094c53a0ba34ecbb0dfdcef452fa05dc9a"
integrity sha512-wnf6WSfh9AsBzI8I//eNolmQ2rwMIk/KIuGmTEOAuAxRMLgqzZUA3PjX2XAE6oUUowqy1MET1UFiqjDf/NZcNQ== integrity sha512-uqT27oh9m58L6MUjgvT+7NpAFbigOnnTUWMsCLijNUKd7i37T6UxTVKPvuqNHlaLXsmDRxVHN3INI0IrWZ3R+w==
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"
"@angular/platform-browser@7.2.0-beta.1": "@angular/platform-browser@7.2.0-rc.0":
version "7.2.0-beta.1" version "7.2.0-rc.0"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.0-beta.1.tgz#20c272ebfcccb3151baed7ceddbafdb359f54cd8" resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.0-rc.0.tgz#c6d1f0b2328b1d81649bea70c23edc33de729015"
integrity sha512-sCMzCFCdE4Dq9foXf2PpWPegtVfirHhg+DQzoiwFDYj5i+QB9nWY7BOLlrCPAWpd8opUxCsaLrzXbfgM40FAGA== integrity sha512-r0ak7SVLWrivd4S0MXWmqNLeF6NNOBAopnjrhUu2j5I00u7/QfLrX0E5zRlJ8JkARVjer6Wm+D1ztlOWw5jHag==
dependencies: dependencies:
tslib "^1.9.0" tslib "^1.9.0"

View File

@@ -14,8 +14,8 @@
"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.0-beta.7", "electron": "4.0.0",
"electron-builder": "^20.38.2", "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.2",
@@ -24,7 +24,7 @@
"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.4.4",
"node-gyp": "^3.6.2", "node-gyp": "^3.8.0",
"node-sass": "^4.5.3", "node-sass": "^4.5.3",
"npmlog": "4.1.0", "npmlog": "4.1.0",
"npx": "^10.2.0", "npx": "^10.2.0",
@@ -53,6 +53,9 @@
"yaml-loader": "0.4.0", "yaml-loader": "0.4.0",
"yarn": "^1.10.1" "yarn": "^1.10.1"
}, },
"resolutions": {
"*/node-abi": "^2.5.0"
},
"build": { "build": {
"appId": "org.terminus", "appId": "org.terminus",
"productName": "Terminus", "productName": "Terminus",

View File

@@ -30,6 +30,7 @@ export class HostAppService {
private cliOpenProfile = new Subject<string>() private cliOpenProfile = new Subject<string>()
private configChangeBroadcast = new Subject<void>() private configChangeBroadcast = new Subject<void>()
private windowCloseRequest = new Subject<void>() private windowCloseRequest = new Subject<void>()
private windowMoved = new Subject<void>()
private logger: Logger private logger: Logger
private windowId: number private windowId: number
@@ -41,6 +42,7 @@ export class HostAppService {
get cliOpenProfile$ (): Observable<string> { return this.cliOpenProfile } get cliOpenProfile$ (): Observable<string> { return this.cliOpenProfile }
get configChangeBroadcast$ (): Observable<void> { return this.configChangeBroadcast } get configChangeBroadcast$ (): Observable<void> { return this.configChangeBroadcast }
get windowCloseRequest$ (): Observable<void> { return this.windowCloseRequest } get windowCloseRequest$ (): Observable<void> { return this.windowCloseRequest }
get windowMoved$ (): Observable<void> { return this.windowMoved }
constructor ( constructor (
private zone: NgZone, private zone: NgZone,
@@ -80,6 +82,10 @@ export class HostAppService {
this.zone.run(() => this.windowCloseRequest.next()) this.zone.run(() => this.windowCloseRequest.next())
}) })
electron.ipcRenderer.on('host:window-moved', () => {
this.zone.run(() => this.windowMoved.next())
})
electron.ipcRenderer.on('host:second-instance', (_$event, argv: any, cwd: string) => this.zone.run(() => { electron.ipcRenderer.on('host:second-instance', (_$event, argv: any, cwd: string) => this.zone.run(() => {
this.logger.info('Second instance', argv) this.logger.info('Second instance', argv)
const op = argv._[0] const op = argv._[0]

View File

@@ -117,7 +117,7 @@ export class PluginsSettingsTabComponent {
} }
disablePlugin (plugin: IPluginInfo) { disablePlugin (plugin: IPluginInfo) {
this.config.store.pluginBlacklist.push(plugin.name) this.config.store.pluginBlacklist = [...this.config.store.pluginBlacklist, plugin.name]
this.config.save() this.config.save()
this.config.requestRestart() this.config.requestRestart()
} }

View File

@@ -276,7 +276,11 @@ export class TerminalTabComponent extends BaseTabComponent {
this.session.resize(columns, rows) this.session.resize(columns, rows)
} }
}) })
}) }),
this.hostApp.windowMoved$.subscribe(() => setTimeout(() => {
this.configure()
}, 250)),
] ]
} }

View File

@@ -104,16 +104,24 @@ export class Session extends BaseSession {
LC_MONETARY: locale, LC_MONETARY: locale,
}) })
} }
let cwd = options.cwd || process.env.HOME
if (!fs.existsSync(cwd)) {
console.warn('Ignoring non-existent CWD:', cwd)
cwd = null
}
this.pty = nodePTY.spawn(options.command, options.args || [], { this.pty = nodePTY.spawn(options.command, options.args || [], {
name: 'xterm-256color', name: 'xterm-256color',
cols: options.width || 80, cols: options.width || 80,
rows: options.height || 30, rows: options.height || 30,
cwd: options.cwd || process.env.HOME, cwd,
env: env, env: env,
experimentalUseConpty: this.config.store.terminal.useConPTY, experimentalUseConpty: this.config.store.terminal.useConPTY,
}) })
this.guessedCWD = options.cwd || process.env.HOME this.guessedCWD = cwd
this.truePID = (this.pty as any).pid this.truePID = (this.pty as any).pid
@@ -252,6 +260,14 @@ export class Session extends BaseSession {
return fs.readlink(`/proc/${this.truePID}/cwd`) return fs.readlink(`/proc/${this.truePID}/cwd`)
} }
if (process.platform === 'win32') { if (process.platform === 'win32') {
if (!this.guessedCWD) {
return null
}
try {
fs.access(this.guessedCWD)
} catch (e) {
return null
}
return this.guessedCWD return this.guessedCWD
} }
return null return null

123
yarn.lock
View File

@@ -407,25 +407,30 @@ app-builder-bin@2.6.0:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.0.tgz#b4e5d5ee5bcf264818ab9830b95338f9f419de5d" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.0.tgz#b4e5d5ee5bcf264818ab9830b95338f9f419de5d"
integrity sha512-7HphDMS2U9MwAA6R7lSU6MASFR/D+VJDb5hQ4Fn2coOMyaRn71QDWPdG0TPnDr88F2I7bsTuHYud28S/yN2lZw== integrity sha512-7HphDMS2U9MwAA6R7lSU6MASFR/D+VJDb5hQ4Fn2coOMyaRn71QDWPdG0TPnDr88F2I7bsTuHYud28S/yN2lZw==
app-builder-lib@20.38.2, app-builder-lib@~20.38.2: app-builder-bin@2.6.1:
version "20.38.2" version "2.6.1"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.38.2.tgz#7b5b239ba7ce52cd618a91f5e499068e54a35a95" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.1.tgz#aa97f82d341dfa6f1269d78955482d619cc613ed"
integrity sha512-jwysFwaU4ohvHqv5jNCeoZSO0N/8x7W/c0S6TiTb6QUC3U0YVcsN7DPMj7QApHzTvMTO9kxzjUzwA8dbQZVovg== integrity sha512-W0l85O+s6lOaziWqAhszPfwiG0s15FvMBP9j9i/bknsMccUkwN60u4Cy7yYtf6akCUDuJenLqpTX4/xvkq1egw==
app-builder-lib@20.38.4, app-builder-lib@~20.38.3:
version "20.38.4"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.38.4.tgz#71a515d01f4f2bd48a67495804f659a46c35303c"
integrity sha512-JbuAJQBndcCW6BJVIb2tPjM5wiuIjz2LUlbyVxNIawM2wFKUBV9kr0N3RNBJFxcrCEuA9oprMUCoymJdrMUVfA==
dependencies: dependencies:
"7zip-bin" "~4.1.0" "7zip-bin" "~4.1.0"
app-builder-bin "2.6.0" app-builder-bin "2.6.1"
async-exit-hook "^2.0.1" async-exit-hook "^2.0.1"
bluebird-lst "^1.0.6" bluebird-lst "^1.0.6"
builder-util "9.6.0" builder-util "9.6.1"
builder-util-runtime "8.0.2" builder-util-runtime "8.1.0"
chromium-pickle-js "^0.2.0" chromium-pickle-js "^0.2.0"
debug "^4.1.0" debug "^4.1.0"
ejs "^2.6.1" ejs "^2.6.1"
electron-osx-sign "0.4.11" electron-osx-sign "0.4.11"
electron-publish "20.38.2" electron-publish "20.38.3"
fs-extra-p "^7.0.0" fs-extra-p "^7.0.0"
hosted-git-info "^2.7.1" hosted-git-info "^2.7.1"
is-ci "^1.2.1" is-ci "^2.0.0"
isbinaryfile "^3.0.3" isbinaryfile "^3.0.3"
js-yaml "^3.12.0" js-yaml "^3.12.0"
lazy-val "^1.0.3" lazy-val "^1.0.3"
@@ -1010,7 +1015,17 @@ builder-util-runtime@4.4.1, builder-util-runtime@^4.4.1:
fs-extra-p "^4.6.1" fs-extra-p "^4.6.1"
sax "^1.2.4" sax "^1.2.4"
builder-util-runtime@8.0.2, builder-util-runtime@^8.0.2: builder-util-runtime@8.1.0, builder-util-runtime@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.0.tgz#dd7fca995d48ceee7580b4851ca057566c94601e"
integrity sha512-s1mlJ28mv+56Iebh6c9aXjVe11O3Z0cDTwAGeB0PCcUzHA37fDxGgS8ZGoYNMZP+rBHj21d/od1wuYofTVLaQg==
dependencies:
bluebird-lst "^1.0.6"
debug "^4.1.0"
fs-extra-p "^7.0.0"
sax "^1.2.4"
builder-util-runtime@^8.0.2:
version "8.0.2" version "8.0.2"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.0.2.tgz#9d638a266ca3aa25ced1cff4df74c8fd97dd78cf" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.0.2.tgz#9d638a266ca3aa25ced1cff4df74c8fd97dd78cf"
integrity sha512-46AjyMQ1/yBvGnXWmqNGlg8te7jCPCs7TJ0zDC2+4vV/t5iZp2dR1H9UfVpcBxlvBq3dlAOmwb9fz1d9xZN1+Q== integrity sha512-46AjyMQ1/yBvGnXWmqNGlg8te7jCPCs7TJ0zDC2+4vV/t5iZp2dR1H9UfVpcBxlvBq3dlAOmwb9fz1d9xZN1+Q==
@@ -1040,7 +1055,25 @@ builder-util@6.1.3, builder-util@~6.1.3:
stat-mode "^0.2.2" stat-mode "^0.2.2"
temp-file "^3.1.3" temp-file "^3.1.3"
builder-util@9.6.0, builder-util@~9.6.0: builder-util@9.6.1:
version "9.6.1"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.1.tgz#4625620b1535fe40dcacb178d24fe56d0d7c8957"
integrity sha512-8MljKTjeV+A+LLVexuWEV3EpWbiUcsHHrB4Bg2qNo/3dC+vTo6g/27+W3Ij7Ij1UTobSkNBstFieWijXJCco9A==
dependencies:
"7zip-bin" "~4.1.0"
app-builder-bin "2.6.1"
bluebird-lst "^1.0.6"
builder-util-runtime "^8.1.0"
chalk "^2.4.1"
debug "^4.1.0"
fs-extra-p "^7.0.0"
is-ci "^2.0.0"
js-yaml "^3.12.0"
source-map-support "^0.5.9"
stat-mode "^0.2.2"
temp-file "^3.3.2"
builder-util@~9.6.0:
version "9.6.0" version "9.6.0"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.0.tgz#ffcc0f713d0f4dfa6bcda2aee83b8fcb1f16f5b6" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.0.tgz#ffcc0f713d0f4dfa6bcda2aee83b8fcb1f16f5b6"
integrity sha512-6T4E3aNVndTZ2oCt+22S0wxt47d094MxrADi6S012QumXlDNfSsyu1ffbGN9w0HG+4aubpLzf9apKgMP1yl4Kw== integrity sha512-6T4E3aNVndTZ2oCt+22S0wxt47d094MxrADi6S012QumXlDNfSsyu1ffbGN9w0HG+4aubpLzf9apKgMP1yl4Kw==
@@ -1320,6 +1353,11 @@ ci-info@^1.5.0:
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
ci-info@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
version "1.0.4" version "1.0.4"
resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2055,12 +2093,12 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0" miller-rabin "^4.0.0"
randombytes "^2.0.0" randombytes "^2.0.0"
dmg-builder@6.5.2: dmg-builder@6.5.3:
version "6.5.2" version "6.5.3"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.5.2.tgz#cb6e34b793831349f46c7e6415182d90e8c4a386" resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.5.3.tgz#95afe3deab33fd874f68d299bc71b481e94f5312"
integrity sha512-eT3qc8IrwfDyq5ddGO807Wya2ltVlIlE0FVf6Aa+HWdlp9JnYayPNGWrQA9xIHpKKlq206JdNZ6LYIn93EAzdg== integrity sha512-ZNl4GFBg6rdFplnuoK56iftxh/qgM7rXJUxgl21eK4WsjxgQwtQ0REZo+pDSL4OzVeyOO8MMNWSNQcCsBLiDyA==
dependencies: dependencies:
app-builder-lib "~20.38.2" app-builder-lib "~20.38.3"
bluebird-lst "^1.0.6" bluebird-lst "^1.0.6"
builder-util "~9.6.0" builder-util "~9.6.0"
fs-extra-p "^7.0.0" fs-extra-p "^7.0.0"
@@ -2160,19 +2198,19 @@ electron-builder-squirrel-windows@^20.28.3:
optionalDependencies: optionalDependencies:
"7zip-bin" "~4.0.2" "7zip-bin" "~4.0.2"
electron-builder@^20.38.2: electron-builder@^20.38.4:
version "20.38.2" version "20.38.4"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.38.2.tgz#e44f086348f70e40bad796b260a7d3542cb93282" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.38.4.tgz#67727529ffb87e7fdd78b3a84ea0d6c22bf04ec2"
integrity sha512-uUEzfc/e8J7nAowvFQw4SyHIe4d6VSHO1LmcLy53he4aGXlVklHluhbwa0rxATPdYVNgHmJz7zoVgYYOd/YS+A== integrity sha512-WHOr3Rz2wktxV5TqmRL6woO9/wrIZeRfJPSEXOhgfgLskE5Sp2Aer0zAF7lHNqXuG6JhU+0I9IYFAxa73MTs9w==
dependencies: dependencies:
app-builder-lib "20.38.2" app-builder-lib "20.38.4"
bluebird-lst "^1.0.6" bluebird-lst "^1.0.6"
builder-util "9.6.0" builder-util "9.6.1"
builder-util-runtime "8.0.2" builder-util-runtime "8.1.0"
chalk "^2.4.1" chalk "^2.4.1"
dmg-builder "6.5.2" dmg-builder "6.5.3"
fs-extra-p "^7.0.0" fs-extra-p "^7.0.0"
is-ci "^1.2.1" is-ci "^2.0.0"
lazy-val "^1.0.3" lazy-val "^1.0.3"
read-config-file "3.2.0" read-config-file "3.2.0"
sanitize-filename "^1.6.1" sanitize-filename "^1.6.1"
@@ -2252,14 +2290,14 @@ electron-publish@20.28.3:
lazy-val "^1.0.3" lazy-val "^1.0.3"
mime "^2.3.1" mime "^2.3.1"
electron-publish@20.38.2: electron-publish@20.38.3:
version "20.38.2" version "20.38.3"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.38.2.tgz#b0a59ee4435c509caa633f9fed01913addd48e1c" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.38.3.tgz#7c162904f728ba2bbf2640bc3620b65ce1061ce3"
integrity sha512-GXwnZm9I9l4RjlDwuALpR57aIH38qRzDEYbhLysmrC5T2xlCgyBIfxS5EUNESqKT+9KeJJZcj+eTKMjbz+Qafw== integrity sha512-Qomq253NT5DfjUZgFSx6p+gheU5YhM6zZ67fTtBZvwyk0v8HwxNXfa8fZT7h+1c3BwEmjusTbmjZRNW/XZBXFA==
dependencies: dependencies:
bluebird-lst "^1.0.6" bluebird-lst "^1.0.6"
builder-util "~9.6.0" builder-util "~9.6.0"
builder-util-runtime "^8.0.2" builder-util-runtime "^8.1.0"
chalk "^2.4.1" chalk "^2.4.1"
fs-extra-p "^7.0.0" fs-extra-p "^7.0.0"
lazy-val "^1.0.3" lazy-val "^1.0.3"
@@ -2286,10 +2324,10 @@ electron-to-chromium@^1.2.7:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188"
integrity sha512-AGJxlBEn2wOohxqWZkISVsOjZueKTQljfEODTDSEiMqSpH0S+xzV+/5oEM9AGaqhu7DzrpKOgU7ocQRjj0nJmg== integrity sha512-AGJxlBEn2wOohxqWZkISVsOjZueKTQljfEODTDSEiMqSpH0S+xzV+/5oEM9AGaqhu7DzrpKOgU7ocQRjj0nJmg==
electron@4.0.0-beta.7: electron@4.0.0:
version "4.0.0-beta.7" version "4.0.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.0-beta.7.tgz#d54f3fb19910da593408ba6b4320d2bdf5c039da" resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.0.tgz#6ccb40cc8bf2d49954dcea73b97ae7ad12ee04b3"
integrity sha512-770Hzxq10nQrzq39uVmvHLNKpPY3TCNrk+IYGDQTNWqmkreXZX6+9iflMMo+xdg1ZHysrTj1QQZvsjjBY176pg== integrity sha512-3XPG/3IXlvnT1oe1K6zEushoD0SKbP8xwdrL10EWGe6k2iOV4hSHqJ8vWnR8yZ7VbSXmBRfomEFDNAo/q/cwKw==
dependencies: dependencies:
"@types/node" "^8.0.24" "@types/node" "^8.0.24"
electron-download "^4.1.0" electron-download "^4.1.0"
@@ -3428,6 +3466,13 @@ is-ci@^1.0.10, is-ci@^1.2.0, is-ci@^1.2.1:
dependencies: dependencies:
ci-info "^1.5.0" ci-info "^1.5.0"
is-ci@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
dependencies:
ci-info "^2.0.0"
is-data-descriptor@^0.1.4: is-data-descriptor@^0.1.4:
version "0.1.4" version "0.1.4"
resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4528,10 +4573,10 @@ no-case@^2.2.0:
dependencies: dependencies:
lower-case "^1.1.1" lower-case "^1.1.1"
node-abi@^2.0.0, node-abi@^2.4.4: node-abi@^2.0.0, node-abi@^2.4.4, node-abi@^2.5.0:
version "2.5.0" version "2.5.1"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.5.0.tgz#942e1a78bce764bc0c1672d5821e492b9d032052" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.5.1.tgz#bb17288fc3b2f68fea0ed9897c66979fd754ed47"
integrity sha512-9g2twBGSP6wIR5PW7tXvAWnEWKJDH/VskdXp168xsw9VVxpEGov8K4jsP4/VeoC7b2ZAyzckvMCuQuQlw44lXg== integrity sha512-oDbFc7vCFx0RWWCweTer3hFm1u+e60N5FtGnmRV6QqvgATGFH/XRR6vqWIeBVosCYCqt6YdIr2L0exLZuEdVcQ==
dependencies: dependencies:
semver "^5.4.1" semver "^5.4.1"
@@ -4544,7 +4589,7 @@ node-fetch-npm@^2.0.2:
json-parse-better-errors "^1.0.0" json-parse-better-errors "^1.0.0"
safe-buffer "^5.1.1" safe-buffer "^5.1.1"
node-gyp@^3.6.0, node-gyp@^3.6.2, node-gyp@^3.8.0: node-gyp@^3.6.0, node-gyp@^3.8.0:
version "3.8.0" version "3.8.0"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==