chore: lint JavaScript code (#1741)

.eslintignore

@@ -2,3 +2,4 @@ typedoc/**/*
 **/test/fixtures/**/node_modules/**
 **/test/work/*
 dist/
+src/targets.js

.eslintrc.js

@@ -1,21 +1,17 @@
+'use strict'
 const eslintConfig = {
   extends: [
-    'eslint:recommended',
-    'plugin:ava/recommended',
-    'plugin:import/errors',
-    'plugin:import/warnings',
-    'plugin:promise/recommended',
-    'standard',
-    'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:import/typescript',
+    'eslint:recommended'
   ],
-  parser: '@typescript-eslint/parser',
   parserOptions: {
-    sourceType: 'module',
+    "ecmaVersion": "latest"
+  },
+  env: {
+    "es6": true,
+    "node": true
   },
   plugins: [
-    'ava',
+    'ava'
   ],
   rules: {
     'ava/no-import-test-files': 0,
@@ -25,17 +21,45 @@ const eslintConfig = {
       2,
       {
         CallExpression: {
-          arguments: 'first',
+          arguments: 'first'
         },
-        SwitchCase: 1,
-      },
+        SwitchCase: 1
+      }
     ],
     'no-console': 0,
     strict: 'error',
-    'comma-dangle': ['error', 'only-multiline'],
-    semi: ['error', 'always'],
-    'space-before-function-paren': ['error', 'never']
+    'comma-dangle': ['error', 'never'],
+    semi: ['error', 'never'],
+    'space-before-function-paren': ['error', 'always']
   },
-};
+  overrides: [
+    {
+      files: ["**/*.ts"],
+      extends: [
+        'eslint:recommended',
+        'plugin:ava/recommended',
+        'plugin:import/errors',
+        'plugin:import/warnings',
+        'plugin:promise/recommended',
+        'plugin:@typescript-eslint/eslint-recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:import/typescript'
+      ],
+      parser: '@typescript-eslint/parser',
+      parserOptions: {
+        sourceType: 'module'
+      },
+      rules: {
+        'comma-dangle': ['error', 'always-multiline'],
+        semi: ['error', 'always'],
+        'space-before-function-paren': ['error', {
+          "anonymous": "never",
+          "named": "never",
+          "asyncArrow": "always"
+        }]
+      }
+    }
+  ]
+}
 
-module.exports = eslintConfig;
+module.exports = eslintConfig

package.json

@@ -52,19 +52,19 @@
     "@types/parse-author": "^2.0.2",
     "@types/plist": "^3.0.4",
     "@types/resolve": "^1.20.4",
+    "@types/semver": "^7.5.8",
     "@types/yargs-parser": "^21.0.2",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
     "@typescript-eslint/parser": "^6.9.1",
     "ava": "^3.10.1",
     "buffer-equal": "^1.0.0",
     "codecov": "^3.0.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8.52.0",
-    "eslint-config-standard": "^16.0.0",
     "eslint-plugin-ava": "^14.0.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-promise": "^6.2.0",
     "lodash": "^4.17.21",
     "nyc": "^15.0.0",
     "pkg-up": "^4.0.0",
@@ -82,7 +82,7 @@
     "codecov": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "coverage": "nyc ava test/index.js",
     "docs:build": "node test/ci/build_docs.js",
-    "lint": "eslint --ext .ts .",
+    "lint": "eslint .",
     "prepublish": "npm run build",
     "pretest": "npm run build",
     "test": "npm run lint && npm run coverage"

src/cli.ts

@@ -22,17 +22,17 @@ export function parseArgs(argv: string[]) {
       'junk',
       'overwrite',
       'prune',
-      'quiet'
+      'quiet',
     ],
     default: {
       'deref-symlinks': true,
       junk: true,
-      prune: true
+      prune: true,
     },
     string: [
       'electron-version',
-      'out'
-    ]
+      'out',
+    ],
   });
 
   args.dir = args._[0];

src/infer.ts

@@ -127,7 +127,7 @@ export async function getMetadataFromPackageJSON(platforms: SupportedPlatform[],
       'dependencies.electron',
       'devDependencies.electron',
       'dependencies.electron-nightly',
-      'devDependencies.electron-nightly'
+      'devDependencies.electron-nightly',
     ]);
   }
 

src/prune.ts

@@ -5,7 +5,7 @@ import path from 'path';
 
 const ELECTRON_MODULES = [
   'electron',
-  'electron-nightly'
+  'electron-nightly',
 ];
 
 export class Pruner {
@@ -20,7 +20,7 @@ export class Pruner {
     this.quiet = quiet;
     this.galactus = new DestroyerOfModules({
       rootDirectory: dir,
-      shouldKeepModuleTest: (module, isDevDep) => this.shouldKeepModule(module, isDevDep)
+      shouldKeepModuleTest: (module, isDevDep) => this.shouldKeepModule(module, isDevDep),
     });
   }
 

src/resedit.ts

@@ -55,7 +55,7 @@ export async function resedit(exePath: string, options: ExeMetadata) {
       res.entries,
       existingIconGroups[0].id,
       existingIconGroups[0].lang,
-      iconFile.icons.map((item) => item.data)
+      iconFile.icons.map((item) => item.data),
     );
   }
 
@@ -78,7 +78,7 @@ export async function resedit(exePath: string, options: ExeMetadata) {
       const currentManifestContent = Buffer.from(manifestEntry.bin).toString('utf-8');
       const newContent = currentManifestContent.replace(
         /(<requestedExecutionLevel level=")asInvoker(" uiAccess="false"\/>)/g,
-        `$1${options.win32Metadata?.['requested-execution-level']}$2`
+        `$1${options.win32Metadata?.['requested-execution-level']}$2`,
       );
       manifestEntry.bin = Buffer.from(newContent, 'utf-8');
     }

src/universal.ts

@@ -30,7 +30,7 @@ export async function packageUniversalMac(packageForPlatformAndArchWithOpts: Pac
 
   const tempPackages = {} as Record<SupportedArch, string>;
 
-  await Promise.all((['x64', 'arm64'] as SupportedArch[]).map(async(tempArch) => {
+  await Promise.all((['x64', 'arm64'] as SupportedArch[]).map(async (tempArch) => {
     const tempOpts = {
       ...comboOpts,
       arch: tempArch,

temp/targets.js

@@ -1 +1,2 @@
+'use strict'
 module.exports = require('../dist/targets')

test/_setup.js

@@ -21,7 +21,7 @@ function fixtureSubdir (subdir) {
  * Skip testing darwin/mas target on Windows since Electron Packager itself skips it
  * (see https://github.com/electron/packager/issues/71)
  */
-function skipDownloadingMacZips (platform, arch) {
+function skipDownloadingMacZips (platform) {
   return isPlatformMac(platform) && process.platform === 'win32'
 }
 

test/_util.js

@@ -15,15 +15,15 @@ const test = require('ava')
 
 const ORIGINAL_CWD = process.cwd()
 
-test.before(async t => {
+test.before(async () => {
   if (!process.env.CI) {
     await setup.setupTestsuite()
     process.chdir(setup.WORK_CWD)
   }
   return Promise.resolve(process.chdir(setup.WORK_CWD))
 })
 
-test.after.always(async t => {
+test.after.always(async () => {
   process.chdir(ORIGINAL_CWD)
   await fs.remove(setup.WORK_CWD)
 })

test/prune.js

@@ -18,7 +18,7 @@ async function assertDependencyExists (t, resourcesPath, moduleName) {
   await util.assertDirectory(t, modulePath, 'module is a directory')
 }
 
-async function createPruneOptionTest (t, baseOpts, prune, testMessage) {
+async function createPruneOptionTest (t, baseOpts, prune) {
   const opts = {
     ...baseOpts,
     name: 'pruneTest',

test/targets.js

@@ -2,7 +2,7 @@
 
 const config = require('./config.json')
 const sinon = require('sinon')
-const { allOfficialArchsForPlatformAndVersion, createPlatformArchPairs, osModules, supported, validateListFromOptions } = require('../dist/targets')
+const { allOfficialArchsForPlatformAndVersion, createPlatformArchPairs, supported, validateListFromOptions } = require('../dist/targets')
 const test = require('ava')
 const util = require('./_util')