use @electron/remote

This commit is contained in:
Eugene Pankov
2021-03-20 17:12:39 +01:00
parent 4a97cc4383
commit bd46b08c9d
16 changed files with 58 additions and 50 deletions

View File

@@ -1,5 +1,7 @@
import { app, ipcMain, Menu, Tray, shell, screen, globalShortcut, MenuItemConstructorOptions } from 'electron'
import * as promiseIpc from 'electron-promise-ipc'
import * as remote from '@electron/remote/main'
import { loadConfig } from './config'
import { Window, WindowOptions } from './window'
import { pluginManager } from './pluginManager'
@@ -9,6 +11,8 @@ export class Application {
private windows: Window[] = []
constructor () {
remote.initialize()
ipcMain.on('app:config-change', (_event, config) => {
this.broadcast('host:config-change', config)
})

View File

@@ -1,12 +1,8 @@
import * as path from 'path'
import * as fs from 'fs'
import * as electron from 'electron'
let appPath: string | null = null
try {
appPath = path.dirname(require('electron').app.getPath('exe'))
} catch {
appPath = path.dirname(require('electron').remote.app.getPath('exe'))
}
const appPath = path.dirname(electron.app.getPath('exe'))
if (fs.existsSync(path.join(appPath, 'terminus-data'))) {
fs.renameSync(path.join(appPath, 'terminus-data'), path.join(appPath, 'data'))
@@ -14,9 +10,5 @@ if (fs.existsSync(path.join(appPath, 'terminus-data'))) {
const portableData = path.join(appPath, 'data')
if (fs.existsSync(portableData)) {
console.log('reset user data to ' + portableData)
try {
require('electron').app.setPath('userData', portableData)
} catch {
require('electron').remote.app.setPath('userData', portableData)
}
electron.app.setPath('userData', portableData)
}

View File

@@ -1,16 +1,14 @@
const { init } = String(process.type) === 'main' ? require('@sentry/electron/dist/main') : require('@sentry/electron/dist/renderer')
import * as isDev from 'electron-is-dev'
const SENTRY_DSN = 'https://4717a0a7ee0b4429bd3a0f06c3d7eec3@sentry.io/181876'
let release = null
try {
release = require('electron').app.getVersion()
} catch {
release = require('electron').remote.app.getVersion()
release = require('@electron/remote').app.getVersion()
}
if (!isDev) {
if (!process.env.TERMINUS_DEV) {
init({
dsn: SENTRY_DSN,
release,