Skip to content

Commit

Permalink
fix: types for nativeImage, webContents, ShareMenu, webFrameMain (#109)
Browse files Browse the repository at this point in the history
  • Loading branch information
andersk authored Feb 21, 2022
1 parent 3f49620 commit 7c61752
Showing 1 changed file with 28 additions and 23 deletions.
51 changes: 28 additions & 23 deletions index.d.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,45 @@
import * as Electron from 'electron';
import * as Main from 'electron/main'

export {
ClientRequest,
CommandLine,
Cookies,
Debugger,
Dock,
DownloadItem,
IncomingMessage,
MessagePortMain,
ServiceWorkers,
TouchBarButton,
TouchBarColorPicker,
TouchBarGroup,
TouchBarLabel,
TouchBarOtherItemsProxy,
TouchBarPopover,
TouchBarScrubber,
TouchBarSegmentedControl,
TouchBarSlider,
TouchBarSpacer,
WebRequest,
} from 'electron/main';

// Taken from `RemoteMainInterface`
export var app: Electron.App;
export var autoUpdater: Electron.AutoUpdater;
export var BrowserView: typeof Electron.BrowserView;
export var BrowserWindow: typeof Electron.BrowserWindow;
export var ClientRequest: Main.ClientRequest;
export var clipboard: Electron.Clipboard;
export var CommandLine: Main.CommandLine;
export var contentTracing: Electron.ContentTracing;
export var Cookies: Main.Cookies;
export var crashReporter: Electron.CrashReporter;
export var Debugger: Main.Debugger;
export var desktopCapturer: Electron.DesktopCapturer;
export var dialog: Electron.Dialog;
export var Dock: Main.Dock;
export var DownloadItem: Main.DownloadItem;
export var globalShortcut: Electron.GlobalShortcut;
export var inAppPurchase: Electron.InAppPurchase;
export var IncomingMessage: Main.IncomingMessage;
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 MessagePortMain: Main.MessagePortMain;
export var nativeImage: 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 @@ -33,24 +48,14 @@ export var powerMonitor: Electron.PowerMonitor;
export var powerSaveBlocker: Electron.PowerSaveBlocker;
export var protocol: Electron.Protocol;
export var screen: Electron.Screen;
export var ServiceWorkers: Main.ServiceWorkers;
export var session: typeof Electron.session;
export var ShareMenu: typeof Electron.ShareMenu;
export var shell: Electron.Shell;
export var systemPreferences: Electron.SystemPreferences;
export var TouchBar: typeof Electron.TouchBar;
export var TouchBarButton: Main.TouchBarButton;
export var TouchBarColorPicker: Main.TouchBarColorPicker;
export var TouchBarGroup: Main.TouchBarGroup;
export var TouchBarLabel: Main.TouchBarLabel;
export var TouchBarOtherItemsProxy: Main.TouchBarOtherItemsProxy;
export var TouchBarPopover: Main.TouchBarPopover;
export var TouchBarScrubber: Main.TouchBarScrubber;
export var TouchBarSegmentedControl: Main.TouchBarSegmentedControl;
export var TouchBarSlider: Main.TouchBarSlider;
export var TouchBarSpacer: Main.TouchBarSpacer;
export var Tray: typeof Electron.Tray;
export var webContents: typeof Electron.webContents;
export var WebRequest: Main.WebRequest;

This comment has been minimized.

Copy link
@andersk

andersk Mar 1, 2022

Author Contributor

@lckerday You mean removing WebRequest? It wasn’t removed, merely moved up to an export declaration near the top. Note that we now export the type, not a var—but since there is no var at runtime, this doesn’t break anything that wouldn’t have already failed.

(We should probably take any further discussion of this to the PR page #109, where people can be properly @’d and notified.)

export var webContents: typeof Electron.WebContents;
export var webFrameMain: typeof Electron.WebFrameMain;

// Taken from `Remote`
export function getCurrentWebContents(): Electron.WebContents;
Expand Down

0 comments on commit 7c61752

Please sign in to comment.