electron-userland
diff --git a/‎README.md
Lines changed: 1 addition & 0 deletions b/‎README.md
Lines changed: 1 addition & 0 deletions
diff --git a/‎lib/api.js
Lines changed: 12 additions & 16 deletions b/‎lib/api.js
Lines changed: 12 additions & 16 deletions
diff --git a/‎lib/spectron.d.ts
Lines changed: 2 additions & 8 deletions b/‎lib/spectron.d.ts
Lines changed: 2 additions & 8 deletions
@@ -36,6 +36,7 @@ For given versions of Electron you must depend on a very specific version range
 | `^11.0.0` | `^13.0.0`|
 | `^12.0.0` | `^14.0.0`|
 | `^13.0.0` | `^15.0.0`|
+| `^15.0.0` | `^17.0.0`|
 
 Learn more from [this presentation](https://speakerdeck.com/kevinsawicki/testing-your-electron-apps-with-chromedriver).
 
 
@@ -79,6 +79,7 @@ Api.prototype.loadApi = function () {
       );
     }
     const electron = window[requireName]('electron');
+    electron.remote = window[requireName]('@electron/remote');
     const process = window[requireName]('process');
 
     const api = {
@@ -350,9 +351,8 @@ Api.prototype.addCapturePageSupport = function () {
       async function (rect, requireName, done) {
         const args = [];
         if (rect != null) args.push(rect);
-        const browserWindow = window[requireName](
-          'electron'
-        ).remote.getCurrentWindow();
+        const browserWindow =
+          window[requireName]('@electron/remote').getCurrentWindow();
         const image = await browserWindow.capturePage.apply(
           browserWindow,
           args
@@ -413,9 +413,8 @@ Api.prototype.addSavePageSupport = function () {
   app.client.addCommand('webContents.savePage', function (fullPath, saveType) {
     return this.executeAsync(
       async function (fullPath, saveType, requireName, done) {
-        const webContents = window[requireName](
-          'electron'
-        ).remote.getCurrentWebContents();
+        const webContents =
+          window[requireName]('@electron/remote').getCurrentWebContents();
         await webContents.savePage(fullPath, saveType);
         done();
       },
@@ -445,9 +444,8 @@ Api.prototype.addExecuteJavaScriptSupport = function () {
     function (code, useGesture) {
       return this.executeAsync(
         async function (code, useGesture, requireName, done) {
-          const webContents = window[requireName](
-            'electron'
-          ).remote.getCurrentWebContents();
+          const webContents =
+            window[requireName]('@electron/remote').getCurrentWebContents();
           const result = await webContents.executeJavaScript(code, useGesture);
           done(result);
         },
@@ -538,7 +536,7 @@ function callRenderApi(moduleName, api, args, requireName) {
 }
 
 function callMainApi(moduleName, api, args, requireName) {
-  let module = window[requireName]('electron').remote;
+  let module = window[requireName]('@electron/remote');
   if (moduleName) {
     module = module[moduleName];
   }
@@ -550,16 +548,14 @@ function callMainApi(moduleName, api, args, requireName) {
 }
 
 function callWebContentsApi(name, args, requireName) {
-  const webContents = window[requireName](
-    'electron'
-  ).remote.getCurrentWebContents();
+  const webContents =
+    window[requireName]('@electron/remote').getCurrentWebContents();
   return webContents[name].apply(webContents, args);
 }
 
 function callBrowserWindowApi(name, args, requireName) {
-  const browserWindow = window[requireName](
-    'electron'
-  ).remote.getCurrentWindow();
+  const browserWindow =
+    window[requireName]('@electron/remote').getCurrentWindow();
   return browserWindow[name].apply(browserWindow, args);
 }
 
 
@@ -63,13 +63,7 @@ declare module 'spectron' {
     }[];
   }
 
-  export interface SpectronClient extends WebdriverIO.BrowserObject {
-    /**
-     * Focus a window using its title or URL.
-     * <webview> tags can also be focused as a separate window.
-     */
-    switchWindow(urlOrTitleToMatch: string): Promise<void>;
-
+  export interface SpectronClient extends WebdriverIO.Browser<'async'> {
     /**
      * Wait until the window is no longer loading.
      * Takes an optional timeout in milliseconds that defaults to 5000.
@@ -261,7 +255,7 @@ declare module 'spectron' {
      * Each Electron module is exposed as a property on the electron property so you can
      * think of it as an alias for require('electron') from within your app.
      */
-    electron: Electron.RemoteMainInterface;
+    electron: typeof Electron;
     /**
      * The browserWindow property is an alias for require('electron').remote.getCurrentWindow().
      * It provides you access to the current BrowserWindow and contains all the APIs.