From f7d6e3fa7bb703e00410ce729661a91f02e97b0b Mon Sep 17 00:00:00 2001 From: Felix Rieseberg Date: Thu, 23 Nov 2017 13:53:03 -0800 Subject: [PATCH] :wrench: Disable standard/no-callback-literal where necessary --- lib/browser/api/auto-updater/squirrel-update-win.js | 6 ++++++ lib/browser/api/session.js | 2 ++ lib/browser/chrome-extension.js | 4 ++++ lib/common/asar.js | 2 ++ lib/renderer/chrome-api.js | 2 ++ lib/renderer/extensions/storage.js | 5 +++++ 6 files changed, 21 insertions(+) diff --git a/lib/browser/api/auto-updater/squirrel-update-win.js b/lib/browser/api/auto-updater/squirrel-update-win.js index d82577bcf483..b0813d1fcdda 100644 --- a/lib/browser/api/auto-updater/squirrel-update-win.js +++ b/lib/browser/api/auto-updater/squirrel-update-win.js @@ -28,6 +28,8 @@ var spawnUpdate = function (args, detached, callback) { // Process spawned, different args: Return with error // No process spawned: Spawn new process if (spawnedProcess && !isSameArgs(args)) { + // 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, { @@ -68,6 +70,8 @@ var spawnUpdate = function (args, detached, callback) { // Process terminated with error. if (code !== 0) { + // Disabled for backwards compatibility: + // eslint-disable-next-line standard/no-callback-literal return callback(`Command failed: ${signal != null ? signal : code}\n${stderr}`) } @@ -93,6 +97,8 @@ 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) { + // Disabled for backwards compatibility: + // eslint-disable-next-line standard/no-callback-literal return callback(`Invalid result:\n${stdout}`) } return callback(null, update) diff --git a/lib/browser/api/session.js b/lib/browser/api/session.js index 33f3b47dee0e..6c103d25d623 100644 --- a/lib/browser/api/session.js +++ b/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) }) }) diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js index 868e07e96096..af88438d33dd 100644 --- a/lib/browser/chrome-extension.js +++ b/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) diff --git a/lib/common/asar.js b/lib/common/asar.js index 6eaddebf2618..1b9a993a2e67 100644 --- a/lib/common/asar.js +++ b/lib/common/asar.js @@ -367,6 +367,8 @@ return invalidArchiveError(asarPath, callback) } process.nextTick(function () { + // Disabled due to false positive in StandardJS + // eslint-disable-next-line standard/no-callback-literal callback(archive.stat(filePath) !== false) }) } diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js index 1b509178f49e..07b940675b30 100644 --- a/lib/renderer/chrome-api.js +++ b/lib/renderer/chrome-api.js @@ -147,6 +147,8 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) { executeScript (tabId, details, callback) { const requestId = ++nextId ipcRenderer.once(`CHROME_TABS_EXECUTESCRIPT_RESULT_${requestId}`, (event, result) => { + // Disabled due to false positive in StandardJS + // eslint-disable-next-line standard/no-callback-literal callback([event.result]) }) ipcRenderer.send('CHROME_TABS_EXECUTESCRIPT', requestId, tabId, extensionId, details) diff --git a/lib/renderer/extensions/storage.js b/lib/renderer/extensions/storage.js index 2920a2860e03..f2a560f81c2c 100644 --- a/lib/renderer/extensions/storage.js +++ b/lib/renderer/extensions/storage.js @@ -51,6 +51,8 @@ const getStorage = (storageType, extensionId, cb) => { if (data !== null) { cb(JSON.parse(data)) } else { + // Disabled due to false positive in StandardJS + // eslint-disable-next-line standard/no-callback-literal cb({}) } }) @@ -82,6 +84,9 @@ const getStorageManager = (storageType, extensionId) => { } break } + + // Disabled due to false positive in StandardJS + // eslint-disable-next-line standard/no-callback-literal if (keys.length === 0) return callback({}) let items = {}