From 2931adea799e9604bfa67a9c91db4d002fc427d9 Mon Sep 17 00:00:00 2001 From: purocean Date: Sun, 19 Dec 2021 11:01:35 +0800 Subject: [PATCH] refactor: upgrade Electron to 15.3.2 --- .github/workflows/release.yml | 2 +- ...{m1-11.4.2-pty.node => m1-15.3.2-pty.node} | Bin 63061 -> 63173 bytes package.json | 11 +- scripts/install.bat | 2 +- scripts/install.sh | 2 +- src/main/app.ts | 36 ++- src/renderer/components/ExportPanel.vue | 4 +- src/renderer/components/TitleBar.vue | 4 +- src/renderer/plugins/electron-zoom.ts | 2 +- src/renderer/plugins/markdown-luckysheet.ts | 2 +- src/renderer/support/env.ts | 22 +- tsconfig.json | 1 + yarn.lock | 269 +++++++++++------- 13 files changed, 211 insertions(+), 146 deletions(-) rename files/{m1-11.4.2-pty.node => m1-15.3.2-pty.node} (59%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f06c0413..501355df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} env: npm_config_disturl: https://atom.io/download/electron - npm_config_target: 11.4.5 + npm_config_target: 15.3.2 npm_config_runtime: "electron" steps: diff --git a/files/m1-11.4.2-pty.node b/files/m1-15.3.2-pty.node similarity index 59% rename from files/m1-11.4.2-pty.node rename to files/m1-15.3.2-pty.node index edfc225f38fcb06696b2a34549bdda1f0e6578cf..fd2c93b68c9b3398b9865b34ff9173c1810ea338 100755 GIT binary patch literal 63173 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 aHfPNG6U$zn-D|$r8sETLe>0{!^uGa=+t}y; literal 63061 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 F{{UDYwio~a diff --git a/package.json b/package.json index 29503a33..5161a4b7 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,13 @@ "rebuild-pty": "electron-rebuild -f -w node-pty" }, "dependencies": { + "@electron/remote": "^2.0.1", "command-exists": "^1.2.9", "electron-context-menu": "^3.1.1", - "electron-log": "^4.3.5", + "electron-log": "^4.4.3", "electron-progressbar": "^2.0.1", "electron-store": "^5.2.0", - "electron-updater": "^4.3.9", + "electron-updater": "^4.6.1", "fs-extra": "^10.0.0", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", @@ -75,9 +76,9 @@ "crypto-js": "^3.3.0", "dayjs": "^1.10.5", "echarts": "^5.2.2", - "electron": "11.4.6", - "electron-builder": "^22.11.7", - "electron-notarize": "^1.0.0", + "electron": "15.3.2", + "electron-builder": "^22.14.5", + "electron-notarize": "^1.1.1", "eslint": "^7.11.0", "eslint-plugin-import": "^2.20.2", "eslint-plugin-node": "^11.1.0", diff --git a/scripts/install.bat b/scripts/install.bat index f065baa4..7e7aa434 100644 --- a/scripts/install.bat +++ b/scripts/install.bat @@ -1,5 +1,5 @@ set npm_config_disturl=https://atom.io/download/electron -set npm_config_target=11.4.6 +set npm_config_target=15.3.2 set npm_config_runtime="electron" yarn install diff --git a/scripts/install.sh b/scripts/install.sh index 6032d4db..d7908833 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,7 +1,7 @@ #!/bin/sh export npm_config_disturl=https://atom.io/download/electron -export npm_config_target=11.4.6 +export npm_config_target=15.3.2 export npm_config_runtime="electron" yarn install diff --git a/src/main/app.ts b/src/main/app.ts index 78ab9bf7..4590e67e 100644 --- a/src/main/app.ts +++ b/src/main/app.ts @@ -1,8 +1,9 @@ -import { protocol, app, BrowserWindow, Menu, Tray, powerMonitor, dialog, OpenDialogOptions, shell } from 'electron' +/* eslint-disable @typescript-eslint/no-var-requires */ +import { protocol, app, Menu, Tray, powerMonitor, dialog, OpenDialogOptions, shell, BrowserWindow } from 'electron' +import type TBrowserWindow from 'electron' import * as path from 'path' import * as os from 'os' import * as yargs from 'yargs' -import ElectronContextmenu from 'electron-context-menu' import server from './server' import { APP_NAME } from './constant' import { getTrayMenus, getMainMenus } from './menus' @@ -13,6 +14,9 @@ import { registerShortcut } from './shortcut' import { $t } from './i18n' import { getProxyAgent } from './proxy-agent' +const electronContextMenu = require('electron-context-menu') +const electronRemote = require('@electron/remote/main') + const isMacos = os.platform() === 'darwin' const isLinux = os.platform() === 'linux' @@ -22,7 +26,8 @@ const trayEnabled = !(yargs.argv['disable-tray']) const backendPort = Number(yargs.argv.port) || 3044 const devFrontendPort = 8066 -ElectronContextmenu({ +electronRemote.initialize() +electronContextMenu({ showLookUpSelection: true, showSearchWithGoogle: false, showCopyImage: true, @@ -36,7 +41,7 @@ ElectronContextmenu({ Menu.setApplicationMenu(getMainMenus()) let fullscreen = false -let win: BrowserWindow | null = null +let win: TBrowserWindow.BrowserWindow | null = null let tray: Tray | null = null const getUrl = (mode?: typeof urlMode) => { @@ -84,37 +89,37 @@ const createWindow = () => { webPreferences: { webSecurity: false, nodeIntegration: true, - enableRemoteModule: true, + contextIsolation: false, }, // for linux icon. ...(isLinux ? { icon: path.join(__dirname, './assets/icon.png') } : undefined) }) // win.maximize() - win.show() - win.setMenu(null) + win!.show() + win!.setMenu(null) // could not load js correctly when startup setTimeout(() => { win && win.loadURL(getUrl()) }, 0) - win.on('close', e => { + win!.on('close', e => { if (trayEnabled) { hideWindow() e.preventDefault() } }) - win.on('closed', () => { + win!.on('closed', () => { win = null }) - win.on('enter-full-screen', () => { + win!.on('enter-full-screen', () => { fullscreen = true }) - win.on('leave-full-screen', () => { + win!.on('leave-full-screen', () => { fullscreen = false }) } @@ -298,7 +303,10 @@ if (!gotTheLock) { }) app.on('web-contents-created', (_, webContents) => { - webContents.on('new-window', (e, url) => { + electronRemote.enable(webContents) + webContents.openDevTools() + + webContents.setWindowOpenHandler(({ url }) => { const allowList = [ `${APP_NAME}://`, `http://localhost:${backendPort}`, @@ -308,9 +316,11 @@ if (!gotTheLock) { ] if (!allowList.find(x => url.startsWith(x))) { - e.preventDefault() shell.openExternal(url) + return { action: 'deny' } } + + return { action: 'allow' } }) }) } diff --git a/src/renderer/components/ExportPanel.vue b/src/renderer/components/ExportPanel.vue index 2ee79e59..9b3babc7 100644 --- a/src/renderer/components/ExportPanel.vue +++ b/src/renderer/components/ExportPanel.vue @@ -74,7 +74,7 @@