From fbeffdb166755a5cfa2395d89f498a0eaa1944a9 Mon Sep 17 00:00:00 2001 From: Ven Date: Sun, 20 Nov 2022 20:46:37 +0100 Subject: [PATCH] Add missing BrowserWindow import; bump deps (#258) --- package.json | 12 ++++++------ pnpm-lock.yaml | 50 +++++++++++++++++++++++++------------------------- src/menu.ts | 4 ++-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index f212c88..2882ec5 100644 --- a/package.json +++ b/package.json @@ -27,24 +27,24 @@ }, "homepage": "https://github.com/armcord/armcord#readme", "devDependencies": { - "@types/node": "^17.0.45", + "@types/node": "^18.11.9", "@types/ws": "^8.5.3", "chalk-cli": "^5.0.0", "copyfiles": "^2.4.1", - "electron": "^20.1.0", + "electron": "^21.3.0", "electron-builder": "^23.6.0", - "husky": "^8.0.1", - "prettier": "^2.7.0", + "husky": "^8.0.2", + "prettier": "^2.7.1", "typescript": "^4.9.3" }, "dependencies": { "@pyke/vibe": "github:pykeio/vibe#11984868ce9e007859ed91ff159c7f7f0a34e7ae", - "arrpc": "file:./src/arrpc", + "arrpc": "file:src/arrpc", "cross-fetch": "^3.1.5", "electron-context-menu": "github:ArmCord/electron-context-menu", "extract-zip": "^2.0.1", "v8-compile-cache": "^2.3.0", - "ws": "^8.8.0" + "ws": "^8.11.0" }, "build": { "nsis": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b761d9b..5fb39fd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,24 +2,24 @@ lockfileVersion: 5.4 specifiers: '@pyke/vibe': github:pykeio/vibe#11984868ce9e007859ed91ff159c7f7f0a34e7ae - '@types/node': ^17.0.45 + '@types/node': ^18.11.9 '@types/ws': ^8.5.3 - arrpc: file:./src/arrpc + arrpc: file:src/arrpc chalk-cli: ^5.0.0 copyfiles: ^2.4.1 cross-fetch: ^3.1.5 - electron: ^20.1.0 + electron: ^21.3.0 electron-builder: ^23.6.0 electron-context-menu: github:ArmCord/electron-context-menu extract-zip: ^2.0.1 - husky: ^8.0.1 - prettier: ^2.7.0 + husky: ^8.0.2 + prettier: ^2.7.1 typescript: ^4.9.3 v8-compile-cache: ^2.3.0 - ws: ^8.8.0 + ws: ^8.11.0 dependencies: - '@pyke/vibe': github.com/pykeio/vibe/11984868ce9e007859ed91ff159c7f7f0a34e7ae_electron@20.3.5 + '@pyke/vibe': github.com/pykeio/vibe/11984868ce9e007859ed91ff159c7f7f0a34e7ae_electron@21.3.0 arrpc: file:src/arrpc cross-fetch: 3.1.5 electron-context-menu: github.com/ArmCord/electron-context-menu/280c81398c02a063f46e3285a9708d8db1a7ce32 @@ -28,11 +28,11 @@ dependencies: ws: 8.11.0 devDependencies: - '@types/node': 17.0.45 + '@types/node': 18.11.9 '@types/ws': 8.5.3 chalk-cli: 5.0.0 copyfiles: 2.4.1 - electron: 20.3.5 + electron: 21.3.0 electron-builder: 23.6.0 husky: 8.0.2 prettier: 2.7.1 @@ -148,7 +148,7 @@ packages: /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 17.0.45 + '@types/node': 18.11.9 dev: true /@types/glob/7.2.0: @@ -156,14 +156,14 @@ packages: requiresBuild: true dependencies: '@types/minimatch': 5.1.2 - '@types/node': 17.0.45 + '@types/node': 18.11.9 dev: true optional: true /@types/keyv/3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 17.0.45 + '@types/node': 18.11.9 /@types/minimatch/5.1.2: resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} @@ -181,8 +181,8 @@ packages: /@types/node/16.18.3: resolution: {integrity: sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==} - /@types/node/17.0.45: - resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} + /@types/node/18.11.9: + resolution: {integrity: sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==} /@types/normalize-package-data/2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -192,7 +192,7 @@ packages: resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==} requiresBuild: true dependencies: - '@types/node': 17.0.45 + '@types/node': 18.11.9 xmlbuilder: 15.1.1 dev: true optional: true @@ -200,7 +200,7 @@ packages: /@types/responselike/1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 17.0.45 + '@types/node': 18.11.9 /@types/verror/1.10.6: resolution: {integrity: sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ==} @@ -211,7 +211,7 @@ packages: /@types/ws/8.5.3: resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==} dependencies: - '@types/node': 17.0.45 + '@types/node': 18.11.9 dev: true /@types/yargs-parser/21.0.0: @@ -228,7 +228,7 @@ packages: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 17.0.45 + '@types/node': 18.11.9 optional: true /agent-base/6.0.2: @@ -599,7 +599,7 @@ packages: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} /colors/1.0.3: - resolution: {integrity: sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==} + resolution: {integrity: sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=} engines: {node: '>=0.1.90'} dev: true @@ -628,7 +628,7 @@ packages: dev: true /concat-map/0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} dev: true /config-chain/1.1.13: @@ -885,8 +885,8 @@ packages: - supports-color dev: true - /electron/20.3.5: - resolution: {integrity: sha512-xTBjdgAZXf6txxfIhv9mZ3yloJZ+KTht7D2X10uHlFnQu4ZmvzqwhGuQPnldVKhRUDvZehIjulmmrFO6Mz6SzQ==} + /electron/21.3.0: + resolution: {integrity: sha512-MGRpshN8fBcx4IRuBABIsGDv0tB/MclIFsyFHFFXsBCUc+vIXaE/E6vuWaniGIFSz5WyeuapfTH5IeRb+7yIfw==} engines: {node: '>= 10.17.0'} hasBin: true requiresBuild: true @@ -2242,7 +2242,7 @@ packages: file:src/arrpc: resolution: {directory: src/arrpc, type: directory} name: arrpc - version: 0.1.0 + version: 1.1.0 dependencies: ws: 8.11.0 transitivePeerDependencies: @@ -2260,7 +2260,7 @@ packages: electron-is-dev: 2.0.0 dev: false - github.com/pykeio/vibe/11984868ce9e007859ed91ff159c7f7f0a34e7ae_electron@20.3.5: + github.com/pykeio/vibe/11984868ce9e007859ed91ff159c7f7f0a34e7ae_electron@21.3.0: resolution: {tarball: https://codeload.github.com/pykeio/vibe/tar.gz/11984868ce9e007859ed91ff159c7f7f0a34e7ae} id: github.com/pykeio/vibe/11984868ce9e007859ed91ff159c7f7f0a34e7ae name: '@pyke/vibe' @@ -2270,5 +2270,5 @@ packages: electron: '>=11.0' dependencies: cargo-cp-artifact: 0.1.7 - electron: 20.3.5 + electron: 21.3.0 dev: false diff --git a/src/menu.ts b/src/menu.ts index bbcb446..6ccae58 100644 --- a/src/menu.ts +++ b/src/menu.ts @@ -1,4 +1,4 @@ -import {Menu, app, clipboard, globalShortcut} from "electron"; +import {BrowserWindow, Menu, app, clipboard, globalShortcut} from "electron"; import {mainWindow} from "./window"; import {getConfig} from "./utils"; import {createSettingsWindow} from "./settings/main"; @@ -49,7 +49,7 @@ export async function setMenu() { label: "Developer tools", accelerator: "CmdOrCtrl+Shift+I", click: function () { - BrowserWindow.getFocusedWindow().toggleDevTools() + BrowserWindow.getFocusedWindow()!.webContents.toggleDevTools(); } }, {