Merge pull request #11235 from electron/standard-10

infra: Upgrade to StandardJS 10

lib/browser/api/auto-updater/squirrel-update-win.js

@@ -28,7 +28,9 @@ var spawnUpdate = function (args, detached, callback) {
     // Process spawned, different args:   Return with error
     // No process spawned:                Spawn new process
     if (spawnedProcess && !isSameArgs(args)) {
-      return callback('AutoUpdater process with arguments ' + args + ' is already running')
+      // Disabled for backwards compatibility:
+      // eslint-disable-next-line standard/no-callback-literal
+      return callback(`AutoUpdater process with arguments ${args} is already running`)
     } else if (!spawnedProcess) {
       spawnedProcess = spawn(updateExe, args, {
         detached: detached
@@ -68,7 +70,9 @@ var spawnUpdate = function (args, detached, callback) {
 
     // Process terminated with error.
     if (code !== 0) {
-      return callback('Command failed: ' + (signal != null ? signal : code) + '\n' + stderr)
+      // Disabled for backwards compatibility:
+      // eslint-disable-next-line standard/no-callback-literal
+      return callback(`Command failed: ${signal != null ? signal : code}\n${stderr}`)
     }
 
     // Success.
@@ -93,7 +97,9 @@ exports.checkForUpdate = function (updateURL, callback) {
       json = stdout.trim().split('\n').pop()
       update = (ref = JSON.parse(json)) != null ? (ref1 = ref.releasesToApply) != null ? typeof ref1.pop === 'function' ? ref1.pop() : void 0 : void 0 : void 0
     } catch (jsonError) {
-      return callback('Invalid result:\n' + stdout)
+      // Disabled for backwards compatibility:
+      // eslint-disable-next-line standard/no-callback-literal
+      return callback(`Invalid result:\n${stdout}`)
     }
     return callback(null, update)
   })

lib/browser/api/net.js

@@ -79,7 +79,6 @@ class IncomingMessage extends Readable {
     this.shouldPush = true
     this._pushInternalData()
   }
-
 }
 
 URLRequest.prototype._emitRequestEvent = function (isAsync, ...rest) {
@@ -103,7 +102,6 @@ URLRequest.prototype._emitResponseEvent = function (isAsync, ...rest) {
 }
 
 class ClientRequest extends EventEmitter {
-
   constructor (options, callback) {
     super()
 
@@ -354,7 +352,6 @@ class ClientRequest extends EventEmitter {
   abort () {
     this.urlRequest.cancel()
   }
-
 }
 
 function writeAfterEndNT (self, error, callback) {

lib/browser/api/session.js

@@ -26,6 +26,8 @@ Session.prototype.setCertificateVerifyProc = function (verifyProc) {
     // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
     this._setCertificateVerifyProc(({hostname, certificate, verificationResult}, cb) => {
       verifyProc(hostname, certificate, (result) => {
+        // Disabled due to false positive in StandardJS
+        // eslint-disable-next-line standard/no-callback-literal
         cb(result ? 0 : -2)
       })
     })

lib/browser/api/web-contents.js

@@ -6,6 +6,7 @@ const {app, ipcMain, session, NavigationController} = electron
 
 // session is not used here, the purpose is to make sure session is initalized
 // before the webContents module.
+// eslint-disable-next-line
 session
 
 let nextId = 0

lib/browser/chrome-extension.js

@@ -311,6 +311,8 @@ const chromeExtensionHandler = function (request, callback) {
 
   const page = backgroundPages[parsed.hostname]
   if (page && parsed.path === `/${page.name}`) {
+    // Disabled due to false positive in StandardJS
+    // eslint-disable-next-line standard/no-callback-literal
     return callback({
       mimeType: 'text/html',
       data: page.html
@@ -319,6 +321,8 @@ const chromeExtensionHandler = function (request, callback) {
 
   fs.readFile(path.join(manifest.srcDirectory, parsed.path), function (err, content) {
     if (err) {
+      // Disabled due to false positive in StandardJS
+      // eslint-disable-next-line standard/no-callback-literal
       return callback(-6)  // FILE_NOT_FOUND
     } else {
       return callback(content)