Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 15, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
545e044
fix: types for nativeImage, webContents, webFrameMain again
andersk Feb 24, 2022
653c360
ci: Remove Electron 11
andersk Mar 1, 2022
7a9c9ec
fix: Remove exclusion of index.d.ts from tsconfig
andersk Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -53,7 +46,6 @@ workflows:
test_and_release:
jobs:
- test-electron-13
- test-electron-11
- test-electron-12
- release:
requires:
Expand Down
6 changes: 3 additions & 3 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"strict": true,
"esModuleInterop": true
},
"exclude": ["dist", "index.d.ts", "main", "renderer"]
"exclude": ["dist", "main", "renderer"]
}