feat: improve DX with env variables

Signed-off-by: Grigorii Shartsev <[email protected]>

.env.example

@@ -1,6 +1,6 @@
 # Path to talk repository
 TALK_PATH=spreed
 
-# List of Nextcloud development server hosts separetad by comma
-# For example: https://nextcloud.local,https://stable25.local
-NEXTCLOUD_DEV_SERVER_HOSTS=https://nextcloud.local
+# List of Nextcloud development server hosts separetad by space (incl. signaling WS server host)
+# Example: https://nextcloud.local https://stable26.local
+NEXTCLOUD_DEV_SERVER_HOSTS=https://nextcloud.local https://stable26.local

forge.config.js

@@ -21,8 +21,6 @@
 
 require('dotenv').config()
 
-const DEV_SERVER_HOST = process.env.NEXTCLOUD_DEV_SERVER_HOSTS ?? 'https://nextcloud.local'
-
 module.exports = {
 	packagerConfig: {
 		icon: './spreed/img/favicon.ico',
@@ -51,7 +49,7 @@ module.exports = {
 			name: '@electron-forge/plugin-webpack',
 			config: {
 				mainConfig: './webpack.main.config.js',
-				devContentSecurityPolicy: `default-src 'self' 'unsafe-inline' data: blob: ${DEV_SERVER_HOST}; script-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob:`,
+				devContentSecurityPolicy: `default-src 'self' 'unsafe-inline' data: blob: ${process.env.NEXTCLOUD_DEV_SERVER_HOSTS}; script-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob:`,
 				renderer: {
 					config: './webpack.renderer.config.js',
 					entryPoints: [

src/accounts/accounts.window.js

@@ -41,7 +41,10 @@ function createAccountsWindow() {
 			preload: ACCOUNTS_WINDOW_PRELOAD_WEBPACK_ENTRY,
 		},
 	})
-	window.removeMenu()
+
+	if (process.env.NODE_ENV === 'production') {
+		window.removeMenu()
+	}
 
 	window.loadURL(ACCOUNTS_WINDOW_WEBPACK_ENTRY)
 

src/accounts/renderer/WindowAccounts.vue

@@ -92,7 +92,7 @@ export default {
 
 	data() {
 		return {
-			serverUrl: process.env.NODE_ENV !== 'production' ? 'https://nextcloud.local' : '',
+			serverUrl: process.env.NODE_ENV !== 'production' ? process.env.NEXTCLOUD_DEV_SERVER_HOSTS?.split?.(' ')?.[0] : '',
 			/** @type {'idle'|'loading'|'error'|'success'} */
 			state: 'idle',
 			stateText: '',

src/app/webRequestInterceptor.js

@@ -20,7 +20,7 @@
  */
 
 const { session } = require('electron')
-const { DEVSERVER_HOST } = require('../constants.js')
+const { DEV_SERVER_ORIGIN } = require('../constants.js')
 
 /**
  * Patch requests on the default session to a specific Nextcloud server for Cookies or CORS.
@@ -65,7 +65,7 @@ function enableWebRequestInterceptor(serverUrl, {
 		}
 	}
 
-	const ALLOWED_ORIGIN = [process.env.NODE_ENV === 'production' ? 'file://' : `${DEVSERVER_HOST}`]
+	const ALLOWED_ORIGIN = [process.env.NODE_ENV === 'production' ? 'file://' : `${DEV_SERVER_ORIGIN}`]
 	const ALLOWED_CREDENTIALS_TRUE = ['true']
 	const ALLOWED_HEADERS = [[
 		// Common headers

src/constants.js

@@ -21,12 +21,10 @@
 
 const BASE_TITLE = 'Talk Desktop'
 const USER_AGENT = 'Talk Desktop'
-const DEVSERVER_HOST = 'http://localhost:3000'
-const SERVER_URL = process.env.NEXTCLOUD_DEV_SERVER_HOSTS
+const DEV_SERVER_ORIGIN = 'http://localhost:3000'
 
 module.exports = {
 	BASE_TITLE,
 	USER_AGENT,
-	DEVSERVER_HOST,
-	SERVER_URL,
+	DEV_SERVER_ORIGIN,
 }

src/talk/talk.window.js

@@ -34,7 +34,10 @@ function createTalkWindow() {
 			preload: TALK_WINDOW_PRELOAD_WEBPACK_ENTRY,
 		},
 	})
-	window.removeMenu()
+
+	if (process.env.NODE_ENV === 'production') {
+		window.removeMenu()
+	}
 
 	window.once('ready-to-show', () => {
 		window.maximize()

webpack.renderer.config.js

@@ -93,6 +93,9 @@ module.exports = merge(commonTalkWebpackConfig, {
 			t: ['@nextcloud/l10n', 'translate'],
 		}),
 
-		new webpack.DefinePlugin({ IS_TALK_DESKTOP: true }),
+		new webpack.DefinePlugin({
+			IS_TALK_DESKTOP: true,
+			'process.env.NEXTCLOUD_DEV_SERVER_HOSTS': JSON.stringify(process.env.NEXTCLOUD_DEV_SERVER_HOSTS),
+		}),
 	],
 })