diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts
index 30f6bee22f..84f1ca89c1 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/github-electron/github-electron-main-tests.ts
@@ -1,4 +1,4 @@
-///
+///
import {
app,
autoUpdater,
diff --git a/github-electron/github-electron-main.d.ts b/github-electron/github-electron-main.d.ts
deleted file mode 100644
index aa83e88016..0000000000
--- a/github-electron/github-electron-main.d.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-// Type definitions for the Electron 0.25.2 main process
-// Project: http://electron.atom.io/
-// Definitions by: jedmao
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-///
-
-declare module GitHubElectron {
- interface ContentTracing {
- /**
- * Get a set of category groups. The category groups can change as new code paths are reached.
- * @param callback Called once all child processes have acked to the getCategories request.
- */
- getCategories(callback: (categoryGroups: any[]) => void): void;
- /**
- * Start recording on all processes. Recording begins immediately locally, and asynchronously
- * on child processes as soon as they receive the EnableRecording request.
- * @param categoryFilter A filter to control what category groups should be traced.
- * A filter can have an optional "-" prefix to exclude category groups that contain
- * a matching category. Having both included and excluded category patterns in the
- * same list would not be supported.
- * @param options controls what kind of tracing is enabled, it could be a OR-ed
- * combination of tracing.DEFAULT_OPTIONS, tracing.ENABLE_SYSTRACE, tracing.ENABLE_SAMPLING
- * and tracing.RECORD_CONTINUOUSLY.
- * @param callback Called once all child processes have acked to the startRecording request.
- */
- startRecording(categoryFilter: string, options: number, callback: Function): void;
- /**
- * Stop recording on all processes. Child processes typically are caching trace data and
- * only rarely flush and send trace data back to the main process. That is because it may
- * be an expensive operation to send the trace data over IPC, and we would like to avoid
- * much runtime overhead of tracing. So, to end tracing, we must asynchronously ask all
- * child processes to flush any pending trace data.
- * @param resultFilePath Trace data will be written into this file if it is not empty,
- * or into a temporary file.
- * @param callback Called once all child processes have acked to the stopRecording request.
- */
- stopRecording(resultFilePath: string, callback:
- /**
- * @param filePath A file that contains the traced data.
- */
- (filePath: string) => void
- ): void;
- /**
- * Start monitoring on all processes. Monitoring begins immediately locally, and asynchronously
- * on child processes as soon as they receive the startMonitoring request.
- * @param callback Called once all child processes have acked to the startMonitoring request.
- */
- startMonitoring(categoryFilter: string, options: number, callback: Function): void;
- /**
- * Stop monitoring on all processes.
- * @param callback Called once all child processes have acked to the stopMonitoring request.
- */
- stopMonitoring(callback: Function): void;
- /**
- * Get the current monitoring traced data. Child processes typically are caching trace data
- * and only rarely flush and send trace data back to the main process. That is because it may
- * be an expensive operation to send the trace data over IPC, and we would like to avoid much
- * runtime overhead of tracing. So, to end tracing, we must asynchronously ask all child
- * processes to flush any pending trace data.
- * @param callback Called once all child processes have acked to the captureMonitoringSnapshot request.
- */
- captureMonitoringSnapshot(resultFilePath: string, callback:
- /**
- * @param filePath A file that contains the traced data
- * @returns {}
- */
- (filePath: string) => void
- ): void;
- /**
- * Get the maximum across processes of trace buffer percent full state.
- * @param callback Called when the TraceBufferUsage value is determined.
- */
- getTraceBufferUsage(callback: Function): void;
- /**
- * @param callback Called every time the given event occurs on any process.
- */
- setWatchEvent(categoryName: string, eventName: string, callback: Function): void;
- /**
- * Cancel the watch event. If tracing is enabled, this may race with the watch event callback.
- */
- cancelWatchEvent(): void;
- DEFAULT_OPTIONS: number;
- ENABLE_SYSTRACE: number;
- ENABLE_SAMPLING: number;
- RECORD_CONTINUOUSLY: number;
- }
-
- interface Dialog {
- /**
- * @param callback If supplied, the API call will be asynchronous.
- * @returns On success, returns an array of file paths chosen by the user,
- * otherwise returns undefined.
- */
- showOpenDialog: typeof GitHubElectron.Dialog.showOpenDialog;
- /**
- * @param callback If supplied, the API call will be asynchronous.
- * @returns On success, returns the path of file chosen by the user, otherwise
- * returns undefined.
- */
- showSaveDialog: typeof GitHubElectron.Dialog.showSaveDialog;
- /**
- * Shows a message box. It will block until the message box is closed. It returns .
- * @param callback If supplied, the API call will be asynchronous.
- * @returns The index of the clicked button.
- */
- showMessageBox: typeof GitHubElectron.Dialog.showMessageBox;
-
- /**
- * Runs a modal dialog that shows an error message. This API can be called safely
- * before the ready event of app module emits, it is usually used to report errors
- * in early stage of startup.
- */
- showErrorBox(title: string, content: string): void;
- }
-
- interface GlobalShortcut {
- /**
- * Registers a global shortcut of accelerator.
- * @param accelerator Represents a keyboard shortcut. It can contain modifiers
- * and key codes, combined by the "+" character.
- * @param callback Called when the registered shortcut is pressed by the user.
- * @returns {}
- */
- register(accelerator: string, callback: Function): void;
- /**
- * @param accelerator Represents a keyboard shortcut. It can contain modifiers
- * and key codes, combined by the "+" character.
- * @returns Whether the accelerator is registered.
- */
- isRegistered(accelerator: string): boolean;
- /**
- * Unregisters the global shortcut of keycode.
- * @param accelerator Represents a keyboard shortcut. It can contain modifiers
- * and key codes, combined by the "+" character.
- */
- unregister(accelerator: string): void;
- /**
- * Unregisters all the global shortcuts.
- */
- unregisterAll(): void;
- }
-
- class RequestFileJob {
- /**
- * Create a request job which would query a file of path and set corresponding mime types.
- */
- constructor(path: string);
- }
-
- class RequestStringJob {
- /**
- * Create a request job which sends a string as response.
- */
- constructor(options?: {
- /**
- * Default is "text/plain".
- */
- mimeType?: string;
- /**
- * Default is "UTF-8".
- */
- charset?: string;
- data?: string;
- });
- }
-
- class RequestBufferJob {
- /**
- * Create a request job which accepts a buffer and sends a string as response.
- */
- constructor(options?: {
- /**
- * Default is "application/octet-stream".
- */
- mimeType?: string;
- /**
- * Default is "UTF-8".
- */
- encoding?: string;
- data?: Buffer;
- });
- }
-
- interface Protocol {
- registerProtocol(scheme: string, handler: (request: any) => void): void;
- unregisterProtocol(scheme: string): void;
- isHandledProtocol(scheme: string): boolean;
- interceptProtocol(scheme: string, handler: (request: any) => void): void;
- uninterceptProtocol(scheme: string): void;
- RequestFileJob: typeof RequestFileJob;
- RequestStringJob: typeof RequestStringJob;
- RequestBufferJob: typeof RequestBufferJob;
- }
-
- interface Electron {
- app: GitHubElectron.App;
- autoUpdater: GitHubElectron.AutoUpdater;
- BrowserWindow: typeof GitHubElectron.BrowserWindow;
- contentTracing: GitHubElectron.ContentTracing;
- dialog: GitHubElectron.Dialog;
- globalShortcut: GitHubElectron.GlobalShortcut;
- ipcMain: NodeJS.EventEmitter;
- Menu: typeof GitHubElectron.Menu;
- MenuItem: typeof GitHubElectron.MenuItem;
- powerMonitor: NodeJS.EventEmitter;
- protocol: GitHubElectron.Protocol;
- Tray: typeof GitHubElectron.Tray;
- }
-}
-
-declare module 'electron' {
- var electron: GitHubElectron.Electron;
- export = electron;
-}
-
-interface NodeRequireFunction {
- (id: 'electron'): GitHubElectron.Electron;
-}
diff --git a/github-electron/github-electron-renderer-tests.ts b/github-electron/github-electron-renderer-tests.ts
index 88fa4fcd55..cf610718ce 100644
--- a/github-electron/github-electron-renderer-tests.ts
+++ b/github-electron/github-electron-renderer-tests.ts
@@ -1,4 +1,4 @@
-///
+///
import {
ipcRenderer,
remote,
diff --git a/github-electron/github-electron-renderer.d.ts b/github-electron/github-electron-renderer.d.ts
deleted file mode 100644
index 7cfdca5a06..0000000000
--- a/github-electron/github-electron-renderer.d.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-// Type definitions for the Electron 0.25.2 renderer process (web page)
-// Project: http://electron.atom.io/
-// Definitions by: jedmao
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-///
-
-declare module GitHubElectron {
- export class InProcess implements NodeJS.EventEmitter {
- addListener(event: string, listener: Function): InProcess;
- on(event: string, listener: Function): InProcess;
- once(event: string, listener: Function): InProcess;
- removeListener(event: string, listener: Function): InProcess;
- removeAllListeners(event?: string): InProcess;
- setMaxListeners(n: number): void;
- listeners(event: string): Function[];
- emit(event: string, ...args: any[]): boolean;
- /**
- * Send ...args to the renderer via channel in asynchronous message, the main
- * process can handle it by listening to the channel event of ipc module.
- */
- send(channel: string, ...args: any[]): void;
- /**
- * Send ...args to the renderer via channel in synchronous message, and returns
- * the result sent from main process. The main process can handle it by listening
- * to the channel event of ipc module, and returns by setting event.returnValue.
- * Note: Usually developers should never use this API, since sending synchronous
- * message would block the whole renderer process.
- * @returns The result sent from the main process.
- */
- sendSync(channel: string, ...args: any[]): string;
- /**
- * Like ipc.send but the message will be sent to the host page instead of the main process.
- * This is mainly used by the page in to communicate with host page.
- */
- sendToHost(channel: string, ...args: any[]): void;
- }
-
- interface Remote {
- /**
- * @returns The object returned by require(module) in the main process.
- */
- require(module: string): any;
- /**
- * @returns The BrowserWindow object which this web page belongs to.
- */
- getCurrentWindow(): BrowserWindow
- /**
- * @returns The global variable of name (e.g. global[name]) in the main process.
- */
- getGlobal(name: string): any;
- /**
- * Returns the process object in the main process. This is the same as
- * remote.getGlobal('process'), but gets cached.
- */
- process: any;
- }
-
- interface WebFrame {
- /**
- * Changes the zoom factor to the specified factor, zoom factor is
- * zoom percent / 100, so 300% = 3.0.
- */
- setZoomFactor(factor: number): void;
- /**
- * @returns The current zoom factor.
- */
- getZoomFactor(): number;
- /**
- * Changes the zoom level to the specified level, 0 is "original size", and each
- * increment above or below represents zooming 20% larger or smaller to default
- * limits of 300% and 50% of original size, respectively.
- */
- setZoomLevel(level: number): void;
- /**
- * @returns The current zoom level.
- */
- getZoomLevel(): number;
- /**
- * Sets a provider for spell checking in input fields and text areas.
- */
- setSpellCheckProvider(language: string, autoCorrectWord: boolean, provider: {
- /**
- * @returns Whether the word passed is correctly spelled.
- */
- spellCheck: (text: string) => boolean;
- }): void;
- /**
- * Sets the scheme as secure scheme. Secure schemes do not trigger mixed content
- * warnings. For example, https and data are secure schemes because they cannot be
- * corrupted by active network attackers.
- */
- registerURLSchemeAsSecure(scheme: string): void;
- }
-
- export interface Electron {
- remote: GitHubElectron.Remote;
- ipcRenderer: GitHubElectron.InProcess;
- webFrame: GitHubElectron.WebFrame;
- }
-}
-
-declare module 'electron' {
- var electron: GitHubElectron.Electron;
- export = electron;
-}
-
-interface NodeRequireFunction {
- (id: 'electron'): GitHubElectron.Electron;
-}
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
index 05a4a65712..10c3a43f2b 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -1405,12 +1405,306 @@ declare module GitHubElectron {
beep(): void;
}
+ // Type definitions for renderer process
+
+ export class IpcRenderer implements NodeJS.EventEmitter {
+ addListener(event: string, listener: Function): IpcRenderer;
+ on(event: string, listener: Function): IpcRenderer;
+ once(event: string, listener: Function): IpcRenderer;
+ removeListener(event: string, listener: Function): IpcRenderer;
+ removeAllListeners(event?: string): IpcRenderer;
+ setMaxListeners(n: number): void;
+ listeners(event: string): Function[];
+ emit(event: string, ...args: any[]): boolean;
+ /**
+ * Send ...args to the renderer via channel in asynchronous message, the main
+ * process can handle it by listening to the channel event of ipc module.
+ */
+ send(channel: string, ...args: any[]): void;
+ /**
+ * Send ...args to the renderer via channel in synchronous message, and returns
+ * the result sent from main process. The main process can handle it by listening
+ * to the channel event of ipc module, and returns by setting event.returnValue.
+ * Note: Usually developers should never use this API, since sending synchronous
+ * message would block the whole renderer process.
+ * @returns The result sent from the main process.
+ */
+ sendSync(channel: string, ...args: any[]): string;
+ /**
+ * Like ipc.send but the message will be sent to the host page instead of the main process.
+ * This is mainly used by the page in to communicate with host page.
+ */
+ sendToHost(channel: string, ...args: any[]): void;
+ }
+
+ interface Remote {
+ /**
+ * @returns The object returned by require(module) in the main process.
+ */
+ require(module: string): any;
+ /**
+ * @returns The BrowserWindow object which this web page belongs to.
+ */
+ getCurrentWindow(): BrowserWindow
+ /**
+ * @returns The global variable of name (e.g. global[name]) in the main process.
+ */
+ getGlobal(name: string): any;
+ /**
+ * Returns the process object in the main process. This is the same as
+ * remote.getGlobal('process'), but gets cached.
+ */
+ process: any;
+ }
+
+ interface WebFrame {
+ /**
+ * Changes the zoom factor to the specified factor, zoom factor is
+ * zoom percent / 100, so 300% = 3.0.
+ */
+ setZoomFactor(factor: number): void;
+ /**
+ * @returns The current zoom factor.
+ */
+ getZoomFactor(): number;
+ /**
+ * Changes the zoom level to the specified level, 0 is "original size", and each
+ * increment above or below represents zooming 20% larger or smaller to default
+ * limits of 300% and 50% of original size, respectively.
+ */
+ setZoomLevel(level: number): void;
+ /**
+ * @returns The current zoom level.
+ */
+ getZoomLevel(): number;
+ /**
+ * Sets a provider for spell checking in input fields and text areas.
+ */
+ setSpellCheckProvider(language: string, autoCorrectWord: boolean, provider: {
+ /**
+ * @returns Whether the word passed is correctly spelled.
+ */
+ spellCheck: (text: string) => boolean;
+ }): void;
+ /**
+ * Sets the scheme as secure scheme. Secure schemes do not trigger mixed content
+ * warnings. For example, https and data are secure schemes because they cannot be
+ * corrupted by active network attackers.
+ */
+ registerURLSchemeAsSecure(scheme: string): void;
+ }
+
+ // Type definitions for main process
+
+ interface ContentTracing {
+ /**
+ * Get a set of category groups. The category groups can change as new code paths are reached.
+ * @param callback Called once all child processes have acked to the getCategories request.
+ */
+ getCategories(callback: (categoryGroups: any[]) => void): void;
+ /**
+ * Start recording on all processes. Recording begins immediately locally, and asynchronously
+ * on child processes as soon as they receive the EnableRecording request.
+ * @param categoryFilter A filter to control what category groups should be traced.
+ * A filter can have an optional "-" prefix to exclude category groups that contain
+ * a matching category. Having both included and excluded category patterns in the
+ * same list would not be supported.
+ * @param options controls what kind of tracing is enabled, it could be a OR-ed
+ * combination of tracing.DEFAULT_OPTIONS, tracing.ENABLE_SYSTRACE, tracing.ENABLE_SAMPLING
+ * and tracing.RECORD_CONTINUOUSLY.
+ * @param callback Called once all child processes have acked to the startRecording request.
+ */
+ startRecording(categoryFilter: string, options: number, callback: Function): void;
+ /**
+ * Stop recording on all processes. Child processes typically are caching trace data and
+ * only rarely flush and send trace data back to the main process. That is because it may
+ * be an expensive operation to send the trace data over IPC, and we would like to avoid
+ * much runtime overhead of tracing. So, to end tracing, we must asynchronously ask all
+ * child processes to flush any pending trace data.
+ * @param resultFilePath Trace data will be written into this file if it is not empty,
+ * or into a temporary file.
+ * @param callback Called once all child processes have acked to the stopRecording request.
+ */
+ stopRecording(resultFilePath: string, callback:
+ /**
+ * @param filePath A file that contains the traced data.
+ */
+ (filePath: string) => void
+ ): void;
+ /**
+ * Start monitoring on all processes. Monitoring begins immediately locally, and asynchronously
+ * on child processes as soon as they receive the startMonitoring request.
+ * @param callback Called once all child processes have acked to the startMonitoring request.
+ */
+ startMonitoring(categoryFilter: string, options: number, callback: Function): void;
+ /**
+ * Stop monitoring on all processes.
+ * @param callback Called once all child processes have acked to the stopMonitoring request.
+ */
+ stopMonitoring(callback: Function): void;
+ /**
+ * Get the current monitoring traced data. Child processes typically are caching trace data
+ * and only rarely flush and send trace data back to the main process. That is because it may
+ * be an expensive operation to send the trace data over IPC, and we would like to avoid much
+ * runtime overhead of tracing. So, to end tracing, we must asynchronously ask all child
+ * processes to flush any pending trace data.
+ * @param callback Called once all child processes have acked to the captureMonitoringSnapshot request.
+ */
+ captureMonitoringSnapshot(resultFilePath: string, callback:
+ /**
+ * @param filePath A file that contains the traced data
+ * @returns {}
+ */
+ (filePath: string) => void
+ ): void;
+ /**
+ * Get the maximum across processes of trace buffer percent full state.
+ * @param callback Called when the TraceBufferUsage value is determined.
+ */
+ getTraceBufferUsage(callback: Function): void;
+ /**
+ * @param callback Called every time the given event occurs on any process.
+ */
+ setWatchEvent(categoryName: string, eventName: string, callback: Function): void;
+ /**
+ * Cancel the watch event. If tracing is enabled, this may race with the watch event callback.
+ */
+ cancelWatchEvent(): void;
+ DEFAULT_OPTIONS: number;
+ ENABLE_SYSTRACE: number;
+ ENABLE_SAMPLING: number;
+ RECORD_CONTINUOUSLY: number;
+ }
+
+ interface Dialog {
+ /**
+ * @param callback If supplied, the API call will be asynchronous.
+ * @returns On success, returns an array of file paths chosen by the user,
+ * otherwise returns undefined.
+ */
+ showOpenDialog: typeof GitHubElectron.Dialog.showOpenDialog;
+ /**
+ * @param callback If supplied, the API call will be asynchronous.
+ * @returns On success, returns the path of file chosen by the user, otherwise
+ * returns undefined.
+ */
+ showSaveDialog: typeof GitHubElectron.Dialog.showSaveDialog;
+ /**
+ * Shows a message box. It will block until the message box is closed. It returns .
+ * @param callback If supplied, the API call will be asynchronous.
+ * @returns The index of the clicked button.
+ */
+ showMessageBox: typeof GitHubElectron.Dialog.showMessageBox;
+
+ /**
+ * Runs a modal dialog that shows an error message. This API can be called safely
+ * before the ready event of app module emits, it is usually used to report errors
+ * in early stage of startup.
+ */
+ showErrorBox(title: string, content: string): void;
+ }
+
+ interface GlobalShortcut {
+ /**
+ * Registers a global shortcut of accelerator.
+ * @param accelerator Represents a keyboard shortcut. It can contain modifiers
+ * and key codes, combined by the "+" character.
+ * @param callback Called when the registered shortcut is pressed by the user.
+ * @returns {}
+ */
+ register(accelerator: string, callback: Function): void;
+ /**
+ * @param accelerator Represents a keyboard shortcut. It can contain modifiers
+ * and key codes, combined by the "+" character.
+ * @returns Whether the accelerator is registered.
+ */
+ isRegistered(accelerator: string): boolean;
+ /**
+ * Unregisters the global shortcut of keycode.
+ * @param accelerator Represents a keyboard shortcut. It can contain modifiers
+ * and key codes, combined by the "+" character.
+ */
+ unregister(accelerator: string): void;
+ /**
+ * Unregisters all the global shortcuts.
+ */
+ unregisterAll(): void;
+ }
+
+ class RequestFileJob {
+ /**
+ * Create a request job which would query a file of path and set corresponding mime types.
+ */
+ constructor(path: string);
+ }
+
+ class RequestStringJob {
+ /**
+ * Create a request job which sends a string as response.
+ */
+ constructor(options?: {
+ /**
+ * Default is "text/plain".
+ */
+ mimeType?: string;
+ /**
+ * Default is "UTF-8".
+ */
+ charset?: string;
+ data?: string;
+ });
+ }
+
+ class RequestBufferJob {
+ /**
+ * Create a request job which accepts a buffer and sends a string as response.
+ */
+ constructor(options?: {
+ /**
+ * Default is "application/octet-stream".
+ */
+ mimeType?: string;
+ /**
+ * Default is "UTF-8".
+ */
+ encoding?: string;
+ data?: Buffer;
+ });
+ }
+
+ interface Protocol {
+ registerProtocol(scheme: string, handler: (request: any) => void): void;
+ unregisterProtocol(scheme: string): void;
+ isHandledProtocol(scheme: string): boolean;
+ interceptProtocol(scheme: string, handler: (request: any) => void): void;
+ uninterceptProtocol(scheme: string): void;
+ RequestFileJob: typeof RequestFileJob;
+ RequestStringJob: typeof RequestStringJob;
+ RequestBufferJob: typeof RequestBufferJob;
+ }
+
+
interface Electron {
clipboard: GitHubElectron.Clipboard;
crashReporter: GitHubElectron.CrashReporter;
nativeImage: GitHubElectron.NativeImage;
screen: GitHubElectron.Screen;
shell: GitHubElectron.Shell;
+ remote: GitHubElectron.Remote;
+ ipcRenderer: GitHubElectron.IpcRenderer;
+ webFrame: GitHubElectron.WebFrame;
+ app: GitHubElectron.App;
+ autoUpdater: GitHubElectron.AutoUpdater;
+ BrowserWindow: typeof GitHubElectron.BrowserWindow;
+ contentTracing: GitHubElectron.ContentTracing;
+ dialog: GitHubElectron.Dialog;
+ globalShortcut: GitHubElectron.GlobalShortcut;
+ ipcMain: NodeJS.EventEmitter;
+ Menu: typeof GitHubElectron.Menu;
+ MenuItem: typeof GitHubElectron.MenuItem;
+ powerMonitor: NodeJS.EventEmitter;
+ protocol: GitHubElectron.Protocol;
+ Tray: typeof GitHubElectron.Tray;
}
}
@@ -1429,10 +1723,11 @@ interface File {
path: string;
}
+declare module 'electron' {
+ var electron: GitHubElectron.Electron;
+ export = electron;
+}
+
interface NodeRequireFunction {
- (id: 'clipboard'): GitHubElectron.Clipboard
- (id: 'crash-reporter'): GitHubElectron.CrashReporter
- (id: 'native-image'): typeof GitHubElectron.NativeImage
- (id: 'screen'): GitHubElectron.Screen
- (id: 'shell'): GitHubElectron.Shell
+ (id: 'electron'): GitHubElectron.Electron;
}