From 33123c354b79f7951423dd75097b11e7eb075f99 Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Fri, 2 Jul 2021 19:49:55 -0600
Subject: Upgrade various dependencies to latest part 2 (#1557)

* Upgrade various dependencies to latest, remove unnecessary electron-hunspell
  - upgrade eslint and friends to latest
  - remove deprecated 'node-sass' in favor of 'sass'
  - disable new rules from 'eslint-config-airbnb' that are conflicting with current code style
  - add workspace config for 'vscode' that silences 'experimentalDecorator' warning and forces 'prettier' to single quote
* Run yarn lint to autofix with new ruleset and worked down lint issues to zero
---
 src/webview/contextMenuBuilder.js |  2 +-
 src/webview/lib/RecipeWebview.js  |  1 -
 src/webview/screenshare.js        | 39 +++++++++++++++++++++++----------------
 3 files changed, 24 insertions(+), 18 deletions(-)

(limited to 'src/webview')

diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js
index c26f192fe..500a1a653 100644
--- a/src/webview/contextMenuBuilder.js
+++ b/src/webview/contextMenuBuilder.js
@@ -64,7 +64,7 @@ module.exports = class ContextMenuBuilder {
     this.debugMode = debugMode;
     this.processMenu = processMenu;
     this.menu = null;
-    this.stringTable = Object.assign({}, contextMenuStringTable);
+    this.stringTable = { ...contextMenuStringTable };
     this.getWebContents = () => webContents;
   }
 
diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index 84ac45ecc..b5793a5f1 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -59,7 +59,6 @@ class RecipeWebview {
       indirect: Math.max(indirectInt, 0),
     };
 
-
     ipcRenderer.sendToHost('message-counts', count);
     Object.assign(this.countCache, count);
 
diff --git a/src/webview/screenshare.js b/src/webview/screenshare.js
index 2715f2e3e..84d2e1e95 100644
--- a/src/webview/screenshare.js
+++ b/src/webview/screenshare.js
@@ -73,25 +73,29 @@ export const screenShareCss = `
 `;
 
 // Patch getDisplayMedia for screen sharing
-window.navigator.mediaDevices.getDisplayMedia = () => new Promise(async (resolve, reject) => {
+window.navigator.mediaDevices.getDisplayMedia = () => async (resolve, reject) => {
   try {
-    const sources = await desktopCapturer.getSources({ types: ['screen', 'window'] });
+    const sources = await desktopCapturer.getSources({
+      types: ['screen', 'window'],
+    });
 
     const selectionElem = document.createElement('div');
     selectionElem.classList = 'desktop-capturer-selection';
     selectionElem.innerHTML = `
         <div class="desktop-capturer-selection__scroller">
           <ul class="desktop-capturer-selection__list">
-            ${sources.map(({
-    id, name, thumbnail,
-  }) => `
+            ${sources
+    .map(
+      ({ id, name, thumbnail }) => `
               <li class="desktop-capturer-selection__item">
                 <button class="desktop-capturer-selection__btn" data-id="${id}" title="${name}">
                   <img class="desktop-capturer-selection__thumbnail" src="${thumbnail.toDataURL()}" />
                   <span class="desktop-capturer-selection__name">${name}</span>
                 </button>
               </li>
-            `).join('')}
+            `,
+    )
+    .join('')}
             <li class="desktop-capturer-selection__item">
               <button class="desktop-capturer-selection__btn" data-id="${CANCEL_ID}" title="Cancel">
                 <span class="desktop-capturer-selection__name desktop-capturer-selection__name--cancel">Cancel</span>
@@ -102,7 +106,8 @@ window.navigator.mediaDevices.getDisplayMedia = () => new Promise(async (resolve
       `;
     document.body.appendChild(selectionElem);
 
-    document.querySelectorAll('.desktop-capturer-selection__btn')
+    document
+      .querySelectorAll('.desktop-capturer-selection__btn')
       .forEach((button) => {
         button.addEventListener('click', async () => {
           try {
@@ -110,20 +115,22 @@ window.navigator.mediaDevices.getDisplayMedia = () => new Promise(async (resolve
             if (id === CANCEL_ID) {
               reject(new Error('Cancelled by user'));
             } else {
-              const mediaSource = sources.find(source => source.id === id);
+              const mediaSource = sources.find((source) => source.id === id);
               if (!mediaSource) {
                 throw new Error(`Source with id ${id} does not exist`);
               }
 
-              const stream = await window.navigator.mediaDevices.getUserMedia({
-                audio: false,
-                video: {
-                  mandatory: {
-                    chromeMediaSource: 'desktop',
-                    chromeMediaSourceId: mediaSource.id,
+              const stream = await window.navigator.mediaDevices.getUserMedia(
+                {
+                  audio: false,
+                  video: {
+                    mandatory: {
+                      chromeMediaSource: 'desktop',
+                      chromeMediaSourceId: mediaSource.id,
+                    },
                   },
                 },
-              });
+              );
               resolve(stream);
             }
           } catch (err) {
@@ -136,4 +143,4 @@ window.navigator.mediaDevices.getDisplayMedia = () => new Promise(async (resolve
   } catch (err) {
     reject(err);
   }
-});
+};
-- 
cgit v1.2.3-70-g09d2