From f2a27c89df725f0e78e3de235dd594d9548bff41 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Thu, 22 Jul 2021 11:25:04 -0300 Subject: [PATCH 1/4] chore(deps): update web --- web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web b/web index de8be411..6408941c 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit de8be411f4c7ec957360f449b9f36da00d37d9cc +Subproject commit 6408941c07effefc99c6622a8e599d1cab98cd09 From a048e0d5874b2843866e19c5b6a1b837ed24a3fb Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Thu, 22 Jul 2021 11:25:24 -0300 Subject: [PATCH 2/4] chore(version): 3.8.18 --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index ff64e546..4346c978 100644 --- 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 ", - "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 index 8cc9a7f2..ed91ab87 100644 --- 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" From 2659c514a2025908e94942dc843a5a80490f9466 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Thu, 22 Jul 2021 11:51:34 -0300 Subject: [PATCH 3/4] fix: add websocket url --- app/javascripts/renderer/renderer.ts | 4 +++- webpack.common.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/javascripts/renderer/renderer.ts b/app/javascripts/renderer/renderer.ts index bfd3c1fe..712aa0a9 100644 --- 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/webpack.common.js b/webpack.common.js index bcdf1922..c2f231a5 100644 --- 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) }), ], }; From 843e5959a19d293d8ea6a7df33a41fbac1acb910 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Thu, 22 Jul 2021 11:53:52 -0300 Subject: [PATCH 4/4] chore: format --- app/javascripts/renderer/renderer.ts | 2 +- webpack.common.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascripts/renderer/renderer.ts b/app/javascripts/renderer/renderer.ts index 712aa0a9..65874c56 100644 --- a/app/javascripts/renderer/renderer.ts +++ b/app/javascripts/renderer/renderer.ts @@ -42,7 +42,7 @@ window._bugsnag_api_key = BUGSNAG_API_KEY; // eslint-disable-next-line no-undef DEFAULT_SYNC_SERVER || 'https://sync.standardnotes.org', window.bridge, - WEBSOCKET_URL, + WEBSOCKET_URL ); await new Promise((resolve) => diff --git a/webpack.common.js b/webpack.common.js index c2f231a5..923e94f2 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -142,7 +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) + WEBSOCKET_URL: JSON.stringify(process.env.WEBSOCKET_URL), }), ], };