Feature/fix dependencies

.github/workflows/build.yml

@@ -96,4 +96,3 @@ jobs:
           name: Postbird.apk
           path: dist/*.apk
         if: ${{ runner.os == 'Linux' }}
-

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org

.nvmrc

@@ -0,0 +1 @@
+16.11

app/views/history_window.js

@@ -1,4 +1,3 @@
-var electronRemote = require('@electron/remote');
 const { BrowserWindow } = require('@electron/remote')
 
 class HistoryWindow {
@@ -23,7 +22,6 @@ class HistoryWindow {
       }
     });
 
-    electronRemote.require('@electron/remote/main').enable(newWindow.webContents);
     newWindow.loadURL('file://' + App.root + '/views/history_window.html');
 
     if (process.env.POSTBIRD_DEBUG == "true") {

app/views/snippets.js

@@ -1,4 +1,3 @@
-var electronRemote = require('@electron/remote');
 const { BrowserWindow } = require('@electron/remote')
 
 class SnippetsWindow {
@@ -22,7 +21,6 @@ class SnippetsWindow {
       }
     });
 
-    electronRemote.require('@electron/remote/main').enable(newWindow.webContents);
     newWindow.loadURL('file://' + App.root + '/views/snippets_window.html');
 
     newWindow.setTitle("Snippets");

index.js

@@ -84,7 +84,9 @@ $(window).on('window-ready', () => {
 require('./app/top_menu');
 
 var cliArgs = electronRemote.process.argv;
-if (cliArgs.length > 2 && !electronRemote.process.env.RUN_POSTBIRD_JS_TEST) {
+// Skip argument parsing when running tests
+var isTestMode = cliArgs.some(arg => arg.includes('electron-mocha') || arg.includes('tests/') || arg.includes('test'));
+if (cliArgs.length > 2 && !isTestMode) {
   var connectionStr = cliArgs[2];
   if (connectionStr.startsWith("postgres://") || connectionStr.startsWith("postgresql://")) {
     App.cliConnectString = connectionStr;

main.js

@@ -6,6 +6,11 @@ const windowStateKeeper = require('electron-window-state');
 
 require('@electron/remote/main').initialize();
 
+// Enable remote for all new web contents
+app.on('web-contents-created', (event, contents) => {
+  require('@electron/remote/main').enable(contents);
+});
+
 electron.app.ApplicationStart = Date.now();
 electron.app.MainFilename = process.mainModule.filename;
 
@@ -68,8 +73,6 @@ app.on('open-url', (event, url) => {
   }
 });
 
-var gotTheLock = app.requestSingleInstanceLock();
-
 app.on('ready', () => {
   const mainWindowState = windowStateKeeper({
     defaultWidth: 960,
@@ -92,8 +95,10 @@ app.on('ready', () => {
 
   electron.app.mainWindow = mainWindow;
 
-  // and load the index.html of the app.
+  // Enable @electron/remote for this webContents
   require("@electron/remote/main").enable(mainWindow.webContents);
+
+  // and load the index.html of the app.
   mainWindow.loadURL('file://' + __dirname + '/index.html');
 
   if (process.env.POSTBIRD_DEBUG == "true") {