diff --git a/desktop/index.ts b/desktop/index.ts index 7b6ecd56a..0334d7863 100644 --- a/desktop/index.ts +++ b/desktop/index.ts @@ -26,7 +26,7 @@ function createWindow () { enableRemoteModule: false, webSecurity: true, nodeIntegration: true - }, + } }) mainWindow.webContents.openDevTools() @@ -34,7 +34,7 @@ function createWindow () { mainWindow.loadURL(WinURL) mainWindow.on('close', function (event: any) { if (!willQuitApp) { - event.preventDefault() + // event.preventDefault() // mainWindow?.hide() } }) diff --git a/package.json b/package.json index 8f36db331..c01968398 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@vue/eslint-config-typescript": "7.0.0", "concurrently": "^6.3.0", "cross-env": "^7.0.3", - "electron": "^13.1.7", + "electron": "15.2.0", "electron-builder": "^22.11.7", "electron-dev-runner": "^1.0.1", "eslint": "7.32.0", diff --git a/src/use/pdf.ts b/src/use/pdf.ts index 51dd11baf..3007992e6 100644 --- a/src/use/pdf.ts +++ b/src/use/pdf.ts @@ -506,7 +506,7 @@ export const usePDF = () => { if (store.state.pdf.normalize['Roboto']) set['Roboto'] = store.state.pdf.normalize['Roboto'] - // @ts-ignore + // @ts-ignore ;(pdfMake).fonts = set } diff --git a/yarn.lock b/yarn.lock index c6c78e6ed..96beeb2df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -336,7 +336,7 @@ dependencies: perfect-freehand "^1.0.4" -"@electron/get@^1.0.1": +"@electron/get@^1.13.0": version "1.13.0" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c" integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ== @@ -3036,12 +3036,12 @@ electron-to-chromium@^1.3.846: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.850.tgz#c56c72abfeab051b4b328beb894461c5912d0456" integrity sha512-ZzkDcdzePeF4dhoGZQT77V2CyJOpwfTZEOg4h0x6R/jQhGt/rIRpbRyVreWLtD7B/WsVxo91URm2WxMKR9JQZA== -electron@^13.1.7: - version "13.5.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.5.2.tgz#5c5826e58a5e12bb5ca8047b789d07b45260ecbc" - integrity sha512-CPakwDpy5m8dL0383F5uJboQcVtn9bT/+6/wdDKo8LuTUO9aER1TF41v7feZgZW2c+UwoGPWa814ElSQ3qta2A== +electron@15.2.0: + version "15.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-15.2.0.tgz#3068099d1e5c625d1708487de519c59d7c0a8e6e" + integrity sha512-kg0JdlsVbJgD/hO/A7o9VH8U44pQWkIsyt/sALxH6g8CiHQxMujLn2JfB2gyUfHXPT7m8vD4Z+CurS2KodEsWw== dependencies: - "@electron/get" "^1.0.1" + "@electron/get" "^1.13.0" "@types/node" "^14.6.2" extract-zip "^1.0.3"