Merge branch 'release/3.8.17' into main

standardnotes · Jul 14, 2021 · e98fb1f · e98fb1f
2 parents 416dea1 + e3d4b6a
commit e98fb1f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git 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;
@@ -41,8 +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,
-    NEXT_VERSION_SYNC_SERVER || 'https://api.standardnotes.com'
+    window.bridge
   );
 
   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.16",
+  "version": "3.8.17",
   "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.16",
+  "version": "3.8.17",
   "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
@@ -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,