mirror of
				https://github.com/zulip/zulip-desktop.git
				synced 2025-11-04 05:53:21 +00:00 
			
		
		
		
	electron-connect: Disable electron-connect when it's run from npm start.
Improves gulp dev script.
This commit is contained in:
		@@ -1,6 +1,7 @@
 | 
			
		||||
'use strict';
 | 
			
		||||
 | 
			
		||||
const { ipcRenderer, remote } = require('electron');
 | 
			
		||||
const isDev = require('electron-is-dev');
 | 
			
		||||
 | 
			
		||||
const { session } = remote;
 | 
			
		||||
 | 
			
		||||
@@ -482,8 +483,17 @@ class ServerManagerView {
 | 
			
		||||
window.onload = () => {
 | 
			
		||||
	const serverManagerView = new ServerManagerView();
 | 
			
		||||
	serverManagerView.init();
 | 
			
		||||
 | 
			
		||||
	window.addEventListener('online', () => {
 | 
			
		||||
		serverManagerView.reloadView();
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	// only start electron-connect (auto reload on change) when its ran
 | 
			
		||||
	// from `npm run dev` or `gulp dev` and not from `npm start` when
 | 
			
		||||
	// app is started `npm start` main process's proces.argv will have
 | 
			
		||||
	// `--no-electron-connect`
 | 
			
		||||
	const mainProcessArgv = remote.getGlobal('process').argv;
 | 
			
		||||
	if (isDev && !mainProcessArgv.includes('--no-electron-connect')) {
 | 
			
		||||
		const electronConnect = require('electron-connect');
 | 
			
		||||
		electronConnect.client.create();
 | 
			
		||||
	}
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
@@ -40,14 +40,4 @@
 | 
			
		||||
  </div>
 | 
			
		||||
</body>
 | 
			
		||||
<script src="js/main.js"></script>
 | 
			
		||||
 | 
			
		||||
<!-- To trigger electron.reload on changes in renderer from gulp -->
 | 
			
		||||
<script>
 | 
			
		||||
  window.addEventListener('load', () => {
 | 
			
		||||
    const isDev = require('electron-is-dev');
 | 
			
		||||
    if (isDev) {
 | 
			
		||||
      require('electron-connect').client.create();
 | 
			
		||||
    }
 | 
			
		||||
  });
 | 
			
		||||
</script>
 | 
			
		||||
</html>
 | 
			
		||||
@@ -18,7 +18,7 @@
 | 
			
		||||
    "url": "https://github.com/zulip/zulip-electron/issues"
 | 
			
		||||
  },
 | 
			
		||||
  "scripts": {
 | 
			
		||||
    "start": "electron app --disable-http-cache",
 | 
			
		||||
    "start": "electron app --disable-http-cache --no-electron-connect",
 | 
			
		||||
    "reinstall": "./tools/reinstall-node-modules",
 | 
			
		||||
    "postinstall": "electron-builder install-app-deps",
 | 
			
		||||
    "test": "xo",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user