mirror/tabby
2
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-11-27 06:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

electron 14

Browse Source
This commit is contained in:
Eugene Pankov 2021-12-12 14:05:55 +01:00
parent 9500fa8770
commit b6fd909d67
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
5 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/window.ts
View File

@ -3,6 +3,7 @@ import * as glasstron from 'glasstron'
import { Subject, Observable, debounceTime } from 'rxjs' import { Subject, Observable, debounceTime } from 'rxjs'
import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions, TouchBar, nativeImage } from 'electron' import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions, TouchBar, nativeImage } from 'electron'
import ElectronConfig = require('electron-config') import ElectronConfig = require('electron-config')
import { enable as enableRemote } from '@electron/remote/main'
import * as os from 'os' import * as os from 'os'
import * as path from 'path' import * as path from 'path'
import macOSRelease from 'macos-release' import macOSRelease from 'macos-release'
@ -65,7 +66,6 @@ export class Window {
nodeIntegration: true, nodeIntegration: true,
preload: path.join(__dirname, 'sentry.js'), preload: path.join(__dirname, 'sentry.js'),
backgroundThrottling: false, backgroundThrottling: false,
enableRemoteModule: true,
contextIsolation: false, contextIsolation: false,
}, },
maximizable: true, maximizable: true,
@ -126,6 +126,8 @@ export class Window {
} }
}) })
enableRemote(this.window.webContents)
this.window.loadURL(`file://${app.getAppPath()}/dist/index.html`, { extraHeaders: 'pragma: no-cache\n' }) this.window.loadURL(`file://${app.getAppPath()}/dist/index.html`, { extraHeaders: 'pragma: no-cache\n' })
this.window.webContents.setVisualZoomLevelLimits(1, 1) this.window.webContents.setVisualZoomLevelLimits(1, 1)

4
app/package.json
View File

@ -15,7 +15,7 @@
}, },
"dependencies": { "dependencies": {
"@angular/cdk": "^12.2.9", "@angular/cdk": "^12.2.9",
"@electron/remote": "1.2.0", "@electron/remote": "2.0.1",
"@tabby-gang/node-pty": "^0.11.0-beta.200", "@tabby-gang/node-pty": "^0.11.0-beta.200",
"any-promise": "^1.3.0", "any-promise": "^1.3.0",
"electron-config": "2.0.0", "electron-config": "2.0.0",
@ -35,9 +35,9 @@
"yargs": "^17.2.1" "yargs": "^17.2.1"
}, },
"optionalDependencies": { "optionalDependencies": {
"@tabby-gang/windows-blurbehind": "^3.0.0",
"macos-native-processlist": "^2.0.0", "macos-native-processlist": "^2.0.0",
"serialport": "^10.0.0", "serialport": "^10.0.0",
"@tabby-gang/windows-blurbehind": "^3.0.0",
"windows-native-registry": "^3.1.0", "windows-native-registry": "^3.1.0",
"windows-process-tree": "^0.3.2" "windows-process-tree": "^0.3.2"
}, },

8
app/yarn.lock
View File

@ -11,10 +11,10 @@
optionalDependencies: optionalDependencies:
parse5 "^5.0.0" parse5 "^5.0.0"
"@electron/remote@1.2.0": "@electron/remote@2.0.1":
version "1.2.0" version "2.0.1"
resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-1.2.0.tgz#772eb4c3ac17aaba5a9cf05a09092f6277f5671f" resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
integrity sha512-C774t2DFVJsa+dxU9Gc2nYzylRZoJ79I0Sxrh8T9cN69fBkntfGbyBEQiD9UfZopqL0CYLzk1anY2Ywhql6h1w== integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
"@iarna/cli@^1.2.0": "@iarna/cli@^1.2.0":
version "1.2.0" version "1.2.0"

4
package.json
View File

@ -30,7 +30,7 @@
"cross-env": "7.0.3", "cross-env": "7.0.3",
"css-loader": "^6.5.1", "css-loader": "^6.5.1",
"deep-equal": "2.0.5", "deep-equal": "2.0.5",
"electron": "13.5.1", "electron": "14.2.1",
"electron-builder": "^22.14.5", "electron-builder": "^22.14.5",
"electron-download": "^4.1.1", "electron-download": "^4.1.1",
"electron-installer-snap": "^5.1.0", "electron-installer-snap": "^5.1.0",
@ -81,7 +81,7 @@
}, },
"resolutions": { "resolutions": {
"lzma-native": "^8.0.0", "lzma-native": "^8.0.0",
"*/node-abi": "^2.30.0", "*/node-abi": "^3.5.0",
"**/graceful-fs": "^4.2.4" "**/graceful-fs": "^4.2.4"
}, },
"scripts": { "scripts": {

23
yarn.lock
View File

@ -2664,10 +2664,10 @@ electron-to-chromium@^1.3.723:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052"
integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig== integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig==
electron@13.5.1: electron@14.2.1:
version "13.5.1" version "14.2.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-13.5.1.tgz#76c02c39be228532f886a170b472cbd3d93f0d0f" resolved "https://registry.yarnpkg.com/electron/-/electron-14.2.1.tgz#ee8b9cfa8c04ad4d9456daa5bbac562c2c2517a1"
integrity sha512-ZyxhIhmdaeE3xiIGObf0zqEyCyuIDqZQBv9NKX8w5FNzGm87j4qR0H1+GQg6vz+cA1Nnv1x175Zvimzc0/UwEQ== integrity sha512-20cLOVpmjIgYMgsDLpI36VQhv0bIy54sSBAP3rLFtrs/kVVHLu0educMVZkkMm5GJPd2vvU4mcK7f43JgVRcNg==
dependencies: dependencies:
"@electron/get" "^1.0.1" "@electron/get" "^1.0.1"
"@types/node" "^14.6.2" "@types/node" "^14.6.2"
@ -5335,17 +5335,10 @@ no-case@^3.0.4:
lower-case "^2.0.2" lower-case "^2.0.2"
tslib "^2.0.3" tslib "^2.0.3"
node-abi@^2.30.0, node-abi@^3.0.0: node-abi@^3.0.0, node-abi@^3.2.0, node-abi@^3.5.0:
version "2.30.0" version "3.5.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248"
integrity sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg== integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw==
dependencies:
semver "^5.4.1"
node-abi@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.2.0.tgz#c8ec6874f808b4da5fbd56e9506390ce65b152a2"
integrity sha512-/qb92JAb2uiwEQ4aXpVphXfGJU77qdCieXACDaIofcMz+YMPBmnCo8v0OlzJBuXh5QHmMiiI/GKyiCzbjOMn2g==
dependencies: dependencies:
semver "^7.3.5" semver "^7.3.5"