From 545e044626f77b2dd79284d5966ca516aea9b37a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 23 Feb 2022 18:01:50 -0800 Subject: [PATCH 1/3] fix: types for nativeImage, webContents, webFrameMain again Fixes #110. Signed-off-by: Anders Kaseorg --- index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.d.ts b/index.d.ts index 7fa3a25..26836fb 100644 --- a/index.d.ts +++ b/index.d.ts @@ -39,7 +39,7 @@ export var ipcMain: Electron.IpcMain; export var Menu: typeof Electron.Menu; export var MenuItem: typeof Electron.MenuItem; export var MessageChannelMain: typeof Electron.MessageChannelMain; -export var nativeImage: typeof Electron.NativeImage; +export var nativeImage: typeof Electron.nativeImage; export var nativeTheme: Electron.NativeTheme; export var net: Electron.Net; export var netLog: Electron.NetLog; @@ -54,8 +54,8 @@ export var shell: Electron.Shell; export var systemPreferences: Electron.SystemPreferences; export var TouchBar: typeof Electron.TouchBar; export var Tray: typeof Electron.Tray; -export var webContents: typeof Electron.WebContents; -export var webFrameMain: typeof Electron.WebFrameMain; +export var webContents: typeof Electron.webContents; +export var webFrameMain: typeof Electron.webFrameMain; // Taken from `Remote` export function getCurrentWebContents(): Electron.WebContents; From 653c3607887594e6bb91e77d24f4fea514792e77 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 28 Feb 2022 22:13:51 -0800 Subject: [PATCH 2/3] ci: Remove Electron 11 ShareMenu and webFrameMain are new in Electron 12. Signed-off-by: Anders Kaseorg --- .circleci/config.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 666516c..c68ffca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,13 +26,6 @@ jobs: - image: circleci/node:14-browsers <<: *steps-test - test-electron-11: - docker: - - image: circleci/node:14-browsers - environment: - ELECTRON_VERSION: 11.x - <<: *steps-test - test-electron-12: docker: - image: circleci/node:14-browsers @@ -53,7 +46,6 @@ workflows: test_and_release: jobs: - test-electron-13 - - test-electron-11 - test-electron-12 - release: requires: From 7a9c9ece0622941aab1a9f01a57c49f2b86b102f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 28 Feb 2022 19:09:55 -0800 Subject: [PATCH 3/3] fix: Remove exclusion of index.d.ts from tsconfig This was previously excluded (#48) because of CI failures due to index.d.ts referencing files in dist. Those references were later removed (#58), so we can include it again to have CI verify that index.d.ts type checks. Signed-off-by: Anders Kaseorg --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index e60de47..34e00ca 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,5 +13,5 @@ "strict": true, "esModuleInterop": true }, - "exclude": ["dist", "index.d.ts", "main", "renderer"] + "exclude": ["dist", "main", "renderer"] }