From 3bdc58143dd9189f433a0e18082f4593187c0968 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Tue, 13 Jul 2021 19:28:26 -0300 Subject: [PATCH 1/4] chore(deps): update web and remove next version host --- app/javascripts/renderer/renderer.ts | 2 -- web | 2 +- webpack.common.js | 6 +----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/javascripts/renderer/renderer.ts b/app/javascripts/renderer/renderer.ts index bf67e0bb..7d7ef053 100644 --- a/app/javascripts/renderer/renderer.ts +++ b/app/javascripts/renderer/renderer.ts @@ -4,7 +4,6 @@ import { Bridge } from '@web/services/bridge'; declare const BUGSNAG_API_KEY: string; declare const DEFAULT_SYNC_SERVER: string; -declare const NEXT_VERSION_SYNC_SERVER: string; declare global { interface Window { ElectronValence: any; @@ -42,7 +41,6 @@ window._bugsnag_api_key = BUGSNAG_API_KEY; // eslint-disable-next-line no-undef DEFAULT_SYNC_SERVER || 'https://sync.standardnotes.org', window.bridge, - NEXT_VERSION_SYNC_SERVER || 'https://api.standardnotes.com' ); await new Promise((resolve) => diff --git a/web b/web index bd65ca08..b1aeaeac 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit bd65ca08152bc4197054dd7f3b31c9dfd95289be +Subproject commit b1aeaeac41dd0c1d3bccc579fdea16079cd0594c diff --git a/webpack.common.js b/webpack.common.js index 5ad7f455..bcdf1922 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -138,11 +138,7 @@ module.exports = function ({ plugins: [ new webpack.DefinePlugin({ DEFAULT_SYNC_SERVER: JSON.stringify( - process.env.DEFAULT_SYNC_SERVER || 'https://sync.standardnotes.org' - ), - NEXT_VERSION_SYNC_SERVER: JSON.stringify( - process.env.NEXT_VERSION_SYNC_SERVER || - 'https://api.standardnotes.com' + process.env.DEFAULT_SYNC_SERVER || 'https://api.standardnotes.com' ), BUGSNAG_API_KEY: JSON.stringify(process.env.BUGSNAG_API_KEY), EXPERIMENTAL_FEATURES, From ef370b762b3159cf94b4a1909b7798015e2f5fb7 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Tue, 13 Jul 2021 19:29:22 -0300 Subject: [PATCH 2/4] fix: format --- app/javascripts/renderer/renderer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascripts/renderer/renderer.ts b/app/javascripts/renderer/renderer.ts index 7d7ef053..bfd3c1fe 100644 --- a/app/javascripts/renderer/renderer.ts +++ b/app/javascripts/renderer/renderer.ts @@ -40,7 +40,7 @@ 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 ); await new Promise((resolve) => From 596045dbb65032cd7c9d50c15e9dcef9eee81394 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Wed, 14 Jul 2021 12:05:05 -0300 Subject: [PATCH 3/4] chore(deps): update web --- web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web b/web index b1aeaeac..de8be411 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit b1aeaeac41dd0c1d3bccc579fdea16079cd0594c +Subproject commit de8be411f4c7ec957360f449b9f36da00d37d9cc From e3d4b6a40f189b74c790c21ae8ade57e08d235e1 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Wed, 14 Jul 2021 12:05:57 -0300 Subject: [PATCH 4/4] chore(version): 3.8.17 --- 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 ded2ff8f..ff64e546 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.16", + "version": "3.8.17", "main": "./dist/index.js", "dependencies": { "keytar": "^7.4.0", diff --git a/package.json b/package.json index da016411..8cc9a7f2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "standard-notes", "main": "./app/dist/index.js", - "version": "3.8.16", + "version": "3.8.17", "repository": { "type": "git", "url": "git://github.com/standardnotes/desktop"