Merge branch 'release/3.8.18' into main

standardnotes · Jul 22, 2021 · 4727775 · 4727775
2 parents e98fb1f + 843e595
commit 4727775
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/app/javascripts/renderer/renderer.ts b/app/javascripts/renderer/renderer.ts
@@ -4,6 +4,7 @@ import { Bridge } from '@web/services/bridge';
 
 declare const BUGSNAG_API_KEY: string;
 declare const DEFAULT_SYNC_SERVER: string;
+declare const WEBSOCKET_URL: string;
 declare global {
   interface Window {
     ElectronValence: any;
@@ -40,7 +41,8 @@ window._bugsnag_api_key = BUGSNAG_API_KEY;
   window.startApplication(
     // eslint-disable-next-line no-undef
     DEFAULT_SYNC_SERVER || 'https://sync.standardnotes.org',
-    window.bridge
+    window.bridge,
+    WEBSOCKET_URL
   );
 
   await new Promise((resolve) =>

diff --git a/app/package.json b/app/package.json
@@ -3,7 +3,7 @@
   "productName": "Standard Notes",
   "description": "A simple and private place for your notes, thoughts, and life's work.",
   "author": "Standard Notes <[email protected]>",
-  "version": "3.8.17",
+  "version": "3.8.18",
   "main": "./dist/index.js",
   "dependencies": {
     "keytar": "^7.4.0",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "standard-notes",
   "main": "./app/dist/index.js",
-  "version": "3.8.17",
+  "version": "3.8.18",
   "repository": {
     "type": "git",
     "url": "git://github.com/standardnotes/desktop"

diff --git a/web b/web
diff --git a/webpack.common.js b/webpack.common.js
@@ -142,6 +142,7 @@ module.exports = function ({
         ),
         BUGSNAG_API_KEY: JSON.stringify(process.env.BUGSNAG_API_KEY),
         EXPERIMENTAL_FEATURES,
+        WEBSOCKET_URL: JSON.stringify(process.env.WEBSOCKET_URL),
       }),
     ],
   };
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,6 +142,7 @@ module.exports = function ({ @@
             ),
             BUGSNAG_API_KEY: JSON.stringify(process.env.BUGSNAG_API_KEY),
             EXPERIMENTAL_FEATURES,
+            WEBSOCKET_URL: JSON.stringify(process.env.WEBSOCKET_URL),
           }),
         ],
       };
@@ Expand Down @@