- Fixed linting changes

electron · Jul 25, 2022 · c2472b4 · c2472b4
1 parent ab3f7d3
commit c2472b4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 53 deletions.
diff --git a/docs/api/context-bridge.md b/docs/api/context-bridge.md
@@ -90,7 +90,7 @@ contextBridge.exposeInMainWorld(
 )
 ```
 
-An example of complex API exposed in an isolated world is shown below:
+An example of API exposed in an isolated world is shown below:
 
 ```javascript
 
@@ -104,22 +104,7 @@ contextBridge.exposeInIsolatedWorld(
   1005,
   'electron',
   {
-    doThing: () => ipcRenderer.send('do-a-thing'),
-    myPromises: [Promise.resolve(), Promise.reject(new Error('whoops'))],
-    anAsyncFunction: async () => 123,
-    data: {
-      myFlags: ['a', 'b', 'c'],
-      bootTime: 1234
-    },
-    nestedAPI: {
-      evenDeeper: {
-        youCanDoThisAsMuchAsYouWant: {
-          fn: () => ({
-            returnData: 123
-          })
-        }
-      }
-    }
+    doThing: () => ipcRenderer.send('do-a-thing')
   }
 )
 

diff --git a/lib/renderer/api/context-bridge.ts b/lib/renderer/api/context-bridge.ts
@@ -1,11 +1,7 @@
 const binding = process._linkedBinding('electron_renderer_context_bridge');
 
 const checkContextIsolationEnabled = () => {
-  if (!process.contextIsolated) {
-    throw new Error(
-      'contextBridge API can only be used when contextIsolation is enabled'
-    );
-  }
+  if (!process.contextIsolated) throw new Error('contextBridge API can only be used when contextIsolation is enabled');
 };
 
 const contextBridge: Electron.ContextBridge = {
@@ -26,22 +22,11 @@ export const internalContextBridge = {
   overrideGlobalValueFromIsolatedWorld: (keys: string[], value: any) => {
     return binding._overrideGlobalValueFromIsolatedWorld(keys, value, false);
   },
-  overrideGlobalValueWithDynamicPropsFromIsolatedWorld: (
-    keys: string[],
-    value: any
-  ) => {
+  overrideGlobalValueWithDynamicPropsFromIsolatedWorld: (keys: string[], value: any) => {
     return binding._overrideGlobalValueFromIsolatedWorld(keys, value, true);
   },
-  overrideGlobalPropertyFromIsolatedWorld: (
-    keys: string[],
-    getter: Function,
-    setter?: Function
-  ) => {
-    return binding._overrideGlobalPropertyFromIsolatedWorld(
-      keys,
-      getter,
-      setter || null
-    );
+  overrideGlobalPropertyFromIsolatedWorld: (keys: string[], getter: Function, setter?: Function) => {
+    return binding._overrideGlobalPropertyFromIsolatedWorld(keys, getter, setter || null);
   },
   isInMainWorld: () => binding._isCalledFromMainWorld() as boolean
 };

diff --git a/spec-main/api-context-bridge-spec.ts b/spec-main/api-context-bridge-spec.ts
@@ -1,23 +1,17 @@
-import * as cp from 'child_process';
+import { BrowserWindow, ipcMain } from 'electron/main';
+import { contextBridge } from 'electron/renderer';
+import { expect } from 'chai';
 import * as fs from 'fs-extra';
 import * as http from 'http';
 import * as os from 'os';
 import * as path from 'path';
+import * as cp from 'child_process';
 
-import { BrowserWindow, ipcMain } from 'electron/main';
-
-import { AddressInfo } from 'net';
 import { closeWindow } from './window-helpers';
-import { contextBridge } from 'electron/renderer';
 import { emittedOnce } from './events-helpers';
-import { expect } from 'chai';
+import { AddressInfo } from 'net';
 
-const fixturesPath = path.resolve(
-  __dirname,
-  'fixtures',
-  'api',
-  'context-bridge'
-);
+const fixturesPath = path.resolve(__dirname, 'fixtures', 'api', 'context-bridge');
 
 describe('contextBridge', () => {
   let w: BrowserWindow;
@@ -29,9 +23,7 @@ describe('contextBridge', () => {
       res.setHeader('Content-Type', 'text/html');
       res.end('');
     });
-    await new Promise<void>((resolve) =>
-      server.listen(0, '127.0.0.1', resolve)
-    );
+    await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve));
   });
 
   after(async () => {
@@ -862,7 +854,8 @@ describe('contextBridge', () => {
               throwNotClonable: () => {
                 return Object(Symbol('foo'));
               },
-              argumentConvert: () => {}
+              argumentConvert: () => {
+              }
             });
           });
           const result = await callWithBindings((root: any) => {
@@ -1988,7 +1981,8 @@ describe('contextBridge', () => {
               throwNotClonable: () => {
                 return Object(Symbol('foo'));
               },
-              argumentConvert: () => {}
+              argumentConvert: () => {
+              }
             });
           });
           const result = await callWithBindings((root: any) => {