From 4af23dc82472559390627aac6c5bc1dae1bfbd5a Mon Sep 17 00:00:00 2001 From: Mo Date: Fri, 4 Mar 2022 14:11:30 -0600 Subject: [PATCH] chore: upgrade deps --- app/javascripts/renderer/renderer.ts | 2 ++ tsconfig.json | 3 +-- web | 2 +- webpack.common.js | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/javascripts/renderer/renderer.ts b/app/javascripts/renderer/renderer.ts index d7279677..67881cce 100644 --- a/app/javascripts/renderer/renderer.ts +++ b/app/javascripts/renderer/renderer.ts @@ -4,6 +4,7 @@ import { Bridge, ElectronDesktopCallbacks } from '@web/services/bridge'; declare const BUGSNAG_API_KEY: string; declare const DEFAULT_SYNC_SERVER: string; +declare const DEFAULT_FILES_SERVER: string; declare const WEBSOCKET_URL: string; declare const ENABLE_UNFINISHED_FEATURES: string; declare const PURCHASE_URL: string; @@ -49,6 +50,7 @@ window._dashboard_url = DASHBOARD_URL; window.startApplication( // eslint-disable-next-line no-undef DEFAULT_SYNC_SERVER, + DEFAULT_FILES_SERVER, window.bridge, window._enable_unfinished_features, WEBSOCKET_URL diff --git a/tsconfig.json b/tsconfig.json index f68d98ac..1afbf374 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,7 +23,6 @@ "exclude": ["app/renderer/preload.js", "node_modules", "app/dist"], "files": [ "app/index.ts", - "app/javascripts/renderer/renderer.ts", - "app/javascripts/renderer/grantLinuxPasswordsAccess.ts" + "app/javascripts/renderer/renderer.ts" ] } diff --git a/web b/web index 42d97df1..b2a692ca 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 42d97df1fe508cc8f1155727dabaed8f80fc52ac +Subproject commit b2a692caf44e87aa2607c06e6c38b190caac92e5 diff --git a/webpack.common.js b/webpack.common.js index 94e0ba83..256b9168 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -143,6 +143,9 @@ module.exports = function ({ DEFAULT_SYNC_SERVER: JSON.stringify( process.env.DEFAULT_SYNC_SERVER || 'https://api.standardnotes.com' ), + DEFAULT_FILES_SERVER: JSON.stringify( + process.env.DEFAULT_FILES_SERVER || 'https://files.standardnotes.com' + ), BUGSNAG_API_KEY: JSON.stringify(process.env.BUGSNAG_API_KEY), PURCHASE_URL: JSON.stringify(process.env.PURCHASE_URL), PLANS_URL: JSON.stringify(process.env.PLANS_URL),