From 7a6fe00f494d79d738efdd015f94d9772cf23d54 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 17 Dec 2018 20:47:41 +0100
Subject: [PATCH] chore: simplify code for modules internally using
 remote.require in sandbox (#16104)

---
 BUILD.gn                                            | 12 ------------
 lib/renderer/remote.js                              |  8 ++++----
 lib/sandboxed_renderer/api/exports/child_process.js |  8 --------
 lib/sandboxed_renderer/api/exports/fs.js            |  8 --------
 lib/sandboxed_renderer/api/exports/os.js            |  8 --------
 lib/sandboxed_renderer/api/exports/path.js          |  8 --------
 lib/sandboxed_renderer/init.js                      |  5 ++++-
 7 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 lib/sandboxed_renderer/api/exports/child_process.js
 delete mode 100644 lib/sandboxed_renderer/api/exports/fs.js
 delete mode 100644 lib/sandboxed_renderer/api/exports/os.js
 delete mode 100644 lib/sandboxed_renderer/api/exports/path.js

diff --git a/BUILD.gn b/BUILD.gn
index 178f04f4b7..b362b4fc7d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -62,14 +62,6 @@ npm_action("atom_browserify_sandbox") {
     "lib/sandboxed_renderer/init.js",
     "-r",
     "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-    "-r",
-    "./lib/sandboxed_renderer/api/exports/fs.js:fs",
-    "-r",
-    "./lib/sandboxed_renderer/api/exports/os.js:os",
-    "-r",
-    "./lib/sandboxed_renderer/api/exports/path.js:path",
-    "-r",
-    "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
     "-t",
     "aliasify",
   ]
@@ -80,10 +72,6 @@ npm_action("atom_browserify_sandbox") {
     # Use a script to generate all dependencies and put them here.
     "lib/sandboxed_renderer/init.js",
     "lib/sandboxed_renderer/api/exports/electron.js",
-    "lib/sandboxed_renderer/api/exports/fs.js",
-    "lib/sandboxed_renderer/api/exports/os.js",
-    "lib/sandboxed_renderer/api/exports/path.js",
-    "lib/sandboxed_renderer/api/exports/child_process.js",
   ]
   outputs = [
     "$target_gen_dir/js2c/preload_bundle.js",
diff --git a/lib/renderer/remote.js b/lib/renderer/remote.js
index ed867c0abe..0ef98ca060 100644
--- a/lib/renderer/remote.js
+++ b/lib/renderer/remote.js
@@ -9,16 +9,16 @@ exports.getRemote = function (name) {
   return remote[name]
 }
 
-exports.getRemoteFor = function (usage) {
+exports.remoteRequire = function (name) {
   if (!remote) {
-    throw new Error(`${usage} requires remote, which is not enabled`)
+    throw new Error(`${name} requires remote, which is not enabled`)
   }
-  return remote
+  return remote.require(name)
 }
 
 exports.potentiallyRemoteRequire = function (name) {
   if (process.sandboxed) {
-    return exports.getRemoteFor(name).require(name)
+    return exports.remoteRequire(name)
   } else {
     return require(name)
   }
diff --git a/lib/sandboxed_renderer/api/exports/child_process.js b/lib/sandboxed_renderer/api/exports/child_process.js
deleted file mode 100644
index 8e9c220c62..0000000000
--- a/lib/sandboxed_renderer/api/exports/child_process.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict'
-
-const { deprecate } = require('electron')
-
-deprecate.warn(`require('child_process')`, `remote.require('child_process')`)
-
-const { getRemoteFor } = require('@electron/internal/renderer/remote')
-module.exports = getRemoteFor('child_process').require('child_process')
diff --git a/lib/sandboxed_renderer/api/exports/fs.js b/lib/sandboxed_renderer/api/exports/fs.js
deleted file mode 100644
index 1036a1682a..0000000000
--- a/lib/sandboxed_renderer/api/exports/fs.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict'
-
-const { deprecate } = require('electron')
-
-deprecate.warn(`require('fs')`, `remote.require('fs')`)
-
-const { getRemoteFor } = require('@electron/internal/renderer/remote')
-module.exports = getRemoteFor('fs').require('fs')
diff --git a/lib/sandboxed_renderer/api/exports/os.js b/lib/sandboxed_renderer/api/exports/os.js
deleted file mode 100644
index 4848eaa531..0000000000
--- a/lib/sandboxed_renderer/api/exports/os.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict'
-
-const { deprecate } = require('electron')
-
-deprecate.warn(`require('os')`, `remote.require('os')`)
-
-const { getRemoteFor } = require('@electron/internal/renderer/remote')
-module.exports = getRemoteFor('os').require('os')
diff --git a/lib/sandboxed_renderer/api/exports/path.js b/lib/sandboxed_renderer/api/exports/path.js
deleted file mode 100644
index 089efca0d2..0000000000
--- a/lib/sandboxed_renderer/api/exports/path.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict'
-
-const { deprecate } = require('electron')
-
-deprecate.warn(`require('path')`, `remote.require('path')`)
-
-const { getRemoteFor } = require('@electron/internal/renderer/remote')
-module.exports = getRemoteFor('path').require('path')
diff --git a/lib/sandboxed_renderer/init.js b/lib/sandboxed_renderer/init.js
index 3910b28594..567785c748 100644
--- a/lib/sandboxed_renderer/init.js
+++ b/lib/sandboxed_renderer/init.js
@@ -91,13 +91,16 @@ Object.defineProperty(preloadProcess, 'noDeprecation', {
 
 process.on('exit', () => preloadProcess.emit('exit'))
 
+const { remoteRequire } = require('@electron/internal/renderer/remote')
+
 // This is the `require` function that will be visible to the preload script
 function preloadRequire (module) {
   if (loadedModules.has(module)) {
     return loadedModules.get(module)
   }
   if (remoteModules.has(module)) {
-    return require(module)
+    electron.deprecate.warn(`require('${module}')`, `remote.require('${module}')`)
+    return remoteRequire(module)
   }
   throw new Error('module not found')
 }