From 3a26c65efd182b9e5ddf6b655cb0d52001f23bcc Mon Sep 17 00:00:00 2001
From: TheGoddessInari <thegoddessinari@gmail.com>
Date: Mon, 29 Apr 2019 15:23:48 -0700
Subject: [PATCH] Prepare for electron v5: Make requires in WebView use
 electron remote as appropriate.

https://github.com/electron/electron/blob/master/docs/api/breaking-changes.md#require-in-sandboxed-renderers
---
 app/ux/WebView.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/ux/WebView.js b/app/ux/WebView.js
index defc4578..54c0602e 100644
--- a/app/ux/WebView.js
+++ b/app/ux/WebView.js
@@ -838,8 +838,9 @@ Ext.define('Rambox.ux.WebView',{
 	}
 	,getOSArch: function() {
 		const me = this;
-		let platform = require('os').platform();
-		let arch = require('os').arch();
+		const {remote} = require('electron');
+		const platform = remote.require('os').platform();
+		let arch = remote.require('os').arch();
 
 		switch (platform) {
 			case 'win32':
@@ -859,7 +860,7 @@ Ext.define('Rambox.ux.WebView',{
 		return arch;
 	}
 	,getOSArchType: function() {
-		let arch = require('os').arch();
+		let arch = require('electron').remote.require('os').arch();
 
 		switch(arch) {
 			case 'x64':
@@ -891,7 +892,7 @@ Ext.define('Rambox.ux.WebView',{
 	}
 	,getOSPlatform: function() {
 		const me = this;
-		let platform = require('os').platform();
+		let platform = require('electron').remote.require('os').platform();
 		switch (platform) {
 			case 'win32':
 				platform = `Windows NT ${me.getOSRelease()}; ${me.getOSArch()}`;
@@ -914,10 +915,10 @@ Ext.define('Rambox.ux.WebView',{
 		return platform;
 	}
 	,isWindows: function() {
-		return require('os').platform() === 'win32';
+		return require('electron').remote.require('os').platform() === 'win32';
 	}
 	,is32bit: function() {
-		const arch = require('os').arch();
+		const arch = require('electron').remote.require('os').arch();
 		if (arch === 'ia32' || arch === 'x32')
 			return true;
 		else
@@ -925,12 +926,13 @@ Ext.define('Rambox.ux.WebView',{
 	}
 	,getOSRelease: function() {
 		const me = this;
+		const remote = require('electron');
 		return me.isWindows() ?
-		require('os').release().match(/([0-9]+\.[0-9]+)/)[0]
-			: require('os').release();
+		remote.require('os').release().match(/([0-9]+\.[0-9]+)/)[0]
+			: remote.require('os').release();
 	}
 	,getChromeVersion: function() {
-		return require('process').versions['chrome'];
+		return require('electron').remote.require('process').versions['chrome'];
 	}
 	,getElectronVersion: function() {
 		return require('process').versions['electron'];