fix: types for nativeImage, webContents, webFrameMain again (#111)

* fix: types for nativeImage, webContents, webFrameMain again Fixes #110. Signed-off-by: Anders Kaseorg <[email protected]> * ci: Remove Electron 11 ShareMenu and webFrameMain are new in Electron 12. Signed-off-by: Anders Kaseorg <[email protected]> * 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 <[email protected]>
electron · Mar 15, 2022 · 084bdff · 084bdff
1 parent 36e4f9d
commit 084bdff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git 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:

diff --git 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;

diff --git 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"]
 }