From 63fc46fd3f61cdee254e574338e06af4d9bb4dcb Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Fri, 29 Oct 2021 10:12:36 +0200
Subject: chore: use caret for dependencies instead of locked versions (#2162)

- use caret for all dependencies except brittle ones like e.g. typescript
- remove 'save-exact' true from .npmrc
- fix various prettier formatting issues
---
 src/components/auth/Login.js                      |  4 +++-
 src/components/services/content/ServiceWebview.js | 28 +++++++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'src/components')

diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 6ed89afb6..956205258 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -173,7 +173,9 @@ class Login extends Component {
                 <p className="error-message center">
                   {intl.formatMessage(messages.customServerQuestion)}{' '}
                   <Link
-                    to={`${window['ferdi'].stores.settings.all.app.server.replace(
+                    to={`${window[
+                      'ferdi'
+                    ].stores.settings.all.app.server.replace(
                       API_VERSION,
                       '',
                     )}/import`}
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 2562c09ce..187785f82 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -31,13 +31,15 @@ class ServiceWebview extends Component {
             debug('Service logged a message:', e.message);
           });
           this.webview.view.addEventListener('did-navigate', () => {
-            document.title = `Ferdi - ${this.props.service.name} ${this.props.service.dialogTitle
-              ? ` - ${this.props.service.dialogTitle}`
-              : ''
-              } ${`- ${this.props.service._webview.getTitle()}`}`;
-          })
+            document.title = `Ferdi - ${this.props.service.name} ${
+              this.props.service.dialogTitle
+                ? ` - ${this.props.service.dialogTitle}`
+                : ''
+            } ${`- ${this.props.service._webview.getTitle()}`}`;
+          });
         }
-      })
+      },
+    );
   }
 
   componentWillUnmount() {
@@ -53,10 +55,11 @@ class ServiceWebview extends Component {
       webview.view.blur();
       webview.view.focus();
       window.setTimeout(() => {
-        document.title = `Ferdi - ${this.props.service.name} ${this.props.service.dialogTitle
-          ? ` - ${this.props.service.dialogTitle}`
-          : ''
-          } ${`- ${this.props.service._webview.getTitle()}`}`;
+        document.title = `Ferdi - ${this.props.service.name} ${
+          this.props.service.dialogTitle
+            ? ` - ${this.props.service.dialogTitle}`
+            : ''
+        } ${`- ${this.props.service._webview.getTitle()}`}`;
       }, 100);
     } else {
       debug('Refocus not required - Not active service');
@@ -103,8 +106,9 @@ class ServiceWebview extends Component {
         }
         allowpopups
         nodeintegration
-        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0
-          }, contextIsolation=1, enableRemoteModule=1`}
+        webpreferences={`spellcheck=${
+          isSpellcheckerEnabled ? 1 : 0
+        }, contextIsolation=1, enableRemoteModule=1`}
       />
     );
   }
-- 
cgit v1.2.3-70-g09d2