chore: cleanup unusued variables + enable linting (#38898)

.eslintrc.json

@@ -28,12 +28,6 @@
     "sourceType": "module"
   },
   "overrides": [
-    {
-      "files": "*.js",
-      "rules": {
-        "@typescript-eslint/no-unused-vars": "off"
-      }
-    },
     {
       "files": "*.ts",
       "rules": {

script/download-circleci-artifacts.js

@@ -50,7 +50,7 @@ async function downloadWithRetry (url, directory) {
       return await downloadFile(downloadURL, directory);
     } catch (err) {
       lastError = err;
-      await new Promise((resolve, reject) => setTimeout(resolve, 30000));
+      await new Promise(resolve => setTimeout(resolve, 30000));
     }
   }
   throw lastError;

script/generate-version-json.js

@@ -1,5 +1,4 @@
 const fs = require('node:fs');
-const path = require('node:path');
 const semver = require('semver');
 
 const outputPath = process.argv[2];

script/lib/azput.js

@@ -1,6 +1,5 @@
 /* eslint-disable camelcase */
 const { BlobServiceClient } = require('@azure/storage-blob');
-const fs = require('node:fs');
 const path = require('node:path');
 
 const blobServiceClient = BlobServiceClient.fromConnectionString(process.env.ELECTRON_ARTIFACTS_BLOB_STORAGE);

script/lib/utils.js

@@ -8,6 +8,7 @@ const ELECTRON_DIR = path.resolve(__dirname, '..', '..');
 const SRC_DIR = path.resolve(ELECTRON_DIR, '..');
 
 require('colors');
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const pass = '✓'.green;
 const fail = '✗'.red;
 
@@ -129,7 +130,7 @@ function chunkFilenames (filenames, offset = 0) {
  * @returns {Promise<string[]>}
 */
 async function findMatchingFiles (top, test) {
-  return new Promise((resolve, reject) => {
+  return new Promise(resolve => {
     const matches = [];
     klaw(top, {
       filter: f => path.basename(f) !== '.bin'

script/lint.js

@@ -272,7 +272,7 @@ function parseCommandLine () {
   const opts = minimist(process.argv.slice(2), {
     boolean: ['c++', 'objc', 'javascript', 'python', 'gn', 'patches', 'help', 'changed', 'fix', 'verbose', 'only'],
     alias: { 'c++': ['cc', 'cpp', 'cxx'], javascript: ['js', 'es'], python: 'py', changed: 'c', help: 'h', verbose: 'v' },
-    unknown: arg => { help = true; }
+    unknown: () => { help = true; }
   });
   if (help || opts.help) {
     console.log('Usage: script/lint.js [--cc] [--js] [--py] [-c|--changed] [-h|--help] [-v|--verbose] [--fix] [--only -- file1 file2]');

script/release/ci-release-build.js

@@ -2,7 +2,6 @@ if (!process.env.CI) require('dotenv-safe').load();
 
 const assert = require('node:assert');
 const got = require('got');
-const { Octokit } = require('@octokit/rest');
 
 const BUILD_APPVEYOR_URL = 'https://ci.appveyor.com/api/builds';
 const CIRCLECI_PIPELINE_URL = 'https://circleci.com/api/v2/project/gh/electron/electron/pipeline';

script/release/notes/notes.js

@@ -256,7 +256,7 @@ async function runRetryable (fn, maxRetries) {
     try {
       return await fn();
     } catch (error) {
-      await new Promise((resolve, reject) => setTimeout(resolve, CHECK_INTERVAL));
+      await new Promise(resolve => setTimeout(resolve, CHECK_INTERVAL));
       lastError = error;
     }
   }

script/release/prepare-release.js

@@ -173,7 +173,7 @@ async function verifyNewVersion () {
 }
 
 async function promptForVersion (version) {
-  return new Promise((resolve, reject) => {
+  return new Promise(resolve => {
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout

script/release/publish-to-npm.js

@@ -2,7 +2,6 @@ const temp = require('temp');
 const fs = require('node:fs');
 const path = require('node:path');
 const childProcess = require('node:child_process');
-const got = require('got');
 const semver = require('semver');
 
 const { getCurrentBranch, ELECTRON_DIR } = require('../lib/utils');

script/release/release-artifact-cleanup.js

@@ -5,9 +5,6 @@ const args = require('minimist')(process.argv.slice(2), {
   string: ['tag', 'releaseID'],
   default: { releaseID: '' }
 });
-const { execSync } = require('node:child_process');
-const { GitProcess } = require('dugite');
-const { getCurrentBranch, ELECTRON_DIR } = require('../lib/utils.js');
 const { Octokit } = require('@octokit/rest');
 
 const octokit = new Octokit({

script/release/release.js

@@ -15,7 +15,6 @@ const got = require('got');
 const path = require('node:path');
 const semver = require('semver');
 const temp = require('temp').track();
-const { URL } = require('node:url');
 const { BlobServiceClient } = require('@azure/storage-blob');
 const { Octokit } = require('@octokit/rest');
 
@@ -299,7 +298,7 @@ async function uploadShasumFile (filePath, fileName, releaseId) {
 }
 
 function saveShaSumFile (checksums, fileName) {
-  return new Promise((resolve, reject) => {
+  return new Promise(resolve => {
     temp.open(fileName, (err, info) => {
       if (err) {
         console.error(`${fail} Could not create ${fileName} file`);
@@ -372,18 +371,6 @@ async function makeRelease (releaseToValidate) {
   }
 }
 
-async function makeTempDir () {
-  return new Promise((resolve, reject) => {
-    temp.mkdir('electron-publish', (err, dirPath) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(dirPath);
-      }
-    });
-  });
-}
-
 const SHASUM_256_FILENAME = 'SHASUMS256.txt';
 const SHASUM_1_FILENAME = 'SHASUMS.txt';
 

script/release/version-bumper.js

@@ -12,7 +12,7 @@ function parseCommandLine () {
     string: ['bump', 'version'],
     boolean: ['dryRun', 'help'],
     alias: { version: ['v'] },
-    unknown: arg => { help = true; }
+    unknown: () => { help = true; }
   });
   if (help || opts.help || !opts.bump) {
     console.log(`
@@ -33,14 +33,6 @@ async function main () {
   const currentVersion = getElectronVersion();
   const version = await nextVersion(opts.bump, currentVersion);
 
-  const parsed = semver.parse(version);
-  const components = {
-    major: parsed.major,
-    minor: parsed.minor,
-    patch: parsed.patch,
-    pre: parsed.prerelease
-  };
-
   // print would-be new version and exit early
   if (opts.dryRun) {
     console.log(`new version number would be: ${version}\n`);
@@ -97,18 +89,6 @@ async function nextVersion (bumpType, version) {
   return version;
 }
 
-function isMajorStable (bump, currentVersion) {
-  if (versionUtils.isBeta(currentVersion) && (bump === 'stable')) return true;
-  return false;
-}
-
-function isMajorNightly (version, currentVersion) {
-  const parsed = semver.parse(version);
-  const current = semver.parse(currentVersion);
-  if (versionUtils.isNightly(currentVersion) && (parsed.major > current.major)) return true;
-  return false;
-}
-
 if (require.main === module) {
   main().catch((error) => {
     console.error(error);

script/release/version-utils.js

@@ -1,13 +1,8 @@
-const path = require('node:path');
-const fs = require('node:fs');
 const semver = require('semver');
 const { GitProcess } = require('dugite');
-const { promisify } = require('node:util');
 
 const { ELECTRON_DIR } = require('../lib/utils');
 
-const readFile = promisify(fs.readFile);
-
 const preType = {
   NONE: 'none',
   PARTIAL: 'partial',

script/spec-runner.js

@@ -183,14 +183,6 @@ async function runTestUsingElectron (specDir, testName) {
   console.log(`${pass} Electron ${testName} process tests passed.`);
 }
 
-const specFilter = (file) => {
-  if (!/-spec\.[tj]s$/.test(file)) {
-    return false;
-  } else {
-    return true;
-  }
-};
-
 async function runNativeElectronTests () {
   let testTargets = require('./native-test-targets.json');
   const outDir = `out/${utils.getOutDir()}`;

spec/fixtures/api/context-bridge/context-bridge-mutability/preload.js

@@ -1,4 +1,4 @@
-const { contextBridge, ipcRenderer } = require('electron');
+const { contextBridge } = require('electron');
 
 contextBridge.exposeInMainWorld('str', 'some-text');
 contextBridge.exposeInMainWorld('obj', { prop: 'obj-prop' });

spec/fixtures/api/new-window-preload.js

@@ -1,4 +1,4 @@
-const { ipcRenderer, webFrame } = require('electron');
+const { ipcRenderer } = require('electron');
 
 ipcRenderer.send('answer', {
   argv: process.argv

spec/fixtures/api/safe-storage/decrypt-app/main.js

@@ -1,4 +1,4 @@
-const { app, safeStorage, ipcMain } = require('electron');
+const { app, safeStorage } = require('electron');
 const { promises: fs } = require('node:fs');
 const path = require('node:path');
 

spec/fixtures/api/safe-storage/encrypt-app/main.js

@@ -1,4 +1,4 @@
-const { app, safeStorage, ipcMain } = require('electron');
+const { app, safeStorage } = require('electron');
 const { promises: fs } = require('node:fs');
 const path = require('node:path');
 
@@ -7,6 +7,6 @@ const writeFile = fs.writeFile;
 
 app.whenReady().then(async () => {
   const encrypted = safeStorage.encryptString('plaintext');
-  const encryptedString = await writeFile(pathToEncryptedString, encrypted);
+  await writeFile(pathToEncryptedString, encrypted);
   app.quit();
 });

spec/fixtures/api/service-workers/sw-logs.js

@@ -1,4 +1,4 @@
-self.addEventListener('install', function (event) {
+self.addEventListener('install', function () {
   console.log('log log');
   console.info('info log');
   console.warn('warn log');

spec/fixtures/api/service-workers/sw.js

@@ -1,3 +1,3 @@
-self.addEventListener('install', function (event) {
+self.addEventListener('install', function () {
   console.log('Installed');
 });

spec/fixtures/api/singleton/main.js

@@ -8,7 +8,7 @@ const gotTheLock = app.requestSingleInstanceLock();
 
 app.on('second-instance', (event, args, workingDirectory) => {
   setImmediate(() => {
-    console.log(JSON.stringify(args));
+    console.log(JSON.stringify(args), workingDirectory);
     app.exit(0);
   });
 });

spec/fixtures/apps/crash/node-extra-args.js

@@ -1,6 +1,3 @@
-const path = require('node:path');
-const childProcess = require('node:child_process');
-
 process.on('message', function () {
   process.send(process.argv);
 });

spec/fixtures/apps/libuv-hang/renderer.js

@@ -1,5 +1,3 @@
-const count = localStorage.getItem('count');
-
 const { run, ipcRenderer } = window.api;
 
 run().then(async () => {

spec/fixtures/apps/remote-control/main.js

@@ -1,7 +1,7 @@
 const { app } = require('electron');
 const http = require('node:http');
 const v8 = require('node:v8');
-// eslint-disable-next-line camelcase
+// eslint-disable-next-line camelcase,@typescript-eslint/no-unused-vars
 const promises_1 = require('node:timers/promises');
 
 if (app.commandLine.hasSwitch('boot-eval')) {

spec/fixtures/apps/self-module-paths/main.js

@@ -1,6 +1,5 @@
 // Modules to control application life and create native browser window
 const { app, BrowserWindow, ipcMain } = require('electron');
-const path = require('node:path');
 
 function createWindow () {
   const mainWindow = new BrowserWindow({

spec/fixtures/chromium/other-window.js

@@ -4,7 +4,7 @@ const ints = (...args) => args.map(a => parseInt(a, 10));
 
 const [x, y, width, height] = ints(...process.argv.slice(2));
 
-let w;
+let w; // eslint-disable-line @typescript-eslint/no-unused-vars
 
 app.whenReady().then(() => {
   w = new BrowserWindow({

spec/fixtures/crash-cases/fs-promises-renderer-crash/index.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain } = require('electron');
+const { app, BrowserWindow } = require('electron');
 const path = require('node:path');
 
 app.whenReady().then(() => {

spec/fixtures/crash-cases/worker-multiple-destroy/worklet.js

@@ -1,6 +1,7 @@
 /* global registerPaint */
 
 class CheckerboardPainter {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   paint (ctx, geom, properties) {
     const colors = ['red', 'green', 'blue'];
     const size = 32;

spec/fixtures/extensions/chrome-webRequest/background.js

@@ -1,6 +1,7 @@
 /* global chrome */
 
 chrome.webRequest.onBeforeRequest.addListener(
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   (details) => {
     return { cancel: true };
   },

spec/fixtures/extensions/lazy-background-page/get-background-page.js

@@ -2,6 +2,6 @@
 window.completionPromise = new Promise((resolve) => {
   window.completionPromiseResolve = resolve;
 });
-chrome.runtime.sendMessage({ some: 'message' }, (response) => {
+chrome.runtime.sendMessage({ some: 'message' }, () => {
   window.completionPromiseResolve(chrome.extension.getBackgroundPage().receivedMessage);
 });

spec/fixtures/extensions/lazy-background-page/runtime-get-background-page.js

@@ -2,7 +2,7 @@
 window.completionPromise = new Promise((resolve) => {
   window.completionPromiseResolve = resolve;
 });
-chrome.runtime.sendMessage({ some: 'message' }, (response) => {
+chrome.runtime.sendMessage({ some: 'message' }, () => {
   chrome.runtime.getBackgroundPage((bgPage) => {
     window.completionPromiseResolve(bgPage.receivedMessage);
   });

spec/fixtures/module/preload-context.js

@@ -1,4 +1,4 @@
-var test = 'test'; // eslint-disable-line no-var
+var test = 'test'; // eslint-disable-line no-var,@typescript-eslint/no-unused-vars
 
 const types = {
   require: typeof require,

spec/fixtures/module/preload-sandbox.js

@@ -58,6 +58,7 @@
       ipcRenderer.on('touch-the-opener', () => {
         let errorMessage = null;
         try {
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
           const openerDoc = opener.document;
         } catch (error) {
           errorMessage = error.message;

spec/fixtures/testsnap.js

@@ -1,3 +1,4 @@
-// taken from https://chromium.googlesource.com/v8/v8.git/+/HEAD/test/cctest/test-serialize.cc#1127
+// taken from https://chromium.googlesource.com/v8/v8.git/+/HEAD/test/cctest/test-serialize.cc
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function f () { return g() * 2; }
 function g () { return 43; }

spec/lib/video-helpers.js

@@ -394,8 +394,10 @@ function parseWebP (riff) {
   const height = tmp & 0x3FFF;
   const verticalScale = tmp >> 14;
   return {
-    width: width,
+    width,
-    height: height,
+    height,
+    horizontalScale,
+    verticalScale,
     data: VP8,
     riff: riff
   };